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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-01-20 11:13:37 +08:00
parent d27aa2c7ef
commit 724123aff7
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -249,7 +249,7 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64,
} else { } else {
outJxOrder.OrderID = jxutils.GenOrderNo() outJxOrder.OrderID = jxutils.GenOrderNo()
} }
order, err2 := jxOrder2GoodsOrder(ctx, outJxOrder, deliveryAddress, "", IsDeliverySelf) order, err2 := jxOrder2GoodsOrder(ctx, outJxOrder, deliveryAddress, "", IsDeliverySelf, couponIDs)
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 {
@@ -1029,7 +1029,7 @@ func matterSkusLimited(skus []*JxSkuInfo, storeID int) (err error) {
return err return err
} }
func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAddress *dao.UserDeliveryAddressEx, userID string, IsDeliverySelf bool) (order *model.GoodsOrder, err error) { func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAddress *dao.UserDeliveryAddressEx, userID string, IsDeliverySelf bool, couponIDs []int) (order *model.GoodsOrder, err error) {
order = &model.GoodsOrder{ order = &model.GoodsOrder{
VendorOrderID: utils.Int64ToStr(jxOrder.OrderID), VendorOrderID: utils.Int64ToStr(jxOrder.OrderID),
VendorID: model.VendorIDJX, VendorID: model.VendorIDJX,
@@ -1057,6 +1057,13 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
OrderType: jxOrder.OrderType, OrderType: jxOrder.OrderType,
VendorOrderID2: jxOrder.OrderID2, VendorOrderID2: jxOrder.OrderID2,
} }
if len(couponIDs) > 0 {
strCounponIDs := []string{}
for _, v := range couponIDs {
strCounponIDs = append(strCounponIDs, utils.Int2Str(v))
}
order.CouponIDs = strings.Join(strCounponIDs, ",")
}
if userID == "" { if userID == "" {
order.UserID = ctx.GetUserID() order.UserID = ctx.GetUserID()
} else { } else {
@@ -1229,7 +1236,7 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
//分包后的子订单ID默认是后面加两位（目前的规则），要改的话要注意取消订单那的判断 //分包后的子订单ID默认是后面加两位（目前的规则），要改的话要注意取消订单那的判断
outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1) outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1)
checkMatterDeliveryAddress(deliveryAddress) checkMatterDeliveryAddress(deliveryAddress)
order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID, false) order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID, false, nil)
if err = err2; err == nil { if err = err2; err == nil {
order2.FromStoreID = v.FromStoreID order2.FromStoreID = v.FromStoreID
order2.AddressID = order.AddressID order2.AddressID = order.AddressID
@@ -2045,7 +2052,7 @@ func createMatterOrder(jxOrder *JxOrderInfo, order *model.GoodsOrder, newOrderID
} }
outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + newOrderIDSuffix outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + newOrderIDSuffix
checkMatterDeliveryAddress(deliveryAddress) checkMatterDeliveryAddress(deliveryAddress)
order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID, false) order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID, false, nil)
if err = err2; err == nil { if err = err2; err == nil {
order2.AddressID = order.AddressID order2.AddressID = order.AddressID
order2.Status = model.OrderStatusDelivering order2.Status = model.OrderStatusDelivering