fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:订单

Browse Source
This commit is contained in:
momo 2023-10-16 17:42:03 +08:00
parent ab312efbb5
commit b8f1997ed7
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
service/repositories/order.go
View File

@ -816,7 +816,7 @@ func (d *defaultOrder) CreatePrePaymentByDeposit(ctx context.Context, in *Create
var orderAddressByte []byte var orderAddressByte []byte
var statusLinkByte []byte var statusLinkByte []byte
if in.DeliveryMethod == constants.DELIVERYMETHODDIRECTMAIL { if in.DeliveryMethod == constants.DELIVERYMETHODDIRECTMAIL && in.DeliveryAddress != nil {
orderAddress = &gmodel.OrderAddress{ orderAddress = &gmodel.OrderAddress{
Name: in.DeliveryAddress.Name, Name: in.DeliveryAddress.Name,
Mobile: in.DeliveryAddress.Mobile, Mobile: in.DeliveryAddress.Mobile,
@ -830,6 +830,16 @@ func (d *defaultOrder) CreatePrePaymentByDeposit(ctx context.Context, in *Create
ErrorCode: errorCode, ErrorCode: errorCode,
}, err }, err
} }
} else {
var orderAddress *gmodel.OrderAddress
orderAddressByte, err = json.Marshal(orderAddress)
if err != nil {
logc.Errorf(ctx, "create prePayment deposit failed orderAddressByte, err: %v", err)
errorCode = *basic.CodeServiceErr
return &CreatePrePaymentByDepositRes{
ErrorCode: errorCode,
}, err
}
} }
// 订单状态--链路 // 订单状态--链路
tPlus60Days := ntime.AddDate(0, 0, 60).UTC() tPlus60Days := ntime.AddDate(0, 0, 60).UTC()
@ -845,12 +855,8 @@ func (d *defaultOrder) CreatePrePaymentByDeposit(ctx context.Context, in *Create
// 更新数据库 // 更新数据库
var table = gmodel.NewAllModels(d.MysqlConn).FsOrder.TableName() var table = gmodel.NewAllModels(d.MysqlConn).FsOrder.TableName()
var resUpdate *gorm.DB var resUpdate = d.MysqlConn.Exec(fmt.Sprintf("UPDATE %s SET `delivery_method` = ? , `utime` = ?, `status_link` = JSON_MERGE_PATCH(`status_link`,?), `order_address` = JSON_MERGE_PATCH(`order_address`,?) WHERE `id` = ?", table), in.DeliveryMethod, ntime, statusLinkByte, orderAddressByte, orderInfo.Id)
if in.DeliveryMethod == constants.DELIVERYMETHODDIRECTMAIL {
resUpdate = d.MysqlConn.Exec(fmt.Sprintf("UPDATE %s SET `delivery_method` = ? , `utime` = ?, `order_address` = JSON_MERGE_PATCH(`order_address`,?), `status_link` = JSON_MERGE_PATCH(`status_link`,?) WHERE `id` = ?", table), in.DeliveryMethod, ntime, orderAddressByte, statusLinkByte, orderInfo.Id)
} else {
resUpdate = d.MysqlConn.Exec(fmt.Sprintf("UPDATE %s SET `delivery_method` = ? , `utime` = ? WHERE `id` = ?", table), in.DeliveryMethod, ntime, orderInfo.Id)
}
err = resUpdate.Error err = resUpdate.Error
if err != nil { if err != nil {
logc.Errorf(ctx, "create prePayment deposit failed update Exec, err: %v", err) logc.Errorf(ctx, "create prePayment deposit failed update Exec, err: %v", err)