From 5793e16622667262dc58a8e7b5564e3e9907fa0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 18 Apr 2022 09:59:44 +0800 Subject: [PATCH 1/9] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 26940ba7f..b9fb9bd87 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -621,6 +621,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo //订单已经是结束状态之后来的运单143945553920000001 if order.Status > model.OrderStatusEndBegin { s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime) + s.SelfDeliverDelivered(order, "自送或三方") } if model.IsWaybillPlatformOwn(bill) { if bill.Status == model.WaybillStatusDelivering && order.Status < model.OrderStatusEndBegin { @@ -630,8 +631,8 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo } } else { if model.IsOrderDeliveryByStore(savedOrderInfo.order) { + // 转自送失败,取消三方配送 if err := s.SelfDeliverDelivering(savedOrderInfo.order, bill.CourierMobile); err != nil { - // 转自送失败,取消三方配送 s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrSwitch2SelfFailed) partner.CurOrderManager.OnOrderMsg(order, "自送出设置失败", err.Error()) } From b40196783f009e2f6c7dfee0630b75d7c0a1723b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 18 Apr 2022 16:14:59 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BD=AC=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sync.go | 1 + business/jxstore/misc/misc2_test.go | 7 +++++++ business/partner/purchase/jd/store.go | 2 +- business/partner/purchase/jdshop/order.go | 16 +++++++--------- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index 6a4329dd0..254927bce 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -685,6 +685,7 @@ func (v *VendorSync) AmendAndPruneStoreStuff(ctx *jxcontext.Context, vendorIDs [ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.ITask, db *dao.DaoDB, taskName string, isAsync, isManageIt bool, vendorIDs []int, storeIDs []int, mustDirty bool, handler tasksch.WorkFunc, isContinueWhenError bool) (task tasksch.ITask, hint string, err error) { var storeMapList []*model.StoreMap + //stores, _ := dao.GetStoresMapList(db, []int{model.VendorIDMTWM, model.VendorIDJD, model.VendorIDEBAI}, nil, []int{model.StoreStatusOpened, model.StoreStatusHaveRest}, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "") if storeMapList, err = dao.GetStoresMapList2(db, vendorIDs, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", "", mustDirty); err != nil { return nil, "", err } diff --git a/business/jxstore/misc/misc2_test.go b/business/jxstore/misc/misc2_test.go index e6627a75a..685ebaf00 100644 --- a/business/jxstore/misc/misc2_test.go +++ b/business/jxstore/misc/misc2_test.go @@ -1,6 +1,9 @@ package misc import ( + "git.rosy.net.cn/jx-callback/business/jxstore/cms" + "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/model/dao" "testing" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" @@ -9,3 +12,7 @@ import ( func TestStartOrEndOpStore(t *testing.T) { StartOrEndOpStore(jxcontext.AdminCtx, true, nil, nil, 0, 0, false, true) } + +func TestIssny(t *testing.T) { + cms.CurVendorSync.SyncStore2(jxcontext.AdminCtx, dao.GetDB(), []int{model.VendorIDMTWM, model.VendorIDJD, model.VendorIDEBAI}, nil, true, true) +} \ No newline at end of file diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index a7ce7e27b..b33ecf5fb 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -202,7 +202,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin modifyCloseStatus := false if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagDeletedMask|model.SyncFlagStoreStatus) != 0 { modifyCloseStatus = true - _, storeParams.CloseStatus = JxStoreStatus2JdStatus(jxutils.MergeStoreStatus(store.Status, store.JdStoreStatus)) + _, storeParams.CloseStatus = JxStoreStatus2JdStatus(jxutils.MergeStoreStatus(store.Status, store.JdStoreStatus)) // 1storeParams.CloseStatus } fillOpTimeParams(storeParams, store.GetOpTimeList()) // globals.SugarLogger.Debug(utils.Format4Output(storeParams, false)) diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index a002c1367..106c2d346 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -279,15 +279,13 @@ func apiToYd(url string, params map[string]interface{}) (retVal map[string]inter return retVal, err } -func GetJdsOrder(vendorOrderID, vendorOrgCode string) (jdsOrder *jdshopapi.GetOrderResult, err error) { - params := make(map[string]interface{}) - params["orderID"] = vendorOrderID - params["token"] = jdshopapi.JdsYdToken - params["vendorOrgCode"] = vendorOrgCode - result, err := apiToYd("order/GetJdsOrder", params) - jdsOrder2 := &jdshopapi.GetOrderResult{} - err = utils.UnmarshalUseNumber([]byte(strings.ReplaceAll(result["data"].(string), "\\", "")), &jdsOrder2) - return jdsOrder2, err +func GetJdsOrder(vendorOrderID, vendorOrgCode string) (jdsOrder *jdshopapi.GetEnOrderResult, err error) { + jdmcshopapi := jdshopapi.New("37d36b62c0d14bd4b872f948b335c95czinj", "E1D746D42474D5F1F1A10CECE75D99F6", "efa7e1d1a22640fa990e6cf164b28608") + result, err := jdmcshopapi.GetOrderById(utils.Str2Int64(vendorOrderID), false) + if err != nil { + return nil, err + } + return result, err } func GetJdsOrder2(vendorOrderID, vendorOrgCode string) (jdsOrder string, err error) { From c238749094e8ad26d8a4cfa03c18a6d33b11fa62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 18 Apr 2022 16:20:18 +0800 Subject: [PATCH 3/9] 1 --- business/partner/purchase/jdshop/order.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index 106c2d346..1832fb968 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -282,6 +282,7 @@ func apiToYd(url string, params map[string]interface{}) (retVal map[string]inter func GetJdsOrder(vendorOrderID, vendorOrgCode string) (jdsOrder *jdshopapi.GetEnOrderResult, err error) { jdmcshopapi := jdshopapi.New("37d36b62c0d14bd4b872f948b335c95czinj", "E1D746D42474D5F1F1A10CECE75D99F6", "efa7e1d1a22640fa990e6cf164b28608") result, err := jdmcshopapi.GetOrderById(utils.Str2Int64(vendorOrderID), false) + fmt.Println("==================",err) if err != nil { return nil, err } From e0a89b86c5d680ac55e6697cfce403c597be4510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 18 Apr 2022 16:24:48 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=B0=86=E7=B3=BB=E7=BB=9F=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=AE=A2=E5=8D=95=E5=8F=B7=E8=A7=A3=E6=9E=90=E4=B8=BA?= =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E8=AE=A2=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jdshop/order.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index 1832fb968..821e2de48 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -281,8 +281,8 @@ func apiToYd(url string, params map[string]interface{}) (retVal map[string]inter func GetJdsOrder(vendorOrderID, vendorOrgCode string) (jdsOrder *jdshopapi.GetEnOrderResult, err error) { jdmcshopapi := jdshopapi.New("37d36b62c0d14bd4b872f948b335c95czinj", "E1D746D42474D5F1F1A10CECE75D99F6", "efa7e1d1a22640fa990e6cf164b28608") - result, err := jdmcshopapi.GetOrderById(utils.Str2Int64(vendorOrderID), false) - fmt.Println("==================",err) + result, err := jdmcshopapi.GetOrderById(utils.Str2Int64(vendorOrderID[0:12]), false) + fmt.Println("==================", err) if err != nil { return nil, err } From b5ed707d0c863e7736e4528fe0e3802a0aeec250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 18 Apr 2022 16:47:56 +0800 Subject: [PATCH 5/9] 1 --- business/partner/purchase/jdshop/order.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index 821e2de48..e5c05e236 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -280,9 +280,10 @@ func apiToYd(url string, params map[string]interface{}) (retVal map[string]inter } func GetJdsOrder(vendorOrderID, vendorOrgCode string) (jdsOrder *jdshopapi.GetEnOrderResult, err error) { - jdmcshopapi := jdshopapi.New("37d36b62c0d14bd4b872f948b335c95czinj", "E1D746D42474D5F1F1A10CECE75D99F6", "efa7e1d1a22640fa990e6cf164b28608") + jdmcshopapi := jdshopapi.New("f9c5ce9a5ce24218936924f7c4864cc9owe1", "E1D746D42474D5F1F1A10CECE75D99F6", "efa7e1d1a22640fa990e6cf164b28608") result, err := jdmcshopapi.GetOrderById(utils.Str2Int64(vendorOrderID[0:12]), false) fmt.Println("==================", err) + fmt.Println("==================", result) if err != nil { return nil, err } From ab58a3096ed755fe0c0a08be3d47e4bb0484aaa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 18 Apr 2022 17:26:15 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=BD=AC=E5=BA=97,=E6=8B=A3=E8=B4=A7=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jdshop/order.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index e5c05e236..168781b30 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -282,8 +282,6 @@ func apiToYd(url string, params map[string]interface{}) (retVal map[string]inter func GetJdsOrder(vendorOrderID, vendorOrgCode string) (jdsOrder *jdshopapi.GetEnOrderResult, err error) { jdmcshopapi := jdshopapi.New("f9c5ce9a5ce24218936924f7c4864cc9owe1", "E1D746D42474D5F1F1A10CECE75D99F6", "efa7e1d1a22640fa990e6cf164b28608") result, err := jdmcshopapi.GetOrderById(utils.Str2Int64(vendorOrderID[0:12]), false) - fmt.Println("==================", err) - fmt.Println("==================", result) if err != nil { return nil, err } From fd35dcfc380ce485b3dfd19f49e6c3f5750c3a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 18 Apr 2022 17:49:24 +0800 Subject: [PATCH 7/9] 1 --- business/partner/purchase/jdshop/order.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index 168781b30..1ea318c13 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -27,7 +27,12 @@ func (p *PurchaseHandler) AcceptOrRefuseFailedGetOrder(ctx *jxcontext.Context, o func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) { result := &jdshopapi.AllOrdersResult{} - utils.Map2StructByJson(orderData, &result, false) + if err := utils.Map2StructByJson(orderData, &result, false); err != nil { + fmt.Println("err===============", err) + return nil + } + fmt.Println("err===============", orderData) + jdsOrder := result.OrderList[0] order = &model.GoodsOrder{ VendorOrderID: utils.Int64ToStr(jdsOrder.OrderID), From 27b4d3d9ce971c5e51a0c557115c8d1282b4de7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 18 Apr 2022 17:55:24 +0800 Subject: [PATCH 8/9] 1 --- business/partner/purchase/jdshop/order.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index 1ea318c13..a68c0871b 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -56,6 +56,7 @@ func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID s if err != nil { return nil, err } + fmt.Println("resultOrders===============", resultOrders) return p.Map2Order(utils.Struct2FlatMap(resultOrders)), err } func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) { From 3528ff9d43290d1c460924ae5d87fc197acedebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 18 Apr 2022 18:05:24 +0800 Subject: [PATCH 9/9] 1 --- business/partner/purchase/jdshop/order.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index a68c0871b..bbe85ad1b 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -51,7 +51,7 @@ func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID s resultOrders, err := api.JdShopAPI.AllOrders(&jdshopapi.AllOrdersParam{ OrderID: vendorOrderID, Current: 1, - PageSize: 1, + PageSize: 10, }) if err != nil { return nil, err