diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go index 9c58f95db..34e667af4 100644 --- a/business/q_bida/q_bida_server.go +++ b/business/q_bida/q_bida_server.go @@ -62,12 +62,10 @@ func QueryExpressPrice(param *bida.GetExpressPriceReq) (map[string]*bida.GetExpr //寄件 if find := strings.Contains(param.SendAddress, v); find { param.SendAddress = v + param.SendAddress - //param.SendAddress = strings.Join([]string{v}, param.SendAddress) } //收件 if find2 := strings.Contains(param.ReceiveAddress, v); find2 { param.ReceiveAddress = v + param.ReceiveAddress - //param.ReceiveAddress = strings.Join([]string{v}, param.ReceiveAddress) } } globals.SugarLogger.Debug("检测param是否加上前缀", param.SendAddress, param.ReceiveAddress) @@ -112,7 +110,6 @@ func QueryExpressPrice(param *bida.GetExpressPriceReq) (map[string]*bida.GetExpr } } } - } else { fee, err := api.QBiDaAPI.GetExpressPrice(param) if err != nil { @@ -121,14 +118,12 @@ func QueryExpressPrice(param *bida.GetExpressPriceReq) (map[string]*bida.GetExpr if fee.Code != 0 { return nil, errors.New(fee.Msg) } - if fee.Data.ChannelFee != 0 { addFee := int(fee.Data.ChannelFee*100) + param.Weight*MarkupAmount fee.Data.ChannelFee = utils.Int2Float64(addFee) / float64(100) result[fmt.Sprintf("%d", param.Type)] = fee } } - return result, nil } diff --git a/controllers/event_controller.go b/controllers/event_controller.go index eab29576e..957c4174a 100644 --- a/controllers/event_controller.go +++ b/controllers/event_controller.go @@ -307,7 +307,7 @@ func (c *EventController) UploadAudio() { } defer f.Close() io.Copy(f, file) - + c.SaveToFile("rsmAudio", "/jxdata/cthrgw/dist/audio/"+timeStr+"/"+fileName) return &model.ImMessageRecord{ Content: "https://www.jxcs.net/audio/" + timeStr + "/" + fileName, }, "", err