liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #145: (tmp -> mark)

Browse Source 
Merge Request: 订单状态修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/145
This commit is contained in:
苏尹岚
2020-01-14 19:03:22 +08:00
parent 5c3e0627ba fa93efc754
commit 45adf058c9
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/orderman/orderman_ext.go
View File

@@ -1066,7 +1066,7 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in
if err = err2; err == nil {
if model.IsOrderFinalStatus(order.Status) {
goodsOrder.Status = order.Status
goodsOrder.OrderFinishedAt = order.OrderFinishedAt
goodsOrder.OrderFinishedAt = order.StatusTime
_, err = dao.UpdateEntity(db, goodsOrder, "Status", "OrderFinishedAt")
}
}

2
business/partner/purchase/ebai/order.go
View File

@@ -212,7 +212,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
OrderSeq: int(utils.ForceInterface2Int64(orderMap["order_index"])),
StatusTime: getTimeFromInterface(orderMap["create_time"]),
OrderCreatedAt: getTimeFromInterface(orderMap["create_time"]),
OrderFinishedAt: getTimeFromInterface(orderMap["finished_time"]),
// OrderFinishedAt: getTimeFromInterface(orderMap["finished_time"]),
OriginalData: string(utils.MustMarshal(result)),
ActualPayPrice: utils.ForceInterface2Int64(orderMap["user_fee"]),
BaseFreightMoney: utils.ForceInterface2Int64(orderMap["send_fee"]),

2
business/partner/purchase/jd/order.go
View File

@@ -184,7 +184,7 @@ func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
OrderSeq: int(utils.MustInterface2Int64(result["orderNum"])),
StatusTime: utils.Str2Time(result[statusTimeField].(string)),
OrderCreatedAt: utils.Str2Time(result[statusTimeField].(string)),
OrderFinishedAt: utils.Str2Time(result["orderStatusTime"].(string)),
// OrderFinishedAt: utils.Str2Time(result["orderStatusTime"].(string)),
OriginalData: string(utils.MustMarshal(result)),
ActualPayPrice: utils.MustInterface2Int64(result["orderBuyerPayableMoney"]),
BaseFreightMoney: utils.Interface2Int64WithDefault(result["orderBaseFreightMoney"], 0),

2
business/partner/purchase/mtwm/order.go
View File

@@ -133,7 +133,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
OrderSeq: int(utils.MustInterface2Int64(result["day_seq"])),
StatusTime: getTimeFromTimestamp(utils.MustInterface2Int64(result["ctime"])),
OrderCreatedAt: getTimeFromTimestamp(utils.MustInterface2Int64(result["ctime"])),
OrderFinishedAt: getTimeFromTimestamp(utils.MustInterface2Int64(result["order_completed_time"])),
// OrderFinishedAt: getTimeFromTimestamp(utils.MustInterface2Int64(result["order_completed_time"])),
OriginalData: string(utils.MustMarshal(result)),
ActualPayPrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["total"])),
BaseFreightMoney: jxutils.StandardPrice2Int(utils.Interface2Float64WithDefault(result["shipping_fee"], 0)),