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) {