From 89f64ecc9701ceef3d6f858817bd160366c97891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 14 Jan 2020 18:22:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=B7=E6=96=B0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=97=B6=E9=97=B4=EF=BC=8C=E7=95=85=E9=94=80=E5=93=81?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=85=B3=E6=B3=A8=E6=94=BE=E5=BC=80=E5=9F=8E?= =?UTF-8?q?=E5=B8=82=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/orderman_ext.go | 9 +++++---- business/jxstore/cms/store_sku.go | 16 ++++++++-------- business/partner/purchase/ebai/order.go | 1 + business/partner/purchase/jd/order.go | 1 + business/partner/purchase/mtwm/order.go | 1 + 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 3bf0b2b45..a173433c3 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -1062,11 +1062,12 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { goodsOrder := batchItemList[0].(*model.GoodsOrder) if handler := partner.GetPurchaseOrderHandlerFromVendorID(goodsOrder.VendorID); handler != nil { - status, err2 := handler.GetOrderStatus(goodsOrder.VendorOrgCode, goodsOrder.VendorOrderID) + order, err2 := handler.GetOrder(goodsOrder.VendorOrgCode, goodsOrder.VendorOrderID) if err = err2; err == nil { - if model.IsOrderFinalStatus(status) { - goodsOrder.Status = status - _, err = dao.UpdateEntity(db, goodsOrder, "Status") + if model.IsOrderFinalStatus(order.status) { + goodsOrder.Status = order.status + goodsOrder.OrderFinishedAt = order.OrderFinishedAt + _, err = dao.UpdateEntity(db, goodsOrder, "Status", "OrderFinishedAt") } } } diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 8d736c421..5b436c1cd 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -3058,15 +3058,15 @@ func FocusStoreSkusBySku(ctx *jxcontext.Context, skuBindInfos []*StoreSkuBindInf func AutoFocusStoreSkusForTopSkus(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint string, err error) { db := dao.GetDB() var ( - result1 []interface{} - cityCodes = []int{ - 530100, //昆明 - 430300, //湘潭市 - 510700, //绵阳市 - 520100, //贵阳市 - } + result1 []interface{} + // cityCodes = []int{ + // 530100, //昆明 + // 430300, //湘潭市 + // 510700, //绵阳市 + // 520100, //贵阳市 + // } ) - storeList, err := dao.GetStoreList(db, nil, cityCodes, nil, nil, "") + storeList, err := dao.GetStoreList(db, nil, nil, nil, nil, "") taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { switch step { case 0: diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 0156e6349..cea080b36 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -212,6 +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"]), OriginalData: string(utils.MustMarshal(result)), ActualPayPrice: utils.ForceInterface2Int64(orderMap["user_fee"]), BaseFreightMoney: utils.ForceInterface2Int64(orderMap["send_fee"]), diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 2f307f2ba..091056b92 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -184,6 +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)), OriginalData: string(utils.MustMarshal(result)), ActualPayPrice: utils.MustInterface2Int64(result["orderBuyerPayableMoney"]), BaseFreightMoney: utils.Interface2Int64WithDefault(result["orderBaseFreightMoney"], 0), diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index 2be1bca8a..4359f2753 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -133,6 +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"])), OriginalData: string(utils.MustMarshal(result)), ActualPayPrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["total"])), BaseFreightMoney: jxutils.StandardPrice2Int(utils.Interface2Float64WithDefault(result["shipping_fee"], 0)), From 6375cde8247287a91db2c4fe085f81355a5e4906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 14 Jan 2020 18:24:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/orderman_ext.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index a173433c3..aa30caa06 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -1064,8 +1064,8 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in if handler := partner.GetPurchaseOrderHandlerFromVendorID(goodsOrder.VendorID); handler != nil { order, err2 := handler.GetOrder(goodsOrder.VendorOrgCode, goodsOrder.VendorOrderID) if err = err2; err == nil { - if model.IsOrderFinalStatus(order.status) { - goodsOrder.Status = order.status + if model.IsOrderFinalStatus(order.Status) { + goodsOrder.Status = order.Status goodsOrder.OrderFinishedAt = order.OrderFinishedAt _, err = dao.UpdateEntity(db, goodsOrder, "Status", "OrderFinishedAt") }