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-09-03 18:09:26 +08:00
parent ee2b801945
commit 1a1c49398b
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
business/jxcallback/orderman/order_afs.go
View File

@@ -3,7 +3,6 @@ package orderman
import ( import (
"strings" "strings"
"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils"
@@ -61,29 +60,6 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode
} }
} }
} }
//如果是扣点的单需要修改totalShopMoney等
skuMap := make(map[int]*model.OrderSku)
for _, sku := range order.Skus {
skuMap[sku.SkuID] = sku
}
if err == nil && order.EarningType == model.EarningTypePoints {
var diff int64
origin := float64(order.TotalShopMoney) / jdshopapi.JdsPayPercentage
for _, sku := range afsOrder.Skus {
if skuMap[sku.SkuID] != nil {
diff += skuMap[sku.SkuID].SalePrice * int64(sku.Count)
}
}
order.TotalShopMoney = utils.Float64TwoInt64((origin - float64(diff)) * jdshopapi.JdsPayPercentage)
storeDetail, _ := dao.GetStoreDetail(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorID)
wayBills, _ := dao.GetWaybills(db, order.VendorOrderID)
if len(wayBills) > 0 {
jxutils.RefreshOrderEarningPrice3(order, storeDetail.PayPercentage, wayBills[0])
} else {
jxutils.RefreshOrderEarningPrice2(order, storeDetail.PayPercentage)
}
dao.UpdateEntity(db, order, "TotalShopMoney", "NewEarningPrice")
}
} }
// //
dao.Begin(db) dao.Begin(db)

28
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -6,6 +6,7 @@ import (
"time" "time"
"git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/baseapi/platformapi/dingdingapi"
"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/baseapi/utils/errlist" "git.rosy.net.cn/baseapi/utils/errlist"
"git.rosy.net.cn/jx-callback/business/jxstore/cms" "git.rosy.net.cn/jx-callback/business/jxstore/cms"
@@ -213,6 +214,33 @@ func (c *BaseScheduler) AgreeOrRefuseRefund(ctx *jxcontext.Context, afsOrderID s
flag = model.AfsOrderFlagRefuseUserRefund flag = model.AfsOrderFlagRefuseUserRefund
afsOrder.RefuseReason = reason afsOrder.RefuseReason = reason
partner.CurOrderManager.UpdateAfsOrderFields(afsOrder, []string{"RefuseReason"}) partner.CurOrderManager.UpdateAfsOrderFields(afsOrder, []string{"RefuseReason"})
} else {
if order, _ := partner.CurOrderManager.LoadOrder(afsOrder.VendorOrderID, afsOrder.VendorID); order != nil {
//如果是扣点的单需要修改totalShopMoney等
skuMap := make(map[int]*model.OrderSku)
db := dao.GetDB()
for _, sku := range order.Skus {
skuMap[sku.SkuID] = sku
}
if err == nil && order.EarningType == model.EarningTypePoints {
var diff int64
origin := float64(order.TotalShopMoney) / jdshopapi.JdsPayPercentage
for _, sku := range afsOrder.Skus {
if skuMap[sku.SkuID] != nil {
diff += skuMap[sku.SkuID].SalePrice * int64(sku.Count)
}
}
order.TotalShopMoney = utils.Float64TwoInt64((origin - float64(diff)) * jdshopapi.JdsPayPercentage)
storeDetail, _ := dao.GetStoreDetail(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorID)
wayBills, _ := dao.GetWaybills(db, order.VendorOrderID)
if len(wayBills) > 0 {
jxutils.RefreshOrderEarningPrice3(order, storeDetail.PayPercentage, wayBills[0])
} else {
jxutils.RefreshOrderEarningPrice2(order, storeDetail.PayPercentage)
}
dao.UpdateEntity(db, order, "TotalShopMoney", "NewEarningPrice")
}
}
} }
dao.SetAfsOrderFlag(dao.GetDB(), ctx.GetUserName(), afsOrderID, vendorID, flag) dao.SetAfsOrderFlag(dao.GetDB(), ctx.GetUserName(), afsOrderID, vendorID, flag)
} }