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:42:32 +08:00
parent 635b84049c
commit 216dfea73b
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,20 +229,23 @@ func GetMyOrderCountInfo(ctx *jxcontext.Context, fromDate, toDate time.Time, sta
//fromStoreID 为-1 表示也是物料订单，但是不是门店申请，是个人申请的 //fromStoreID 为-1 表示也是物料订单，但是不是门店申请，是个人申请的
//fromStoreID 在后面 generateOrder中有用 //fromStoreID 在后面 generateOrder中有用
//IsAuto 是否是守价结算而自动创建的守价订单 //IsAuto 是否是守价结算而自动创建的守价订单
func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, createType int, fromStoreID int, IsDeliverySelf, IsAuto 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 && !IsAuto { 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 {
return nil, fmt.Errorf("商品或配送信息发生改变，请重新下单") return nil, fmt.Errorf("商品或配送信息发生改变，请重新下单")
} }
@@ -259,6 +262,7 @@ 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)
} }
} }
@@ -1971,7 +1975,7 @@ func CreateOrderByPriceDefend(ctx *jxcontext.Context) (err error) {
IsPriceDefend: model.YES, IsPriceDefend: model.YES,
OrderID: utils.Str2Int64(vv[0].VendorOrderID), OrderID: utils.Str2Int64(vv[0].VendorOrderID),
} }
if _, err := CreateOrder(ctx, jxOrder, kk, OrderCreateTypeNormal, 0, false, true); err == nil { if _, err := CreateOrder(ctx, jxOrder, kk, OrderCreateTypeNormal, 0, false); err == nil {
err = SettleDiscountActByPriceDefend(ctx, vv[0], false) err = SettleDiscountActByPriceDefend(ctx, vv[0], false)
} }
} else { } else {
@@ -1996,7 +2000,7 @@ func CreateOrderByPriceDefend(ctx *jxcontext.Context) (err error) {
} }
jxOrder.Skus = skus jxOrder.Skus = skus
jxOrder.OrderID2 = strings.Join(orderIDs, ",") jxOrder.OrderID2 = strings.Join(orderIDs, ",")
if _, err := CreateOrder(ctx, jxOrder, kk, OrderCreateTypeNormal, 0, false, true); err == nil { if _, err := CreateOrder(ctx, jxOrder, kk, OrderCreateTypeNormal, 0, false); err == nil {
} }
} }
} }

2
controllers/jx_order2.go
View File

@@ -26,7 +26,7 @@ func (c *JxOrderController) CreateOrder() {
c.callCreateOrder(func(params *tJxorderCreateOrderParams) (retVal interface{}, errCode string, err error) { c.callCreateOrder(func(params *tJxorderCreateOrderParams) (retVal interface{}, errCode string, err error) {
var jxOrder *localjx.JxOrderInfo var jxOrder *localjx.JxOrderInfo
if err = utils.UnmarshalUseNumber([]byte(params.JxOrder), &jxOrder); err == nil { if err = utils.UnmarshalUseNumber([]byte(params.JxOrder), &jxOrder); err == nil {
retVal, err = localjx.CreateOrder(params.Ctx, jxOrder, int64(params.AddressID), params.CreateType, params.FromStoreID, params.IsDeliverySelf, false) retVal, err = localjx.CreateOrder(params.Ctx, jxOrder, int64(params.AddressID), params.CreateType, params.FromStoreID, params.IsDeliverySelf)
} }
return retVal, "", err return retVal, "", err
}) })