bug修改

无关风月

2025-04-11 1d9f7b0cf4251f3058badb07dd7a2bc06b6bc09a

bug修改

 cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java

@@ -100,6 +100,9 @@
                return ResultUtil.tokenErr();
            }
            THuiminCard huiminCard = huiminCardService.getById(id);
            if (huiminCard.getEndTime()!=null && huiminCard.getEndTime().before(new Date())){
                return ResultUtil.error("该惠民卡已过期");
            }
            if (huiminCard.getGrantCount()!=null){
                if (huiminCard.getGrantCount()<=payHuiminService.lambdaQuery().eq(TPayHuimin::getCardId, huiminCard.getId())
                        .eq(TPayHuimin::getStatus,2).count()){
@@ -329,13 +332,10 @@
            List<THuiminCard> list = huiminCardService.list();
            for (MyHuiminCardVO myHuiminCardVO : cardList) {
                TPayHuimin byId = payHuiminService.getById(myHuiminCardVO.getId());
                myHuiminCardVO.setEndTime(byId.getEndTime());

                myHuiminCardVO.setSalesMoney(byId.getSalesMoney());
                if (myHuiminCardVO.getEndTime().before(new Date())){
                    // 已过期
                    myHuiminCardVO.setIsExpire(1);
                }else{
                    myHuiminCardVO.setIsExpire(0);
                }

                int count = huiminRecordService.count(new LambdaQueryWrapper<THuiminRecord>()
                        .eq(THuiminRecord::getHuiminCardId, myHuiminCardVO.getCardId()));
                // 购卡7日内没有使用记录可退款。超过7日不管有没有使用记录都不能退款
@@ -351,6 +351,15 @@
                if (null!=huiminCard){
                    myHuiminCardVO.setCover(huiminCard.getBuyCover());
                }
                if (myHuiminCardVO.getEndTime().before(new Date())){
                    // 已过期
                    myHuiminCardVO.setIsExpire(1);
                    if (null!=huiminCard){
                        myHuiminCardVO.setCover(huiminCard.getUnBuyCover());
                    }
                }else{
                    myHuiminCardVO.setIsExpire(0);
                }
                // 查询绑定人员列表
                List<TStudent> studentByIds = studentClient.getStudentByIds(myHuiminCardVO.getStudentId());
                myHuiminCardVO.setStudentList(studentByIds);

 cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml

@@ -8,7 +8,7 @@
        where
            find_in_set(#{storeId},t1.storeIds)

          and t1.endTime >= now()

        and t1.status = 1
            order by t1.sort desc
            limit #{pageNo}, #{pageSize}
@@ -19,7 +19,7 @@
        where
            find_in_set(#{storeId},t1.storeIds)

          and t1.endTime >= now()

        and t1.status = 1
            order by t1.sort desc
    </select>