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

美团公益捐款优化

Browse Source
This commit is contained in:
renyutian
2019-04-08 15:07:10 +08:00
parent 976a7d0d76
commit 1094c325fa
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -578,7 +578,7 @@ func (c *OrderManager) GetOrdersFinancial(ctx *jxcontext.Context, fromDateStr, t
} }
sql += sqlWhere sql += sqlWhere
sql += ` sql += `
ORDER BY t1.delivery_confirm_time DESC ORDER BY t2.delivery_confirm_time DESC
LIMIT ? OFFSET ? LIMIT ? OFFSET ?
` `
sqlParams = append(sqlParams, pageSize, offset) sqlParams = append(sqlParams, pageSize, offset)

5
business/partner/purchase/mtwm/financial.go
View File

@@ -45,7 +45,7 @@ func (p *PurchaseHandler) OrderFinancialDetail2Refund(orderFinancial *model.Orde
VendorID: model.VendorIDMTWM, VendorID: model.VendorIDMTWM,
AfsOrderID: orderData.Get("order_id"), AfsOrderID: orderData.Get("order_id"),
VendorOrderID: orderData.Get("order_id"), VendorOrderID: orderData.Get("order_id"),
AfsCreateAt: utils.Timestamp2Time(utils.Str2Int64WithDefault(orderData.Get("timestamp"), 0)), AfsCreateAt: utils.Timestamp2Time(utils.Str2Int64(orderData.Get("timestamp"))),
// BoxMoney: orderFinancial.BoxMoney, // BoxMoney: orderFinancial.BoxMoney,
// SkuBoxMoney: orderFinancial.SkuBoxMoney, // 美团的餐盒费已经拆到单条SKU里面去了,退款时直接计算用户支付sku金额就好了 // SkuBoxMoney: orderFinancial.SkuBoxMoney, // 美团的餐盒费已经拆到单条SKU里面去了,退款时直接计算用户支付sku金额就好了
FreightUserMoney: orderFinancial.FreightMoney, FreightUserMoney: orderFinancial.FreightMoney,
@@ -245,6 +245,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) (
// // 3/18之后的订单一直都不显示公益捐款金额，而且结算现在结算到了3/18之后的订单，没有的已经不计算了，先注释 // // 3/18之后的订单一直都不显示公益捐款金额，而且结算现在结算到了3/18之后的订单，没有的已经不计算了，先注释
// // 2019-04-03 10.52 询问赵mf, 此计划是必须参加的，而且是长期的，每单固定扣除一分钱 // // 2019-04-03 10.52 询问赵mf, 此计划是必须参加的，而且是长期的，每单固定扣除一分钱
orderFinancial.DonationMoney = PublicWelfareDonation orderFinancial.DonationMoney = PublicWelfareDonation
orderFinancial.ShopMoney -= PublicWelfareDonation // 不应该对第三方结账金额做更改，就算有异常，也要保留异常，知道问题出在哪里
// orderFinancial.ShopMoney -= PublicWelfareDonation
return orderFinancial return orderFinancial
} }