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

1

Browse Source
This commit is contained in:
邹宗楠
2025-08-05 16:54:19 +08:00
parent 263c380174
commit 40fea113f1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/lakala/lakala_incoming.go
View File

@@ -496,7 +496,7 @@ func SeparateQueryAmt(merchantNo, logDate, logNo, vendorOrderId string) (*lakala
return nil, err return nil, err
} }
separate, _ := dao.GetSeparateAmtByOrderID(vendorOrderId, "", logNo) separate, err := dao.GetSeparateAmtByOrderID(vendorOrderId, "", logNo)
if separate != nil { if separate != nil {
separate.TotalAmt = result.TotalSeparateAmt separate.TotalAmt = result.TotalSeparateAmt
separate.ActualSeparateAmt = result.CanSeparateAmt separate.ActualSeparateAmt = result.CanSeparateAmt

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

@@ -208,7 +208,7 @@ func GetRecipientList(orgCode, receiverNo, receiverName string, offset, pageSize
func GetSeparateAmtByOrderID(vendorOrderID string, cmdType string, logNo string) (*model.LakalaSeparateAmt, error) { func GetSeparateAmtByOrderID(vendorOrderID string, cmdType string, logNo string) (*model.LakalaSeparateAmt, error) {
var recipient *model.LakalaSeparateAmt var recipient *model.LakalaSeparateAmt
sql := ` SELECT * FROM Lakala_separate_amt WHERE vendor_order_id = ?` sql := ` SELECT * FROM lakala_separate_amt WHERE vendor_order_id = ?`
param := []interface{}{vendorOrderID} param := []interface{}{vendorOrderID}
if cmdType != "" { if cmdType != "" {
sql += ` AND cmd_type = ? ` sql += ` AND cmd_type = ? `
@@ -238,7 +238,7 @@ func GetSeparateAmt(merchantNo, cmdType, status, separateNo, vendorOrderID strin
var recipient []*model.LakalaSeparateAmt var recipient []*model.LakalaSeparateAmt
var param = []interface{}{} var param = []interface{}{}
sql := ` SELECT SQL_CALC_FOUND_ROWS r.* FROM Lakala_separate_amt r WHERE 1=1 ` sql := ` SELECT SQL_CALC_FOUND_ROWS r.* FROM lakala_separate_amt r WHERE 1=1 `
if merchantNo != "" { if merchantNo != "" {
sql += ` AND r.merchant_no = ? ` sql += ` AND r.merchant_no = ? `
param = append(param, merchantNo) param = append(param, merchantNo)