From 0e2b692adcd90942bcc4931fd477784ddeb29333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 9 Nov 2020 10:28:40 +0800 Subject: [PATCH 01/18] ebai --- .../jxcallback/scheduler/defsch/defsch.go | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 14d109778..c2a3b2ab1 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -378,8 +378,22 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool) (err savedOrderInfo.SetOrder(order) if order.Status == model.OrderStatusWaitAccepted { s.resetTimer(savedOrderInfo, nil, isPending) - // push.NotifyNewOrder(order) - s.notifyNewOrder(order) + if order.Flag&model.OrderFlagMaskFake == 0 { + utils.CallFuncAsync(func() { + order = setFakeActualPayPrice(order) + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) + //目前暂且认为AdjustCount > 0 就是调整单 + if order.AdjustCount > 0 { + weixinmsg.NotifyAdjustOrder(order) + } else { + weixinmsg.NotifyNewOrder(order) + } + OrderProfitWarning(order) + smsmsg.NotifyNewOrder(order) + smsmsg.NotifyNewUserOrder(order) + push.NotifyNewOrder(order) + }) + } msghub.OnNewOrder(order) } if order.Status >= model.OrderStatusNew { @@ -1459,7 +1473,7 @@ func setFakeActualPayPrice(order *model.GoodsOrder) (newOrder *model.GoodsOrder) } func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) { - if order.Flag&model.OrderFlagMaskFake == 0 { + if order.Flag&model.OrderFlagMaskFake == 0 && order.VendorID != model.VendorIDEBAI { utils.CallFuncAsync(func() { order = setFakeActualPayPrice(order) netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) From 96d364fac4d7d9bef070e0c280488f904ae16431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 9 Nov 2020 15:27:22 +0800 Subject: [PATCH 02/18] gy --- business/jxcallback/orderman/orderman_ext.go | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index b2954410f..879a28dcf 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -705,8 +705,12 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID } saleInfoMap[index] = saleInfo } - if v.EarningType == model.EarningTypeQuote { - saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count) + if beego.BConfig.RunMode == "prod" { + if v.EarningType == model.EarningTypeQuote { + saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count) + } + } else { + saleInfo.RealEarningPrice += v.NewEarningPrice } saleInfo.ShopPrice += v.ShopPrice * int64(v.Count) saleInfo.VendorPrice += v.VendorPrice * int64(v.Count) @@ -715,14 +719,22 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID if v.VendorOrderID == flagVendorOrderID { if k == 0 { saleInfo.EarningPrice = v.NewEarningPrice - if v.EarningType == model.EarningTypePoints { + if beego.BConfig.RunMode == "prod" { + if v.EarningType == model.EarningTypePoints { + saleInfo.RealEarningPrice += v.NewEarningPrice + } + } else { saleInfo.RealEarningPrice += v.NewEarningPrice } } } else { flagVendorOrderID = v.VendorOrderID saleInfo.EarningPrice += v.NewEarningPrice - if v.EarningType == model.EarningTypePoints { + if beego.BConfig.RunMode == "prod" { + if v.EarningType == model.EarningTypePoints { + saleInfo.RealEarningPrice += v.NewEarningPrice + } + } else { saleInfo.RealEarningPrice += v.NewEarningPrice } } From 32ed7d2f11e8553697ae90901fa9afb94fbc23da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 9 Nov 2020 15:29:05 +0800 Subject: [PATCH 03/18] gy --- business/jxcallback/orderman/orderman_ext.go | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 879a28dcf..b2954410f 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -705,12 +705,8 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID } saleInfoMap[index] = saleInfo } - if beego.BConfig.RunMode == "prod" { - if v.EarningType == model.EarningTypeQuote { - saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count) - } - } else { - saleInfo.RealEarningPrice += v.NewEarningPrice + if v.EarningType == model.EarningTypeQuote { + saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count) } saleInfo.ShopPrice += v.ShopPrice * int64(v.Count) saleInfo.VendorPrice += v.VendorPrice * int64(v.Count) @@ -719,22 +715,14 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID if v.VendorOrderID == flagVendorOrderID { if k == 0 { saleInfo.EarningPrice = v.NewEarningPrice - if beego.BConfig.RunMode == "prod" { - if v.EarningType == model.EarningTypePoints { - saleInfo.RealEarningPrice += v.NewEarningPrice - } - } else { + if v.EarningType == model.EarningTypePoints { saleInfo.RealEarningPrice += v.NewEarningPrice } } } else { flagVendorOrderID = v.VendorOrderID saleInfo.EarningPrice += v.NewEarningPrice - if beego.BConfig.RunMode == "prod" { - if v.EarningType == model.EarningTypePoints { - saleInfo.RealEarningPrice += v.NewEarningPrice - } - } else { + if v.EarningType == model.EarningTypePoints { saleInfo.RealEarningPrice += v.NewEarningPrice } } From adb3c1b6dd3c42bf5155add4280687f6c124b4b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 9 Nov 2020 15:32:17 +0800 Subject: [PATCH 04/18] gy --- business/jxcallback/orderman/orderman_ext.go | 30 ++++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index b2954410f..871517d53 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -705,8 +705,14 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID } saleInfoMap[index] = saleInfo } - if v.EarningType == model.EarningTypeQuote { - saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count) + if beego.BConfig.RunMode == "prod" { + if v.EarningType == model.EarningTypeQuote { + saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count) + } + } else { + if v.PayPercentage == 100 { + saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count) + } } saleInfo.ShopPrice += v.ShopPrice * int64(v.Count) saleInfo.VendorPrice += v.VendorPrice * int64(v.Count) @@ -715,15 +721,27 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID if v.VendorOrderID == flagVendorOrderID { if k == 0 { saleInfo.EarningPrice = v.NewEarningPrice - if v.EarningType == model.EarningTypePoints { - saleInfo.RealEarningPrice += v.NewEarningPrice + if beego.BConfig.RunMode == "prod" { + if v.EarningType == model.EarningTypePoints { + saleInfo.RealEarningPrice += v.NewEarningPrice + } + } else { + if v.PayPercentage < 100 { + saleInfo.RealEarningPrice += v.NewEarningPrice + } } } } else { flagVendorOrderID = v.VendorOrderID saleInfo.EarningPrice += v.NewEarningPrice - if v.EarningType == model.EarningTypePoints { - saleInfo.RealEarningPrice += v.NewEarningPrice + if beego.BConfig.RunMode == "prod" { + if v.EarningType == model.EarningTypePoints { + saleInfo.RealEarningPrice += v.NewEarningPrice + } + } else { + if v.PayPercentage < 100 { + saleInfo.RealEarningPrice += v.NewEarningPrice + } } } From 7e51b093e56f2baaec6911d38fcad995f21e67c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 9 Nov 2020 15:36:45 +0800 Subject: [PATCH 05/18] gy --- business/jxcallback/orderman/orderman_ext.go | 6 +++--- business/model/dao/dao_order.go | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 871517d53..f9a8b43ed 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -710,7 +710,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count) } } else { - if v.PayPercentage == 100 { + if v.OrderPayPercentage == 100 { saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count) } } @@ -726,7 +726,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID saleInfo.RealEarningPrice += v.NewEarningPrice } } else { - if v.PayPercentage < 100 { + if v.OrderPayPercentage < 100 { saleInfo.RealEarningPrice += v.NewEarningPrice } } @@ -739,7 +739,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID saleInfo.RealEarningPrice += v.NewEarningPrice } } else { - if v.PayPercentage < 100 { + if v.OrderPayPercentage < 100 { saleInfo.RealEarningPrice += v.NewEarningPrice } } diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index c46002c47..36b6a3e10 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -45,9 +45,10 @@ type OrderSkuWithActualPayPrice struct { StoreID int `orm:"column(store_id)" json:"storeID"` // 外部系统里记录的 jxstoreid Status int `json:"status"` // 参见OrderStatus*相关的常量定义 - PayPercentage int `json:"payPercentage"` - NewEarningPrice int64 `json:"newEarningPrice"` - EarningType int `json:"earningType"` + PayPercentage int `json:"payPercentage"` + OrderPayPercentage int `json:"orderPayPercentage"` + NewEarningPrice int64 `json:"newEarningPrice"` + EarningType int `json:"earningType"` } type tGoodsAndOrder struct { @@ -376,7 +377,7 @@ func GetStoreOrderSkuList(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAt sql := ` SELECT t1.*, IF(t2.jx_store_id > 0, t2.jx_store_id, t2.store_id) store_id, t2.status, t2.actual_pay_price, t2.distance_freight_money, t2.waybill_tip_money, t2.new_earning_price, - t3.pay_percentage, t2.earning_type + t3.pay_percentage, t2.earning_type, t2.order_pay_percentage FROM order_sku t1 JOIN goods_order t2 ON t2.vendor_order_id = t1.vendor_order_id AND t2.vendor_id = t1.vendor_id LEFT JOIN store t3 ON t3.id = IF(t2.jx_store_id > 0, t2.jx_store_id, t2.store_id) From 216ca31b35a60b2b73567e0d79951f3ca4fad696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 9 Nov 2020 15:52:27 +0800 Subject: [PATCH 06/18] gy --- business/jxcallback/orderman/order.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 8edf55f0b..39e9b3839 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -364,9 +364,9 @@ func ModifyOrderSkusStock(db *dao.DaoDB, order *model.GoodsOrder, isAdd bool) (e for _, sku := range skus { storeSkus, _ := dao.GetStoresSkusInfo(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, []int{sku.SkuID}) if len(storeSkus) == 0 { - if !isAdd { - globals.SugarLogger.Warnf("此订单商品没得storsku，%v,%v", order.VendorOrderID, sku.SkuID) - } + // if !isAdd { + // globals.SugarLogger.Warnf("此订单商品没得storsku，%v,%v", order.VendorOrderID, sku.SkuID) + // } continue } storeSku, stock := storeSkus[0], 0 From ea29ab48dd3cfaa8bebdb0c8b2d5a5b422ea991d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 9 Nov 2020 16:25:39 +0800 Subject: [PATCH 07/18] ebai order cuoxu --- .../jxcallback/scheduler/defsch/defsch.go | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index c2a3b2ab1..395742acf 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -376,25 +376,27 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool) (err globals.SugarLogger.Debugf("OnOrderNew orderID:%s", order.VendorOrderID) savedOrderInfo := s.loadSavedOrderFromMap(model.Order2Status(order), false) savedOrderInfo.SetOrder(order) - if order.Status == model.OrderStatusWaitAccepted { - s.resetTimer(savedOrderInfo, nil, isPending) - if order.Flag&model.OrderFlagMaskFake == 0 { - utils.CallFuncAsync(func() { - order = setFakeActualPayPrice(order) - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) - //目前暂且认为AdjustCount > 0 就是调整单 - if order.AdjustCount > 0 { - weixinmsg.NotifyAdjustOrder(order) - } else { - weixinmsg.NotifyNewOrder(order) - } - OrderProfitWarning(order) - smsmsg.NotifyNewOrder(order) - smsmsg.NotifyNewUserOrder(order) - push.NotifyNewOrder(order) - }) + if order.VendorID == model.VendorIDEBAI { //饿百订单待接单的时候就推所有东西 + if order.Status >= model.OrderStatusWaitAccepted { //错序 + s.resetTimer(savedOrderInfo, nil, isPending) + if order.Flag&model.OrderFlagMaskFake == 0 { + utils.CallFuncAsync(func() { + order = setFakeActualPayPrice(order) + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) + //目前暂且认为AdjustCount > 0 就是调整单 + if order.AdjustCount > 0 { + weixinmsg.NotifyAdjustOrder(order) + } else { + weixinmsg.NotifyNewOrder(order) + } + OrderProfitWarning(order) + smsmsg.NotifyNewOrder(order) + smsmsg.NotifyNewUserOrder(order) + push.NotifyNewOrder(order) + }) + } + msghub.OnNewOrder(order) } - msghub.OnNewOrder(order) } if order.Status >= model.OrderStatusNew { s.resetTimer(savedOrderInfo, nil, isPending) From 172b5650b6e32c1bed79e5f6faade7206c880f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 9 Nov 2020 16:39:22 +0800 Subject: [PATCH 08/18] ebaiorder --- business/jxcallback/scheduler/defsch/defsch.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 395742acf..93271734a 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -377,7 +377,7 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool) (err savedOrderInfo := s.loadSavedOrderFromMap(model.Order2Status(order), false) savedOrderInfo.SetOrder(order) if order.VendorID == model.VendorIDEBAI { //饿百订单待接单的时候就推所有东西 - if order.Status >= model.OrderStatusWaitAccepted { //错序 + if order.Status == model.OrderStatusWaitAccepted || order.Status == model.OrderStatusFinishedPickup { //错序 s.resetTimer(savedOrderInfo, nil, isPending) if order.Flag&model.OrderFlagMaskFake == 0 { utils.CallFuncAsync(func() { From 74f536584c83b1ae16bee5d9151861e9c4cd40b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 9 Nov 2020 17:07:52 +0800 Subject: [PATCH 09/18] jdsc --- business/partner/purchase/jd/order.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 7bcb7d284..96f817dea 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -248,6 +248,11 @@ func Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) { if result[statusTimeField] == nil { // 814560888003021 orderPurchaseTime为空 statusTimeField = "orderStartTime" } + //物竞天择订单备注改一下 + comment := utils.TrimBlankChar(utils.Interface2String(result["orderBuyerRemark"])) + if strings.Contains(comment, "【JD】") { + comment += "【京东商城】" + } order = &model.GoodsOrder{ VendorOrderID: orderID, VendorID: model.VendorIDJD, @@ -259,7 +264,7 @@ func Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) { ConsigneeMobile: jxutils.FormalizeMobile(utils.Interface2String(result["buyerMobile"])), ConsigneeAddress: utils.Interface2String(result["buyerFullAddress"]), CoordinateType: model.CoordinateTypeMars, - BuyerComment: utils.TrimBlankChar(utils.Interface2String(result["orderBuyerRemark"])), + BuyerComment: comment, ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["orderPreEndDeliveryTime"]), utils.DefaultTimeValue), PickDeadline: utils.Str2TimeWithDefault(utils.Interface2String(result["pickDeadline"]), utils.DefaultTimeValue), // 813951615000022 pickDeadline为空 VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(result["orderStatus"])), From 99bf4c4d7ce37c251241f7c90377fb7016a431c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 9 Nov 2020 17:46:29 +0800 Subject: [PATCH 10/18] dd --- business/jxcallback/orderman/order.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 39e9b3839..778f9ac9f 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -142,7 +142,7 @@ func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, orderStatus *model // }, "OnAdjustOrder delete order_sku, orderID:%s", order.VendorOrderID) order.AdjustCount = adjustCount + 1 //扣点的订单需要修改订单的totalshopmoney - if err == nil && order.EarningType == model.EarningTypePoints { + if err == nil && order.OrderPayPercentage < 100 { order2, _ := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).GetOrder(order.VendorOrgCode, order.VendorOrderID) order.TotalShopMoney = order2.TotalShopMoney } From f3eae584a2f3ca37132d9b1c4d91d72fdb2e951b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 10 Nov 2020 08:57:13 +0800 Subject: [PATCH 11/18] ebaishoudongjiedan --- business/jxcallback/orderman/order.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 778f9ac9f..fe5dc32a6 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -12,11 +12,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxstore/common" "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" - "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" - "git.rosy.net.cn/jx-callback/business/jxutils/smsmsg" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" - "git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg" - "git.rosy.net.cn/jx-callback/business/msghub" "git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop" "git.rosy.net.cn/jx-callback/globals/api" @@ -1845,11 +1841,11 @@ func AcceptOrRefuseOrder(ctx *jxcontext.Context, vendorOrderID string, vendorID handler := partner.GetPurchaseOrderHandlerFromVendorID(vendorID) err = handler.AcceptOrRefuseOrder(order, isAccept, ctx.GetUserName()) if err == nil && isAccept && vendorID == model.VendorIDEBAI { - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) - smsmsg.NotifyNewOrder(order) - smsmsg.NotifyNewUserOrder(order) - weixinmsg.NotifyNewOrder(order) - msghub.OnNewOrder(order) + // netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) + // smsmsg.NotifyNewOrder(order) + // smsmsg.NotifyNewUserOrder(order) + // weixinmsg.NotifyNewOrder(order) + // msghub.OnNewOrder(order) } return err } From 0f46f034932d722e0ab247db0a979cc11c06b051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 10 Nov 2020 09:01:55 +0800 Subject: [PATCH 12/18] mendianbeizhu --- business/model/store.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/model/store.go b/business/model/store.go index 8b513e42a..a668dad6d 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -293,6 +293,7 @@ type Store struct { AutoReplyType int8 `json:"autoReplyType"` // 订单评价自动回复类型 LinkStoreID int `orm:"column(link_store_id);default(0);index" json:"linkStoreID"` // 关联门店ID StoreLevel string `orm:"default(C);size(32)" json:"storeLevel"` // 门店等级（筛选用，京西的） + Comment string `orm:"size(255)" json:"comment"` //门店备注 PrinterDisabled int8 `orm:"default(0)" json:"printerDisabled"` // 是否禁用网络打印机 PrinterFontSize int8 `orm:"default(0)" json:"printerFontSize"` // 打印字体-1：小，0：正常，1：大 From efd55100d76c959e912e6d28f3f2629c0978db9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 10 Nov 2020 18:44:16 +0800 Subject: [PATCH 13/18] meituan shuang 111 --- business/jxstore/misc/misc.go | 7 + business/jxstore/tempop/tempop.go | 362 +++++++++++++++++++++++++++++- 2 files changed, 362 insertions(+), 7 deletions(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index e8f813765..7458d1465 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -6,6 +6,8 @@ import ( "sync" "time" + "git.rosy.net.cn/jx-callback/business/jxstore/tempop" + "git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop" "git.rosy.net.cn/baseapi/platformapi/jdapi" @@ -270,6 +272,11 @@ func Init() { ScheduleTimerFunc("RefreshUserMemberStatus", func() { cms.RefreshUserMemberStatus(jxcontext.AdminCtx) }, updateActStatusTimeList) + ScheduleTimerFunc("mtshaung11", func() { + tempop.UploadJdsImage(jxcontext.AdminCtx) + }, []string{ + "23:00:00", + }) } ScheduleTimerFunc("AutoSaleStoreSku", func() { cms.AutoSaleStoreSku(jxcontext.AdminCtx, nil, false) diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index a0b88564b..062d1e523 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -8,8 +8,6 @@ import ( "strings" "time" - "git.rosy.net.cn/jx-callback/business/authz/autils" - "git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin" "git.rosy.net.cn/jx-callback/business/partner/delivery" "github.com/360EntSecGroup-Skylar/excelize" @@ -1712,12 +1710,362 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // cms.UpdateStoreSkus(ctx, 0, storeDetail.ID, skuBindInfos, true, true) // } var ( - db = dao.GetDB() + db = dao.GetDB() + storeIDs = []int{ + 667510, + 667501, + 667493, + 667490, + 667485, + 667480, + 667479, + 667463, + 667459, + 667446, + 667445, + 667441, + 667439, + 667431, + 667429, + 667423, + 667421, + 667414, + 667413, + 667412, + 667410, + 667407, + 667401, + 667399, + 667398, + 667394, + 667385, + 667383, + 667377, + 667375, + 667365, + 667363, + 667357, + 667351, + 667349, + 667341, + 667331, + 667329, + 667317, + 667312, + 667308, + 667304, + 667302, + 667296, + 667293, + 667292, + 667284, + 667283, + 667266, + 667234, + 667231, + 667229, + 667214, + 667208, + 667198, + 667182, + 667179, + 667176, + 667158, + 667152, + 667133, + 667128, + 667125, + 667122, + 667116, + 667110, + 667101, + 667094, + 667093, + 667091, + 667067, + 667066, + 667057, + 667047, + 667044, + 667011, + 666987, + 666972, + 666963, + 666942, + 666932, + 666919, + 666918, + 666915, + 666891, + 666888, + 666879, + 666864, + 666839, + 666820, + 666800, + 666793, + 666790, + 666786, + 666767, + 666755, + 666751, + 666746, + 666678, + 666677, + 103459, + 103435, + 103433, + 103408, + 103205, + 103197, + 103194, + 103193, + 103191, + 103189, + 103182, + 103151, + 103119, + 103111, + 103090, + 103089, + 103088, + 103085, + 103084, + 103074, + 103069, + 103062, + 103055, + 103050, + 103037, + 103036, + 103035, + 103033, + 103031, + 103029, + 103027, + 103022, + 103015, + 103009, + 103006, + 103004, + 103002, + 102999, + 102997, + 102996, + 102995, + 102994, + 102992, + 102987, + 102981, + 102980, + 102978, + 102973, + 102969, + 102966, + 102963, + 102962, + 102960, + 102958, + 102956, + 102955, + 102952, + 102945, + 102935, + 102934, + 102933, + 102929, + 102926, + 102924, + 102923, + 102921, + 102920, + 102911, + 102908, + 102907, + 102902, + 102898, + 102896, + 102895, + 102894, + 102893, + 102891, + 102890, + 102888, + 102877, + 102876, + 102875, + 102865, + 102859, + 102858, + 102857, + 102851, + 102844, + 102836, + 102826, + 102824, + 102823, + 102819, + 102818, + 102812, + 102807, + 102795, + 102794, + 102790, + 102789, + 102788, + 102785, + 102784, + 102778, + 102776, + 102767, + 102756, + 102752, + 102751, + 102744, + 102742, + 102736, + 102731, + 102718, + 102713, + 102705, + 102691, + 102686, + 102676, + 102671, + 102630, + 102624, + 102596, + 102594, + 102561, + 102533, + 102530, + 102498, + 102490, + 102488, + 102482, + 102481, + 102479, + 102475, + 102433, + 102426, + 102425, + 102383, + 102379, + 102374, + 102373, + 102371, + 102364, + 102358, + 102357, + 102353, + 102304, + 102303, + 102300, + 102293, + 102280, + 102206, + 102167, + 102147, + 102126, + 102101, + 102075, + 102074, + 102068, + 102063, + 102046, + 102016, + 102014, + 101997, + 101983, + 101979, + 101956, + 101948, + 101909, + 101897, + 101763, + 101750, + 101736, + 101666, + 101176, + 101134, + 101111, + 101110, + 101099, + 101078, + 101062, + 101039, + 101036, + 101013, + 101012, + 101000, + 100988, + 100987, + 100946, + 100937, + 100920, + 100905, + 100887, + 100867, + 100849, + 100829, + 100802, + 100766, + 100720, + 100712, + 100699, + 100681, + 100670, + 100664, + 100658, + 100600, + 100548, + 100477, + 100471, + 100470, + 100463, + 100455, + 100454, + 100449, + 100444, + 100409, + 100396, + 100366, + 100361, + 100324, + 100309, + 100299, + 100292, + 100274, + 100236, + 100215, + 100206, + 100190, + 100175, + 100167, + 100157, + 100135, + 100123, + 100121, + 100115, + 100068, + 100065, + 100056, + 100032, + 100022, + 100002, + } + payload = make(map[string]interface{}) ) - stores, _ := dao.GetStoreList(db, nil, nil, nil, nil, "") - for _, v := range stores { - cms.AddUsers4Role(jxcontext.AdminCtx, autils.NewRole("StoreBoss", v.ID), []string{"5CD3666C666711E9B19B525400E86DC0"}) - } + payload["pricePercentagePack"] = "美团菜市双11（69-25）" + task := tasksch.NewParallelTask("美团双11刷新", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, + func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + v := batchItemList[0].(int) + cms.UpdateStoreVendorMap(ctx, db, v, model.VendorIDMTWM, payload, ctx.GetUserName()) + cms.CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, []int{model.VendorIDMTWM}, []int{v}, nil, false, true, true) + return retVal, err + }, storeIDs) + tasksch.HandleTask(task, nil, true).Run() + task.GetID() return err } From 8749f1d4be504427a2d1cd0f3e5c94b2d8f80322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 11 Nov 2020 08:46:34 +0800 Subject: [PATCH 14/18] dingshi --- business/jxstore/misc/misc.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 7458d1465..e8f813765 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -6,8 +6,6 @@ import ( "sync" "time" - "git.rosy.net.cn/jx-callback/business/jxstore/tempop" - "git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop" "git.rosy.net.cn/baseapi/platformapi/jdapi" @@ -272,11 +270,6 @@ func Init() { ScheduleTimerFunc("RefreshUserMemberStatus", func() { cms.RefreshUserMemberStatus(jxcontext.AdminCtx) }, updateActStatusTimeList) - ScheduleTimerFunc("mtshaung11", func() { - tempop.UploadJdsImage(jxcontext.AdminCtx) - }, []string{ - "23:00:00", - }) } ScheduleTimerFunc("AutoSaleStoreSku", func() { cms.AutoSaleStoreSku(jxcontext.AdminCtx, nil, false) From 19c58e4b4ae5fca3b01d13d73762609bdd01fe7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 11 Nov 2020 18:08:55 +0800 Subject: [PATCH 15/18] ceshi --- business/jxcallback/orderman/orderman_ext.go | 7 +- business/jxstore/tempop/tempop.go | 413 +++---------------- business/model/dao/dao_order.go | 3 +- 3 files changed, 64 insertions(+), 359 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index f9a8b43ed..4339f379c 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -705,8 +705,9 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID } saleInfoMap[index] = saleInfo } + //成都菜市 if beego.BConfig.RunMode == "prod" { - if v.EarningType == model.EarningTypeQuote { + if v.EarningType == model.EarningTypeQuote && v.VendorID != model.VendorIDJD && v.CityCode != 510100 { saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count) } } else { @@ -722,7 +723,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID if k == 0 { saleInfo.EarningPrice = v.NewEarningPrice if beego.BConfig.RunMode == "prod" { - if v.EarningType == model.EarningTypePoints { + if v.EarningType == model.EarningTypePoints && v.VendorID != model.VendorIDJD && v.CityCode != 510100 { saleInfo.RealEarningPrice += v.NewEarningPrice } } else { @@ -735,7 +736,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID flagVendorOrderID = v.VendorOrderID saleInfo.EarningPrice += v.NewEarningPrice if beego.BConfig.RunMode == "prod" { - if v.EarningType == model.EarningTypePoints { + if v.EarningType == model.EarningTypePoints && v.VendorID != model.VendorIDJD && v.CityCode != 510100 { saleInfo.RealEarningPrice += v.NewEarningPrice } } else { diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 062d1e523..ac7a3db70 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1710,362 +1710,65 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // cms.UpdateStoreSkus(ctx, 0, storeDetail.ID, skuBindInfos, true, true) // } var ( - db = dao.GetDB() - storeIDs = []int{ - 667510, - 667501, - 667493, - 667490, - 667485, - 667480, - 667479, - 667463, - 667459, - 667446, - 667445, - 667441, - 667439, - 667431, - 667429, - 667423, - 667421, - 667414, - 667413, - 667412, - 667410, - 667407, - 667401, - 667399, - 667398, - 667394, - 667385, - 667383, - 667377, - 667375, - 667365, - 667363, - 667357, - 667351, - 667349, - 667341, - 667331, - 667329, - 667317, - 667312, - 667308, - 667304, - 667302, - 667296, - 667293, - 667292, - 667284, - 667283, - 667266, - 667234, - 667231, - 667229, - 667214, - 667208, - 667198, - 667182, - 667179, - 667176, - 667158, - 667152, - 667133, - 667128, - 667125, - 667122, - 667116, - 667110, - 667101, - 667094, - 667093, - 667091, - 667067, - 667066, - 667057, - 667047, - 667044, - 667011, - 666987, - 666972, - 666963, - 666942, - 666932, - 666919, - 666918, - 666915, - 666891, - 666888, - 666879, - 666864, - 666839, - 666820, - 666800, - 666793, - 666790, - 666786, - 666767, - 666755, - 666751, - 666746, - 666678, - 666677, - 103459, - 103435, - 103433, - 103408, - 103205, - 103197, - 103194, - 103193, - 103191, - 103189, - 103182, - 103151, - 103119, - 103111, - 103090, - 103089, - 103088, - 103085, - 103084, - 103074, - 103069, - 103062, - 103055, - 103050, - 103037, - 103036, - 103035, - 103033, - 103031, - 103029, - 103027, - 103022, - 103015, - 103009, - 103006, - 103004, - 103002, - 102999, - 102997, - 102996, - 102995, - 102994, - 102992, - 102987, - 102981, - 102980, - 102978, - 102973, - 102969, - 102966, - 102963, - 102962, - 102960, - 102958, - 102956, - 102955, - 102952, - 102945, - 102935, - 102934, - 102933, - 102929, - 102926, - 102924, - 102923, - 102921, - 102920, - 102911, - 102908, - 102907, - 102902, - 102898, - 102896, - 102895, - 102894, - 102893, - 102891, - 102890, - 102888, - 102877, - 102876, - 102875, - 102865, - 102859, - 102858, - 102857, - 102851, - 102844, - 102836, - 102826, - 102824, - 102823, - 102819, - 102818, - 102812, - 102807, - 102795, - 102794, - 102790, - 102789, - 102788, - 102785, - 102784, - 102778, - 102776, - 102767, - 102756, - 102752, - 102751, - 102744, - 102742, - 102736, - 102731, - 102718, - 102713, - 102705, - 102691, - 102686, - 102676, - 102671, - 102630, - 102624, - 102596, - 102594, - 102561, - 102533, - 102530, - 102498, - 102490, - 102488, - 102482, - 102481, - 102479, - 102475, - 102433, - 102426, - 102425, - 102383, - 102379, - 102374, - 102373, - 102371, - 102364, - 102358, - 102357, - 102353, - 102304, - 102303, - 102300, - 102293, - 102280, - 102206, - 102167, - 102147, - 102126, - 102101, - 102075, - 102074, - 102068, - 102063, - 102046, - 102016, - 102014, - 101997, - 101983, - 101979, - 101956, - 101948, - 101909, - 101897, - 101763, - 101750, - 101736, - 101666, - 101176, - 101134, - 101111, - 101110, - 101099, - 101078, - 101062, - 101039, - 101036, - 101013, - 101012, - 101000, - 100988, - 100987, - 100946, - 100937, - 100920, - 100905, - 100887, - 100867, - 100849, - 100829, - 100802, - 100766, - 100720, - 100712, - 100699, - 100681, - 100670, - 100664, - 100658, - 100600, - 100548, - 100477, - 100471, - 100470, - 100463, - 100455, - 100454, - 100449, - 100444, - 100409, - 100396, - 100366, - 100361, - 100324, - 100309, - 100299, - 100292, - 100274, - 100236, - 100215, - 100206, - 100190, - 100175, - 100167, - 100157, - 100135, - 100123, - 100121, - 100115, - 100068, - 100065, - 100056, - 100032, - 100022, - 100002, - } - payload = make(map[string]interface{}) + // jdStoreIDs = []string{ + // "11734848", + // "11734850", + // "11734854", + // "11734862", + // "11734868", + // "11734873", + // "11734874", + // "11734886", + // "11748353", + // "11890095", + // "11800399", + // "11738114", + // "11857499", + // "11873440", + // "11883071", + // "11734852", + // "11886763", + // "11874614", + // "11734884", + // "11926674", + // "11929173", + // "11894144", + // "11734861", + // "11951611", + // "11800403", + // "11913597", + // "11980746", + // "11981675", + // "12011812", + // "12007545", + // "11734846", + // "12005417", + // "12005640", + // "12005682", + // "12006134", + // "11982352", + // "12007250", + // "12007560", + // "11982427", + // "12008087", + // "12035806", + // "12008160", + // "12008395", + // "12009345", + // "11940019", + // "12010237", + // "12010654", + // "12011111", + // "12006857", + // "11734851", + // "12030632", + // "12050456", + // } + jdStoreIDxipu = "11890095" ) - payload["pricePercentagePack"] = "美团菜市双11（69-25）" - task := tasksch.NewParallelTask("美团双11刷新", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, - func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - v := batchItemList[0].(int) - cms.UpdateStoreVendorMap(ctx, db, v, model.VendorIDMTWM, payload, ctx.GetUserName()) - cms.CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, []int{model.VendorIDMTWM}, []int{v}, nil, false, true, true) - return retVal, err - }, storeIDs) - tasksch.HandleTask(task, nil, true).Run() - task.GetID() + handler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler) + outStoreSkuList, err := handler.GetStoreSkusBareInfo(ctx, "320406", nil, 0, jdStoreIDxipu, nil) + fmt.Println(utils.Format4Output(outStoreSkuList, false)) return err } diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 36b6a3e10..81e83b85b 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -49,6 +49,7 @@ type OrderSkuWithActualPayPrice struct { OrderPayPercentage int `json:"orderPayPercentage"` NewEarningPrice int64 `json:"newEarningPrice"` EarningType int `json:"earningType"` + CityCode int `json:"cityCode"` } type tGoodsAndOrder struct { @@ -377,7 +378,7 @@ func GetStoreOrderSkuList(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAt sql := ` SELECT t1.*, IF(t2.jx_store_id > 0, t2.jx_store_id, t2.store_id) store_id, t2.status, t2.actual_pay_price, t2.distance_freight_money, t2.waybill_tip_money, t2.new_earning_price, - t3.pay_percentage, t2.earning_type, t2.order_pay_percentage + t3.pay_percentage, t2.earning_type, t2.order_pay_percentage, t3.city_code FROM order_sku t1 JOIN goods_order t2 ON t2.vendor_order_id = t1.vendor_order_id AND t2.vendor_id = t1.vendor_id LEFT JOIN store t3 ON t3.id = IF(t2.jx_store_id > 0, t2.jx_store_id, t2.store_id) From 788c73a7343d0d63672301911ffc61e6b71d7cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 11 Nov 2020 18:39:35 +0800 Subject: [PATCH 16/18] heihei --- business/jxstore/tempop/tempop.go | 128 ++++++++++++--------- business/partner/purchase/jd/store_sku2.go | 6 +- 2 files changed, 79 insertions(+), 55 deletions(-) diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index ac7a3db70..db1f5b5ba 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1712,63 +1712,87 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { var ( // jdStoreIDs = []string{ // "11734848", - // "11734850", - // "11734854", - // "11734862", - // "11734868", - // "11734873", - // "11734874", - // "11734886", - // "11748353", - // "11890095", - // "11800399", - // "11738114", - // "11857499", - // "11873440", - // "11883071", - // "11734852", - // "11886763", - // "11874614", - // "11734884", - // "11926674", - // "11929173", - // "11894144", - // "11734861", - // "11951611", - // "11800403", - // "11913597", - // "11980746", - // "11981675", - // "12011812", - // "12007545", - // "11734846", - // "12005417", - // "12005640", - // "12005682", - // "12006134", - // "11982352", - // "12007250", - // "12007560", - // "11982427", - // "12008087", - // "12035806", - // "12008160", - // "12008395", - // "12009345", - // "11940019", - // "12010237", - // "12010654", - // "12011111", - // "12006857", - // "11734851", - // "12030632", - // "12050456", + // "11734850", + // "11734854", + // "11734862", + // "11734868", + // "11734873", + // "11734874", + // "11734886", + // "11748353", + // "11890095", + // "11800399", + // "11738114", + // "11857499", + // "11873440", + // "11883071", + // "11734852", + // "11886763", + // "11874614", + // "11734884", + // "11926674", + // "11929173", + // "11894144", + // "11734861", + // "11951611", + // "11800403", + // "11913597", + // "11980746", + // "11981675", + // "12011812", + // "12007545", + // "11734846", + // "12005417", + // "12005640", + // "12005682", + // "12006134", + // "11982352", + // "12007250", + // "12007560", + // "11982427", + // "12008087", + // "12035806", + // "12008160", + // "12008395", + // "12009345", + // "11940019", + // "12010237", + // "12010654", + // "12011111", + // "12006857", + // "11734851", + // "12030632", + // "12050456", // } jdStoreIDxipu = "11890095" ) + StoreSkuFullList2BareFilter := func(storeSkuFull []*partner.SkuNameInfo) (bareStoreSkuList []*partner.StoreSkuInfo) { + for _, v := range storeSkuFull { + for _, v2 := range v.SkuList { + if v2.Status > model.SkuStatusDontSale { + bareStoreSkuList = append(bareStoreSkuList, &v2.StoreSkuInfo) + } + } + } + return bareStoreSkuList + } handler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler) - outStoreSkuList, err := handler.GetStoreSkusBareInfo(ctx, "320406", nil, 0, jdStoreIDxipu, nil) + multiHandler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IMultipleStoresHandler) + allSkuNameInfoList, err := multiHandler.GetSkus(ctx, "320406", 0, "") + skuInfos := StoreSkuFullList2BareFilter(allSkuNameInfoList) + outStoreSkuList, err := handler.GetStoreSkusBareInfo(ctx, "320406", nil, 0, jdStoreIDxipu, skuInfos) fmt.Println(utils.Format4Output(outStoreSkuList, false)) + // task := tasksch.NewParallelTask("初始化京东", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, + // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + // jdStoreID := batchItemList[0].(string) + // outStoreSkuList2, err := handler.GetStoreSkusBareInfo(ctx, "320406", nil, 0, jdStoreID, skuInfos) + // for _, v := range outStoreSkuList { + + // } + // return retVal, err + // }, jdStoreIDs) + // tasksch.HandleTask(task, nil, true).Run() + // task.GetID() return err } diff --git a/business/partner/purchase/jd/store_sku2.go b/business/partner/purchase/jd/store_sku2.go index 0cd83d594..00c9ac4c9 100644 --- a/business/partner/purchase/jd/store_sku2.go +++ b/business/partner/purchase/jd/store_sku2.go @@ -55,9 +55,9 @@ func (p *PurchaseHandler) getStoreSkusBareInfoLimitSize(ctx *jxcontext.Context, sku := storeSkuMap[utils.Int64ToStr(v.SkuID)] sku.Status = jdStoreSkuStatus2Jx(v.Vendibility) sku.Stock = v.UsableQty - if sku.Stock > 0 { - outStoreSkuList = append(outStoreSkuList, sku) - } + // if sku.Stock > 0 { + outStoreSkuList = append(outStoreSkuList, sku) + // } } for _, v := range priceInfo { sku := storeSkuMap[utils.Int64ToStr(v.SkuID)] From 0e1067ad96060c86919911bd5f3357bf61ce0a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 11 Nov 2020 18:50:29 +0800 Subject: [PATCH 17/18] ceshi --- business/partner/purchase/jd/store_sku2.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/jd/store_sku2.go b/business/partner/purchase/jd/store_sku2.go index 00c9ac4c9..0cd83d594 100644 --- a/business/partner/purchase/jd/store_sku2.go +++ b/business/partner/purchase/jd/store_sku2.go @@ -55,9 +55,9 @@ func (p *PurchaseHandler) getStoreSkusBareInfoLimitSize(ctx *jxcontext.Context, sku := storeSkuMap[utils.Int64ToStr(v.SkuID)] sku.Status = jdStoreSkuStatus2Jx(v.Vendibility) sku.Stock = v.UsableQty - // if sku.Stock > 0 { - outStoreSkuList = append(outStoreSkuList, sku) - // } + if sku.Stock > 0 { + outStoreSkuList = append(outStoreSkuList, sku) + } } for _, v := range priceInfo { sku := storeSkuMap[utils.Int64ToStr(v.SkuID)] From 5a3e88fd252a1bea1ca956f495b67e34b94b1c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 11 Nov 2020 19:06:27 +0800 Subject: [PATCH 18/18] heihei --- business/jxstore/tempop/tempop.go | 140 ++++++++++++++++-------------- 1 file changed, 75 insertions(+), 65 deletions(-) diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index db1f5b5ba..0fbbd333d 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1710,61 +1710,63 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // cms.UpdateStoreSkus(ctx, 0, storeDetail.ID, skuBindInfos, true, true) // } var ( - // jdStoreIDs = []string{ - // "11734848", - // "11734850", - // "11734854", - // "11734862", - // "11734868", - // "11734873", - // "11734874", - // "11734886", - // "11748353", - // "11890095", - // "11800399", - // "11738114", - // "11857499", - // "11873440", - // "11883071", - // "11734852", - // "11886763", - // "11874614", - // "11734884", - // "11926674", - // "11929173", - // "11894144", - // "11734861", - // "11951611", - // "11800403", - // "11913597", - // "11980746", - // "11981675", - // "12011812", - // "12007545", - // "11734846", - // "12005417", - // "12005640", - // "12005682", - // "12006134", - // "11982352", - // "12007250", - // "12007560", - // "11982427", - // "12008087", - // "12035806", - // "12008160", - // "12008395", - // "12009345", - // "11940019", - // "12010237", - // "12010654", - // "12011111", - // "12006857", - // "11734851", - // "12030632", - // "12050456", - // } + jdStoreIDs = []string{ + "11734848", + "11734850", + "11734854", + "11734862", + "11734868", + "11734873", + "11734874", + "11734886", + "11748353", + "11890095", + "11800399", + "11738114", + "11857499", + "11873440", + "11883071", + "11734852", + "11886763", + "11874614", + "11734884", + "11926674", + "11929173", + "11894144", + "11734861", + "11951611", + "11800403", + "11913597", + "11980746", + "11981675", + "12011812", + "12007545", + "11734846", + "12005417", + "12005640", + "12005682", + "12006134", + "11982352", + "12007250", + "12007560", + "11982427", + "12008087", + "12035806", + "12008160", + "12008395", + "12009345", + "11940019", + "12010237", + "12010654", + "12011111", + "12006857", + "11734851", + "12030632", + "12050456", + } jdStoreIDxipu = "11890095" + skuMap = make(map[string]*partner.StoreSkuInfo) + priceList []*pa ) StoreSkuFullList2BareFilter := func(storeSkuFull []*partner.SkuNameInfo) (bareStoreSkuList []*partner.StoreSkuInfo) { for _, v := range storeSkuFull { @@ -1781,18 +1783,26 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { allSkuNameInfoList, err := multiHandler.GetSkus(ctx, "320406", 0, "") skuInfos := StoreSkuFullList2BareFilter(allSkuNameInfoList) outStoreSkuList, err := handler.GetStoreSkusBareInfo(ctx, "320406", nil, 0, jdStoreIDxipu, skuInfos) - fmt.Println(utils.Format4Output(outStoreSkuList, false)) - // task := tasksch.NewParallelTask("初始化京东", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, - // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - // jdStoreID := batchItemList[0].(string) - // outStoreSkuList2, err := handler.GetStoreSkusBareInfo(ctx, "320406", nil, 0, jdStoreID, skuInfos) - // for _, v := range outStoreSkuList { + for _, v := range outStoreSkuList { + skuMap[v.VendorSkuID] = v + } + task := tasksch.NewParallelTask("初始化京东", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, + func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + jdStoreID := batchItemList[0].(string) + outStoreSkuList2, err := handler.GetStoreSkusBareInfo(ctx, "320406", nil, 0, jdStoreID, skuInfos) + for _, v := range outStoreSkuList2 { + if skuMap[v.VendorSkuID] != nil { + continue + } + if skuMap[v.VendorSkuID].VendorPrice != v.VendorPrice { + v.VendorPrice = skuMap[v.VendorSkuID].VendorPrice - // } - // return retVal, err - // }, jdStoreIDs) - // tasksch.HandleTask(task, nil, true).Run() - // task.GetID() + } + } + return retVal, err + }, jdStoreIDs) + tasksch.HandleTask(task, nil, true).Run() + task.GetID() return err }