From b8f0d43a0d1a51b638dba03e473e3d3b1addbb71 Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Tue, 1 Jun 2021 10:28:31 +0800 Subject: [PATCH] aa --- business/model/dao/report.go | 3 ++- business/partner/purchase/mtwm/order_afs.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/business/model/dao/report.go b/business/model/dao/report.go index 3acd1ea07..ddedfd947 100644 --- a/business/model/dao/report.go +++ b/business/model/dao/report.go @@ -1,6 +1,7 @@ package dao import ( + "fmt" "time" "git.rosy.net.cn/baseapi/utils" @@ -104,7 +105,7 @@ func GetStatisticsReportForOrders(db *DaoDB, storeIDs, vendorIDs []int, fromDate SUM(IF(a.earning_type = 1, a.earning_price, a.new_earning_price)) earning_price1, SUM(a.total_shop_money-IF(a.earning_type = 1, a.earning_price, a.new_earning_price)-b.desired_fee) total_gross_profit1, SUM(d.shop_price) afs_shop_price, - SUM(d.refund_money_by_cal) afs_total_money + SUM(IF(d.refund_money_by_cal > 0, d.refund_money_by_cal, 0)) afs_total_money FROM goods_order a LEFT JOIN waybill b ON IF(a.waybill_vendor_id = -1,a.vendor_order_id,a.vendor_waybill_id) = b.vendor_waybill_id LEFT JOIN afs_order c ON c.vendor_order_id = a.vendor_order_id diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go index 2070c3e76..140e6eae4 100644 --- a/business/partner/purchase/mtwm/order_afs.go +++ b/business/partner/purchase/mtwm/order_afs.go @@ -122,7 +122,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma afsOrder.SkuUserMoney += orderSku.UserMoney afsOrder.Skus = append(afsOrder.Skus, orderSku) } - afsOrder.PmSubsidyMoney += afsOrder.RefundMoney - afsOrder.SkuUserMoney + //afsOrder.PmSubsidyMoney += afsOrder.RefundMoney - afsOrder.SkuUserMoney } else { if afsOrder = c.createAfsOrder(msg.FormData); afsOrder != nil { // if orderFinancial, err2 := partner.CurOrderManager.LoadOrderFinancial(orderStatus.RefVendorOrderID, model.VendorIDMTWM); err2 == nil {