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

对于SkuID超范围的，改为设置成JxSkuID

Browse Source
This commit is contained in:
gazebo
2020-02-20 14:35:37 +08:00
parent 9b48d6d1a4
commit 4159a6198e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/orderman/financial.go
View File

@@ -98,7 +98,7 @@ func (c *OrderManager) SaveOrderFinancialInfo(order *model.OrderFinancial, opera
sku.JxShopMoney = sku.ShopMoneyByCal + sku.JxSubsidyMoney - sku.JxDeductionsMoney sku.JxShopMoney = sku.ShopMoneyByCal + sku.JxSubsidyMoney - sku.JxDeductionsMoney
order.Skus[0].JxShopMoney += sku.JxShopMoney order.Skus[0].JxShopMoney += sku.JxShopMoney
if sku.SkuID >= math.MaxInt32 { if sku.SkuID >= math.MaxInt32 {
sku.SkuID = 0 sku.SkuID = sku.JxSkuID
} }
if err = dao.CreateEntity(db, sku); err != nil { if err = dao.CreateEntity(db, sku); err != nil {
if !dao.IsDuplicateError(err) { if !dao.IsDuplicateError(err) {
@@ -112,7 +112,7 @@ func (c *OrderManager) SaveOrderFinancialInfo(order *model.OrderFinancial, opera
if len(order.Skus) > 0 { if len(order.Skus) > 0 {
sku := order.Skus[0] sku := order.Skus[0]
if sku.SkuID > math.MaxInt32 { if sku.SkuID > math.MaxInt32 {
sku.SkuID = 0 sku.SkuID = sku.JxSkuID
} }
sku.UserMoney = order.SalePriceMoney - order.DiscountMoney - sku.UserMoney sku.UserMoney = order.SalePriceMoney - order.DiscountMoney - sku.UserMoney
sku.PmSubsidyMoney = platOrderGoodsDiscountMoney + order.SelfDeliveryDiscountMoney - sku.PmSubsidyMoney sku.PmSubsidyMoney = platOrderGoodsDiscountMoney + order.SelfDeliveryDiscountMoney - sku.PmSubsidyMoney

4
business/jxutils/jxutils.go
View File

@@ -524,7 +524,7 @@ func RefreshOrderSkuRelated(order *model.GoodsOrder) *model.GoodsOrder {
order.EarningPrice = 0 order.EarningPrice = 0
for _, sku := range order.Skus { for _, sku := range order.Skus {
if sku.SkuID > math.MaxInt32 { if sku.SkuID > math.MaxInt32 {
sku.SkuID = 0 sku.SkuID = sku.JxSkuID
} }
sku.OrderCreatedAt = order.OrderCreatedAt sku.OrderCreatedAt = order.OrderCreatedAt
sku.VendorID = order.VendorID sku.VendorID = order.VendorID
@@ -545,7 +545,7 @@ func RefreshAfsOrderSkuRelated(afsOrder *model.AfsOrder) *model.AfsOrder {
afsOrder.PmSkuSubsidyMoney = 0 afsOrder.PmSkuSubsidyMoney = 0
for _, orderSku := range afsOrder.Skus { for _, orderSku := range afsOrder.Skus {
if orderSku.SkuID > math.MaxInt32 { if orderSku.SkuID > math.MaxInt32 {
orderSku.SkuID = 0 orderSku.SkuID = orderSku.JxSkuID
} }
afsOrder.SkuUserMoney += orderSku.UserMoney afsOrder.SkuUserMoney += orderSku.UserMoney
afsOrder.PmSkuSubsidyMoney += orderSku.PmSkuSubsidyMoney afsOrder.PmSkuSubsidyMoney += orderSku.PmSkuSubsidyMoney