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

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2023-07-03 17:47:18 +08:00
parent c26804a4dd 24e26bc8e8
commit b0e85e5a87
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ package dao
import ( import (
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/globals"
"regexp" "regexp"
"strconv" "strconv"
"time" "time"
@@ -892,7 +893,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
sql := fmt.Sprintf(` sql := fmt.Sprintf(`
SELECT SQL_CALC_FOUND_ROWS a.* FROM ( SELECT SQL_CALC_FOUND_ROWS a.* FROM (
SELECT SELECT
DISTINCT t1.*, t1.*,
-- CAST(IF(t1.earning_price <> 0, t1.earning_price, IF(t1.shop_price <> 0 && t1.shop_price < t1.sale_price, t1.shop_price, t1.sale_price) * IF(t1.order_pay_percentage > 0, t1.order_pay_percentage, %d) / 100) AS SIGNED) earning_price, -- CAST(IF(t1.earning_price <> 0, t1.earning_price, IF(t1.shop_price <> 0 && t1.shop_price < t1.sale_price, t1.shop_price, t1.sale_price) * IF(t1.order_pay_percentage > 0, t1.order_pay_percentage, %d) / 100) AS SIGNED) earning_price,
t2.status waybill_status, t2.courier_name, t2.courier_mobile, t2.status waybill_status, t2.courier_name, t2.courier_mobile,
t2.actual_fee, t2.desired_fee,t2.punctual_fee, t2.waybill_created_at, t2.waybill_finished_at, t2.vendor_waybill_id2 vendor_waybill_id2_waybill, t2.actual_fee, t2.desired_fee,t2.punctual_fee, t2.waybill_created_at, t2.waybill_finished_at, t2.vendor_waybill_id2 vendor_waybill_id2_waybill,
@@ -1155,6 +1156,8 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
sqlParams = append(sqlParams, pageSize, offset) sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) defer Commit(db, txDB)
globals.SugarLogger.Debugf("===============sql2 := %s", sql)
globals.SugarLogger.Debugf("===============sql2 := %s", utils.Format4Output(sqlParams, false))
if err = GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil { if err = GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount2(db, txDB) totalCount = GetLastTotalRowCount2(db, txDB)
} }

4
controllers/taobao_vegetable.go
View File

@@ -146,11 +146,11 @@ func (c *TaoBaoVegetableController) ApplyCancelOrder() {
c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名")) c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名"))
c.ServeJSON() c.ServeJSON()
return return
} /*else { } else {
c.Data["json"] = tao_vegetable.CallBackResultSign(nil) c.Data["json"] = tao_vegetable.CallBackResultSign(nil)
c.ServeJSON() c.ServeJSON()
return return
}*/ }
callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusApplyAfs, afsOrder.OutOrderId, afsOrder) callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusApplyAfs, afsOrder.OutOrderId, afsOrder)
c.Data["json"] = callbackResponse c.Data["json"] = callbackResponse