From 635b84049cc78016cf2b4b966fa81ef5dfb1a0af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 27 Aug 2020 09:37:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 13 ++++++-------
 controllers/jx_order2.go                      |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 921163c0f..735adef40 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -228,16 +228,17 @@ func GetMyOrderCountInfo(ctx *jxcontext.Context, fromDate, toDate time.Time, sta
 //fromStoreID 为 门店ID ，表示是物料订单，fromStoreID表示是哪个门店申请的物料,或者进货方门店
 //fromStoreID 为-1 表示也是物料订单，但是不是门店申请，是个人申请的
 //fromStoreID 在后面 generateOrder中有用
-func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, createType int, fromStoreID int, IsDeliverySelf bool) (outJxOrder *JxOrderInfo, err error) {
+//IsAuto  是否是守价结算而自动创建的守价订单
+func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, createType int, fromStoreID int, IsDeliverySelf, IsAuto bool) (outJxOrder *JxOrderInfo, err error) {
 	outJxOrder, deliveryAddress, err := generateOrder(ctx, jxOrder, addressID, fromStoreID, "", IsDeliverySelf)
 	if err != nil {
 		return nil, err
 	}
-	if fromStoreID != 0 {
+	if jxOrder.OrderType == model.OrderTypeMatter {
 		checkMatterDeliveryAddress(deliveryAddress)
 	}
 	if createType == OrderCreateTypeNormal {
-		if jxOrder.OrderType == model.OrderTypeDefendPrice {
+		if jxOrder.OrderType == model.OrderTypeDefendPrice && !IsAuto {
 			vendorOrderID := buildDefendPriceOrder(ctx, jxOrder, addressID)
 			outJxOrder.OrderID = utils.Str2Int64(vendorOrderID)
 			return outJxOrder, err
@@ -1952,12 +1953,10 @@ func CreateOrderByPriceDefend(ctx *jxcontext.Context) (err error) {
 	)
 	globals.SugarLogger.Debugf("CreateOrderByPriceDefend Begin:")
 	priceDefends, _ := dao.GetPriceDefendOrder(db, "", nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, 1, 1, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false)
-	fmt.Println("test1111111111111111111111111111111111", utils.Format4Output(priceDefends, false))
 	if len(priceDefends) > 0 {
 		for _, v := range priceDefends {
 			userOrderMap[v.AddressID] = append(userOrderMap[v.AddressID], v)
 		}
-		fmt.Println("test22222222222222222222222", utils.Format4Output(userOrderMap, false))
 		for kk, vv := range userOrderMap {
 			if len(vv) == 1 {
 				jxOrder := &JxOrderInfo{
@@ -1972,7 +1971,7 @@ func CreateOrderByPriceDefend(ctx *jxcontext.Context) (err error) {
 					IsPriceDefend: model.YES,
 					OrderID:       utils.Str2Int64(vv[0].VendorOrderID),
 				}
-				if _, err := CreateOrder(ctx, jxOrder, kk, OrderCreateTypeNormal, 0, false); err == nil {
+				if _, err := CreateOrder(ctx, jxOrder, kk, OrderCreateTypeNormal, 0, false, true); err == nil {
 					err = SettleDiscountActByPriceDefend(ctx, vv[0], false)
 				}
 			} else {
@@ -1997,7 +1996,7 @@ func CreateOrderByPriceDefend(ctx *jxcontext.Context) (err error) {
 				}
 				jxOrder.Skus = skus
 				jxOrder.OrderID2 = strings.Join(orderIDs, ",")
-				if _, err := CreateOrder(ctx, jxOrder, kk, OrderCreateTypeNormal, 0, false); err == nil {
+				if _, err := CreateOrder(ctx, jxOrder, kk, OrderCreateTypeNormal, 0, false, true); err == nil {
 				}
 			}
 		}
diff --git a/controllers/jx_order2.go b/controllers/jx_order2.go
index 82103922f..af96eedf4 100644
--- a/controllers/jx_order2.go
+++ b/controllers/jx_order2.go
@@ -26,7 +26,7 @@ func (c *JxOrderController) CreateOrder() {
 	c.callCreateOrder(func(params *tJxorderCreateOrderParams) (retVal interface{}, errCode string, err error) {
 		var jxOrder *localjx.JxOrderInfo
 		if err = utils.UnmarshalUseNumber([]byte(params.JxOrder), &jxOrder); err == nil {
-			retVal, err = localjx.CreateOrder(params.Ctx, jxOrder, int64(params.AddressID), params.CreateType, params.FromStoreID, params.IsDeliverySelf)
+			retVal, err = localjx.CreateOrder(params.Ctx, jxOrder, int64(params.AddressID), params.CreateType, params.FromStoreID, params.IsDeliverySelf, false)
 		}
 		return retVal, "", err
 	})