diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index 109ba4a47..4ce071c29 100644 --- a/business/partner/purchase/tiktok_store/warehouse.go +++ b/business/partner/purchase/tiktok_store/warehouse.go @@ -288,10 +288,11 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc } } } else { - if err := UpdateFreightTemplate(int(storeID), bindFreightIDs); err != nil { - globals.SugarLogger.Debug("更新运费模板失败:", err) - errList.AddErr(fmt.Errorf("更新运费模板失败:%v", err)) - } + // TODO 暂时不修改这个模版看看 + //if err := UpdateFreightTemplate(int(storeID), bindFreightIDs); err != nil { + // globals.SugarLogger.Debug("更新运费模板失败:", err) + // errList.AddErr(fmt.Errorf("更新运费模板失败:%v", err)) + //} } //2.设置门店打包费 默认为0 diff --git a/controllers/uupt_callback.go b/controllers/uupt_callback.go index f914bc451..76ab5dbb7 100644 --- a/controllers/uupt_callback.go +++ b/controllers/uupt_callback.go @@ -2,6 +2,7 @@ package controllers import ( "encoding/json" + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "io/ioutil" @@ -36,9 +37,9 @@ func (c *UuPtController) UuWaybillCallback() { } else { switch web.BConfig.RunMode { case model.ServerTypeVegetable: - callbackResponse = c.UuPtPush2FruitsOrPet(model.ServerTypeFruits, data) + callbackResponse = c.UuPtPush2FruitsOrPet(model.ServerTypeFruits, map[string]interface{}{"data": data}) case model.ServerTypeFruits: - callbackResponse = c.UuPtPush2FruitsOrPet(model.ServerTypePet, data) + callbackResponse = c.UuPtPush2FruitsOrPet(model.ServerTypePet, map[string]interface{}{"data": data}) case model.ServerTypePet: return } @@ -51,15 +52,15 @@ func (c *UuPtController) UuWaybillCallback() { } } -func (c *UuPtController) UuPtPush2FruitsOrPet(serverType string, msg string) *uuptapi.CallbackResponse { +func (c *UuPtController) UuPtPush2FruitsOrPet(serverType string, msg map[string]interface{}) *uuptapi.CallbackResponse { cl := http.Client{} var request *http.Request var err error switch serverType { case model.ServerTypeFruits: - request, err = http.NewRequest(http.MethodPost, "http://callback-jxgy.jxc4.com/uuPt/uuWaybillCallback", strings.NewReader(msg)) + request, err = http.NewRequest(http.MethodPost, "http://callback-jxgy.jxc4.com/uuPt/uuWaybillCallback", strings.NewReader(utils.Map2URLValues(msg).Encode())) case model.ServerTypePet: - request, err = http.NewRequest(http.MethodPost, "http://callback-gblm.jxc4.com/uuPt/uuWaybillCallback", strings.NewReader(msg)) + request, err = http.NewRequest(http.MethodPost, "http://callback-gblm.jxc4.com/uuPt/uuWaybillCallback", strings.NewReader(utils.Map2URLValues(msg).Encode())) } if err != nil { return uuptapi.Err2CallbackResponse(err)