Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-03 168d852672f8f671a01d6f0f053349d0d321ec7c

 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){
@@ -1707,11 +1707,12 @@
     * @return
     * @throws Exception
     */
    private String smid = "2088330203191220";//平台支付宝商户号
    public ResultUtil aliPaymentCoupon(String body, UserCouponPayment userCouponPayment) throws Exception {
        String code = userCouponPayment.getCode();
        Double cash = userCouponPayment.getCash();

        ResultUtil alipay = payMoneyUtil.alipay(body, body, "", code, cash.toString(), "/base/coupon/aliPaymentCouponCallback");
        ResultUtil alipay = payMoneyUtil.alipay(smid, body, "",String.valueOf(userCouponPayment.getId()), code, cash.toString(), "/base/coupon/aliPaymentCouponCallback");
        if (alipay.getCode() == 200) {
            new Thread(new Runnable() {
                @Override
@@ -1744,6 +1745,10 @@
                                    //有待支付的订单，这里不处理
                                    userCouponPayment1.setStatus(-1);
                                    userCouponPaymentClient.updateUserCouponPayment(userCouponPayment1);
                                    if ("TRADE_FINISHED".equals(s)) {
                                        // todo 资金结算

                                    }
                                    break;
                                }
                                if ("TRADE_SUCCESS".equals(s)) {
@@ -1751,22 +1756,23 @@
                                    userCouponPayment1.setPaymentTime(new Date());
                                    userCouponPayment1.setOrderNumber(tradeNo);
                                    userCouponPaymentClient.updateUserCouponPayment(userCouponPayment1);

                                    UserCoupon userCoupon = new UserCoupon();
                                    userCoupon.setCouponId(userCouponPayment1.getCouponId());
                                    userCoupon.setUserId(userCouponPayment1.getUserId());
                                    userCoupon.setStatus(1);
                                    userCoupon.setInsertTime(new Date());
                                    userConponClient.insertToAppuserCoupon(userCoupon);

                                    if(null != userCouponPayment1.getIntegral() && 0 != userCouponPayment1.getIntegral()){
                                        //扣积分
                                        TAppUser user = appUserService.getById(userCouponPayment1.getUserId());
                                        user.setIntegral(user.getIntegral() - userCouponPayment1.getIntegral().intValue());
                                        appUserService.updateById(user);
                                    }
                                    payMoneyUtil.confirm(smid,code,tradeNo,cash.toString());
                                    break;

                                }

                                if ("WAIT_BUYER_PAY".equals(s)) {
                                    num++;
                                }
@@ -1838,7 +1844,7 @@
    }

    private ResultUtil AlipayPayment(BigDecimal cash, String code, Long returnId) {
        ResultUtil alipay = payMoneyUtil.alipay("优惠卷", "优惠卷", String.valueOf(returnId), code, cash.toString(),
        ResultUtil alipay = payMoneyUtil.alipay(smid,"优惠卷", "优惠卷", String.valueOf(returnId), code, cash.toString(),
                "/base/pointMer/exchangeGoodPaymentAliCallback");
        if (alipay.getCode() == 200) {
            new Thread(new Runnable() {
@@ -1886,6 +1892,11 @@
                                    moneyOut(tradeNo, tradeNo);
                                    break;
                                }
                                if ("TRADE_FINISHED".equals(tradeStatus)) {
                                    // todo 资金结算
                                    payMoneyUtil.confirm(smid,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;