diff --git a/business/q_bida/express_test.go b/business/q_bida/express_test.go new file mode 100644 index 000000000..814f04184 --- /dev/null +++ b/business/q_bida/express_test.go @@ -0,0 +1,27 @@ +package q_bida + +import ( + "fmt" + bida "git.rosy.net.cn/baseapi/platformapi/q_bida" + "testing" +) + +func TestQueryExpressPrice(t *testing.T) { + param := &bida.GetExpressPriceReq{ + Type: 0, + PromiseTimeType: 0, + DeliveryType: 0, + GoodsValue: 1, + ReceiveAddress: "四川省攀枝花市米易县攀莲镇米易县米易县政府", + SendAddress: "四川省成都市锦江区牛市口街道大融厨(九眼桥店)七鑫大酒店", + Weight: 2, + Length: 0, + Height: 0, + Width: 0, + SendPhone: "18981810340", + ChannelType: 2, + } + data,err := QueryExpressPrice(param) + fmt.Println(err) + fmt.Println(data) +} diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go index 623d6d55f..e474b614e 100644 --- a/business/q_bida/q_bida_server.go +++ b/business/q_bida/q_bida_server.go @@ -709,7 +709,7 @@ func TryAgainOrder(ctx *jxcontext.Context, oldNo string) (*model.UserVendorOrder Bulk: utils.Int2Float64(fee[fmt.Sprintf("%d", oldOrder.Type)].Data.Bulk), ServiceCharge: fee[fmt.Sprintf("%d", oldOrder.Type)].Data.ServiceCharge, GuarantFee: fee[fmt.Sprintf("%d", oldOrder.Type)].Data.GuarantFee, - OriginalFee: utils.Int2Float64(fee[fmt.Sprintf("%d", oldOrder.Type)].Data.OriginalFee), + OriginalFee: utils.Interface2Float64WithDefault(fee[fmt.Sprintf("%d", oldOrder.Type)].Data.OriginalFee, 0.0), Increment: fee[fmt.Sprintf("%d", oldOrder.Type)].Data.IncrementFee, } return CreateWayOrder(ctx, param, oldOrder.UserId) diff --git a/controllers/user2_controller.go b/controllers/user2_controller.go index 8078b22eb..b3c3a6c4d 100644 --- a/controllers/user2_controller.go +++ b/controllers/user2_controller.go @@ -140,7 +140,7 @@ func (c *User2Controller) AddMyDeliveryAddress() { Remark: params.Remark, IsDefault: int8(params.IsDefault), Type: params.Type, - AutoAddress: params.AutoAddress, + AutoAddress: params.AutoAddress, } retVal, err = cms.AddMyDeliveryAddress(params.Ctx, address) return retVal, "", err