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

测试接口

Browse Source
This commit is contained in:
苏尹岚
2020-08-27 09:45:26 +08:00
parent 216dfea73b
commit 501b18d456
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,21 +232,20 @@ func GetMyOrderCountInfo(ctx *jxcontext.Context, fromDate, toDate time.Time, sta
func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, createType int, fromStoreID int, IsDeliverySelf 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) outJxOrder, deliveryAddress, err := generateOrder(ctx, jxOrder, addressID, fromStoreID, "", IsDeliverySelf)
if err != nil { if err != nil {
fmt.Println("teeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee", err)
return nil, err return nil, err
} }
if jxOrder.OrderType == model.OrderTypeMatter { if jxOrder.OrderType == model.OrderTypeMatter {
checkMatterDeliveryAddress(deliveryAddress) checkMatterDeliveryAddress(deliveryAddress)
} }
fmt.Println("tesssss11111111111111111111111111111111111111111111111111111")
if createType == OrderCreateTypeNormal { if createType == OrderCreateTypeNormal {
if jxOrder.OrderType == model.OrderTypeDefendPrice && jxOrder.IsPriceDefend != model.YES { if jxOrder.OrderType == model.OrderTypeDefendPrice && jxOrder.IsPriceDefend != model.YES {
vendorOrderID := buildDefendPriceOrder(ctx, jxOrder, addressID) vendorOrderID := buildDefendPriceOrder(ctx, jxOrder, addressID)
outJxOrder.OrderID = utils.Str2Int64(vendorOrderID) outJxOrder.OrderID = utils.Str2Int64(vendorOrderID)
return outJxOrder, err return outJxOrder, err
} }
fmt.Println("te222222222222222222222222222222222222222222222222222222222222")
if outJxOrder.TotalPrice != jxOrder.TotalPrice { if outJxOrder.TotalPrice != jxOrder.TotalPrice {
fmt.Println("te222222222222222222222222222222222222222222222222222222222222", utils.Format4Output(outJxOrder, false))
fmt.Println("te", utils.Format4Output(jxOrder, false))
return nil, fmt.Errorf("商品或配送信息发生改变，请重新下单") return nil, fmt.Errorf("商品或配送信息发生改变，请重新下单")
} }
if jxOrder.IsPriceDefend == model.YES { if jxOrder.IsPriceDefend == model.YES {
@@ -255,6 +254,7 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64,
outJxOrder.OrderID = GenOrderNo(ctx) outJxOrder.OrderID = GenOrderNo(ctx)
} }
order, err2 := jxOrder2GoodsOrder(ctx, outJxOrder, deliveryAddress, "", IsDeliverySelf) order, err2 := jxOrder2GoodsOrder(ctx, outJxOrder, deliveryAddress, "", IsDeliverySelf)
fmt.Println("te333333333333333333333333333333333333333333333333333333333333333333", err2)
if err = err2; err == nil { if err = err2; err == nil {
order.AddressID = addressID order.AddressID = addressID
if jxOrder.IsPriceDefend == model.YES { if jxOrder.IsPriceDefend == model.YES {
@@ -262,7 +262,6 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64,
} else { } else {
order.Status = model.OrderStatusWait4Pay order.Status = model.OrderStatusWait4Pay
} }
fmt.Println("te333333333333333333333333333333333333333333333333333333333333333333")
callNewOrder(order) callNewOrder(order)
} }
} }