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 13:51:03 +08:00
parent 5859c589da
commit ca415b259f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/model/order.go
View File

@@ -146,7 +146,7 @@ type GoodsOrder struct {
EarningType int `json:"earningType"` //订单结算方式，2为扣点，1为报价 EarningType int `json:"earningType"` //订单结算方式，2为扣点，1为报价
OrderType int `json:"orderType"` //订单类型，0为普通订单，1为物料订单，2为进货订单 OrderType int `json:"orderType"` //订单类型，0为普通订单，1为物料订单，2为进货订单
OrderPayPercentage int `json:"orderPayPercentage"` OrderPayPercentage int `json:"orderPayPercentage"`
// CouponIDs string `orm:"column(coupon_ids)" json:"couponIDs"` //优惠券IDs（京西商城） CouponIDs string `orm:"column(coupon_ids)" json:"couponIDs"` //优惠券IDs（京西商城）
// 以下只是用于传递数据 // 以下只是用于传递数据
OriginalData string `orm:"-" json:"-"` OriginalData string `orm:"-" json:"-"`

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

@@ -1058,11 +1058,11 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
VendorOrderID2: jxOrder.OrderID2, VendorOrderID2: jxOrder.OrderID2,
} }
if len(couponIDs) > 0 { if len(couponIDs) > 0 {
// strCounponIDs := []string{} strCounponIDs := []string{}
// for _, v := range couponIDs { for _, v := range couponIDs {
// strCounponIDs = append(strCounponIDs, utils.Int2Str(v)) strCounponIDs = append(strCounponIDs, utils.Int2Str(v))
// } }
// order.CouponIDs = strings.Join(strCounponIDs, ",") order.CouponIDs = strings.Join(strCounponIDs, ",")
} }
if userID == "" { if userID == "" {
order.UserID = ctx.GetUserID() order.UserID = ctx.GetUserID()