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

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 {

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"
 
@@ -890,8 +892,11 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 		sku := v.Sku
 		dao.WrapAddIDCULDEntity(sku, userName)
 		sku.NameID = skuNameExt.ID
-		// sku.JdSyncStatus = model.SyncFlagNewMask
-		// sku.JdID = 0
+		if beego.BConfig.RunMode == "jxgy" {
+			sku.LadderBoxPrice = 50
+		} else if beego.BConfig.RunMode == "prod" {
+			sku.LadderBoxPrice = 20
+		}
 		if err = dao.CreateEntity(db, sku); err != nil {
 			dao.Rollback(db)
 			return nil, err
@@ -1225,7 +1230,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 {

business/partner/purchase/jx/localjx/order.go

@@ -803,6 +803,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