Browse Source

修改订单

wangshan 6 days ago
parent
commit
d9bd112c4c
2 changed files with 12 additions and 2 deletions
  1. 8 0
      internal/controller/orderHandler.go
  2. 4 2
      internal/logic/order/deposit.go

+ 8 - 0
internal/controller/orderHandler.go

@@ -451,6 +451,14 @@ func UpdateOrderHandler(r *ghttp.Request) {
 			if err := order.SaveOrUpdateReturnPlant(ctx, param.OrderCode, param.ContractMoney, param.ReturnPlant); err != nil {
 				return gerror.Wrapf(err, "回款计划异常")
 			}
+			//todo 保证金  param.DepositPaymentAccount, param.DepositAmount
+			if err := order.EditDeposit(ctx, model.SDeposit{
+				OrderCode:             param.OrderCode,
+				DepositAmount:         param.DepositAmount,
+				DepositPaymentAccount: param.DepositPaymentAccount,
+			}); err != nil {
+				return gerror.Wrapf(err, "保证金异常")
+			}
 			if len(delDetailIds) > 0 { //存在删除的订单
 				g.DB().Ctx(ctx).Update(ctx, "dataexport_order", map[string]interface{}{
 					"status":             -1,

+ 4 - 2
internal/logic/order/deposit.go

@@ -423,7 +423,8 @@ func FindDepositDetailByOrderCode(ctx context.Context, orderCode string) (res ma
 		result = record.Map()
 		overviewMap["payMoney"] = gconv.Int64(result["pay_money"]) //已支付金额
 		payWayStr := "第三方支付"
-		payWay := gconv.Int(result["pay_way"]) //支付方式,1-微信 2-支付宝 3-对公转账
+		payWay := gconv.Int(result["pay_way"])       //支付方式,1-微信 2-支付宝 3-对公转账
+		bankFlow := gconv.String(result["pay_code"]) //支付单号/银行流水号
 		switch payWay {
 		case 1:
 			payWayStr = "微信"
@@ -431,6 +432,7 @@ func FindDepositDetailByOrderCode(ctx context.Context, orderCode string) (res ma
 			payWayStr = "支付宝"
 		case 3:
 			payWayStr = "对公转账"
+			bankFlow = gconv.String(result["bank_flow"]) //支付单号/银行流水号
 		}
 		res["payment"] = map[string]interface{}{
 			"payTime":         gconv.String(result["pay_time"]),         //保证金支付时间
@@ -438,7 +440,7 @@ func FindDepositDetailByOrderCode(ctx context.Context, orderCode string) (res ma
 			"payWay":          payWayStr,                                //支付方式
 			"proceduresMoney": gconv.Int64(result["procedures_money"]),  //手续费
 			"bankName":        gconv.String(result["bank_name"]),        //银行
-			"bankFlow":        gconv.String(result["bank_flow"]),        //银行流水号
+			"bankFlow":        bankFlow,                                 //支付单号/银行流水号
 			"payAccountName":  gconv.String(result["pay_account_name"]), //支付户名
 			"flowMoney":       gconv.Int64(result["flow_money"]),        //流水金额
 			"payVoucher":      gconv.String(result["pay_voucher"]),      //支付凭证