1
This commit is contained in:
@@ -206,7 +206,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
|
||||
order.OrderSeq = orderSeq + 1
|
||||
|
||||
// 包装袋金额
|
||||
store, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorOrderID, model.VendorIDTaoVegetable, order.VendorOrgCode)
|
||||
store, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorStoreID, model.VendorIDTaoVegetable, order.VendorOrgCode)
|
||||
if store != nil {
|
||||
order.StoreName = store.Name // 真实门店名称
|
||||
order.PackagePrice = int(*orderDetail.PackageFee) + store.PackageSetting
|
||||
|
||||
@@ -486,18 +486,18 @@ func (c *ActController) GetNotHaveSkuActList() {
|
||||
})
|
||||
}
|
||||
|
||||
//// @Title 查询美团平台活动
|
||||
//// @Description 查询美团平台活动
|
||||
//// @Param token header string true "认证token"
|
||||
//// @Success 200 {object} controllers.CallResult
|
||||
//// @Failure 200 {object} controllers.CallResult
|
||||
//// @router /RefreshMTActivityList [get]
|
||||
//func (c *ActController) RefreshMTActivityList() {
|
||||
// c.callRefreshMTActivityList(func(params *tActRefreshMTActivityListParams) (retVal interface{}, errCode string, err error) {
|
||||
// err = act.RrefreshMtwmVendorAct(params.Ctx)
|
||||
// return retVal, "", err
|
||||
// })
|
||||
//}
|
||||
// @Title 查询美团平台活动
|
||||
// @Description 查询美团平台活动
|
||||
// @Param token header string true "认证token"
|
||||
// @Success 200 {object} controllers.CallResult
|
||||
// @Failure 200 {object} controllers.CallResult
|
||||
// @router /RefreshMTActivityList [get]
|
||||
func (c *ActController) RefreshMTActivityList() {
|
||||
c.callRefreshMTActivityList(func(params *tActRefreshMTActivityListParams) (retVal interface{}, errCode string, err error) {
|
||||
err = act.RrefreshMtwmVendorAct(params.Ctx)
|
||||
return retVal, "", err
|
||||
})
|
||||
}
|
||||
|
||||
// @Title 查询美团平台活动sku
|
||||
// @Description 查询美团平台活动sku
|
||||
|
||||
@@ -114,14 +114,14 @@ func init() {
|
||||
Filters: nil,
|
||||
Params: nil})
|
||||
|
||||
//web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"],
|
||||
// web.ControllerComments{
|
||||
// Method: "/RefreshMTActivityList",
|
||||
// Router: `/RefreshMTActivityList`,
|
||||
// AllowHTTPMethods: []string{"get"},
|
||||
// MethodParams: param.Make(),
|
||||
// Filters: nil,
|
||||
// Params: nil})
|
||||
web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"],
|
||||
web.ControllerComments{
|
||||
Method: "RefreshMTActivityList",
|
||||
Router: `/RefreshMTActivityList`,
|
||||
AllowHTTPMethods: []string{"get"},
|
||||
MethodParams: param.Make(),
|
||||
Filters: nil,
|
||||
Params: nil})
|
||||
|
||||
web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"],
|
||||
web.ControllerComments{
|
||||
|
||||
Reference in New Issue
Block a user