不用补改价

business/jxcallback/orderman/order.go

@@ -1181,9 +1181,33 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 }
 
 func SendJdwlForJdsOrder(ctx *jxcontext.Context, vendorOrderID string) (err error) {
+	db := dao.GetDB()
 	order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDJDShop)
+	if order == nil || err != nil {
+		return fmt.Errorf("目前只支持京狗订单创建！")
+	}
+	if order.Status >= model.OrderStatusDelivering {
+		return fmt.Errorf("订单当前状态不支持创建！")
+	}
+	waybill := &model.Waybill{}
+	waybills, err := dao.GetWaybills(db, vendorOrderID)
+	if err != nil {
+		return err
+	}
+	if len(waybills) > 0 {
+		for _, v := range waybills {
+			if v.Status != model.WaybillStatusCanceled {
+				waybill = v
+			}
+		}
+		handler := partner.DeliveryPlatformHandlers[waybill.WaybillVendorID]
+		err = handler.Handler.CancelWaybill(waybill, 0, "订单已发送其他物流")
+		if err != nil {
+			return err
+		}
+	}
 	handler := partner.DeliveryPlatformHandlers[model.VendorIDJDWL]
-	waybill, err := handler.Handler.CreateWaybill(order, 0)
-	jdshop.CurPurchaseHandler.OrderTransfer(ctx, vendorOrderID, waybill.VendorWaybillID, false)
+	waybill2, err := handler.Handler.CreateWaybill(order, 0)
+	jdshop.CurPurchaseHandler.OrderExport(ctx, vendorOrderID, waybill2.VendorWaybillID, false)
 	return err
 }

business/jxstore/cms/store_sku.go

@@ -863,6 +863,18 @@ func UpdateStoresSkus(ctx *jxcontext.Context, causeFlag int, storeIDs []int, sku
 	return hint, err
 }
 
+func UpdateStoresSkusWithoutSync(ctx *jxcontext.Context, storeIDs []int, skuBindInfos []*StoreSkuBindInfo) (err error) {
+	db := dao.GetDB()
+	if len(storeIDs) == 0 {
+		stores, _ := dao.GetStoreList(db, nil, nil, nil, nil, "")
+		for _, v := range stores {
+			storeIDs = append(storeIDs, v.ID)
+		}
+	}
+	updateStoresSkusWithoutSync(ctx, db, storeIDs, skuBindInfos, false)
+	return err
+}
+
 func UpdateStoresSkusByBind(ctx *jxcontext.Context, parentTask tasksch.ITask, skuBindInfos []*StoreSkuBindInfo, isAsync, isContinueWhenError, isFos bool) (hint string, err error) {
 	// if len(skuBindInfos) > maxStoreNameBind {
 	// 	return "", fmt.Errorf("门店商品信息大于%d", maxStoreNameBind)

business/jxstore/tempop/tempop.go

@@ -1630,6 +1630,7 @@ func RefreshJXPriceChange(ctx *jxcontext.Context, storeID int) (hint string, err
 		SELECT * 
 		  FROM store 
 		 WHERE deleted_at = ? AND status <> ? 
+		   AND id <> 100118 AND id <> 100274 AND id <> 100205
 	`
 	sqlParams := []interface{}{utils.DefaultTimeValue, model.StoreStatusDisabled}
 	if storeID != 0 {
@@ -1668,13 +1669,14 @@ func RefreshJXPriceChange(ctx *jxcontext.Context, storeID int) (hint string, err
 			for _, v := range storeSkus {
 				skuAndName, _ := dao.GetSkus(db, []int{v.SkuID}, nil, nil, nil, nil)
 				skuBindInfo := &cms.StoreSkuBindInfo{
-					StoreID:   store.ID,
+					// StoreID:   store.ID,
 					NameID:    skuAndName[0].NameID,
 					UnitPrice: v.UnitPrice * store.PayPercentage / 100,
 				}
 				skuBindInfos = append(skuBindInfos, skuBindInfo)
 			}
-			cms.UpdateStoresSkusByBind(ctx, task, skuBindInfos, isAsync, isContinueWhenError, false)
+			// cms.UpdateStoresSkusByBind(ctx, task, skuBindInfos, isAsync, isContinueWhenError, false)
+			cms.UpdateStoresSkusWithoutSync(ctx, []int{store.ID}, skuBindInfos)
 			store.PayPercentage = 100
 			dao.UpdateEntity(db, store, "PayPercentage")
 			return retVal, err

controllers/cms_store_sku.go

@@ -233,6 +233,27 @@ func (c *StoreSkuController) UpdateStoresSkus() {
 	})
 }
 
+// @Title 批量修改多商家商品绑定(不同步)
+// @Description 批量修改多商家商品绑定(不同步)
+// @Param	token			header		string	true	"认证token"
+// @Param	storeIDs		formData	string	true	"门店ID列表"
+// @Param	payload			formData	string	true	"json数据，StoreSkuBindInfo对象数组"
+// @Param	isRefreshHigh	formData	bool	true	"是否只刷门店价高于给的价"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /UpdateStoresSkusWithoutSync [put]
+func (c *StoreSkuController) UpdateStoresSkusWithoutSync() {
+	c.callUpdateStoresSkusWithoutSync(func(params *tStoreSkuUpdateStoresSkusWithoutSyncParams) (retVal interface{}, errCode string, err error) {
+		var storeIDs []int
+		var skuBindInfos []*cms.StoreSkuBindInfo
+		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.Payload, &skuBindInfos); err != nil {
+			return retVal, "", err
+		}
+		err = cms.UpdateStoresSkusWithoutSync(params.Ctx, storeIDs, skuBindInfos)
+		return retVal, "", err
+	})
+}
+
 // @Title 按门店商品维度批量修改多商家商品绑定
 // @Description 按门店商品维度批量修改多商家商品绑定
 // @Param	token			header		string	true	"认证token"

routers/commentsRouter_controllers.go

@@ -2205,6 +2205,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"],
+        beego.ControllerComments{
+            Method: "UpdateStoresSkusWithoutSync",
+            Router: `/UpdateStoresSkusWithoutSync`,
+            AllowHTTPMethods: []string{"put"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SyncController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SyncController"],
         beego.ControllerComments{
             Method: "AddCreateFlagForJxStoreSku",