冲突

controllers/act.go

@@ -307,6 +307,27 @@ func (c *ActController) DeleteSkusFromAct() {
 	})
 }
 
+// @Title 将门店从所有活动中删除
+// @Description 将门店从所有活动中删除
+// @Param	token				header	string	true	"认证token"
+// @Param	storeIDs			query	string	true	"门店ID列表"
+// @Param	vendorID			query	int		true	"厂商ID"
+// @Param	types				query	string	false	"活动类型列表"
+// @Param	isAsync				query	bool	false	"是否异步"
+// @Param	isContinueWhenError	query	bool	false	"单个同步失败是否继续，缺省false"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /DeleteStoresFromAct [delete]
+func (c *ActController) DeleteStoresFromAct() {
+	c.callDeleteStoresFromAct(func(params *tActDeleteStoresFromActParams) (retVal interface{}, errCode string, err error) {
+		var storeIDs, types []int
+		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.Types, &types); err == nil {
+			retVal, err = act.DeleteStoresFromAct(params.Ctx, params.VendorID, types, storeIDs, params.IsAsync, params.IsContinueWhenError)
+		}
+		return retVal, "", err
+	})
+}
+
 // @Title 强制更新商品平台价
 // @Description 强制更新商品平台价
 // @Param	token			header		string	true	"认证token"

controllers/jx_order.go

@@ -1119,3 +1119,18 @@ func (c *OrderController) AdjustJdsOrderSimple() {
 		return retVal, "", err
 	})
 }
+
+// @Title 修改订单运费
+// @Description 修改订单运费
+// @Param	token			header		string	true	"认证token"
+// @Param	vendorOrderID	formData	string	true	"订单号"
+// @Param	desiredFee		formData	int		true	"运费"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /UpdateWaybillDesiredFee [put]
+func (c *OrderController) UpdateWaybillDesiredFee() {
+	c.callUpdateWaybillDesiredFee(func(params *tOrderUpdateWaybillDesiredFeeParams) (retVal interface{}, errCode string, err error) {
+		err = orderman.UpdateWaybillDesiredFee(params.Ctx, params.VendorOrderID, params.DesiredFee)
+		return retVal, "", err
+	})
+}