Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2023-12-08 f88cfa02e36752e4acad7adc4b045155e8e50f21

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

@@ -546,6 +546,7 @@
            tAppUser.setPassword(Md5Util.MD5Encode("111111", null));
            tAppUser.setIsVip(0);
            tAppUser.setState(1);
            tAppUser.setInsertTime(new Date());
            this.baseMapper.insert(tAppUser);
        }
        if (tAppUser.getState() == 2) {
@@ -1472,6 +1473,7 @@
                    }
                }
                pointsMerchandise.setCode(code);
                pointsMerchandise.setInsertTime(new Date());
                returnId = mcClient.saveDetailsUserPointMercase(pointsMerchandise);
            }

@@ -1514,6 +1516,7 @@
                                    packagePayment.setStatus(1);
                                    packagePayment.setState(1);
                                    packagePayment.setCode(code);
                                    packagePayment.setInsertTime(new Date());
//                                    paymentClient.savePaymentCoursePackage(packagePayment);

                                    OrderDto orderDto = new OrderDto();
@@ -1533,6 +1536,7 @@
                                    coupon.setCouponId(exchangeType.getGoodId());
                                    coupon.setUserId(userIdFormRedis);
                                    coupon.setStatus(1);
                                    coupon.setInsertTime(new Date());
                                    ucponClient.insertToAppuserCoupon(coupon);
                                }
                                break;
@@ -1692,9 +1696,6 @@
    /**
     * 优惠券支付宝支付
     *
     * @param uid
     * @param paymentPrice
     * @param paymentCourseVo
     * @return
     * @throws Exception
     */
@@ -1829,7 +1830,6 @@
    }

    private ResultUtil AlipayPayment(BigDecimal cash, String code, Long returnId) {
        System.out.println("金额：" + cash);
        ResultUtil alipay = payMoneyUtil.alipay("优惠卷", "优惠卷", String.valueOf(returnId), code, cash.toString(),
                "/base/pointMer/exchangeGoodPaymentAliCallback");
        if (alipay.getCode() == 200) {
@@ -1944,7 +1944,8 @@

        List<UserPointsMerchandise> userPointsMerchandises = merChandiseClient.queryUserPointMerchaseByCode(outNum);
//        PaymentCompetition code = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", outNum));
        Integer storeId = userPointsMerchandises.get(0).getStoreId();
        if(userPointsMerchandises.size() > 0){
            Integer storeId = userPointsMerchandises.get(0).getStoreId();

//        Competition byId1 = competitionService.getById(code.getCompetitionId());

@@ -1952,7 +1953,7 @@
//        TCoursePackage byId = coursePackageService.getById(one.getCoursePackageId());


        OperatorUser operatorUser = storeClient.queryByStoreId(storeId);
            OperatorUser operatorUser = storeClient.queryByStoreId(storeId);


//        Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
@@ -1964,26 +1965,28 @@
//        OperatorUser operatorUser = siteClient.queryOperator(stores);


        OpenApiRoyaltyDetailInfoPojo op = new OpenApiRoyaltyDetailInfoPojo();
        op.setTransOutType("loginName");
        op.setTransOut("happysports@weparklife.com");
        op.setTransInType("userId");
        op.setTransIn(operatorUser.getAlipayNum());
        op.setAmountPercentage(Long.valueOf(operatorUser.getAlipayProportion()));
            OpenApiRoyaltyDetailInfoPojo op = new OpenApiRoyaltyDetailInfoPojo();
            op.setTransOutType("loginName");
            op.setTransOut("happysports@weparklife.com");
            op.setTransInType("userId");
            op.setTransIn(operatorUser.getAlipayNum());
            op.setAmountPercentage(Long.valueOf(operatorUser.getAlipayProportion()));

        List<OpenApiRoyaltyDetailInfoPojo> ops = new ArrayList<>();
        ops.add(op);
        model.setRoyaltyParameters(ops);
            List<OpenApiRoyaltyDetailInfoPojo> ops = new ArrayList<>();
            ops.add(op);
            model.setRoyaltyParameters(ops);

        request.setBizModel(model);
            request.setBizModel(model);


        AlipayTradeOrderSettleResponse response1 = alipayClient.execute(request);
        if (response1.isSuccess()) {
            System.out.println("调用成功");
        } else {
            System.out.println("调用失败");
            AlipayTradeOrderSettleResponse response1 = alipayClient.execute(request);
            if (response1.isSuccess()) {
                System.out.println("调用成功");
            } else {
                System.out.println("调用失败");
            }
        }

    }


@@ -2077,6 +2080,7 @@
                        coupon.setCouponId(userPointsMerchandises.get(0).getPointsMerchandiseId());
                        coupon.setUserId(userPointsMerchandises.get(0).getUserId());
                        coupon.setStatus(1);
                        coupon.setInsertTime(new Date());
                        ucponClient.insertToAppuserCoupon(coupon);
                        break;
                    default:
@@ -2107,6 +2111,7 @@
                    coupon.setCouponId(userPointsMerchandises.get(0).getPointsMerchandiseId());
                    coupon.setUserId(userPointsMerchandises.get(0).getUserId());
                    coupon.setStatus(1);
                    coupon.setInsertTime(new Date());
                    ucponClient.insertToAppuserCoupon(coupon);
                    break;
                default: