+ RemoveSkuFromOrder

+ 美团配送调整消息正确更新订单信息

business/partner/purchase/jd/order.go

@@ -330,27 +330,13 @@ func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.Goods
 }
 
 func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOrder, removedSkuList []*model.OrderSku, reason string) (err error) {
-	removedSkuMap := make(map[int]*model.OrderSku)
-	for _, sku := range removedSkuList {
-		removedSkuMap[jxutils.GetSkuIDFromOrderSku(sku)] = sku
-	}
+	order = jxutils.RemoveSkuFromOrder(order, removedSkuList)
 	var oaosAdjustDTOList []*jdapi.OAOSAdjustDTO
 	for _, sku := range order.Skus {
-		skuID := jxutils.GetSkuIDFromOrderSku(sku)
-		tmp := &jdapi.OAOSAdjustDTO{
-			OutSkuID: utils.Int2Str(skuID),
+		oaosAdjustDTOList = append(oaosAdjustDTOList, &jdapi.OAOSAdjustDTO{
+			OutSkuID: utils.Int2Str(jxutils.GetSkuIDFromOrderSku(sku)),
 			SkuCount: sku.Count,
-		}
-		if removedSkuMap[skuID] != nil {
-			if removedSkuMap[skuID].Count >= sku.Count {
-				tmp = nil
-			} else {
-				tmp.SkuCount -= removedSkuMap[skuID].Count
-			}
-		}
-		if tmp != nil {
-			oaosAdjustDTOList = append(oaosAdjustDTOList, tmp)
-		}
+		})
 	}
 	if globals.EnableStoreWrite {
 		err = api.JdAPI.AdjustOrder(order.VendorOrderID, ctx.GetUserName(), reason, oaosAdjustDTOList)