Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml

pom.xml

@@ -85,32 +85,31 @@
             </properties>
             <activation>
                 <!-- 默认环境 -->
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
         </profile>
         <profile>
             <id>prod</id>
-<!--            <properties>-->
-<!--                <profiles.active>prod</profiles.active>-->
-<!--                <nacos.server>10.32.23.157:8848</nacos.server>-->
-<!--                <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>-->
-<!--                <nacos.config.group>DEFAULT_GROUP</nacos.config.group>-->
-<!--                <nacos.username>nacos</nacos.username>-->
-<!--                <nacos.password>nacos</nacos.password>-->
-<!--                <logstash.address>10.32.23.157:4560</logstash.address>-->
-<!--            </properties>-->
             <properties>
                 <profiles.active>prod</profiles.active>
-                <nacos.server>172.16.137.72:8848</nacos.server>
+                <nacos.server>10.32.23.157:8848</nacos.server>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                 <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                 <nacos.username>nacos</nacos.username>
                 <nacos.password>nacos</nacos.password>
-                <logstash.address>172.16.137.72:4560</logstash.address>
+                <logstash.address>10.32.23.157:4560</logstash.address>
+                <!-- 党校本地环境 -->
+<!--                <profiles.active>prod</profiles.active>-->
+<!--                <nacos.server>172.16.137.72:8848</nacos.server>-->
+<!--                <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>-->
+<!--                <nacos.config.group>DEFAULT_GROUP</nacos.config.group>-->
+<!--                <nacos.username>nacos</nacos.username>-->
+<!--                <nacos.password>nacos</nacos.password>-->
+<!--                <logstash.address>172.16.137.72:4560</logstash.address>-->
             </properties>
             <activation>
                 <!-- 默认环境 -->
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
         </profile>
     </profiles>

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/CardApiController.java

@@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.text.MessageFormat;
 import java.util.Map;
 
@@ -174,6 +175,18 @@ public class CardApiController extends BaseController {
         } else {
             bo.setOperateType(CardOperateEnum.ISSUE);
         }
+        //初始化日消费次数
+        bo.setDayCount(0L);
+        //初始化餐消费次数
+        bo.setMealCount(0L);
+        //初始化日消费金额
+        bo.setDayTotal(BigDecimal.ZERO);
+        //初始化餐消费金额
+        bo.setMealTotal(BigDecimal.ZERO);
+        //新卡设置最后消费餐类为未消费
+        bo.setLastMeal(0L);
+        //新卡的最后消费时间设置为发卡的前一天
+        bo.setLastPay(DateUtil.offsetDay(DateUtil.date(), -1));
         bo.setStatus(CardStatusEnum.NORMAL.code().toString());
         bo.setStationNumb(ObjUtil.isNotEmpty(initParam.get("workStationNumb")) ? Long.parseLong(initParam.get("workStationNumb").toString()) : 0);
         bo.setTenantId(ObjUtil.isNotEmpty(initParam.get("tenantId")) ? initParam.get("tenantId").toString() : defaultTenantId);

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/domain/bo/PtCardBo.java

@@ -8,6 +8,7 @@ import org.dromara.backstage.cardCenter.domain.PtCard;
 import org.dromara.common.core.enums.CardOperateEnum;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -72,7 +73,7 @@ public class PtCardBo extends BaseEntity {
     /**
      * 当日消费金额
      */
-    private Long dayTotal;
+    private BigDecimal dayTotal;
 
     /**
      * 当日消费次数
@@ -82,7 +83,7 @@ public class PtCardBo extends BaseEntity {
     /**
      * 当餐交易金额
      */
-    private Long mealTotal;
+    private BigDecimal mealTotal;
 
     /**
      * 当餐消费次数

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/service/impl/PtCardServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.esotericsoftware.minlog.Log;
 import lombok.RequiredArgsConstructor;
 import org.dromara.backstage.basics.domain.vo.PtCardtypeVo;
 import org.dromara.backstage.basics.service.IPtCardtypeService;
@@ -308,15 +309,6 @@ public class PtCardServiceImpl implements IPtCardService {
      */
     @Override
     public PtCardVo queryMainCardByUserId(Long userId) {
-        PtCardVo vo;
-        List<PtCardVo> redisList = RedisUtils.getCacheList(CacheNames.PT_USER_CARD);
-        if (ObjUtil.isNotNull(redisList) && !redisList.isEmpty()) {
-            vo = redisList.stream().filter(p -> Objects.equals(p.getUserId(), userId)
-                && Objects.equals(p.getMainCard(), "Y") && Objects.equals(p.getStatus(), "1")).findFirst().orElse(null);
-            if (ObjUtil.isNotNull(vo)) {
-                return vo;
-            }
-        }
         PtCardBo bo = new PtCardBo();
         bo.setUserId(userId);
         bo.setMainCard("Y");
@@ -330,17 +322,8 @@ public class PtCardServiceImpl implements IPtCardService {
      * @param cardNo 卡流水号
      * @return 卡片信息
      */
-    @Cacheable(cacheNames = CacheNames.PT_USER_CARD_NO, key = "#cardNo")
     @Override
     public PtCardVo queryCardByCardNo(Long cardNo) {
-        // PtCardVo vo;
-        // List<PtCardVo> redisList = RedisUtils.getCacheList(CacheNames.PT_USER_CARD);
-        // if (ObjUtil.isNotNull(redisList) && !redisList.isEmpty()) {
-        //     vo = redisList.stream().filter(p -> Objects.equals(p.getCardNo(), cardNo)).findFirst().orElse(null);
-        //     if (ObjUtil.isNotNull(vo)) {
-        //         return vo;
-        //     }
-        // }
         PtCardBo bo = new PtCardBo();
         bo.setCardNo(cardNo);
         return this.selectOneByBo(bo);
@@ -354,14 +337,6 @@ public class PtCardServiceImpl implements IPtCardService {
      */
     @Override
     public PtCardVo queryCardByFactoryId(Long factoryId) {
-        PtCardVo vo;
-        List<PtCardVo> redisList = RedisUtils.getCacheList(CacheNames.PT_USER_CARD);
-        if (ObjUtil.isNotNull(redisList) && !redisList.isEmpty()) {
-            vo = redisList.stream().filter(p -> Objects.equals(p.getFactoryId(), factoryId)).findFirst().orElse(null);
-            if (ObjUtil.isNotNull(vo)) {
-                return vo;
-            }
-        }
         PtCardBo bo = new PtCardBo();
         bo.setFactoryId(factoryId);
         return this.selectOneByBo(bo);
@@ -378,9 +353,12 @@ public class PtCardServiceImpl implements IPtCardService {
         List<PtCardVo> list = this.queryList(bo);
         if (ObjUtil.isNotNull(list) && !list.isEmpty()) {
             PtCardVo vo = list.get(0);
-            //PtCardtypeVo cardTypeVo = cardTypeService.queryByCode(vo.getCardType());
-            //vo.setCardTypeName(cardTypeVo.getTypeName());
-            RedisUtils.addCacheList(CacheNames.PT_USER_CARD, vo);
+            if(ObjUtil.isEmpty(vo.getLastPay())){
+                vo.setLastPay(DateUtil.offsetDay(DateUtil.date(),-1));
+            }
+            if (ObjUtil.isEmpty(vo.getLastMeal())|| ObjUtil.isNull(vo.getLastMeal())) {
+                vo.setLastMeal(0L);
+            }
             return vo;
         }
         return null;
@@ -418,7 +396,6 @@ public class PtCardServiceImpl implements IPtCardService {
     }
 
     @Override
-    @CacheEvict(cacheNames = CacheNames.PT_USER_CARD_NO, key = "#bo.cardNo")
     public PtCardVo lockCardByBo(PtCardBo bo) {
         LambdaUpdateWrapper<PtCard> lpw = new LambdaUpdateWrapper<>();
         lpw.set(PtCard::getStatus, CardStatusEnum.LOCK.code());
@@ -445,7 +422,6 @@ public class PtCardServiceImpl implements IPtCardService {
      * @param bo 卡片业务对象
      * @return 回收结果
      */
-    @CacheEvict(cacheNames = CacheNames.PT_USER_CARD_NO, key = "#bo.cardNo")
     @Override
     public Boolean recycleCardByBo(PtCardBo bo) {
         LambdaUpdateWrapper<PtCard> lpw = new LambdaUpdateWrapper<>();
@@ -468,7 +444,6 @@ public class PtCardServiceImpl implements IPtCardService {
      * @param mealType 餐类
      * @return 更新结果
      */
-    @CacheEvict(cacheNames = CacheNames.PT_USER_CARD_NO, key = "#cardNo")
     @Override
     public Boolean initCardMealData(Long cardNo, String mealType) {
         LambdaUpdateWrapper<PtCard> lpw = new LambdaUpdateWrapper<>();
@@ -488,7 +463,6 @@ public class PtCardServiceImpl implements IPtCardService {
      * @param cardNo 卡流水号
      * @return 更新结果
      */
-    @CacheEvict(cacheNames = CacheNames.PT_USER_CARD_NO, key = "#cardNo")
     @Override
     public Boolean initCardDayData(Long cardNo) {
         LambdaUpdateWrapper<PtCard> lpw = new LambdaUpdateWrapper<>();
@@ -509,7 +483,6 @@ public class PtCardServiceImpl implements IPtCardService {
      * @param consumeDate 消费日期
      * @return 更新结果
      */
-    @CacheEvict(cacheNames = CacheNames.PT_USER_CARD_NO, key = "#cardNo")
     @Override
     public Boolean updateCardDayData(Long cardNo, Long mealType, BigDecimal consumeValue, Date consumeDate) {
         PtCardBo bo = new PtCardBo();

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/task/SubsidyScheduled.java

@@ -24,7 +24,7 @@ import org.springframework.stereotype.Component;
 public class SubsidyScheduled implements CommandLineRunner {
     private final PayOrderBusiness subsidyOrderBusiness;
 
-    @Scheduled(fixedDelay = 10 * 60 * 1000)
+    @Scheduled(cron = "0 0 1 * * *")
     public void rechargeSubsidy() {
         R<Object> result = subsidyOrderBusiness.createSubsidyOrder();
         log.info(result.getMsg());