保证金

internal/logic/order/deposit.go

@@ -140,6 +140,8 @@ func SaveDepositPayment(ctx context.Context, sDepositPayment model.SDepositPayme
 				"flow_money":       YuanToFen(sDepositPayment.FlowMoney),
 				"bank_name":        sDepositPayment.BankName,
 				"bank_flow":        sDepositPayment.BankFlow,
+				"pay_code":         sDepositPayment.PayCode,
+				"transaction_id":   sDepositPayment.TransactionId,
 				"pay_voucher":      sDepositPayment.PayVoucher,
 				"pay_account_name": sDepositPayment.PayAccountName,
 				"create_time":      time.Now().Format(time.DateTime),
@@ -224,15 +226,15 @@ func SaveDepositPayment(ctx context.Context, sDepositPayment model.SDepositPayme
 
 // todo 保证金支付款-退还/转回款
 func DepositRefundOrRetMoney(ctx context.Context, sDeposit model.SDeposit) error {
-	//保证金信息  未删除
-	deposits, err := g.DB().GetOne(ctx, fmt.Sprintf(`SELECT  * FROM  %s od WHERE  od.order_code  = ? AND  od.pay_money > 0 AND od.is_del = 0  ORDER BY  od.operate_time DESC ;`, model.DepositPaymentTable), sDeposit.OrderCode)
+	//保证金支付信息  未删除
+	depositPayment, err := g.DB().GetOne(ctx, fmt.Sprintf(`SELECT  * FROM  %s od WHERE  od.order_code  = ? AND  od.pay_money > 0 AND od.is_del = 0  ORDER BY  od.operate_time DESC ;`, model.DepositPaymentTable), sDeposit.OrderCode)
 	if err != nil {
 		return err
 	}
-	if deposits.IsEmpty() {
+	if depositPayment.IsEmpty() {
 		return fmt.Errorf("未查到当前订单 有效的保证金信息")
 	}
-	payMoney := FenToYuanInt64(gconv.Int64(deposits.Map()["pay_money"]))
+	payMoney := FenToYuanInt64(gconv.Int64(depositPayment.Map()["pay_money"]))
 	if payMoney != sDeposit.RefundMoney+sDeposit.ReturnedMoney {
 		return fmt.Errorf("保证金金额异常")
 	}
@@ -256,19 +258,20 @@ func DepositRefundOrRetMoney(ctx context.Context, sDeposit model.SDeposit) error
 			return err
 		}
 		var (
-			orderId        = record.Map()["id"]                               //订单id
-			payWay         = deposits.Map()["pay_way"]                        //支付方式
-			bankFlow       = gconv.String(deposits.Map()["bank_flow"])        //银行流水号
-			bankName       = gconv.String(deposits.Map()["bank_name"])        //银行名称
-			payVoucher     = gconv.String(deposits.Map()["pay_voucher"])      //支付凭证
-			payTime        = gconv.String(deposits.Map()["pay_time"])         //支付时间
-			payAccountName = gconv.String(deposits.Map()["pay_account_name"]) //支付户名
-			transactionId  = gconv.Int(deposits.Map()["transaction_id"])      //支付单号
+			orderId        = record.Map()["id"]                                     //订单id
+			payWay         = gconv.Int(depositPayment.Map()["pay_way"])             //支付方式，1-微信 2-支付宝 3-对公转账
+			bankFlow       = gconv.String(depositPayment.Map()["bank_flow"])        //对公转账 银行流水号，手动录入
+			bankName       = gconv.String(depositPayment.Map()["bank_name"])        //银行名称
+			payVoucher     = gconv.String(depositPayment.Map()["pay_voucher"])      //支付凭证
+			payTime        = gconv.String(depositPayment.Map()["pay_time"])         //支付时间
+			payAccountName = gconv.String(depositPayment.Map()["pay_account_name"]) //支付户名
+			payCode        = gconv.String(depositPayment.Map()["pay_code"])         //支付宝、微信、第三方平台 支付单号
+			transactionId  = gconv.Int(depositPayment.Map()["transaction_id"])      //对公转账银行流水号 cbs 自动录入
 		)
 		var param = model.OrdersEditBatchReturn{
-			ReturnType:    1,
-			FlowType:      0,
-			ReturnCode:    "",
+			ReturnType:    payWay,
+			FlowType:      0, //保证金转回款，即使保证金是CBS回款，转回款不走CBS逻辑
+			ReturnCode:    payCode,
 			TransactionId: transactionId,
 			OrderArr: []g.Map{
 				{

internal/model/deposit.go

@@ -19,12 +19,13 @@ type SDeposit struct {
 // 保证金支付信息
 type SDepositPayment struct {
 	PayWay         int            `json:"pay_way"`          //支付方式，1-微信 2-支付宝 3-对公转账
-	FlowType       int            `json:"flow_type"`        //流水方式 0cds回款  1手动录入
-	TransactionId  int            `json:"transaction_id"`   //对公转账银行流水号？ todo
-	BankFlow       string         `json:"bank_flow"`        //银行流水号
+	FlowType       int            `json:"flow_type"`        //流水方式 0:cbs回款  1:手动录入
+	TransactionId  int            `json:"transaction_id"`   //对公转账银行流水号 cbs 自动录入
+	BankFlow       string         `json:"bank_flow"`        //对公转账 银行流水号，手动录入
+	PayCode        string         `json:"pay_code"`         //支付宝、微信、第三方平台 支付单号
 	PayAccountName string         `json:"pay_account_name"` //支付户名
 	BankName       string         `json:"bank_name"`        //银行
-	PayTime        string         `json:"pay_time"`         //支付时间
+	PayTime        string         `json:"pay_time"`         //回款时间
 	FlowMoney      int64          `json:"flow_money"`       //银行流水  总金额
 	PayVoucher     string         `json:"pay_voucher"`      //支付凭证
 	Remark         string         `json:"remark"`           //支付说明和备注
@@ -33,6 +34,6 @@ type SDepositPayment struct {
 
 // 关联订单回款明细
 type SDepositList struct {
-	OrderCode string `json:"order_code"` //订单
+	OrderCode string `json:"order_code"` //订单编号
 	Money     int64  `json:"money"`      //金额
 }

internal/model/orderParams.go

@@ -99,18 +99,18 @@ type (
 	}
 
 	OrdersEditBatchReturn struct { //回款
-		ReturnType       int                      `json:"returnType"`
-		FlowType         int                      `json:"flowType"`
-		ReturnCode       string                   `json:"returnCode"`
-		TransactionId    int                      `json:"transactionId"`
-		OrderArr         []map[string]interface{} `json:"orderArr"`
-		ReturnVoucherUrl string                   `json:"returnVoucherUrl"`
-		ReturnRemarks    string                   `json:"returnRemarks"`
-		ReturnMoney      int                      `json:"returnMoney"`
-		PayAccountName   string                   `json:"payAccountName"`
-		BNKTIM           string                   `json:"BNKTIM"`
-		BNKFLW           string                   `json:"BNKFLW"`
-		BNKNAM           string                   `json:"BNKNAM"`
+		ReturnType       int                      `json:"returnType"`       //回款方式1微信2阿里 3对公转账
+		FlowType         int                      `json:"flowType"`         //是否CBS流水回款回款0是非0不是
+		ReturnCode       string                   `json:"returnCode"`       //支付宝，微信，第三方平台回款单号
+		TransactionId    int                      `json:"transactionId"`    //对公转账流水单号id
+		OrderArr         []map[string]interface{} `json:"orderArr"`         //订单信息 id：money
+		ReturnVoucherUrl string                   `json:"returnVoucherUrl"` //回款凭证地址
+		ReturnRemarks    string                   `json:"returnRemarks"`    //回款说明/备注
+		ReturnMoney      int                      `json:"returnMoney"`      //回款流水金额
+		PayAccountName   string                   `json:"payAccountName"`   //支付户名
+		BNKTIM           string                   `json:"BNKTIM"`           //回款时间
+		BNKFLW           string                   `json:"BNKFLW"`           //银行流水号
+		BNKNAM           string                   `json:"BNKNAM"`           //银行名称
 	}
 	OrdersDeleteReturn struct { //回款
 		Id int `p:"username"  v:"required"`