diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 1f0c04e40..d09706b19 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -578,7 +578,7 @@ func (c *OrderManager) GetOrdersFinancial(ctx *jxcontext.Context, fromDateStr, t } sql += sqlWhere sql += ` - ORDER BY t1.delivery_confirm_time DESC + ORDER BY t2.delivery_confirm_time DESC LIMIT ? OFFSET ? ` sqlParams = append(sqlParams, pageSize, offset) diff --git a/business/partner/purchase/mtwm/financial.go b/business/partner/purchase/mtwm/financial.go index 2a36baac2..a50efe500 100644 --- a/business/partner/purchase/mtwm/financial.go +++ b/business/partner/purchase/mtwm/financial.go @@ -45,7 +45,7 @@ func (p *PurchaseHandler) OrderFinancialDetail2Refund(orderFinancial *model.Orde VendorID: model.VendorIDMTWM, AfsOrderID: 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, // SkuBoxMoney: orderFinancial.SkuBoxMoney, // 美团的餐盒费已经拆到单条SKU里面去了,退款时直接计算用户支付sku金额就好了 FreightUserMoney: orderFinancial.FreightMoney, @@ -245,6 +245,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) ( // // 3/18之后的订单一直都不显示公益捐款金额,而且结算现在结算到了3/18之后的订单,没有的已经不计算了,先注释 // // 2019-04-03 10.52 询问赵mf, 此计划是必须参加的,而且是长期的,每单固定扣除一分钱 orderFinancial.DonationMoney = PublicWelfareDonation - orderFinancial.ShopMoney -= PublicWelfareDonation + // 不应该对第三方结账金额做更改,就算有异常,也要保留异常,知道问题出在哪里 + // orderFinancial.ShopMoney -= PublicWelfareDonation return orderFinancial }