11.27,9

44323

2023-12-23 aa2c6d722ed799290285b6365f011aaa74373d73

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java

@@ -1369,7 +1369,7 @@
                return ResultUtil.success(returnId);
            }
            //积分+现金
            if(coupon.getRedemptionMethod() == 1){
            if(coupon.getRedemptionMethod() == 2){
                userCouponPaymentClient.addUserCouponPayment(userCouponPayment);
                try {
                    if(exchangeType.getPayType() == 1){
@@ -1744,6 +1744,11 @@
                                    //有待支付的订单，这里不处理
                                    userCouponPayment1.setStatus(-1);
                                    userCouponPaymentClient.updateUserCouponPayment(userCouponPayment1);
                                    if ("TRADE_FINISHED".equals(s)) {
                                        // todo 资金结算
                                        payMoneyUtil.confirm(code,tradeNo,cash.toString());
                                        break;
                                    }
                                    break;
                                }
                                if ("TRADE_SUCCESS".equals(s)) {
@@ -1767,6 +1772,7 @@
                                    }
                                    break;
                                }

                                if ("WAIT_BUYER_PAY".equals(s)) {
                                    num++;
                                }
@@ -1886,6 +1892,11 @@
                                    moneyOut(tradeNo, tradeNo);
                                    break;
                                }
                                if ("TRADE_FINISHED".equals(tradeStatus)) {
                                    // todo 资金结算
                                    payMoneyUtil.confirm(code,tradeNo,cash.toString());
                                    break;
                                }
//                                if("REFUND".equals(tradeStatus) || "NOTPAY".equals(tradeStatus) || "CLOSED".equals(tradeStatus) || "REVOKED".equals(tradeStatus) || "PAYERROR".equals(tradeStatus) || num == 10){
//                                    mcClient.deletePaymentRecord(code);
//                                    break;