整理京西自有PHP商城相关的代码

business/partner/purchase/jx/order.go

@@ -3,79 +3,13 @@ package jx
 import (
 	"time"
 
-	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/partner"
-	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/business/partner/purchase/jx/phpjx"
 )
 
-type Data4Neworder struct {
-	model.GoodsOrder
-	Skus []*model.OrderSku `json:"skus"`
-}
-
-func (c *PurchaseHandler) OnOrderMsg(msg *CallbackMsg) (retVal, errCode string, err error) {
-	jxutils.CallMsgHandler(func() {
-		retVal, errCode, err = c.onOrderMsg(msg)
-	}, jxutils.ComposeUniversalOrderID(msg.ThingID, c.GetVendorID()))
-	return retVal, errCode, err
-}
-
-func (c *PurchaseHandler) onOrderMsg(msg *CallbackMsg) (retVal, errCode string, err error) {
-	subMsgType := int(utils.Str2Int64WithDefault(msg.SubMsgType, 0))
-	if subMsgType == model.OrderStatusNew || subMsgType == model.OrderStatusAdjust {
-		var order *Data4Neworder
-		if err = utils.UnmarshalUseNumber([]byte(msg.Data), &order); err == nil {
-			if order.VendorStatus == "" {
-				order.VendorStatus = utils.Int2Str(order.Status)
-			}
-			retVal, errCode, err = c.onOrderNew(msg, subMsgType, order)
-		}
-	} else {
-		status := c.callbackMsg2Status(msg)
-		err = partner.CurOrderManager.OnOrderStatusChanged(status)
-	}
-	return retVal, errCode, err
-}
-
-func (c *PurchaseHandler) callbackMsg2Status(msg *CallbackMsg) *model.OrderStatus {
-	orderStatus := &model.OrderStatus{
-		VendorOrderID:    msg.ThingID,
-		VendorID:         model.VendorIDJX,
-		OrderType:        model.OrderTypeOrder,
-		RefVendorOrderID: msg.ThingID,
-		RefVendorID:      model.VendorIDJX,
-		VendorStatus:     msg.SubMsgType,
-		Status:           int(utils.Str2Int64WithDefault(msg.SubMsgType, 0)),
-		StatusTime:       utils.Timestamp2Time(msg.Timestamp),
-		Remark:           "",
-	}
-	return orderStatus
-}
-
-func (c *PurchaseHandler) onOrderNew(msg *CallbackMsg, subMsgType int, order *Data4Neworder) (retVal, errCode string, err error) {
-	globals.SugarLogger.Debugf("onOrderNew orderID:%s", msg.ThingID)
-	order.StoreID = int(utils.Str2Int64WithDefault(order.VendorStoreID, 0))
-	order.DeliveryType = model.OrderDeliveryTypeStoreSelf
-	order.GoodsOrder.Skus = order.Skus
-	order.VendorID = model.VendorIDJX
-	order.Flag = model.OrderFlagMaskTempJX
-	for _, v := range order.GoodsOrder.Skus {
-		v.SkuID = int(utils.Str2Int64WithDefault(v.VendorSkuID, 0))
-	}
-	jxutils.RefreshOrderSkuRelated(&order.GoodsOrder)
-	orderStatus := model.Order2Status(&order.GoodsOrder)
-	if subMsgType == model.OrderStatusNew {
-		err = partner.CurOrderManager.OnOrderNew(&order.GoodsOrder, orderStatus)
-	} else if subMsgType == model.OrderStatusAdjust {
-		err = partner.CurOrderManager.OnOrderAdjust(&order.GoodsOrder, orderStatus)
-	}
-	return retVal, errCode, err
-}
-
 func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
 	return order
 }
@@ -91,12 +25,16 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 	} else {
 		status = model.OrderStatusCanceled
 	}
-	err = c.notifyOrderStatusChanged(order, status)
+	if model.IsOrderJXTemp(order) {
+		err = phpjx.NotifyOrderStatusChanged(order, status)
+	}
 	return err
 }
 
 func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
-	err = c.notifyOrderStatusChanged(order, model.OrderStatusFinishedPickup)
+	if model.IsOrderJXTemp(order) {
+		err = phpjx.NotifyOrderStatusChanged(order, model.OrderStatusFinishedPickup)
+	}
 	return err
 }
 
@@ -121,13 +59,16 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName
 }
 
 func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
-	err = c.notifyOrderStatusChanged(order, model.OrderStatusDelivering)
+	if model.IsOrderJXTemp(order) {
+		err = phpjx.NotifyOrderStatusChanged(order, model.OrderStatusDelivering)
+	}
 	return err
 }
 
-// 京东送达接口都是一样的
 func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) {
-	err = c.notifyOrderStatusChanged(order, model.OrderStatusFinished)
+	if model.IsOrderJXTemp(order) {
+		err = phpjx.NotifyOrderStatusChanged(order, model.OrderStatusFinished)
+	}
 	return err
 }
 
@@ -140,7 +81,9 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod
 }
 
 func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
-	err = c.notifyOrderStatusChanged(order, model.OrderStatusCanceled)
+	if model.IsOrderJXTemp(order) {
+		err = phpjx.NotifyOrderStatusChanged(order, model.OrderStatusCanceled)
+	}
 	return err
 }
 
@@ -163,16 +106,9 @@ func (c *PurchaseHandler) AddWaybillTip(ctx *jxcontext.Context, order *model.Goo
 func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, vendorOrderID, selfTakeCode string) (err error) {
 	order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDJX)
 	if err == nil {
-		err = c.notifyOrderStatusChanged(order, model.OrderStatusFinished)
-	}
-	return err
-}
-
-func (c *PurchaseHandler) notifyOrderStatusChanged(order *model.GoodsOrder, status int) (err error) {
-	orderMsg := *order
-	orderMsg.Status = status
-	if err = jxAPI.NotifyOrderStatusChanged(&orderMsg); err == nil {
-		c.postFakeMsg(orderMsg.VendorOrderID, orderMsg.Status)
+		if model.IsOrderJXTemp(order) {
+			err = phpjx.NotifyOrderStatusChanged(order, model.OrderStatusFinished)
+		}
 	}
 	return err
 }