liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2025-02-11 16:09:19 +08:00
parent e44b58c86b
commit 9015ff2cfa
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/partner/purchase/tiktok_store/warehouse.go
View File

@@ -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

11
controllers/uupt_callback.go
View File

@@ -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)