From 65e349187c053015780d62cf37fee336245657f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 29 Mar 2023 10:29:52 +0800
Subject: [PATCH] 1

---
 business/partner/purchase/jx/localjx/order.go | 32 ++++++++++---------
 controllers/jx_order2.go                      |  3 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index fa606668c..e72ce6fd2 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -707,21 +707,23 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 	}
 
 	// 营业状态及时间检查
-	if storeDetail.Status != model.StoreStatusOpened { // model.StoreStatusDisabled {
-		return nil, nil, fmt.Errorf("门店:%s状态是:%s", storeDetail.Name, model.StoreStatusName[storeDetail.Status])
-	}
-	checkTime := time.Now()
-	if jxOrder.ExpectedDeliveredTimestamp == 0 {
-		if storeDetail.Status != model.StoreStatusOpened {
-			return nil, nil, fmt.Errorf("门店:%s不是营业状态,状态是:%s", storeDetail.Name, model.StoreStatusName[storeDetail.Status])
+	if !IsDeliverySelf {
+		if storeDetail.Status != model.StoreStatusOpened { // model.StoreStatusDisabled {
+			return nil, nil, fmt.Errorf("门店:%s状态是:%s", storeDetail.Name, model.StoreStatusName[storeDetail.Status])
 		}
-	} else {
-		checkTime = utils.Timestamp2Time(jxOrder.ExpectedDeliveredTimestamp)
-		if checkTime.Sub(time.Now()) < DingShiDaMinTime {
-			return nil, nil, fmt.Errorf("预订单只能在1小时后")
-		}
-		if utils.Time2Date(time.Now()).Sub(utils.Time2Date(checkTime)) > 24*time.Hour {
-			return nil, nil, fmt.Errorf("预订单只能预定当天或第二天")
+		checkTime := time.Now()
+		if jxOrder.ExpectedDeliveredTimestamp == 0 {
+			if storeDetail.Status != model.StoreStatusOpened {
+				return nil, nil, fmt.Errorf("门店:%s不是营业状态,状态是:%s", storeDetail.Name, model.StoreStatusName[storeDetail.Status])
+			}
+		} else {
+			checkTime = utils.Timestamp2Time(jxOrder.ExpectedDeliveredTimestamp)
+			if checkTime.Sub(time.Now()) < DingShiDaMinTime {
+				return nil, nil, fmt.Errorf("预订单只能在1小时后")
+			}
+			if utils.Time2Date(time.Now()).Sub(utils.Time2Date(checkTime)) > 24*time.Hour {
+				return nil, nil, fmt.Errorf("预订单只能预定当天或第二天")
+			}
 		}
 	}
 	outJxOrder2 := *jxOrder
@@ -836,7 +838,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 						if jxOrder.OrderType != model.OrderTypeMatter || (jxOrder.OrderType == model.OrderTypeMatter && fromStoreID == -1) {
 							outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
 							outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
-						} else { //以下else为物料订单袋子金额和数量处理
+						} else {              //以下else为物料订单袋子金额和数量处理
 							if !result.Flag { //只要flag是false就按原价申请，是true再按订单量
 								outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
 								outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
diff --git a/controllers/jx_order2.go b/controllers/jx_order2.go
index 1933ac07d..df50bd1b9 100644
--- a/controllers/jx_order2.go
+++ b/controllers/jx_order2.go
@@ -7,7 +7,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/jx/localjx"
 	"github.com/astaxie/beego/server/web"
-	"time"
 )
 
 type JxOrderController struct {
@@ -85,7 +84,7 @@ func (c *JxOrderController) Pay4StoreMyselfDeliverOrder() {
 					DefendPrice: 0,
 				},
 			},
-			ExpectedDeliveredTimestamp: time.Now().Unix(),
+			ExpectedDeliveredTimestamp: 0,
 			TotalPrice:                 int64(params.PayMoney),
 			FreightPrice:               0,
 			OrderPrice:                 int64(params.PayMoney),