Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 3530f728388d91b09a62fbd8f82d3a56b1ff265b

Merge remote-tracking branch 'origin/master'

 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java

@@ -79,6 +79,13 @@
    @ResponseBody
    @RequestMapping("/base/competition/listAllPayment")
    public List<PaymentCompetition> listAllPayment(@RequestBody CompetitionQuery query){
        Integer operatorId1 = query.getOperatorId();
        if (operatorId1!=null){
            // 赛事集合id
            List<Integer> operatorId = cttService.list(new QueryWrapper<Competition>()
                    .eq("operatorId", operatorId1)).stream().map(Competition::getId).collect(Collectors.toList());
            query.setUserIds(operatorId);
        }
        List<PaymentCompetition> paymentCompetitions = paymentCompetitionService.listAll(query);
        List<PaymentCompetition> result = new ArrayList<>();
        if (query.getOperatorId()!=null){

 cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml

@@ -64,7 +64,7 @@
            and t1.amount &lt;= #{query.amount}
        </if>
        <if test="query.userIds != null and query.userIds.size()>0">
            AND t1.appUserId IN
            AND t1.competitionId IN
            <foreach collection="query.userIds" separator="," item="id" open="(" close=")">
                #{id}
            </foreach>

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java

@@ -192,6 +192,11 @@
                incomeVOS.add(temp);
            }
        }
        // query权限设置 获取运营商下的门店集合

        if (roleType==2){
            competitionQuery.setOperatorId(UserExt.getUser().getObjectId());
        }
        // 报名活动
        List<PaymentCompetition> competitions = competitionClient.listAllPayment(competitionQuery);
        for (PaymentCompetition competition : competitions) {
@@ -860,7 +865,7 @@
    @RequestMapping(value = "/courseYys")
    @ResponseBody
    public Object courseYys(Integer id) {
        List<Integer> userPt = appUserClient.getUserPt(Arrays.asList(id));
        List<Integer> userPt = appUserClient.getUserYYs(id);
        HashMap<String, Object> map = coursePackagePaymentClient.coursePt(userPt);
        return map;
    }