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

business/jxcallback/orderman/order.go

@@ -7,6 +7,8 @@ import (
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop"
+
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 
 	"git.rosy.net.cn/baseapi"
@@ -995,3 +997,11 @@ func GetOrderSimpleInfo(ctx *jxcontext.Context, vendorOrderID string) (getOrderS
 
 	return getOrderSimpleInfoResult, err
 }
+
+func SaveJdsOrders(ctx *jxcontext.Context, orderCreatedStart, orderCreatedEnd time.Time) (err error) {
+	orders, err := jdshop.CurPurchaseHandler.GetJdsOrders(ctx, utils.Time2Str(orderCreatedStart), utils.Time2Str(orderCreatedEnd))
+	for _, _ = range orders {
+
+	}
+	return err
+}

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -41,13 +41,13 @@ func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *
 				courierVendorID := storeCourier.VendorID
 				bill, err2 := c.CreateWaybill(courierVendorID, order, maxDeliveryFee)
 				if err = err2; err == nil {
-					stores, _ := dao.GetStoreList(dao.GetDB(), []int{order.StoreID}, nil, nil, nil, "")
+					// stores, _ := dao.GetStoreList(dao.GetDB(), []int{order.StoreID}, nil, nil, nil, "")
-					if len(stores) > 0 {
+					// if len(stores) > 0 {
-						if stores[0].PayPercentage <= 50 {
+					// 	if stores[0].PayPercentage <= 50 {
-							order.NewEarningPrice = (order.TotalShopMoney - bill.DesiredFee) * int64((100 - stores[0].PayPercentage/2)) / 100
+					// 		order.NewEarningPrice = (order.TotalShopMoney - bill.DesiredFee) * int64((100 - stores[0].PayPercentage/2)) / 100
-							dao.UpdateEntity(dao.GetDB(), order, "NewEarningPrice")
+					// 		dao.UpdateEntity(dao.GetDB(), order, "NewEarningPrice")
-						}
+					// 	}
-					}
+					// }
 					globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s vendorID:%d bill:%v", order.VendorOrderID, userName, courierVendorID, bill)
 					bills = append(bills, bill)
 					if createOnlyOne {

business/jxstore/misc/misc.go

@@ -261,6 +261,8 @@ func Init() {
 		}, []string{
 			"04:05:06",
 		})
+		ScheduleTimerFuncByInterval(func() {
+		}, 5*time.Second, 5*time.Minute)
 	}
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "ebaiStorePageCookieExdTOKEN", model.ConfigTypeCookie, ""); err == nil {
 		ebaiStorePageCookieExdTOKEN = configs[0].Value

business/partner/delivery/mtps/store.go

@@ -132,8 +132,8 @@ func (c *DeliveryHandler) IsErrStoreExist(err error) bool {
 }
 
 func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) {
-	if globals.EnableStoreWrite {
+	// if globals.EnableStoreWrite {
-		err = api.MtpsAPI.PagePoiUpdate(storeDetail.VendorStoreID, storeDetail.PayeeName, storeDetail.Tel1, fakeContactEmail)
+	// 	err = api.MtpsAPI.PagePoiUpdate(storeDetail.VendorStoreID, storeDetail.PayeeName, storeDetail.Tel1, fakeContactEmail)
-	}
+	// }
 	return err
 }

business/partner/purchase/jd/order.go

@@ -73,6 +73,7 @@ func (c *PurchaseHandler) updateOrderFinancialInfo(a *jdapi.API, orderID string)
 	if err == nil {
 		if orderSettlement != nil {
 			updateOrderBySettleMent(order, orderSettlement)
+			globals.SugarLogger.Debugf("updateOrderBySettleMent", order.NewEarningPrice)
 			err = partner.CurOrderManager.UpdateOrderFields(order, []string{ /*"WaybillTipMoney", */ "TotalShopMoney", "PmSubsidyMoney", "NewEarningPrice"})
 		}
 	}
@@ -146,6 +147,8 @@ func updateOrderBySettleMent(order *model.GoodsOrder, orderSettlement *jdapi.Ord
 					order.NewEarningPrice = order.EarningPrice
 				}
 			}
+		} else {
+			order.NewEarningPrice = order.EarningPrice
 		}
 	}
 }

business/partner/purchase/jdshop/order.go

@@ -1,8 +1,12 @@
 package jdshop
 
 import (
+	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
 func (p *PurchaseHandler) AcceptOrRefuseFailedGetOrder(ctx *jxcontext.Context, order *model.GoodsOrder, isAcceptIt bool) (err error) {
@@ -10,10 +14,28 @@ 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)
+	jdsOrder := result.OrderList[0]
+	order = &model.GoodsOrder{
+		VendorOrderID:    utils.Int64ToStr(jdsOrder.OrderID),
+		VendorID:         model.VendorIDJDShop,
+		BaseFreightMoney: jxutils.StandardPrice2Int(jdsOrder.Freight),
+		VendorStatus:     utils.Int2Str(jdsOrder.OrderStatus),
+		VendorUserID:     jdsOrder.UserPin,
+		BuyerComment:     jdsOrder.UserRemark,
+		PickDeadline:     utils.DefaultTimeValue,
+		OriginalData:     string(utils.MustMarshal(jdsOrder)),
+	}
 	return order
 }
 func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID string) (order *model.GoodsOrder, err error) {
-	return order, err
+	resultOrders, err := api.JdShopAPI.AllOrders(&jdshopapi.AllOrdersParam{
+		OrderID:  vendorOrderID,
+		Current:  1,
+		PageSize: 1,
+	})
+	return p.Map2Order(utils.Struct2FlatMap(resultOrders)), err
 }
 func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) {
 	return status, err
@@ -74,3 +96,31 @@ func (p *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod
 func (p *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, order *model.AfsOrder) (err error) {
 	return err
 }
+
+func (p *PurchaseHandler) GetJdsOrders(ctx *jxcontext.Context, orderCreatedStart, orderCreatedEnd string) (orders []*model.GoodsOrder, err error) {
+	orderResult, err := api.JdShopAPI.AllOrders(&jdshopapi.AllOrdersParam{
+		Current:              1,
+		PageSize:             10,
+		OrderCreateDateRange: []string{orderCreatedStart, orderCreatedEnd},
+	})
+	orders, err = result2Orders(orderResult)
+	return orders, err
+}
+
+func result2Orders(result *jdshopapi.AllOrdersResult) (orders []*model.GoodsOrder, err error) {
+	for _, jdsOrder := range result.OrderList {
+		order := &model.GoodsOrder{
+			VendorOrderID:    utils.Int64ToStr(jdsOrder.OrderID),
+			VendorID:         model.VendorIDJDShop,
+			BaseFreightMoney: jxutils.StandardPrice2Int(jdsOrder.Freight),
+			VendorStatus:     utils.Int2Str(jdsOrder.OrderStatus),
+			VendorUserID:     jdsOrder.UserPin,
+			BuyerComment:     jdsOrder.UserRemark,
+			// PickDeadline:     utils.DefaultTimeValue,
+			OriginalData: string(utils.MustMarshal(jdsOrder)),
+			StoreName:    jdsOrder.StoreName,
+		}
+		orders = append(orders, order)
+	}
+	return orders, err
+}

business/partner/purchase/jdshop/store_sku.go

@@ -157,7 +157,7 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 				},
 				&jdshopapi.CreateSkuParamFeatures{
 					Key:   "tssp", //支持自提
-					Value: "4",
+					Value: "",
 				},
 				// &jdshopapi.CreateSkuParamFeatures{
 				// 	Key:   "fdms", //分单？
@@ -253,7 +253,7 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
 				storeSkus, err2 := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID}, []int{v.SkuID})
 				err = err2
 				if len(storeSkus) > 0 {
-					if storeSkus[0].JdsID != 0 {
+					if storeSkus[0].JdsID != 0 && vendorStoreID != "" {
 						err = api.JdShopAPI.UpdateSkuSiteStock(storeSkus[0].JdsID, stock, utils.Str2Int(vendorStoreID))
 					}
 				}
@@ -309,24 +309,24 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
 		if status == -1 {
 			return fmt.Errorf("京东商城店内分类创建失败！")
 		}
-		flag := false
+		time.Sleep(time.Second * 2)
-		for {
+		// flag := false
-			result, err := api.JdShopAPI.FindShopCategories()
+		// for {
-			if err != nil {
+		result, err := api.JdShopAPI.FindShopCategories()
-				return err
+		if err != nil {
-			}
+			return err
-			for _, v := range result {
+		}
-				if v.Name == storeCat.Name {
+		for _, v := range result {
-					storeCat.VendorCatID = utils.Int64ToStr(v.CID)
+			if v.Name == storeCat.Name {
-					flag = true
+				storeCat.VendorCatID = utils.Int64ToStr(v.CID)
-					break
+				// flag = true
-				}
-			}
-			time.Sleep(time.Second * 2)
-			if flag {
 				break
 			}
 		}
+		// 	if flag {
+		// 		break
+		// 	}
+		// }
 	}
 	return err
 }
@@ -604,7 +604,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		},
 		&jdshopapi.CreateSkuParamFeatures{
 			Key:   "tssp", //支持自提
-			Value: "4",
+			Value: "",
 		},
 		// &jdshopapi.CreateSkuParamFeatures{
 		// 	Key:   "fdms", //分单？

business/partner/purchase/mtwm/store_sku2.go

@@ -246,7 +246,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		syncType = "更新商品"
 	}
 	for i, storeSku := range storeSkuList {
-		// isNeedUpdatePrice := isCreate //storeSku.SkuSyncStatus&( model.SyncFlagPriceMask| model.SyncFlagNewMask) != 0
+		isNeedUpdatePrice := isCreate //storeSku.SkuSyncStatus&( model.SyncFlagPriceMask| model.SyncFlagNewMask) != 0
 		foodData := make(map[string]interface{})
 		foodDataList[i] = foodData
 		foodData[mtwmapi.KeyAppFoodCode] = utils.Int2Str(storeSku.SkuID)
@@ -258,9 +258,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		foodData["skus"] = skus
 		foodData["name"] = utils.LimitUTF8StringLen(utils.FilterEmoji(storeSku.SkuName), mtwmapi.MaxSkuNameCharCount)
 		foodData["description"] = storeSku.Comment
-		// if isNeedUpdatePrice {
+		if isNeedUpdatePrice {
-		foodData["price"] = jxutils.IntPrice2Standard(storeSku.VendorPrice)
+			foodData["price"] = jxutils.IntPrice2Standard(storeSku.VendorPrice)
-		// }
+		}
 		foodData["min_order_count"] = 1
 		foodData["unit"] = storeSku.Unit
 		foodData["box_num"] = 1