diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index aa30caa06..10f161e9c 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -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") } } diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 26972db3d..771f237c8 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -150,6 +150,11 @@ func UpdateCategory(ctx *jxcontext.Context, categoryID int, payload map[string]i if err = dao.GetEntity(db, cat); err != nil { return 0, err } + for k, v := range payload { + if v == nil { + delete(payload, k) + } + } valid := dao.StrictMakeMapByStructObject(payload, cat, userName) if len(valid) > 0 { // syncStatus := 0 diff --git a/business/jxstore/cms/sync_store_sku_fakejd.go b/business/jxstore/cms/sync_store_sku_fakejd.go index 6114bf67c..773b05824 100644 --- a/business/jxstore/cms/sync_store_sku_fakejd.go +++ b/business/jxstore/cms/sync_store_sku_fakejd.go @@ -255,7 +255,7 @@ func excel2FakeJdThingMap(ctx *jxcontext.Context, reader io.Reader) (thingMapLis for rowNum, row := range rows { thingMap := &model.FakeJdThingMap{ JxID: int(utils.Str2Int64WithDefault(row[0], 0)), - JdID: utils.Str2Int64WithDefault(row[0], 0), + JdID: utils.Str2Int64WithDefault(row[1], 0), } if thingMap.JxID == 0 || thingMap.JdID == 0 { if rowNum == 0 { diff --git a/business/jxstore/cms/sync_store_sku_fakejd_test.go b/business/jxstore/cms/sync_store_sku_fakejd_test.go index 318f40cf2..057444628 100644 --- a/business/jxstore/cms/sync_store_sku_fakejd_test.go +++ b/business/jxstore/cms/sync_store_sku_fakejd_test.go @@ -18,7 +18,7 @@ func TestSyncStoreSku4FakeJD(t *testing.T) { } func TestUploadFakeJdThingMap(t *testing.T) { - file, err := os.Open("/Users/xujianhua/Downloads/thingmap.xlsx") + file, err := os.Open("/Users/xujianhua/Downloads/到家菜市门店与商品映射信息(1).xlsx") if err != nil { t.Fatal(err) } diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index cea080b36..11f5c00bd 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -212,12 +212,12 @@ 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"]), - TotalShopMoney: utils.ForceInterface2Int64(orderMap["shop_fee"]), - DeliveryType: mapDeliveryType(int(utils.ForceInterface2Int64(orderMap["delivery_party"]))), + // OrderFinishedAt: getTimeFromInterface(orderMap["finished_time"]), + OriginalData: string(utils.MustMarshal(result)), + ActualPayPrice: utils.ForceInterface2Int64(orderMap["user_fee"]), + BaseFreightMoney: utils.ForceInterface2Int64(orderMap["send_fee"]), + TotalShopMoney: utils.ForceInterface2Int64(orderMap["shop_fee"]), + DeliveryType: mapDeliveryType(int(utils.ForceInterface2Int64(orderMap["delivery_party"]))), InvoiceTitle: utils.Interface2String(orderMap["invoice_title"]), InvoiceTaxerID: utils.Interface2String(orderMap["taxer_id"]), diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 091056b92..df436eb19 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -184,13 +184,13 @@ 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), - DistanceFreightMoney: utils.Interface2Int64WithDefault(result["merchantPaymentDistanceFreightMoney"], 0), - DeliveryType: deliveryTypeMap[int(utils.Str2Int64WithDefault(utils.Interface2String(result["deliveryCarrierNo"]), 0))], - VendorOrgCode: utils.Interface2String(result["orgCode"]), + // OrderFinishedAt: utils.Str2Time(result["orderStatusTime"].(string)), + OriginalData: string(utils.MustMarshal(result)), + ActualPayPrice: utils.MustInterface2Int64(result["orderBuyerPayableMoney"]), + BaseFreightMoney: utils.Interface2Int64WithDefault(result["orderBaseFreightMoney"], 0), + DistanceFreightMoney: utils.Interface2Int64WithDefault(result["merchantPaymentDistanceFreightMoney"], 0), + DeliveryType: deliveryTypeMap[int(utils.Str2Int64WithDefault(utils.Interface2String(result["deliveryCarrierNo"]), 0))], + VendorOrgCode: utils.Interface2String(result["orgCode"]), } if orderInvoice, ok := result["orderInvoice"].(map[string]interface{}); ok && orderInvoice != nil { order.InvoiceTitle = utils.Interface2String(orderInvoice["invoiceTitle"]) diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index 4359f2753..5c74f41a3 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -133,10 +133,10 @@ 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)), + // 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)), InvoiceTitle: utils.Interface2String(result["invoice_title"]), InvoiceTaxerID: utils.Interface2String(result["taxpayer_id"]),