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

business/jxcallback/orderman/order.go

@@ -1007,10 +1007,9 @@ func GetOrderSimpleInfo(ctx *jxcontext.Context, vendorOrderID string) (getOrderS
 
 func SaveJdsOrders(ctx *jxcontext.Context, orderCreatedStart, orderCreatedEnd time.Time) (err error) {
 	var (
-		pageNo   = 1
 		pageSize = 20
 	)
-	orderResult, err := jdshop.CurPurchaseHandler.GetJdsOrders(ctx, utils.Time2Str(orderCreatedStart), utils.Time2Str(orderCreatedEnd), pageNo, pageSize)
+	orderResult, err := jdshop.CurPurchaseHandler.GetJdsOrders(ctx, utils.Time2Str(orderCreatedStart), utils.Time2Str(orderCreatedEnd), 1, pageSize)
 	if err != nil {
 		noticeMsg := fmt.Sprintf("京东商城保存订单出错！（多半是cookie过期了）,err :[%v]", err)
 		ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "DDC5657B43EE11E9A9FF525400E86DC0", "cookie", noticeMsg)
@@ -1018,11 +1017,18 @@ func SaveJdsOrders(ctx *jxcontext.Context, orderCreatedStart, orderCreatedEnd ti
 		return err
 	}
 	orders, err := result2Orders(ctx, orderResult)
+	if orderResult.TotalCount > pageSize {
+		for pageNO := 2; pageNO < orderResult.TotalCount/pageSize+1; pageNO++ {
+			orderResult, _ := jdshop.CurPurchaseHandler.GetJdsOrders(ctx, utils.Time2Str(orderCreatedStart), utils.Time2Str(orderCreatedEnd), pageNO, pageSize)
+			orders2, _ := result2Orders(ctx, orderResult)
+			orders = append(orders, orders2...)
+		}
+	}
 	for _, order := range orders {
-		// order.StoreID = 102919
+		order.StoreID = 102919
-		// order.JxStoreID = 102919
+		order.JxStoreID = 102919
-		// order.StoreName = "商城模板(成都发货)"
+		order.StoreName = "商城模板(成都发货)"
-		// order.VendorStoreID = model.JdShopMainVendorStoreID
+		order.VendorStoreID = model.JdShopMainVendorStoreID
 		partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order))
 		globals.SugarLogger.Debugf("SaveJdsOrders， order: [%v]", utils.Format4Output(order, false))
 		noticeMsg := fmt.Sprintf("京东商城新订单，订单号：[%v] ,将要发到的门店id：[%v] , 门店名：[%v]", order.VendorOrderID, order.StoreID, order.StoreName)
@@ -1084,13 +1090,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
 			order.ConsigneeLng = jxutils.StandardCoordinate2Int(lng)
 			order.ConsigneeLat = jxutils.StandardCoordinate2Int(lat)
 		}
-		// if order.StoreName != "" {
+
-		// 	storeMaps, _ := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDJDShop}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", order.StoreName)
-		// 	if len(storeMaps) > 0 {
-		// 		order.StoreID = storeMaps[0].StoreID
-		// 		order.VendorStoreID = storeMaps[0].VendorStoreID
-		// 	}
-		// } else {
 		storeList, err := common.GetStoreListByLocation(ctx, jxutils.IntCoordinate2Standard(order.ConsigneeLng), jxutils.IntCoordinate2Standard(order.ConsigneeLat), 5000, false, true)
 		if err != nil {
 			globals.SugarLogger.Debugf("jds GetStoreListByLocation error: %v", err.Error())
@@ -1098,6 +1098,10 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
 		}
 		order.StoreID = storeList[0].ID
 		order.StoreName = storeList[0].Name
+		storeMaps, _ := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDJDShop}, []int{order.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+		if len(storeMaps) > 0 {
+			order.VendorStoreID = storeMaps[0].VendorStoreID
+		}
 		// }
 		//如果是暂停，表示是预订单
 		if jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusPause {

business/jxstore/cms/store_sku.go

@@ -13,6 +13,8 @@ import (
 	"time"
 	"unicode"
 
+	"github.com/astaxie/beego"
+
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 
 	"git.rosy.net.cn/jx-callback/globals/api"
@@ -843,7 +845,23 @@ func UpdateStoreSkus(ctx *jxcontext.Context, causeFlag, storeID int, skuBindInfo
 
 func UpdateStoresSkus(ctx *jxcontext.Context, causeFlag int, storeIDs []int, skuBindInfos []*StoreSkuBindInfo, isScale, isRefreshHigh, isAsync, isContinueWhenError bool) (hint string, err error) {
 	globals.SugarLogger.Debugf("UpdateStoresSkus:%s, storeIDs:%v, skuBindInfos:%s", ctx.GetTrackInfo(), storeIDs, utils.Format4Output(skuBindInfos, true))
-	flag, err := doStoreSkuAudit(ctx, storeIDs, skuBindInfos)
+	if beego.BConfig.RunMode == "jxgy" {
+		var num int64
+		db := dao.GetDB()
+		skuIDs, err := updateStoresSkusWithoutSync(ctx, db, storeIDs, skuBindInfos, isScale, isRefreshHigh)
+		if err != nil {
+			return "", err
+		}
+		isAsync = asyncStoreSkuOpFilter(ctx, isAsync)
+		num = int64(len(skuIDs))
+		if num > 0 {
+			hint, err = CurVendorSync.SyncStoresSkus(ctx, nil, causeFlag, db, nil, storeIDs, skuIDs, false, isAsync, isContinueWhenError)
+		}
+		if num == 0 || !isAsync || hint == "" {
+			hint = utils.Int64ToStr(num)
+		}
+	} else {
+		flag, _ := doStoreSkuAudit(ctx, storeIDs, skuBindInfos)
 		if !flag {
 			var num int64
 			db := dao.GetDB()
@@ -860,6 +878,7 @@ func UpdateStoresSkus(ctx *jxcontext.Context, causeFlag int, storeIDs []int, sku
 				hint = utils.Int64ToStr(num)
 			}
 		}
+	}
 	return hint, err
 }
 

business/jxstore/event/event.go

@@ -11,10 +11,8 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
-	"git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
-	"git.rosy.net.cn/jx-callback/globals/api/apimanager"
 )
 
 var (
@@ -149,9 +147,6 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool)
 		errMsg = ""
 	)
 	for _, v := range vendorIDs {
-		appOrgCodeList := apimanager.CurAPIManager.GetAppOrgCodeList(v)
-		if len(appOrgCodeList) > 0 {
-			for _, vv := range appOrgCodeList {
 		cc := &CheckCookie{}
 		var flag = false
 		switch v {
@@ -159,60 +154,39 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool)
 			resultMap, err := api.EbaiAPI.GetStoreOrderInfo(ebaiOrderID)
 			if len(resultMap) < 1 && err != nil {
 				if strings.Contains(err.Error(), ebaiErr) || strings.Contains(err.Error(), ebaiErr2) {
-							errMsg += fmt.Sprintf(" 饿百账号:[%v]的Cookie无效了！", vv)
+					errMsg += fmt.Sprintf(" 饿百账号:[%v]的Cookie无效了！")
 					flag = true
 				}
 			}
-					// result, err := api.Ebai2API.GetEbaiDepotSku(ebaiapi.EbaiWholeCountryStore, "190700570")
-					// if err != nil || len(result) < 1 {
-					// 	cc := &CheckCookie{}
-					// 	cc.VendorID = v
-					// 	cc.VendorOrgCode = "饿百后台饿鲜达全国账号"
-					// 	cc.Status = "无效"
-					// 	ccList = append(ccList, cc)
-					// 	errMsg += fmt.Sprintf(" 饿百账号:[饿百后台饿鲜达全国账号]的Cookie无效了！", vv)
-					// 	flag = true
-					// }
-					// result2, err2 := api.EbaiAPI.GetExianDaSkuDepot("190600741")
-					// if err2 != nil || result2 == nil {
-					// 	cc := &CheckCookie{}
-					// 	cc.VendorID = v
-					// 	cc.VendorOrgCode = "饿鲜达供应链系统"
-					// 	cc.Status = "无效"
-					// 	ccList = append(ccList, cc)
-					// 	errMsg += fmt.Sprintf(" 饿百账号:[饿鲜达供应链系统]的Cookie无效了！", vv)
-					// 	flag = true
-					// }
 		case model.VendorIDMTWM:
 			_, err := api.MtwmAPI.PackagePriceGet(mtStoreID)
 			if err != nil {
 				if strings.Contains(err.Error(), mtErr) {
-							errMsg += fmt.Sprintf(" 美团账号:[%v]的Cookie无效了！", vv)
+					errMsg += fmt.Sprintf(" 美团账号:[%v]的Cookie无效了！")
 					flag = true
 				}
 				globals.SugarLogger.Debugf("cookieCheck", err)
 			}
 		case model.VendorIDJD:
-					result, err := jd.GetAPI(vv).GetJdUpcCodeByName("", jdUpcCode, 1, 5)
+			result, err := api.JdAPI.GetJdUpcCodeByName("", jdUpcCode, 1, 5)
 			if len(result) < 1 && err != nil {
 				if strings.Contains(err.Error(), jdErr) {
-							errMsg += fmt.Sprintf(" 京东账号:[%v]的Cookie无效了！", vv)
+					errMsg += fmt.Sprintf(" 京东账号:[%v]的Cookie无效了！")
 					flag = true
 				}
 			}
-					result2, err2 := api.JdPageAPI.GetCorporationInfo("11926674", "92510108MA68KK3M8P")
+		case model.VendorIDJDShop:
-					if err2 != nil || result2 == nil {
+			_, err := api.JdShopAPI.OrderDetail("124350112427")
-						cc := &CheckCookie{}
+			if err != nil {
-						cc.VendorID = v
+				if strings.Contains(err.Error(), "登录") {
-						cc.VendorOrgCode = "京东page账号"
+					errMsg += fmt.Sprintf("京东商城:[%v]的Cookie无效了！")
-						cc.Status = "无效"
-						ccList = append(ccList, cc)
-						errMsg += fmt.Sprintf(" 京东page账号:的Cookie无效了！", vv)
 					flag = true
 				}
+				globals.SugarLogger.Debugf("cookieCheck", err)
+			}
 		}
 		cc.VendorID = v
-				cc.VendorOrgCode = vv
+		cc.VendorOrgCode = ""
 		if flag {
 			cc.Status = "无效"
 		} else {
@@ -220,8 +194,6 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool)
 		}
 		ccList = append(ccList, cc)
 	}
-		}
-	}
 	if isAuto && errMsg != "" {
 		globals.SugarLogger.Warnf("GetCheckVendorCookie：[%v]", errMsg)
 	}

business/jxstore/misc/misc.go

@@ -164,7 +164,7 @@ func Init() {
 		ScheduleTimerFunc("doDailyWork2", doDailyWork2, dailyWorkTimeList2)
 
 		ScheduleTimerFuncByInterval(func() {
-			orderman.SaveJdsOrders(jxcontext.AdminCtx, time.Now().Add(-15*time.Minute), time.Now())
+			orderman.SaveJdsOrders(jxcontext.AdminCtx, time.Now().Add(-20*time.Minute), time.Now())
 		}, 10*time.Second, 10*time.Minute)
 
 		ScheduleTimerFuncByInterval(func() {
@@ -205,7 +205,7 @@ func Init() {
 			cms.AutoFocusStoreSkusForTopSkus(jxcontext.AdminCtx, true, true)
 		}, createStorePriceTimeList)
 		ScheduleTimerFunc("GetCheckVendorCookie", func() {
-			event.GetCheckVendorCookie(jxcontext.AdminCtx, []int{model.VendorIDEBAI, model.VendorIDJD, model.VendorIDMTWM, model.VendorIDMTPS}, true)
+			event.GetCheckVendorCookie(jxcontext.AdminCtx, []int{model.VendorIDEBAI, model.VendorIDJD, model.VendorIDMTWM, model.VendorIDMTPS, model.VendorIDJDShop}, true)
 		}, checkCookieList)
 		ScheduleTimerFunc("SendSeckillSkusCountMsg", func() {
 			cms.SendSeckillSkusCountMsg(jxcontext.AdminCtx, []int{model.VendorIDEBAI, model.VendorIDJD, model.VendorIDMTWM}, false, true)

business/partner/delivery/mtps/waybill.go

@@ -118,7 +118,6 @@ func (c *DeliveryHandler) pushToGy(waybill *model.Waybill, msg *mtpsapi.Callback
 		params["mt_peisong_id"] = msg.MtPeisongID
 		params["courier_name"] = msg.CourierName
 		params["delivery_id"] = msg.DeliveryID
-		// params["sign"] = "ec61c8d88a1f864cc2cb1b875177fe1fb1402f05"
 		params["appkey"] = msg.AppKey
 		params["order_id"] = msg.OrderID
 		params["courier_phone"] = msg.CourierPhone
@@ -133,6 +132,17 @@ func (c *DeliveryHandler) pushToGy(waybill *model.Waybill, msg *mtpsapi.Callback
 		if err != nil {
 			return
 		}
+		request.PostForm.Set("mt_peisong_id", msg.MtPeisongID)
+		request.PostForm.Set("courier_name", msg.CourierName)
+		request.PostForm.Set("delivery_id", utils.Int64ToStr(msg.DeliveryID))
+		request.PostForm.Set("appkey", msg.AppKey)
+		request.PostForm.Set("order_id", msg.OrderID)
+		request.PostForm.Set("courier_phone", msg.CourierPhone)
+		request.PostForm.Set("status", utils.Int2Str(msg.Status))
+		request.PostForm.Set("timestamp", utils.Int64ToStr(msg.Timestamp))
+		request.PostForm.Set("cancel_reason_id", utils.Int2Str(msg.CancelReasonId))
+		request.PostForm.Set("cancel_reason", msg.CancelReason)
+		request.PostForm.Set("sign", sign)
 		fmt.Println("testgy request : %v", request.FormValue("sign"))
 		request.Header.Set("content_type", "application/x-www-form-urlencoded; charset=UTF-8")
 		cl.Do(request)

business/partner/purchase/mtwm/store_sku2.go

@@ -5,6 +5,8 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/astaxie/beego"
+
 	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -265,6 +267,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		foodData["unit"] = storeSku.Unit
 		foodData["box_num"] = 1
 		foodData["box_price"] = jxutils.IntPrice2Standard(storeSku.BoxFee)
+		if beego.BConfig.RunMode == "jxgy" {
+			foodData["common_attr_value"] = switchAttr(storeSku.VendorVendorCatID)
+		}
 		catCode := tryCatName2Code(storeSku.VendorCatID)
 		if catCode != "" {
 			foodData["category_code"] = catCode
@@ -364,6 +369,28 @@ func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, v
 	return failedList, err
 }
 
+func switchAttr(vendorCatID int64) (attrs string) {
+	switch vendorCatID {
+	case 200002727:
+		return mtwmapi.MtwmSkuAttr200002727
+	case 200001555:
+		return mtwmapi.MtwmSkuAttr200001555
+	case 200002728:
+		return mtwmapi.MtwmSkuAttr200002728
+	case 200001519, 200000592:
+		return mtwmapi.MtwmSkuAttr200000592
+	case 200002704, 200002731:
+		return mtwmapi.MtwmSkuAttr200002731
+	case 200002716:
+		return mtwmapi.MtwmSkuAttr200002716
+	case 200002667, 200002713, 200002670:
+		return mtwmapi.MtwmSkuAttr200002670
+	case 200002680:
+		return mtwmapi.MtwmSkuAttr200002680
+	}
+	return attrs
+}
+
 func stockCount2Mtwm(stock int) (mtwmStock string) {
 	return utils.Int2Str(stock)
 }

controllers/jx_order.go

@@ -1088,3 +1088,18 @@ func (c *OrderController) SendJdwlForJdsOrder() {
 		return retVal, "", err
 	})
 }
+
+// @Title 手动拉取京东商城订单
+// @Description 手动拉取京东商城订单
+// @Param	token			header		string	true	"认证token"
+// @Param	fromTime		formData	string	true	"订单起始时间"
+// @Param	toTime			formData	string	true	"订单结束时间"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /SaveJdsOrders [post]
+func (c *OrderController) SaveJdsOrders() {
+	c.callSaveJdsOrders(func(params *tOrderSaveJdsOrdersParams) (retVal interface{}, errCode string, err error) {
+		err = orderman.SaveJdsOrders(params.Ctx, utils.Str2Time(params.FromTime), utils.Str2Time(params.ToTime))
+		return retVal, "", err
+	})
+}

routers/commentsRouter_controllers.go

@@ -1224,6 +1224,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
+        beego.ControllerComments{
+            Method: "SaveJdsOrders",
+            Router: `/SaveJdsOrders`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
         beego.ControllerComments{
             Method: "SelfDelivered",