添加返回值
This commit is contained in:
@@ -64,11 +64,11 @@ func QueryExpressPrice(param *bida.GetExpressPriceReq) (map[string]*bida.GetExpr
|
|||||||
}
|
}
|
||||||
|
|
||||||
// CreateWayOrder 创建快递订单
|
// CreateWayOrder 创建快递订单
|
||||||
func CreateWayOrder(ctx *jxcontext.Context, param *model.MakeOrderParamReq, userId string) error {
|
func CreateWayOrder(ctx *jxcontext.Context, param *model.MakeOrderParamReq, userId string) (*model.UserVendorOrder, error) {
|
||||||
// 检查价格
|
// 检查价格
|
||||||
reallyCannelleFee := param.ChannelFee
|
reallyCannelleFee := param.ChannelFee
|
||||||
if err := checkWayFeeIsTrue(param); err != nil {
|
if err := checkWayFeeIsTrue(param); err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// 第三方数据创建成功,则创建本地数据
|
// 第三方数据创建成功,则创建本地数据
|
||||||
@@ -118,7 +118,7 @@ func CreateWayOrder(ctx *jxcontext.Context, param *model.MakeOrderParamReq, user
|
|||||||
dao.WrapAddIDCULEntity(vendorOrder, ctx.GetUserName())
|
dao.WrapAddIDCULEntity(vendorOrder, ctx.GetUserName())
|
||||||
if err := dao.CreateEntity(db, vendorOrder); err != nil {
|
if err := dao.CreateEntity(db, vendorOrder); err != nil {
|
||||||
dao.Rollback(db, tdb)
|
dao.Rollback(db, tdb)
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
// 添加待支付订单表
|
// 添加待支付订单表
|
||||||
orderPayStatus := &model.Order{
|
orderPayStatus := &model.Order{
|
||||||
@@ -143,11 +143,11 @@ func CreateWayOrder(ctx *jxcontext.Context, param *model.MakeOrderParamReq, user
|
|||||||
}
|
}
|
||||||
if err := dao.CreateEntity(db, orderPayStatus); err != nil {
|
if err := dao.CreateEntity(db, orderPayStatus); err != nil {
|
||||||
dao.Rollback(db, tdb)
|
dao.Rollback(db, tdb)
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
dao.Commit(db, tdb)
|
dao.Commit(db, tdb)
|
||||||
|
|
||||||
return nil
|
return vendorOrder, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// CancelWayOrder 取消运单 todo
|
// CancelWayOrder 取消运单 todo
|
||||||
|
|||||||
@@ -125,10 +125,11 @@ func (c *QBiDaExpressController) CreateWayOrder() {
|
|||||||
Increment: params.Increment,
|
Increment: params.Increment,
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := bidaServer.CreateWayOrder(params.Ctx, param, params.Ctx.GetUserID()); err != nil {
|
order, err := bidaServer.CreateWayOrder(params.Ctx, param, params.Ctx.GetUserID())
|
||||||
|
if err != nil {
|
||||||
return nil, "", err
|
return nil, "", err
|
||||||
}
|
}
|
||||||
return nil, "", nil
|
return order, "", nil
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user