重写课包支付和排课逻辑

puzhibing

2023-11-25 53e7558400dcacecdce70e39ebfe1727740f9296

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

@@ -176,7 +176,19 @@
    private String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAouYvZ1v4RiydwNOnGcU0Hb4hQu0x6XUooaE2Bi6/atNOobtFdunnATGP6OMOW7yF9DpP8qH5mbFXAiaQD721y/7qlayI50UcV4mngRU4ZcaAVE3bp721Eg2H85RISa+Tb1CiOh+pc9p4l5UBseKsvB2ruHHForfZDPI8FL7AVUKBYCQPsa4zL6KAO2C6KULaTg/lCa+bYQKU0n9ca569VtdsqJUyxB9eSZjVd+9nKl62FLqp2NELGj7cXqiVBgDnBnVS5ZUO3mrBM5z/AxQbw3RwE3JqdkhzUA1BFjejAlT2zIGNOjUFagF8ao0wGElYfuk0bum6Hz5qWAt02QdNNwIDAQAB";//支付宝应用公钥

    private String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";//支付宝支付公钥
    @Resource
    private UserConponClient userConponClient;
    @Autowired
    private TAppUserService appUserService;
    @Resource
    private MerChandiseClient merChandiseClient;

    // 对数据进行分页处理的方法
    private static Page<Goods> getPage(List<Goods> dataList, Pageable pageable) {
        int start = (int) pageable.getOffset();
        int end = Math.min((start + pageable.getPageSize()), dataList.size());
        return new PageImpl<>(dataList.subList(start, end), pageable, dataList.size());
    }

    @Override
    public List<QueryAppUserVO> listAll(QueryAppUser query) {
@@ -190,7 +202,6 @@

        return map;
    }


    @Override
    public List<SelectDto> getSelects(List<Integer> studentIds) {
@@ -206,6 +217,7 @@
    public List<TAppUser> queryAPPUserByNameAndPhone(AppUserByNameAndPhoneDTO dto) {
        return appUserMapper.queryAPPUserByNameAndPhone(dto);
    }

    @Override
    public List<YearData> getYearUserCount(UserInfoQueryDTO dto) {
        return appUserMapper.getYearUserCount(dto);
@@ -228,14 +240,17 @@
    public WeekData getWeekUserCount4(UserInfoQueryDTO dto) {
        return appUserMapper.getWeekUserCount4(dto);
    }

    @Override
    public WeekData getWeekUserCount3(UserInfoQueryDTO dto) {
        return appUserMapper.getWeekUserCount3(dto);
    }

    @Override
    public WeekData getWeekUserCount2(UserInfoQueryDTO dto) {
        return appUserMapper.getWeekUserCount2(dto);
    }

    @Override
    public WeekData getWeekUserCount1(UserInfoQueryDTO dto) {
        return appUserMapper.getWeekUserCount1(dto);
@@ -262,14 +277,11 @@
    public List<GroupCityInfoVO> groupCityInfo(UserInfoQueryDTO dto) {
        return appUserMapper.groupCityInfo(dto);
    }

    @Override
    public ClassInfoVo queryUserOfStus(Integer id,Integer uid) {
        TAppUser tAppUser = this.baseMapper.selectById(uid);
        ClassInfoVo classInfoVo = new ClassInfoVo();
//        if (ToolUtil.isNotEmpty(tAppUser)){

//

        List<TStudent> tStudents = new ArrayList<>();
        if (id!=null) {
             tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
@@ -308,9 +320,7 @@
                }
                List<RegisteredCourse> courseList = new ArrayList<>();
                List<StuCourseResp> stuCoursePayment = paymentClient.getStuCoursePayment(tStudent.getId());
                List<Integer> coursePackIds = new ArrayList<>();
                if (stuCoursePayment.size() > 0){
                    coursePackIds = stuCoursePayment.stream().map(StuCourseResp::getCourseId).collect(Collectors.toList());
                    for (StuCourseResp tCoursePackagePayment : stuCoursePayment) {
                        RegisteredCourse course = new RegisteredCourse();
                        course.setId(tCoursePackagePayment.getId());
@@ -326,7 +336,6 @@
                    }
                }
                classInfoVo.setCourseList(courseList);
//                List<ExerciseVideo> stuCourseOfVideoList = voclClient.getStuCourseOfVideoList(coursePackIds);
                List<ExerciseVideo> query = voclClient.query(tStudent.getId());
                    classInfoVo.setExerciseVideoList(query);

@@ -337,12 +346,12 @@
                    classInfoVo.setImgs(tImgConfigs.get(0).getContent());
                }
            }
//        }
        return classInfoVo;
    }

    /**
     * 处理数据
     *
     * @param storeOfCourses
     * @param longitude
     * @param latitude
@@ -383,9 +392,9 @@
        return courseVenues;
    }


    /**
     * 获取短信验证码
     *
     * @param type 1：登录，2：注册，3：修改密码，4：忘记密码
     * @param phone
     * @return
@@ -412,9 +421,9 @@
        return ResultUtil.success();
    }


    /**
     * 注册用户
     *
     * @return
     * @throws Exception
     */
@@ -489,14 +498,12 @@
            }




        return ResultUtil.success();
    }


    /**
     * 账号密码登录
     *
     * @param phone
     * @param password
     * @return
@@ -519,9 +526,9 @@
        return ResultUtil.success(token);
    }


    /**
     * 验证码登录
     *
     * @return
     * @throws Exception
     */
@@ -548,9 +555,9 @@
        return ResultUtil.success(token);
    }


    /**
     * 微信登录
     *
     * @return
     * @throws Exception
     */
@@ -599,9 +606,9 @@
        return ResultUtil.success(map);
    }


    /**
     * 获取JWT token和存储个人信息
     *
     * @param appUser
     * @return
     */
@@ -614,9 +621,9 @@
        return token;
    }


    /**
     * 修改密码
     *
     * @param phone
     * @param code
     * @param password
@@ -644,7 +651,6 @@
        return ResultUtil.success();
    }


    /**
     * 定时任务修改到期会员的状态
     */
@@ -653,9 +659,9 @@
        this.baseMapper.membershipEnd();
    }


    /**
     * 获取加入玩湃首页数据
     *
     * @param lon
     * @param lat
     * @return
@@ -1107,13 +1113,6 @@
        return goods;
    }

    // 对数据进行分页处理的方法
    private static Page<Goods> getPage(List<Goods> dataList, Pageable pageable) {
        int start = (int) pageable.getOffset();
        int end = Math.min((start + pageable.getPageSize()), dataList.size());
        return new PageImpl<>(dataList.subList(start, end), pageable, dataList.size());
    }

    @Override
    public ProductDetailsVo productDetails(Integer goodId, Integer goodsType ) {
        ProductDetailRequest detailsVo = new ProductDetailRequest();
@@ -1121,6 +1120,7 @@
        detailsVo.setGoodId(goodId);
        return mcClient.getGoodDetailsWithId(detailsVo);
    }

    @Override
    public ProductDetailsVo goodsDetailsOne(Integer goodId ) {
        return mcClient.getGoodDetailsWithIdOne(goodId);
@@ -1278,22 +1278,10 @@
        }
    }



        @Resource
        private UserConponClient userConponClient;

@Autowired
private TAppUserService appUserService;




    @Override
    @Transactional
    public synchronized ResultUtil productRedemptionOperation(Integer userIdFormRedis, GoodsExchangeVo exchangeType) {
        System.out.println("exchangeType:--->");



        ReturnModel returnModel = new ReturnModel();
@@ -1353,15 +1341,11 @@
        }




        System.out.println(exchangeType);
        try {
            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
            String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
            PointsMerchandise merchandise = mcClient.selectPointsMerchandiseById(exchangeType.getGoodId());




            if (ToolUtil.isEmpty(merchandise)){
@@ -1412,8 +1396,6 @@
            if (ToolUtil.isNotEmpty(count1) && count1 >= merchandise.getQuantityIssued()){
                return ResultUtil.error("超过发放数量");
            }




            for (int i = 0; i < goodsNums; i++) {
@@ -1669,12 +1651,6 @@
        return alipay;
    }



    @Resource
    private  MerChandiseClient merChandiseClient;


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


@@ -1708,7 +1684,6 @@
        }



//        RoyaltyDetailInfos royaltyDetailInfos1 = new RoyaltyDetailInfos();
//        royaltyDetailInfos1.setTransOutType("loginName");
//        royaltyDetailInfos1.setTransOut("happysports@weparklife.com");
@@ -1730,9 +1705,7 @@
//        TCoursePackage byId = coursePackageService.getById(one.getCoursePackageId());



        OperatorUser operatorUser =  storeClient.queryByStoreId(storeId);



//        Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
@@ -1742,8 +1715,6 @@
//        stores.add(paymentCompetitions);
//        stores.add(siteBookings);
//        OperatorUser operatorUser = siteClient.queryOperator(stores);




        OpenApiRoyaltyDetailInfoPojo op = new OpenApiRoyaltyDetailInfoPojo();
@@ -1948,8 +1919,6 @@
        }
        return courseVenues;
    }




}