bug修改

无关风月

1 天以前 1b82ac44dc55da55b06f778020413896bd9056cd

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

@@ -54,6 +54,7 @@
import com.dsh.account.vo.entity.MonthData;
import com.dsh.account.vo.entity.WeekData;
import com.dsh.account.vo.entity.YearData;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
@@ -770,7 +771,7 @@
        benefirVo.setUserName(appUser.getName());
        benefirVo.setWpCoin(ToolUtil.isEmpty(appUser.getPlayPaiCoins()) ? 0 : appUser.getPlayPaiCoins());
        benefirVo.setUserIntegral(ToolUtil.isEmpty(appUser.getIntegral()) ? 0 : appUser.getIntegral());
        if (appUser.getIsVip() == 1) {
        if (appUser.getIsVip()!=null&& appUser.getIsVip() == 1) {
            benefirVo.setIsMember("年度会员");
        } else {
            benefirVo.setIsMember("普通用户");
@@ -1527,6 +1528,23 @@
                pointsMerchandise.setPaymentTime(new Date());
            }
            returnId = mcClient.saveDetailsUserPointMercase(pointsMerchandise);
            if(goodsNums>0){
                System.err.println("购买商品数量"+goodsNums);
                List<UserPointsMerchandise> userPointsMerchandises = new ArrayList<>();
                for (int i = 1; i < goodsNums; i++) {
                    UserPointsMerchandise userPointsMerchandise = new UserPointsMerchandise();
                    BeanUtils.copyProperties(pointsMerchandise, userPointsMerchandise);
                    userPointsMerchandises.add(userPointsMerchandise);
                }
                System.err.println("新增额外购买记录"+userPointsMerchandises);
                Boolean b = mcClient.saveDetailsUserPointMercaseList(userPointsMerchandises);
                if (b){
                    System.err.println("多条商品新增成功");
                }else{
                    System.err.println("多条商品新增失败");
                }

            }
            if ((m * goodsNums) == 0 && pointsMerchandise.getPayStatus() == 2) {
                returnModel.setReturnId(returnId);
                return ResultUtil.success(returnModel);
@@ -2029,96 +2047,7 @@
        return alipay;
    }

    public void moneyOut(String outNum, String tradeNo) throws AlipayApiException {


        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
        AlipayTradeOrderSettleRequest request = new AlipayTradeOrderSettleRequest();
        AlipayTradeOrderSettleModel model = new AlipayTradeOrderSettleModel();
        model.setOutRequestNo(outNum);
        model.setTradeNo(tradeNo);
        List<RoyaltyDetailInfos> royaltyDetailInfos = new ArrayList<>();
//

        AlipayTradeRoyaltyRelationBindRequest request1 = new AlipayTradeRoyaltyRelationBindRequest();


        request1.setBizContent("{" +
                "  \"receiver_list\":[" +
                "    {" +
                "      \"type\":\"loginName\"," +
                "      \"account\":\"19522115070\"," +
                "      \"name\":\"罗易胜\"," +
                "      \"memo\":\"分账给测试商户\"," +
                "    }" +
                "  ]," +
                "  \"out_request_no\":\"" + tradeNo + "\"" +
                "}");
        AlipayTradeRoyaltyRelationBindResponse response = alipayClient.execute(request1);
        if (response.isSuccess()) {
            System.out.println("绑定调用成功");
        } else {
            System.out.println("调用失败");
        }


//        RoyaltyDetailInfos royaltyDetailInfos1 = new RoyaltyDetailInfos();
//        royaltyDetailInfos1.setTransOutType("loginName");
//        royaltyDetailInfos1.setTransOut("happysports@weparklife.com");
//        royaltyDetailInfos1.setTransInType("loginName");
//        royaltyDetailInfos1.setTransIn("19522115070");
////        royaltyDetailInfos1.setAmount("0.01");
//        royaltyDetailInfos1.setAmountPercentage("100");

//        royaltyDetailInfos.add(royaltyDetailInfos1);


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

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


//        TCoursePackage byId = coursePackageService.getById(one.getCoursePackageId());


            OperatorUser operatorUser = storeClient.queryByStoreId(storeId);


//        Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
//        Integer siteBookings = siteClient.queryByCode(outTradeNo);
//        List<Integer> stores = new ArrayList<>();
//        stores.add(coursePackagePayments);
//        stores.add(paymentCompetitions);
//        stores.add(siteBookings);
//        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()));

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

            request.setBizModel(model);


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

    }


    private ResultUtil WechatPayment(Integer type, BigDecimal cash, String code, Integer id) throws Exception {
@@ -2209,42 +2138,47 @@
    @Override
    public ResultUtil exchangeAddPaymentCallback(String code, String orderNumber) throws AlipayApiException {
        System.err.println("进入回调" + code);
        UserPointsMerchandise userPointsMerchandise = mcClient.queryUserPointMerchaseByCode(code).get(0);
        System.err.println("商品" + userPointsMerchandise);
        if (userPointsMerchandise.getPayStatus() == 2) {
            return ResultUtil.success();
        }
        List<UserPointsMerchandise> userPointsMerchandises = mcClient.queryUserPointMerchaseByCode(code);
        for (UserPointsMerchandise userPointsMerchandise : userPointsMerchandises) {
            System.err.println("商品" + userPointsMerchandise);
            if (userPointsMerchandise.getPayStatus() == 2) {
                return ResultUtil.success();
            }

        userPointsMerchandise.setOrderNumber(orderNumber);
        userPointsMerchandise.setPayStatus(2);
        userPointsMerchandise.setPaymentTime(new Date());
        mcClient.updateDetailsUserPointMercase(userPointsMerchandise);
            userPointsMerchandise.setOrderNumber(orderNumber);
            userPointsMerchandise.setPayStatus(2);
            userPointsMerchandise.setPaymentTime(new Date());
            mcClient.updateDetailsUserPointMercase(userPointsMerchandise);

        TAppUser tAppUser = baseMapper.selectById(userPointsMerchandise.getUserId());
        dealAppUserIntegral(userPointsMerchandise.getUserId(), tAppUser, userPointsMerchandise.getIntegral());
            TAppUser tAppUser = baseMapper.selectById(userPointsMerchandise.getUserId());
            dealAppUserIntegral(userPointsMerchandise.getUserId(), tAppUser, userPointsMerchandise.getIntegral());

        Integer pointsMerchandiseId = userPointsMerchandise.getPointsMerchandiseId();
        PointsMerchandise pointsMerchandise = mcClient.selectPointsMerchandiseById(pointsMerchandiseId);
        if (pointsMerchandise.getType() == 2) {
            //课程
            CoursePackageOrder coursePackageOrder1 = paymentClient.getCoursePackageOrderByCode(code);
            if (null != coursePackageOrder1) {
                coursePackageOrder1.setPayStatus(2);
                coursePackageOrder1.setOrderNumber(orderNumber);
                coursePackageOrder1.setAppUserId(null);
                paymentClient.updateCoursePackageOrder(coursePackageOrder1);
            Integer pointsMerchandiseId = userPointsMerchandise.getPointsMerchandiseId();
            PointsMerchandise pointsMerchandise = mcClient.selectPointsMerchandiseById(pointsMerchandiseId);
            if (pointsMerchandise.getType() == 2) {
                //课程
                CoursePackageOrder coursePackageOrder1 = paymentClient.getCoursePackageOrderByCode(code);
                if (null != coursePackageOrder1) {
                    coursePackageOrder1.setPayStatus(2);
                    coursePackageOrder1.setOrderNumber(orderNumber);
                    coursePackageOrder1.setAppUserId(null);
                    paymentClient.updateCoursePackageOrder(coursePackageOrder1);

                GetCoursePackagePaymentConfig getCoursePackagePaymentConfig = new GetCoursePackagePaymentConfig();
                getCoursePackagePaymentConfig.setCoursePackageId(coursePackageOrder1.getCoursePackageId());
                getCoursePackagePaymentConfig.setClassHours(coursePackageOrder1.getClassHours());
                CoursePackagePaymentConfig coursePackagePaymentConfig = paymentClient.getCoursePackagePaymentConfig(getCoursePackagePaymentConfig);
                    GetCoursePackagePaymentConfig getCoursePackagePaymentConfig = new GetCoursePackagePaymentConfig();
                    getCoursePackagePaymentConfig.setCoursePackageId(coursePackageOrder1.getCoursePackageId());
                    getCoursePackagePaymentConfig.setClassHours(coursePackageOrder1.getClassHours());
                    CoursePackagePaymentConfig coursePackagePaymentConfig = paymentClient.getCoursePackagePaymentConfig(getCoursePackagePaymentConfig);

                AddCoursePackageOrderStudent addCoursePackageOrderStudent = new AddCoursePackageOrderStudent();
                addCoursePackageOrderStudent.setCoursePackageOrderId(coursePackageOrder1.getId());
                addCoursePackageOrderStudent.setCoursePackagePaymentConfig(coursePackagePaymentConfig);
                paymentClient.addCoursePackageOrderStudent(addCoursePackageOrderStudent);
                    AddCoursePackageOrderStudent addCoursePackageOrderStudent = new AddCoursePackageOrderStudent();
                    addCoursePackageOrderStudent.setCoursePackageOrderId(coursePackageOrder1.getId());
                    addCoursePackageOrderStudent.setCoursePackagePaymentConfig(coursePackagePaymentConfig);
                    paymentClient.addCoursePackageOrderStudent(addCoursePackageOrderStudent);
                }
            }
        }
        UserPointsMerchandise userPointsMerchandise = userPointsMerchandises.get(0);
        Integer pointsMerchandiseId = userPointsMerchandise.getPointsMerchandiseId();
        PointsMerchandise pointsMerchandise = mcClient.selectPointsMerchandiseById(pointsMerchandiseId);
        List<Integer> integers = mcsClient.queryPointMerStoreIds(pointsMerchandise.getId());
        Store store1 = storeClient.queryStoreById(integers.get(0));
        if (store1.getOperatorId() != null && store1.getOperatorId() != 0) {