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-07 09:17:12 +08:00
parent d70bba284f
commit bd72b79987
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/model/dao/dao_order.go
View File

@@ -780,7 +780,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
t5.pay_percentage, t5.old_pay_percentage, t5.market_man_phone, tu.name market_man_name,
t6.vendor_pay_percentage,
city.name city_name, district.name district_name,
ROUND(IF(t1.earning_type = 1, t1.total_shop_money-t1.earning_price-IFNULL(t2.desired_fee,0), t1.total_shop_money *(100- t1.order_pay_percentage/2)/100)) jx_income`, model.DefaultEarningPricePercentage)
ROUND(IF(t1.earning_type = 1, t1.total_shop_money-t1.earning_price-IFNULL(t2.desired_fee,0), t1.total_shop_money *(t1.order_pay_percentage/2)/100)) jx_income`, model.DefaultEarningPricePercentage)
if isIncludeSku {
sql += `,
IF(t3.jx_sku_id > 0, t3.jx_sku_id, t3.sku_id) sku_id,
@@ -1003,8 +1003,6 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
sql += " LIMIT ? OFFSET ?"
sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db)
fmt.Println(sql)
fmt.Println(sqlParams)
defer Commit(db, txDB)
if err = GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount2(db, txDB)