lakala

repository/pay/notice.go

@@ -117,7 +117,7 @@ func CashierNotice(input *models.CashierNoticeInput) (*base.ResponseDataWxNotice
 		//callbackResponse.OutTradeNo = input.OutTradeNo
 		//callbackResponse.TransactionID = input.TransactionId
 		callbackResponse.OutTradeNo = input.OutOrderNo //交易凭据单号 todo ?
-		callbackResponse.TransactionID = input.OutOrderNo //交易凭据单号 todo ? strconv.Itoa(
+		//callbackResponse.TransactionID = input.OutOrderNo //交易凭据单号 todo ? strconv.Itoa(
 
 		OrderTradeInfo, _ := input.OrderTradeInfo.(map[string]interface{})
 		if OrderTradeInfo["auth_code"] != nil {
@@ -125,6 +125,16 @@ func CashierNotice(input *models.CashierNoticeInput) (*base.ResponseDataWxNotice
 			callbackResponse.AuthCode = OrderTradeInfo["auth_code"].(string)
 		}
 
+		if OrderTradeInfo["acc_trade_no"] != nil {
+			//账户端交易订单号
+			callbackResponse.TransactionID = OrderTradeInfo["acc_trade_no"].(string)
+		}
+
+		if OrderTradeInfo["trade_no"] != nil {
+			//交易流水号
+			callbackResponse.TradeNo = OrderTradeInfo["trade_no"].(string)
+		}
+
 		attachMap := make(map[string]interface{}, 0)
 		_ = json.Unmarshal([]byte(attach), &attachMap)
 		if attachMap["store_sn"].(string) == "" {
@@ -252,7 +262,7 @@ func ScanNotice(input *models.ScanNoticeInput) (*base.ResponseDataWxNotice, erro
 		//callbackResponse.OutTradeNo = input.OutTradeNo
 		//callbackResponse.TransactionID = input.TransactionId
 		callbackResponse.OutTradeNo = input.OutTradeNo //交易凭据单号 todo ?
-		callbackResponse.TransactionID = input.OutTradeNo //交易凭据单号 todo ? strconv.Itoa(
+		//callbackResponse.TransactionID = input.OutTradeNo //交易凭据单号 todo ? strconv.Itoa(
 
 		//OrderTradeInfo, _ := input.OrderTradeInfo.(map[string]interface{})
 		//if OrderTradeInfo["auth_code"] != nil {
@@ -260,6 +270,12 @@ func ScanNotice(input *models.ScanNoticeInput) (*base.ResponseDataWxNotice, erro
 		//	callbackResponse.AuthCode = OrderTradeInfo["auth_code"].(string)
 		//}
 
+		//账户端交易订单号
+		callbackResponse.TransactionID = input.AccTradeNo
+
+		//交易流水号
+		callbackResponse.TradeNo = input.TradeNo
+
 		attachMap := make(map[string]interface{}, 0)
 		_ = json.Unmarshal([]byte(attach), &attachMap)
 		if attachMap["store_sn"].(string) == "" {