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

1

Browse Source
This commit is contained in:
邹宗楠
2024-10-31 15:22:06 +08:00
parent 8f6ac899d4
commit b484995584
1 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
business/jxcallback/orderman/orderman_ext.go
View File

@@ -344,12 +344,12 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
//Data: orders, //Data: orders,
} }
if len(orders) > 0 { if len(orders) > 0 {
//if permission.IsRoled(ctx) { if permission.IsRoled(ctx) {
task := tasksch.NewParallelTask("RefreshOrderFinancial", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, task := tasksch.NewParallelTask("RefreshOrderFinancial", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
order := batchItemList[0].(*model.GoodsOrderExt) order := batchItemList[0].(*model.GoodsOrderExt)
var afsOrder *AfsOrderExt var afsOrder *AfsOrderExt
sql := ` sql := `
SELECT t1.afs_total_shop_money, t2.shop_price SELECT t1.afs_total_shop_money, t2.shop_price
FROM afs_order t1 FROM afs_order t1
LEFT JOIN ( LEFT JOIN (
@@ -366,39 +366,39 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
GROUP BY 1) t2 ON t1.afs_order_id = t2.afs_order_id GROUP BY 1) t2 ON t1.afs_order_id = t2.afs_order_id
WHERE t1.afs_order_id = t2.afs_order_id WHERE t1.afs_order_id = t2.afs_order_id
` `
sqlParams := []interface{}{model.AfsOrderStatusFinished, order.VendorOrderID, sqlParams := []interface{}{model.AfsOrderStatusFinished, order.VendorOrderID,
model.YES} model.YES}
if err = dao.GetRow(db, &afsOrder, sql, sqlParams); err == nil && afsOrder != nil { if err = dao.GetRow(db, &afsOrder, sql, sqlParams); err == nil && afsOrder != nil {
if afsOrder.AfsTotalShopMoney != 0 && afsOrder.AfsTotalShopMoney != order.TotalShopMoney { if afsOrder.AfsTotalShopMoney != 0 && afsOrder.AfsTotalShopMoney != order.TotalShopMoney {
//报价，要减去商品的京西价 //报价，要减去商品的京西价
if order.EarningType == model.EarningTypeQuote { if order.EarningType == model.EarningTypeQuote {
order.JxIncome = afsOrder.AfsTotalShopMoney - order.EarningPrice - order.DesiredFee + (afsOrder.ShopPrice * int64(order.OrderPayPercentage) / int64(100)) order.JxIncome = afsOrder.AfsTotalShopMoney - order.EarningPrice - order.DesiredFee + (afsOrder.ShopPrice * int64(order.OrderPayPercentage) / int64(100))
} else { } else {
order.JxIncome = afsOrder.AfsTotalShopMoney * int64(order.OrderPayPercentage/2) / 100 order.JxIncome = afsOrder.AfsTotalShopMoney * int64(order.OrderPayPercentage/2) / 100
}
} }
} }
} // 统计订单的违约金
// 统计订单的违约金 var damages = &struct {
var damages = &struct { Damages int64 `json:"damages"`
Damages int64 `json:"damages"` }{}
}{} sqlDamages := ` SELECT SUM(w.desired_fee) damages FROM waybill w WHERE w.vendor_order_id = ? AND w.status = ? AND w.vendor_waybill_id <> ? `
sqlDamages := ` SELECT SUM(w.desired_fee) damages FROM waybill w WHERE w.vendor_order_id = ? AND w.status = ? AND w.vendor_waybill_id <> ? ` paramDamages := []interface{}{order.VendorOrderID, model.OrderStatusCanceled, order.VendorWaybillID}
paramDamages := []interface{}{order.VendorOrderID, model.OrderStatusCanceled, order.VendorWaybillID} if err := dao.GetRow(db, damages, sqlDamages, paramDamages); err == nil {
if err := dao.GetRow(db, damages, sqlDamages, paramDamages); err == nil { order.LiquidatedDamages = damages.Damages
order.LiquidatedDamages = damages.Damages }
} return retVal, err
return retVal, err }, orders)
}, orders) tasksch.HandleTask(task, nil, true).Run()
tasksch.HandleTask(task, nil, true).Run() result, _ := task.GetResult(0)
result, _ := task.GetResult(0) if len(result) > 0 {
if len(result) > 0 { pagedInfo.Data = result
pagedInfo.Data = result } else {
pagedInfo.Data = orders
}
} else { } else {
pagedInfo.Data = orders pagedInfo.Data = orders
} }
/* } else {
pagedInfo.Data = orders
}*/
} }
} }
return pagedInfo, err return pagedInfo, err