- up

business/partner/purchase/jx/callback.go

@@ -10,8 +10,7 @@ import (
 const (
 	appKey = "4A86853D-E4B6-454E-940A-B68ECDA2B73E"
 
-	MsgTypeOrder       = "order"
-	SubMsgTypeOrderNew = "newOrder"
+	MsgTypeOrder = "order"
 )
 
 type CallbackResponse struct {

business/partner/purchase/jx/order.go

@@ -29,7 +29,7 @@ func (c *PurchaseHandler) onOrderMsg(msg *CallbackMsg) (retVal, errCode string,
 	if subMsgType == model.OrderStatusNew || subMsgType == model.OrderStatusAdjust {
 		var order *Data4Neworder
 		if err = utils.UnmarshalUseNumber([]byte(msg.Data), &order); err == nil {
-			retVal, errCode, err = c.onOrderNew(msg, order)
+			retVal, errCode, err = c.onOrderNew(msg, subMsgType, order)
 		}
 	} else {
 		status := c.callbackMsg2Status(msg)
@@ -53,15 +53,15 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *CallbackMsg) *model.OrderStatu
 	return orderStatus
 }
 
-func (c *PurchaseHandler) onOrderNew(msg *CallbackMsg, order *Data4Neworder) (retVal, errCode string, err error) {
+func (c *PurchaseHandler) onOrderNew(msg *CallbackMsg, subMsgType int, order *Data4Neworder) (retVal, errCode string, err error) {
 	globals.SugarLogger.Debugf("onOrderNew orderID:%s", msg.ThingID)
 	order.GoodsOrder.Skus = order.Skus
 	order.VendorID = model.VendorIDJX
 	jxutils.RefreshOrderSkuRelated(&order.GoodsOrder)
 	orderStatus := model.Order2Status(&order.GoodsOrder)
-	if msg.SubMsgType == SubMsgTypeOrderNew {
+	if subMsgType == model.OrderStatusNew {
 		err = partner.CurOrderManager.OnOrderNew(&order.GoodsOrder, orderStatus)
-	} else {
+	} else if subMsgType == model.OrderStatusAdjust {
 		err = partner.CurOrderManager.OnOrderAdjust(&order.GoodsOrder, orderStatus)
 	}
 	return retVal, errCode, err