fix
This commit is contained in:
parent
807f1aa70e
commit
f5620e397e
|
@ -744,8 +744,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 *gorm.DB
|
||||||
if in.DeliveryMethod == constants.DELIVERYMETHODDIRECTMAIL {
|
if in.DeliveryMethod == constants.DELIVERYMETHODDIRECTMAIL {
|
||||||
var oosql = fmt.Sprintf("UPDATE %s SET `order_address` = JSON_MERGE_PATCH(`order_address`,?), `status_link` = JSON_MERGE_PATCH(`status_link`,?), `delivery_method` = ? , `utime` = ? WHERE `id` = ?", table)
|
var oosql = fmt.Sprintf("UPDATE %s SET `utime` = ?, `order_address` = JSON_MERGE_PATCH(`order_address`,?), `status_link` = JSON_MERGE_PATCH(`status_link`,?), `delivery_method` = ? WHERE `id` = ?", table)
|
||||||
resUpdate = d.MysqlConn.Exec(oosql, orderAddressByte, statusLinkByte, in.DeliveryMethod, ntime, orderInfo.Id)
|
resUpdate = d.MysqlConn.Exec(oosql, ntime, orderAddressByte, statusLinkByte, in.DeliveryMethod, orderInfo.Id)
|
||||||
} else {
|
} else {
|
||||||
resUpdate = d.MysqlConn.Exec(fmt.Sprintf("UPDATE %s SET `delivery_method` = ? , `utime` = ? WHERE `id` = ?", table), in.DeliveryMethod, ntime, orderInfo.Id)
|
resUpdate = d.MysqlConn.Exec(fmt.Sprintf("UPDATE %s SET `delivery_method` = ? , `utime` = ? WHERE `id` = ?", table), in.DeliveryMethod, ntime, orderInfo.Id)
|
||||||
}
|
}
|
||||||
|
@ -1154,7 +1154,10 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe
|
||||||
var statusLink = order.GenerateOrderStatusLink(in.DeliveryMethod, nowTime, in.ExpectedDeliveryTime)
|
var statusLink = order.GenerateOrderStatusLink(in.DeliveryMethod, nowTime, in.ExpectedDeliveryTime)
|
||||||
|
|
||||||
byteOrderProduct, _ := json.Marshal(orderProductList)
|
byteOrderProduct, _ := json.Marshal(orderProductList)
|
||||||
byteOrderAddress, _ := json.Marshal(orderAddress)
|
var byteOrderAddress []byte
|
||||||
|
if orderAddress != nil {
|
||||||
|
byteOrderAddress, _ = json.Marshal(orderAddress)
|
||||||
|
}
|
||||||
|
|
||||||
byteOrderAmount, _ := json.Marshal(orderAmount)
|
byteOrderAmount, _ := json.Marshal(orderAmount)
|
||||||
byteShoppingCartSnapshot, _ := json.Marshal(shoppingCartSnapshotList)
|
byteShoppingCartSnapshot, _ := json.Marshal(shoppingCartSnapshotList)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user