- remove useless legacy codes.

- refactor models

business/partner/purchase/jd/order_legacy.go

@@ -1,49 +0,0 @@
-package jd
-
-import (
-	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/jx-callback/business/legacymodel"
-	"git.rosy.net.cn/jx-callback/business/model"
-	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego/orm"
-)
-
-// 为了兼容之前的表，造出原来需要的数据
-func (c *PurchaseHandler) legacyWriteJdOrder(order *model.GoodsOrder, delOldFirst bool) (err error) {
-	db := orm.NewOrm()
-	if delOldFirst {
-		db.Raw("DELETE FROM jdorder2 WHERE jdorderid = ?", utils.Str2Int64(order.VendorOrderID)).Exec()
-	}
-	legacyOrder := &legacymodel.Jdorder2{
-		Code:            "0",
-		Jdorderid:       utils.Str2Int64(order.VendorOrderID),
-		Orderstatus:     int(utils.Str2Int64(order.VendorStatus)),
-		Orderstatustime: utils.Time2Str(order.StatusTime),
-		Success:         1,
-		Cityname:        "all",
-	}
-	_, err = db.Insert(legacyOrder)
-	if err != nil {
-		globals.SugarLogger.Infof("legacyWriteJdOrder orderID:%s insert error:%v", order.VendorOrderID, err)
-	}
-	return err
-}
-
-func (c *PurchaseHandler) legacyJdOrderStatusChanged(status *model.OrderStatus) (err error) {
-	db := orm.NewOrm()
-	legacyOrder := &legacymodel.Jdorder2{
-		Jdorderid: utils.Str2Int64(status.VendorOrderID),
-	}
-
-	if err = db.Read(legacyOrder, "Jdorderid"); err == nil {
-		utils.CallFuncLogError(func() error {
-			legacyOrder.Orderstatus = int(utils.Str2Int64(status.VendorStatus))
-			legacyOrder.Orderstatustime = utils.Time2Str(status.StatusTime)
-			_, err = db.Update(legacyOrder, "Orderstatus", "Orderstatustime")
-			return err
-		}, "legacyJdOrderStatusChanged, status:%v", status)
-	} else {
-		globals.SugarLogger.Infof("legacyJdOrderStatusChanged db.Read status:%v, error:%v", status, err)
-	}
-	return err
-}

business/partner/purchase/jd/order_legacy_comment.go

@@ -10,6 +10,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"git.rosy.net.cn/jx-callback/business/model/legacymodel"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
@@ -75,7 +76,7 @@ func (c *PurchaseHandler) onOrderComment(msg *jdapi.CallbackOrderMsg) (err error
 		result, err := api.JdAPI.GetCommentByOrderId(intOrderID)
 		if err == nil {
 			globals.SugarLogger.Debugf("onOrderComment comment:%s", utils.Format4Output(result, true))
-			comment := &model.JxBadComments{
+			comment := &legacymodel.JxBadComments{
 				OrderId: msg.BillID,
 			}
 			db := dao.GetDB()