1
This commit is contained in:
@@ -496,7 +496,7 @@ func SeparateQueryAmt(merchantNo, logDate, logNo, vendorOrderId string) (*lakala
|
||||
return nil, err
|
||||
}
|
||||
|
||||
separate, _ := dao.GetSeparateAmtByOrderID(vendorOrderId, "", logNo)
|
||||
separate, err := dao.GetSeparateAmtByOrderID(vendorOrderId, "", logNo)
|
||||
if separate != nil {
|
||||
separate.TotalAmt = result.TotalSeparateAmt
|
||||
separate.ActualSeparateAmt = result.CanSeparateAmt
|
||||
|
||||
@@ -208,7 +208,7 @@ func GetRecipientList(orgCode, receiverNo, receiverName string, offset, pageSize
|
||||
func GetSeparateAmtByOrderID(vendorOrderID string, cmdType string, logNo string) (*model.LakalaSeparateAmt, error) {
|
||||
|
||||
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}
|
||||
if cmdType != "" {
|
||||
sql += ` AND cmd_type = ? `
|
||||
@@ -238,7 +238,7 @@ func GetSeparateAmt(merchantNo, cmdType, status, separateNo, vendorOrderID strin
|
||||
|
||||
var recipient []*model.LakalaSeparateAmt
|
||||
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 != "" {
|
||||
sql += ` AND r.merchant_no = ? `
|
||||
param = append(param, merchantNo)
|
||||
|
||||
Reference in New Issue
Block a user