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

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2023-03-29 11:18:45 +08:00
parent 10b3f159de 837f86f7bd
commit ae98eb4be5
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -695,7 +695,8 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
return nil, nil, fmt.Errorf("地址ID不正确") return nil, nil, fmt.Errorf("地址ID不正确")
} }
deliveryAddress = addressList[0] deliveryAddress = addressList[0]
if distance := jxutils.Point2StoreDistance(deliveryAddress.Lng, deliveryAddress.Lat, storeDetail.Lng, storeDetail.Lat, storeDetail.DeliveryRangeType, storeDetail.DeliveryRange); distance == 0 { distance := jxutils.Point2StoreDistance(deliveryAddress.Lng, deliveryAddress.Lat, storeDetail.Lng, storeDetail.Lat, storeDetail.DeliveryRangeType, storeDetail.DeliveryRange)
if distance == 0 && !IsDeliverySelf {
return nil, nil, fmt.Errorf("当前送货地址不在门店%s的配送范围", storeDetail.Name) return nil, nil, fmt.Errorf("当前送货地址不在门店%s的配送范围", storeDetail.Name)
} }
//结算类型 //结算类型
@@ -706,21 +707,23 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
} }
// 营业状态及时间检查 // 营业状态及时间检查
if storeDetail.Status != model.StoreStatusOpened { // model.StoreStatusDisabled { if !IsDeliverySelf {
return nil, nil, fmt.Errorf("门店:%s状态是:%s", storeDetail.Name, model.StoreStatusName[storeDetail.Status]) 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])
} }
} else { checkTime := time.Now()
checkTime = utils.Timestamp2Time(jxOrder.ExpectedDeliveredTimestamp) if jxOrder.ExpectedDeliveredTimestamp == 0 {
if checkTime.Sub(time.Now()) < DingShiDaMinTime { if storeDetail.Status != model.StoreStatusOpened {
return nil, nil, fmt.Errorf("预订单只能在1小时后") return nil, nil, fmt.Errorf("门店:%s不是营业状态,状态是:%s", storeDetail.Name, model.StoreStatusName[storeDetail.Status])
} }
if utils.Time2Date(time.Now()).Sub(utils.Time2Date(checkTime)) > 24*time.Hour { } else {
return nil, nil, fmt.Errorf("预订单只能预定当天或第二天") 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 outJxOrder2 := *jxOrder

7
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 {
@@ -18,7 +17,7 @@ type JxOrderController struct {
// @Description 创建京西商城订单 // @Description 创建京西商城订单
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param jxOrder formData string true "订单信息" // @Param jxOrder formData string true "订单信息"
// @Param addressID formData int64 fasle "配送地址ID" // @Param addressID formData int64 true "配送地址ID"
// @Param fromStoreID formData int fasle "物料配送门店" // @Param fromStoreID formData int fasle "物料配送门店"
// @Param couponIDs formData string fasle "优惠券IDs" // @Param couponIDs formData string fasle "优惠券IDs"
// @Param createType formData int false "创建类型, 0:预创建, 1:创建" // @Param createType formData int false "创建类型, 0:预创建, 1:创建"
@@ -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),
@@ -97,7 +96,7 @@ func (c *JxOrderController) Pay4StoreMyselfDeliverOrder() {
EarningType: model.EarningTypePoints, EarningType: model.EarningTypePoints,
OrderType: model.OrderTypeNormal, OrderType: model.OrderTypeNormal,
IsBuyNowPrice: 0, IsBuyNowPrice: 0,
IsPriceDefend: 0, IsPriceDefend: model.YES,
OrderID2: "", OrderID2: "",
UserID: params.Ctx.GetUserID(), UserID: params.Ctx.GetUserID(),
} }