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:
邹宗楠
2022-07-04 15:28:50 +08:00
parent 78dc569b70
commit 05b904919c
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/q_bida/q_bida_server.go
View File

@@ -40,6 +40,8 @@ var LogisticsCompany = []int{
bida.DBLogisticsExpressInt, bida.DBLogisticsExpressInt,
} }
const MarkupAmount = 50 // 每公斤加价五毛
// QueryExpressPrice 查询配送价格,获取所有快递价格 // QueryExpressPrice 查询配送价格,获取所有快递价格
func QueryExpressPrice(param *bida.GetExpressPriceReq) (map[string]*bida.GetExpressPriceRes, error) { func QueryExpressPrice(param *bida.GetExpressPriceReq) (map[string]*bida.GetExpressPriceRes, error) {
if param.Weight <= 0 { if param.Weight <= 0 {
@@ -50,7 +52,7 @@ func QueryExpressPrice(param *bida.GetExpressPriceReq) (map[string]*bida.GetExpr
result := make(map[string]*bida.GetExpressPriceRes, 0) result := make(map[string]*bida.GetExpressPriceRes, 0)
if param.Type == 0 { if param.Type == 0 {
// 渠道费每公斤加价两毛 // 渠道费每公斤加价五毛
switch param.ChannelType { switch param.ChannelType {
case 1: // 快递 case 1: // 快递
for i := 0; i < len(ExpressCompany); i++ { for i := 0; i < len(ExpressCompany); i++ {
@@ -64,7 +66,7 @@ func QueryExpressPrice(param *bida.GetExpressPriceReq) (map[string]*bida.GetExpr
continue continue
} }
if fee.Data.ChannelFee != 0 { if fee.Data.ChannelFee != 0 {
addFee := int(fee.Data.ChannelFee*100) + param.Weight*20 addFee := int(fee.Data.ChannelFee*100) + param.Weight*MarkupAmount
fee.Data.ChannelFee = utils.Int2Float64(addFee) / float64(100) fee.Data.ChannelFee = utils.Int2Float64(addFee) / float64(100)
result[fmt.Sprintf("%d", ExpressCompany[i])] = fee result[fmt.Sprintf("%d", ExpressCompany[i])] = fee
} }
@@ -81,7 +83,7 @@ func QueryExpressPrice(param *bida.GetExpressPriceReq) (map[string]*bida.GetExpr
continue continue
} }
if fee.Data.ChannelFee != 0 { if fee.Data.ChannelFee != 0 {
addFee := int(fee.Data.ChannelFee*100) + param.Weight*20 addFee := int(fee.Data.ChannelFee*100) + param.Weight*MarkupAmount
fee.Data.ChannelFee = utils.Int2Float64(addFee) / float64(100) fee.Data.ChannelFee = utils.Int2Float64(addFee) / float64(100)
result[fmt.Sprintf("%d", LogisticsCompany[i])] = fee result[fmt.Sprintf("%d", LogisticsCompany[i])] = fee
} }
@@ -98,7 +100,7 @@ func QueryExpressPrice(param *bida.GetExpressPriceReq) (map[string]*bida.GetExpr
} }
if fee.Data.ChannelFee != 0 { if fee.Data.ChannelFee != 0 {
addFee := int(fee.Data.ChannelFee*100) + param.Weight*20 addFee := int(fee.Data.ChannelFee*100) + param.Weight*MarkupAmount
fee.Data.ChannelFee = utils.Int2Float64(addFee) / float64(100) fee.Data.ChannelFee = utils.Int2Float64(addFee) / float64(100)
result[fmt.Sprintf("%d", param.Type)] = fee result[fmt.Sprintf("%d", param.Type)] = fee
} }

1
controllers/wxpay_callback.go
View File

@@ -18,6 +18,7 @@ type WXPayController struct {
} }
func (c *WXPayController) Msg() { func (c *WXPayController) Msg() {
globals.SugarLogger.Debug("ceshihuidiaohanhu================", c.Ctx.Input.Method())
if c.Ctx.Input.Method() == http.MethodPost { if c.Ctx.Input.Method() == http.MethodPost {
msg, callbackResponse := api.WxpayAPI.GetCallbackMsg(c.Ctx.Request) msg, callbackResponse := api.WxpayAPI.GetCallbackMsg(c.Ctx.Request)
globals.SugarLogger.Debugf("wxpayapi callback msg:%s, callbackResponse:%s, %t", utils.Format4Output(msg, true), utils.Format4Output(callbackResponse, true), callbackResponse == nil) globals.SugarLogger.Debugf("wxpayapi callback msg:%s, callbackResponse:%s, %t", utils.Format4Output(msg, true), utils.Format4Output(callbackResponse, true), callbackResponse == nil)