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

aa

Browse Source
This commit is contained in:
suyl
2021-06-01 10:28:31 +08:00
parent e9495a4db2
commit b8f0d43a0d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/model/dao/report.go
View File

@@ -1,6 +1,7 @@
package dao package dao
import ( import (
"fmt"
"time" "time"
"git.rosy.net.cn/baseapi/utils" "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(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(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.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 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 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 LEFT JOIN afs_order c ON c.vendor_order_id = a.vendor_order_id

2
business/partner/purchase/mtwm/order_afs.go
View File

@@ -122,7 +122,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
afsOrder.SkuUserMoney += orderSku.UserMoney afsOrder.SkuUserMoney += orderSku.UserMoney
afsOrder.Skus = append(afsOrder.Skus, orderSku) afsOrder.Skus = append(afsOrder.Skus, orderSku)
} }
afsOrder.PmSubsidyMoney += afsOrder.RefundMoney - afsOrder.SkuUserMoney //afsOrder.PmSubsidyMoney += afsOrder.RefundMoney - afsOrder.SkuUserMoney
} else { } else {
if afsOrder = c.createAfsOrder(msg.FormData); afsOrder != nil { if afsOrder = c.createAfsOrder(msg.FormData); afsOrder != nil {
// if orderFinancial, err2 := partner.CurOrderManager.LoadOrderFinancial(orderStatus.RefVendorOrderID, model.VendorIDMTWM); err2 == nil { // if orderFinancial, err2 := partner.CurOrderManager.LoadOrderFinancial(orderStatus.RefVendorOrderID, model.VendorIDMTWM); err2 == nil {