Merge remote-tracking branch 'origin/master'

ruoyi-server/ruoyi-server-common/src/main/java/org/dromara/server/common/domain/consume/bo/ConsumptionBo.java

@@ -131,6 +131,21 @@ public class ConsumptionBo {
      * 原始消费记录Id
      */
     private String originalId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 卡类名称
+     */
+    private String cardTypeName;
+
+    /**
+     * 有效期
+     */
+    private Date expireDate;
     //endregion
 
     //region 错扣补款属性

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/CheckBusiness.java

@@ -28,6 +28,7 @@ import org.dromara.server.consume.domain.vo.XfCardLimitedVo;
 import org.dromara.server.consume.domain.vo.XfConsumeDetailOriginalVo;
 import org.dromara.server.consume.domain.vo.XfTermVo;
 import org.dromara.server.consume.domain.vo.yc.TermToken;
+import org.dromara.server.consume.domain.vo.yc.UserInfoVo;
 import org.dromara.server.consume.service.IConsumeDetailOriginalService;
 import org.dromara.server.consume.service.IPtBagService;
 import org.dromara.server.consume.service.IXfCardLimitedService;
@@ -321,6 +322,8 @@ public class CheckBusiness {
         bo.setUserNo(accountVo.getUserNo());
         bo.setUserNumb(accountVo.getUserNumb());
         bo.setTenantId(accountVo.getTenantId());
+        bo.setExpireDate(accountVo.getLifespan());
+        bo.setDeptName(accountVo.getDeptName());
     }
 
     /**
@@ -358,6 +361,9 @@ public class CheckBusiness {
         RemoteUserAccountVo accountVo = remoteUserAccountService.getUserAccountVoById(cardVo.getUserId());
         setUserInfo(bo, accountVo);
         bo.setFactoryId(cardVo.getFactoryId());
+        bo.setCardTypeName(cardVo.getCardTypeName());
+        bo.setExpireDate(accountVo.getLifespan());
+        bo.setDeptName(accountVo.getDeptName());
         BeanUtil.copyProperties(accountVo, userAccountVo);
         BeanUtil.copyProperties(cardVo, userCardVo);
         return R.ok();
@@ -389,6 +395,9 @@ public class CheckBusiness {
         RemoteUserAccountVo accountVo = remoteUserAccountService.getUserAccountVoById(cardVo.getUserId());
         setUserInfo(bo, accountVo);
         bo.setCardNo(cardVo.getCardNo());
+        bo.setCardTypeName(cardVo.getCardTypeName());
+        bo.setExpireDate(accountVo.getLifespan());
+        bo.setDeptName(accountVo.getDeptName());
         BeanUtil.copyProperties(accountVo, userAccountVo);
         BeanUtil.copyProperties(cardVo, userCardVo);
         return R.ok();
@@ -430,6 +439,9 @@ public class CheckBusiness {
         setUserInfo(bo, accountVo);
         bo.setCardNo(cardVo.getCardNo());
         bo.setFactoryId(cardVo.getFactoryId());
+        bo.setCardTypeName(cardVo.getCardTypeName());
+        bo.setExpireDate(accountVo.getLifespan());
+        bo.setDeptName(accountVo.getDeptName());
         BeanUtil.copyProperties(accountVo, userAccountVo);
         BeanUtil.copyProperties(cardVo, userCardVo);
         return R.ok();
@@ -473,6 +485,8 @@ public class CheckBusiness {
         setUserInfo(bo, accountVo);
         bo.setCardNo(cardVo.getCardNo());
         bo.setFactoryId(cardVo.getFactoryId());
+        bo.setCardTypeName(cardVo.getCardTypeName());
+
         BeanUtil.copyProperties(accountVo, userAccountVo);
         BeanUtil.copyProperties(cardVo, userCardVo);
 

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/convert/strategy/impl/YcRecordConvertStrategyImpl.java

@@ -99,6 +99,9 @@ public class YcRecordConvertStrategyImpl implements IRecordConvertStrategy {
             yc.setOperatorID(bo.getOperatorId());
             yc.setConsumeDetailId(bo.getTermRecordId());
             yc.setStatusFlag(bo.getStatusFlag());
+            yc.setExpireDate(bo.getExpireDate());
+            yc.setCardTypeName(bo.getCardTypeName());
+            yc.setDeptName(bo.getDeptName());
 
             return yc;
         }

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/domain/YcConsumeInfo.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * name: YcConsumeInfo
@@ -94,4 +95,19 @@ public class YcConsumeInfo implements Serializable
     private Long consumeDetailId;
 
     private Integer statusFlag;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 卡类名称
+     */
+    private String cardTypeName;
+
+    /**
+     * 有效期
+     */
+    private Date expireDate;
 }

ruoyi-server/ruoyi-server-consume/src/main/resources/logback-plus.xml

@@ -39,10 +39,10 @@
 
     <!-- 控制台输出 -->
     <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/console.log</file>
+        <file>${log.path}/info.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大 1天 -->
             <maxHistory>60</maxHistory>
         </rollingPolicy>