liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-03-29 10:29:52 +08:00
parent 4ac0eba73f
commit 65e349187c
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/partner/purchase/jx/localjx/order.go
View File

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

3
controllers/jx_order2.go
View File

@@ -7,7 +7,6 @@ import (
"git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner/purchase/jx/localjx" "git.rosy.net.cn/jx-callback/business/partner/purchase/jx/localjx"
"github.com/astaxie/beego/server/web" "github.com/astaxie/beego/server/web"
"time"
) )
type JxOrderController struct { type JxOrderController struct {
@@ -85,7 +84,7 @@ func (c *JxOrderController) Pay4StoreMyselfDeliverOrder() {
DefendPrice: 0, DefendPrice: 0,
}, },
}, },
ExpectedDeliveredTimestamp: time.Now().Unix(), ExpectedDeliveredTimestamp: 0,
TotalPrice: int64(params.PayMoney), TotalPrice: int64(params.PayMoney),
FreightPrice: 0, FreightPrice: 0,
OrderPrice: int64(params.PayMoney), OrderPrice: int64(params.PayMoney),