冲突

controllers/cms_store.go

@@ -794,3 +794,17 @@ func (c *StoreController) UpdateStorePricePack() {
 		return retVal, "", err
 	})
 }
+
+// @Title 根据门店获取距离最近的货源店铺
+// @Description 修根据门店获取距离最近的货源店铺
+// @Param	token				header		string	true	"认证token"
+// @Param	storeID				query		int		true	"门店ID"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetNearSupplyGoodsStoreByStoreID [get]
+func (c *StoreController) GetNearSupplyGoodsStoreByStoreID() {
+	c.callGetNearSupplyGoodsStoreByStoreID(func(params *tStoreGetNearSupplyGoodsStoreByStoreIDParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = common.GetNearSupplyGoodsStoreByStoreID(params.Ctx, params.StoreID)
+		return retVal, "", err
+	})
+}

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
+	})
+}

controllers/jx_order2.go

@@ -222,3 +222,21 @@ func (c *JxOrderController) SendFailedMatterOrder() {
 		return retVal, "", err
 	})
 }
+
+// @Title 根据时间获取进货辅助工具里的商品，用于加入购物车
+// @Description 根据时间获取进货辅助工具里的商品，用于加入购物车
+// @Param	token		header	string	true	"认证token"
+// @Param	fromDate	query	string	false	"开始日期（包含），格式（2006-01-02），如果订单号为空此项必须要求"
+// @Param	toDate		query	string	false	"结束日期（包含），格式（2006-01-02），如果订单号为空此项必须要求"
+// @Param	fromStoreID	query	int		false	"进货门店ID"
+// @Param	storeID		query	int		false	"货源门店ID"
+// @Param	percentage	query	string	false	"销量比例，1，1.05，1.1"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetSupplySupportStoreSkus [get]
+func (c *JxOrderController) GetSupplySupportStoreSkus() {
+	c.callGetSupplySupportStoreSkus(func(params *tJxorderGetSupplySupportStoreSkusParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = localjx.GetSupplySupportStoreSkus(params.Ctx, params.FromDate, params.ToDate, params.FromStoreID, params.StoreID, params.Percentage)
+		return retVal, "", err
+	})
+}