Merge remote-tracking branch 'origin/jdshop' into jdshop

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())
 								}

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
 	}

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)
+}

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

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),
@@ -46,11 +51,12 @@ 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
 	}
+	fmt.Println("resultOrders===============", resultOrders)
 	return p.Map2Order(utils.Struct2FlatMap(resultOrders)), err
 }
 func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) {
@@ -279,15 +285,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) {
+func GetJdsOrder(vendorOrderID, vendorOrgCode string) (jdsOrder *jdshopapi.GetEnOrderResult, err error) {
-	params := make(map[string]interface{})
+	jdmcshopapi := jdshopapi.New("f9c5ce9a5ce24218936924f7c4864cc9owe1", "E1D746D42474D5F1F1A10CECE75D99F6", "efa7e1d1a22640fa990e6cf164b28608")
-	params["orderID"] = vendorOrderID
+	result, err := jdmcshopapi.GetOrderById(utils.Str2Int64(vendorOrderID[0:12]), false)
-	params["token"] = jdshopapi.JdsYdToken
+	if err != nil {
-	params["vendorOrgCode"] = vendorOrgCode
+		return nil, err
-	result, err := apiToYd("order/GetJdsOrder", params)
+	}
-	jdsOrder2 := &jdshopapi.GetOrderResult{}
+	return result, err
-	err = utils.UnmarshalUseNumber([]byte(strings.ReplaceAll(result["data"].(string), "\\", "")), &jdsOrder2)
-	return jdsOrder2, err
 }
 
 func GetJdsOrder2(vendorOrderID, vendorOrgCode string) (jdsOrder string, err error) {