Bug修复：上架确认产生的时间bug和redis配置bug修复

background-common/src/main/java/cn/kdan/compdf/enums/DateTImeFormatEnum.java

@@ -15,4 +15,5 @@ public interface DateTImeFormatEnum {
      */
     String DATE_TIME = "yyyy-MM-dd HH:mm";
 
+    String DATE_TIME_SECOND = "yyyy-MM-dd HH:mm:ss";
 }

background-gateway/src/main/resources/application.yml

@@ -51,9 +51,9 @@ spring:
 #      shutdown-timeout: 200
   redis:
     cluster:
-      nodes: ${redis.nodes:81.68.234.235:6371,81.68.234.235:6372,81.68.234.235:6373,81.68.234.235:6374,81.68.234.235:6375,81.68.234.235:6376}
-      max-redirects: ${redis.max-redirects:3}
-    password: ${redis.password:1234}
+      nodes: ${REDIS_NODES:81.68.234.235:6371,81.68.234.235:6372,81.68.234.235:6373,81.68.234.235:6374,81.68.234.235:6375,81.68.234.235:6376}
+      max-redirects: ${REDIS_MAX_REDIRECTS:3}
+    password: ${REDIS_PASSWORD:1234}
     lettuce:
       pool:
         max-active: ${redis.maxTotal:200}

background-user/src/main/java/cn/kdan/compdf/controller/v1/BackgroundUserBalanceController.java

@@ -55,11 +55,11 @@ public class BackgroundUserBalanceController {
      * 账户消费充值记录导出
      */
     @GetMapping("/exportBalanceRecordList")
-    public void exportBalanceRecordList(Integer isDecs,HttpServletResponse response) {
+    public void exportBalanceRecordList(Integer isDecs,Integer timeZone,HttpServletResponse response) {
         if (ObjectUtil.isEmpty(isDecs)) {
             isDecs = 1;
         }
-        backgroundUserBalanceService.exportBalanceRecordList(isDecs,TokenUtil.getRequestHeader().getId(), response);
+        backgroundUserBalanceService.exportBalanceRecordList(timeZone,isDecs,TokenUtil.getRequestHeader().getId(), response);
     }
 
 

background-user/src/main/java/cn/kdan/compdf/service/BackgroundUserBalanceService.java

@@ -44,7 +44,7 @@ public interface BackgroundUserBalanceService extends IService<BackgroundUserBal
      * @param userId 用户id
      * @param response response
      */
-    void exportBalanceRecordList(Integer isDecs,Long userId, HttpServletResponse response);
+    void exportBalanceRecordList(Integer timeZone,Integer isDecs,Long userId, HttpServletResponse response);
 
     /**
      * plan 消费记录数据同步 一天一次

background-user/src/main/java/cn/kdan/compdf/service/impl/BackgroundUserBalanceServiceImpl.java

@@ -10,6 +10,7 @@ import cn.kdan.compdf.config.ExcelWidthStyleStrategy;
 import cn.kdan.compdf.dto.PlanStatisticsDTO;
 import cn.kdan.compdf.entity.BackgroundUserBalance;
 import cn.kdan.compdf.entity.BackgroundUserRemain;
+import cn.kdan.compdf.enums.DateTImeFormatEnum;
 import cn.kdan.compdf.mapper.BackgroundUserBalanceMapper;
 import cn.kdan.compdf.service.BackgroundUserBalanceService;
 import cn.kdan.compdf.service.BackgroundUserRemainService;
@@ -100,9 +101,10 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
         List<BackgroundUserBalanceVO> records = Lists.newArrayList();
         if (CollectionUtil.isNotEmpty(backgroundUserBalancePage.getRecords())) {
             backgroundUserBalancePage.getRecords().forEach(c -> {
-                c.setDate(MyLocalDateUtil.timeZoneConversion(c.getDate(), timeZone));
+//                c.setDate(MyLocalDateUtil.timeZoneConversion(c.getDate(), timeZone));
                 BackgroundUserBalanceVO backgroundUserBalanceVO = new BackgroundUserBalanceVO();
                 BeanUtil.copyProperties(c, backgroundUserBalanceVO);
+                backgroundUserBalanceVO.setDate(DateUtil.format(MyLocalDateUtil.timeZoneConversion(c.getDate(),timeZone), DateTImeFormatEnum.DATE_TIME_SECOND));
                 if (c.getChangeType() == 1) {
                     backgroundUserBalanceVO.setBalanceChange("+" + c.getBalanceChange());
                 } else {
@@ -122,7 +124,7 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
      * @param response response
      */
     @Override
-    public void exportBalanceRecordList(Integer isDecs, Long userId, HttpServletResponse response) {
+    public void exportBalanceRecordList(Integer timeZone,Integer isDecs, Long userId, HttpServletResponse response) {
         LambdaQueryWrapper<BackgroundUserBalance> eq = new LambdaQueryWrapper<BackgroundUserBalance>()
                 .eq(BackgroundUserBalance::getUserId, userId)
                 .orderByDesc(BackgroundUserBalance::getDate);
@@ -133,6 +135,7 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
             backgroundUserBalanceList.forEach(c -> {
                 BackgroundUserBalanceVO backgroundUserBalanceVO = new BackgroundUserBalanceVO();
                 BeanUtil.copyProperties(c, backgroundUserBalanceVO);
+                backgroundUserBalanceVO.setDate(DateUtil.format(MyLocalDateUtil.timeZoneConversion(c.getDate(),timeZone), DateTImeFormatEnum.DATE_TIME));
                 if (c.getChangeType() == 1) {
                     backgroundUserBalanceVO.setBalanceChange("+" + c.getBalanceChange());
                 } else {

background-user/src/main/java/cn/kdan/compdf/vo/BackgroundUserBalanceVO.java

@@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -19,7 +20,7 @@ public class BackgroundUserBalanceVO {
      * 日期
      */
     @ExcelProperty(value = "Date", index = 0)
-    private Date date;
+    private String date;
     /**
      * 充值/消费具体类型描述
      */

background-user/src/main/resources/application.yml

@@ -78,9 +78,9 @@ spring:
   #redis连接池
   redis:
     cluster:
-      nodes: ${redis.nodes:81.68.234.235:6371,81.68.234.235:6372,81.68.234.235:6373,81.68.234.235:6374,81.68.234.235:6375,81.68.234.235:6376}
-      max-redirects: ${redis.max-redirects:3}
-    password: ${redis.password:1234}
+      nodes: ${REDIS_NODES:81.68.234.235:6371,81.68.234.235:6372,81.68.234.235:6373,81.68.234.235:6374,81.68.234.235:6375,81.68.234.235:6376}
+      max-redirects: ${REDIS_MAX_REDIRECTS:3}
+    password: ${REDIS_PASSWORD:1234}
     lettuce:
       pool:
         max-active: ${redis.maxTotal:200}