修改bug

puzhibing

2023-12-08 a1e80d905fd38f6ead484396b788fe19b0a3d7d5

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

@@ -1046,6 +1046,7 @@
                goods.add(commodity);
            }
        }

        List<Coupon> allCoupons = ucponClient.getAllCoupons(commodityRequest);
        if (allCoupons.size() > 0) {
            for (Coupon allCoupon : allCoupons) {
@@ -1333,7 +1334,7 @@
            userCouponPayment.setCode(code);
            userCouponPayment.setPayType(coupon.getRedemptionMethod());
            userCouponPayment.setIntegral(coupon.getIntegral().intValue());
            userCouponPayment.setCash(coupon.getCash().doubleValue());
            userCouponPayment.setCash(null == coupon.getCash() ? 0D : coupon.getCash().doubleValue());
            userCouponPayment.setCashPayType(exchangeType.getPayType());
            userCouponPayment.setInsertTime(new Date());

@@ -1379,7 +1380,20 @@
        try {
            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
            String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
            PointsMerchandise merchandise = mcClient.selectPointsMerchandiseById(exchangeType.getGoodId());
            PointsMerchandise merchandise = new PointsMerchandise();
            if(exchangeType.getGoodsType() != 4){
                merchandise = mcClient.selectPointsMerchandiseById(exchangeType.getGoodId());
            }else{
                Coupon coupon = ucponClient.queryCouponById(exchangeType.getGoodId());
                merchandise.setId(coupon.getId());
                merchandise.setUserPopulation(coupon.getUserPopulation());
                merchandise.setIntegral(coupon.getIntegral().intValue());
                merchandise.setQuantityIssued(coupon.getQuantityIssued());
                merchandise.setPickUpQuantity(coupon.getPickUpQuantity());
                merchandise.setUseScope(coupon.getUseScope());
                merchandise.setCash(coupon.getCash());
                merchandise.setType(4);
            }


            if (ToolUtil.isEmpty(merchandise)) {
@@ -1815,7 +1829,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) {
@@ -1930,7 +1943,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());

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


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


//        Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
@@ -1950,26 +1964,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("调用失败");
            }
        }

    }