1

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

@@ -707,6 +707,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 	}
 
 	// 营业状态及时间检查
+	if !IsDeliverySelf {
 		if storeDetail.Status != model.StoreStatusOpened { // model.StoreStatusDisabled {
 			return nil, nil, fmt.Errorf("门店:%s状态是:%s", storeDetail.Name, model.StoreStatusName[storeDetail.Status])
 		}
@@ -724,6 +725,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 				return nil, nil, fmt.Errorf("预订单只能预定当天或第二天")
 			}
 		}
+	}
 	outJxOrder2 := *jxOrder
 	outJxOrder2.Skus = nil
 	outJxOrder2.OrderPrice = 0

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),