From 216dfea73b3ab93ede672cc256562ad66c525363 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:42:32 +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 | 12 ++++++++----
 controllers/jx_order2.go                      |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 735adef40..533f0342d 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -229,20 +229,23 @@ func GetMyOrderCountInfo(ctx *jxcontext.Context, fromDate, toDate time.Time, sta
 //fromStoreID 为-1 表示也是物料订单，但是不是门店申请，是个人申请的
 //fromStoreID 在后面 generateOrder中有用
 //IsAuto  是否是守价结算而自动创建的守价订单
-func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, createType int, fromStoreID int, IsDeliverySelf, IsAuto bool) (outJxOrder *JxOrderInfo, err error) {
+func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, createType int, fromStoreID int, IsDeliverySelf bool) (outJxOrder *JxOrderInfo, err error) {
 	outJxOrder, deliveryAddress, err := generateOrder(ctx, jxOrder, addressID, fromStoreID, "", IsDeliverySelf)
 	if err != nil {
+		fmt.Println("teeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee", err)
 		return nil, err
 	}
 	if jxOrder.OrderType == model.OrderTypeMatter {
 		checkMatterDeliveryAddress(deliveryAddress)
 	}
+	fmt.Println("tesssss11111111111111111111111111111111111111111111111111111")
 	if createType == OrderCreateTypeNormal {
-		if jxOrder.OrderType == model.OrderTypeDefendPrice && !IsAuto {
+		if jxOrder.OrderType == model.OrderTypeDefendPrice && jxOrder.IsPriceDefend != model.YES {
 			vendorOrderID := buildDefendPriceOrder(ctx, jxOrder, addressID)
 			outJxOrder.OrderID = utils.Str2Int64(vendorOrderID)
 			return outJxOrder, err
 		}
+		fmt.Println("te222222222222222222222222222222222222222222222222222222222222")
 		if outJxOrder.TotalPrice != jxOrder.TotalPrice {
 			return nil, fmt.Errorf("商品或配送信息发生改变，请重新下单")
 		}
@@ -259,6 +262,7 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64,
 			} else {
 				order.Status = model.OrderStatusWait4Pay
 			}
+			fmt.Println("te333333333333333333333333333333333333333333333333333333333333333333")
 			callNewOrder(order)
 		}
 	}
@@ -1971,7 +1975,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, true); err == nil {
+				if _, err := CreateOrder(ctx, jxOrder, kk, OrderCreateTypeNormal, 0, false); err == nil {
 					err = SettleDiscountActByPriceDefend(ctx, vv[0], false)
 				}
 			} else {
@@ -1996,7 +2000,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, true); err == nil {
+				if _, err := CreateOrder(ctx, jxOrder, kk, OrderCreateTypeNormal, 0, false); err == nil {
 				}
 			}
 		}
diff --git a/controllers/jx_order2.go b/controllers/jx_order2.go
index af96eedf4..82103922f 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, false)
+			retVal, err = localjx.CreateOrder(params.Ctx, jxOrder, int64(params.AddressID), params.CreateType, params.FromStoreID, params.IsDeliverySelf)
 		}
 		return retVal, "", err
 	})