From 5d6eb06734ca03f1726617cda49a454afe7f4f84 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, 19 Aug 2020 12:08:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=9D=9E=E9=97=A8=E5=BA=97=E8=87=AA?= =?UTF-8?q?=E9=80=81=E7=9A=84=E8=AE=A2=E5=8D=95=E6=89=8D=E4=B8=8D=E5=8F=91?= =?UTF-8?q?=E4=B8=89=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 22da7bbe9..8fada97a0 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -737,9 +737,12 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf // excludeVendorIDs = append(excludeVendorIDs, model.VendorIDMTPS) // } //TODO 2020-08-18 饿百美团订单暂时不自动发送三方 - if order.VendorID == model.VendorIDEBAI || order.VendorID == model.VendorIDMTWM { - excludeVendorIDs = append(excludeVendorIDs, model.VendorIDMTPS, model.VendorIDDada) + if order.VendorID == model.VendorIDMTWM || order.VendorID == model.VendorIDEBAI { + if order.DeliveryType != model.OrderDeliveryTypeStoreSelf { + excludeVendorIDs = append(excludeVendorIDs, model.VendorIDMTPS, model.VendorIDDada) + } } + if savedOrderInfo != nil { //TODO 2020-07-21 发单时间要在门店的营业时间内 if savedOrderInfo.storeDetail != nil { From dd8a0a5ed6200c8899b09da4d6ddf0505362ba1d 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, 19 Aug 2020 14:46:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=8F=9C=E5=B8=82=E9=BB=98=E8=AE=A40.2?= =?UTF-8?q?=EF=BC=8C=E6=9E=9C=E5=9B=AD=E9=BB=98=E8=AE=A40.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 6e2bb4f40..76159d4cf 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -11,6 +11,8 @@ import ( "strings" "time" + "github.com/astaxie/beego" + "git.rosy.net.cn/baseapi/platformapi/aliupcapi" "git.rosy.net.cn/baseapi/utils" @@ -1225,7 +1227,11 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string) // sku.JdSyncStatus = model.SyncFlagNewMask // sku.JdID = 0 sku.NameID = nameID - + if beego.BConfig.RunMode == "jxgy" { + sku.LadderBoxPrice = 50 + } else if beego.BConfig.RunMode == "prod" { + sku.LadderBoxPrice = 20 + } dao.Begin(db) defer func() { if r := recover(); r != nil { From b1067a2ca7073c1d9c5ba19c47084f90b0efa2de 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, 19 Aug 2020 14:47:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=8F=9C=E5=B8=82=E9=BB=98=E8=AE=A40.2?= =?UTF-8?q?=EF=BC=8C=E6=9E=9C=E5=9B=AD=E9=BB=98=E8=AE=A40.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 76159d4cf..ceaadbfe5 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -892,6 +892,11 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s sku := v.Sku dao.WrapAddIDCULDEntity(sku, userName) sku.NameID = skuNameExt.ID + if beego.BConfig.RunMode == "jxgy" { + sku.LadderBoxPrice = 50 + } else if beego.BConfig.RunMode == "prod" { + sku.LadderBoxPrice = 20 + } // sku.JdSyncStatus = model.SyncFlagNewMask // sku.JdID = 0 if err = dao.CreateEntity(db, sku); err != nil { From c93402c1f5f66302b06a00dc1fd69e47c78dd9e4 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, 19 Aug 2020 14:49:22 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=8F=9C=E5=B8=82=E9=BB=98=E8=AE=A40.2?= =?UTF-8?q?=EF=BC=8C=E6=9E=9C=E5=9B=AD=E9=BB=98=E8=AE=A40.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index ceaadbfe5..3b6db3c78 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -897,8 +897,6 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s } else if beego.BConfig.RunMode == "prod" { sku.LadderBoxPrice = 20 } - // sku.JdSyncStatus = model.SyncFlagNewMask - // sku.JdID = 0 if err = dao.CreateEntity(db, sku); err != nil { dao.Rollback(db) return nil, err From 1372895ceccf9d35079ed802ab060fb562fa351c 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, 19 Aug 2020 16:03:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BA=AC=E8=A5=BF=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E5=8D=95=E4=B8=8D=E7=AE=97=E9=85=8D=E9=80=81=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jx/localjx/order.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 63d5016d3..5955a5db2 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -762,6 +762,9 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 outJxOrder.FreightPrice = 0 } } + if IsDeliverySelf { + outJxOrder.FreightPrice = 0 + } } if err == nil { outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice