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

快递地址前缀

Browse Source
This commit is contained in:
richboo111
2022-08-15 15:54:31 +08:00
parent 5595fd5ad9
commit 48e4753a2a
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/q_bida/q_bida_server.go
View File

@@ -62,12 +62,10 @@ func QueryExpressPrice(param *bida.GetExpressPriceReq) (map[string]*bida.GetExpr
//寄件 //寄件
if find := strings.Contains(param.SendAddress, v); find { if find := strings.Contains(param.SendAddress, v); find {
param.SendAddress = v + param.SendAddress param.SendAddress = v + param.SendAddress
//param.SendAddress = strings.Join([]string{v}, param.SendAddress)
} }
//收件 //收件
if find2 := strings.Contains(param.ReceiveAddress, v); find2 { if find2 := strings.Contains(param.ReceiveAddress, v); find2 {
param.ReceiveAddress = v + param.ReceiveAddress param.ReceiveAddress = v + param.ReceiveAddress
//param.ReceiveAddress = strings.Join([]string{v}, param.ReceiveAddress)
} }
} }
globals.SugarLogger.Debug("检测param是否加上前缀", param.SendAddress, param.ReceiveAddress) globals.SugarLogger.Debug("检测param是否加上前缀", param.SendAddress, param.ReceiveAddress)
@@ -112,7 +110,6 @@ func QueryExpressPrice(param *bida.GetExpressPriceReq) (map[string]*bida.GetExpr
} }
} }
} }
} else { } else {
fee, err := api.QBiDaAPI.GetExpressPrice(param) fee, err := api.QBiDaAPI.GetExpressPrice(param)
if err != nil { if err != nil {
@@ -121,14 +118,12 @@ func QueryExpressPrice(param *bida.GetExpressPriceReq) (map[string]*bida.GetExpr
if fee.Code != 0 { if fee.Code != 0 {
return nil, errors.New(fee.Msg) return nil, errors.New(fee.Msg)
} }
if fee.Data.ChannelFee != 0 { if fee.Data.ChannelFee != 0 {
addFee := int(fee.Data.ChannelFee*100) + param.Weight*MarkupAmount 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
} }
} }
return result, nil return result, nil
} }

2
controllers/event_controller.go
View File

@@ -307,7 +307,7 @@ func (c *EventController) UploadAudio() {
} }
defer f.Close() defer f.Close()
io.Copy(f, file) io.Copy(f, file)
c.SaveToFile("rsmAudio", "/jxdata/cthrgw/dist/audio/"+timeStr+"/"+fileName)
return &model.ImMessageRecord{ return &model.ImMessageRecord{
Content: "https://www.jxcs.net/audio/" + timeStr + "/" + fileName, Content: "https://www.jxcs.net/audio/" + timeStr + "/" + fileName,
}, "", err }, "", err