1

business/jxstore/cms/sku.go

@@ -2958,7 +2958,7 @@ func deleteJdsSku(db *dao.DaoDB, skuID int) (err error) {
 	return err
 }
 
-func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark string, brandID, vendorID int, vendorOrgCode, exPrefix, fromTime, toTime string, isAsync, isContinueWhenError bool) (hint string, err error) {
+func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark string, brandID, vendorID int, vendorOrgCode, exPrefix, fromTime, toTime string, isAsync, isContinueWhenError bool, storeIds0 []int) (hint string, err error) {
 	var (
 		fromTimeP time.Time
 		toTimeP   time.Time
@@ -3013,19 +3013,24 @@ func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark stri
 						for _, v := range skuList {
 							skuIDs = append(skuIDs, v.ID)
 						}
+
+						globals.SugarLogger.Debugf("---------test := %s", utils.Format4Output(partner.IsMultiStore(vendorID), false))
 						if partner.IsMultiStore(vendorID) {
 							for _, v := range skuIDs {
 								OnUpdateThing(ctx, db, nil, int64(v), model.ThingTypeSku)
 							}
 						} else {
 							var storeIDs []int
-							if brandID != 0 {
+							if len(storeIds0) != 0 {
+								storeIDs = storeIds0
+							} else if brandID != 0 {
 								if stores, _ := dao.GetStoreList(db, nil, nil, nil, []int{brandID}, nil, ""); len(stores) > 0 {
 									for _, v := range stores {
 										storeIDs = append(storeIDs, v.ID)
 									}
 								}
 							}
+							globals.SugarLogger.Debugf("---------test storeIDs:= %s", utils.Format4Output(storeIDs, false))
 							SetStoreSkuSyncStatus2(db, storeIDs, []int{vendorID}, skuIDs, model.SyncFlagModifiedMask)
 						}
 					}

business/partner/purchase/ebai/order.go

@@ -291,6 +291,12 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 	if order.StoreID > math.MaxInt32 {
 		order.StoreID = 0
 	}
+
+	sendFeeDetail := utils.MustInterface2Int64(orderMap["send_fee_detail"].(map[string]interface{})["one_on_one_delivery_fee"])
+	if sendFeeDetail > 0 {
+		order.CouponIDs += ",11003"
+	}
+
 	order.Status = p.getStatusFromVendorStatus(order.VendorStatus)
 	if order.Status >= model.OrderStatusEndBegin {
 		order.OrderFinishedAt = time.Now()

business/partner/purchase/mtwm/order.go

@@ -322,7 +322,9 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 		tagList := utils.Interface2Int64List(orderData["order_tag_list"].([]interface{}))
 		tagListStr := make([]string, len(tagList), len(tagList))
 		for _, v := range tagList {
-			tagListStr = append(tagListStr, utils.Int64ToStr(v))
+			if v == 11003 || v == 11002 { // 主单模式1v1急送订单
+				tagListStr = append(tagListStr, utils.Int64ToStr(v))
+			}
 		}
 		order.CouponIDs = strings.Join(tagListStr, ",")
 	}

controllers/cms_sku.go

@@ -598,6 +598,7 @@ func (c *SkuController) RefreshJdDepot() {
 // @Param	imgWaterMark		formData		string	false	"商品水印图"
 // @Param	brandID				formData		int		false	"品牌ID"
 // @Param	vendorID			formData		int		true	"平台ID"
+// @Param	storeId				formData		string	false	"门店ID"
 // @Param	vendorOrgCode		formData		string	true	"平台账号"
 // @Param	isAsync				formData		bool	false	"是否异步"
 // @Param	isContinueWhenError	formData		bool	false	"单个同步失败是否继续，缺省false"
@@ -606,9 +607,9 @@ func (c *SkuController) RefreshJdDepot() {
 // @router /UpdateSkuExinfoMap [put]
 func (c *SkuController) UpdateSkuExinfoMap() {
 	c.callUpdateSkuExinfoMap(func(params *tSkuUpdateSkuExinfoMapParams) (retVal interface{}, errCode string, err error) {
-		var skuIDList []int
+		var skuIDList, storeIds []int
-		if err = jxutils.Strings2Objs(params.NameIDs, &skuIDList); err == nil {
+		if err = jxutils.Strings2Objs(params.NameIDs, &skuIDList, params.StoreId, &storeIds); err == nil {
-			retVal, err = cms.UpdateSkuExinfoMap(params.Ctx, skuIDList, params.ImgWaterMark, params.BrandID, params.VendorID, params.VendorOrgCode, params.ExPrefix, params.FromDate, params.ToDate, params.IsAsync, params.IsContinueWhenError)
+			retVal, err = cms.UpdateSkuExinfoMap(params.Ctx, skuIDList, params.ImgWaterMark, params.BrandID, params.VendorID, params.VendorOrgCode, params.ExPrefix, params.FromDate, params.ToDate, params.IsAsync, params.IsContinueWhenError, storeIds)
 		}
 		return retVal, "", err
 	})

swagger/swagger.json

@@ -17106,6 +17106,14 @@
                         "type": "integer",
                         "format": "int64"
                     },
+                    {
+                        "in": "formData",
+                        "name": "storeId",
+                        "description": "门店ID",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    },
                     {
                         "in": "formData",
                         "name": "vendorOrgCode",

swagger/swagger.yml

@@ -11605,6 +11605,12 @@ paths:
         required: true
         type: integer
         format: int64
+      - in: formData
+        name: storeId
+        description: 门店ID
+        required: true
+        type: integer
+        format: int64
       - in: formData
         name: vendorOrgCode
         description: 平台账号