From 5ea061ee8ee4580068ed71d25a9553cf38536f9f Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Wed, 9 Sep 2026 14:04:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=8C=89=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=B2=A1=E6=9C=89=E6=94=B6=E8=B4=A7=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WelfareNoticeController.java   |  4 +
 .../impl/WelfareStatisticsServiceImpl.java    | 30 +++++-
 src/main/resources/logback.xml                | 98 +++++++++++++++++--
 3 files changed, 119 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareNoticeController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareNoticeController.java
index cd29432..5863663 100644
--- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareNoticeController.java
+++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareNoticeController.java
@@ -1,5 +1,7 @@
 package com.budwk.app.zhgh.welfare.controller;
 
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.zhgh.welfare.service.WelfareProjectService;
@@ -27,6 +29,7 @@ public class WelfareNoticeController {
     @At
     @Ok("beetl:/platform/zhghh5/welfare/notice/detail.html")
     @ApiOperation("福利通知附件详情页")
+    @SaCheckLogin
     public void index() {
     }
 
@@ -38,6 +41,7 @@ public class WelfareNoticeController {
      */
     @At
     @ApiOperation("查询福利通知附件详情")
+    @SaCheckLogin
     public Result detailData(@Valid String id) {
         if (StrUtil.isBlank(id)) {
             return Result.error("福利项目ID不能为空");
diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
index 925f7be..8836578 100644
--- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
@@ -586,6 +586,7 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl<WelfareProject
                   u.loginname AS loginName,
                   u.username AS userName,
                   wpus.mobile,
+                  wpus.userName AS recipient,
                   wl.userState,
                   wl.personType,
                   wl.welfareUnionName,
@@ -635,12 +636,23 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl<WelfareProject
         return unionId;
     }
 
-    /** 将历史收货信息拆为 V3 导出所需的收货人、联系方式和收货地址三列。 */
+    /**
+     * 填充品牌导出的收货信息。当前选择记录分别保存收货人、手机号和纯地址文本；
+     * 历史记录可能将三项信息拼接在 receiveAddress 中，因此继续兼容旧格式解析。
+     */
     private void fillV3ReceiveAddress(NutMap row) {
+        String mobile = row.getString("mobile");
+        if (StrUtil.isNotBlank(mobile)) {
+            row.put("phone", mobile);
+        }
+
         String receiveAddress = row.getString("receiveAddress");
         if (StrUtil.isBlank(receiveAddress)) {
             return;
         }
+        // 新数据的 receiveAddress 仅保存地址正文，可直接作为收货地址导出。
+        row.put("address", receiveAddress);
+
         Map<String, String> values = new HashMap<>();
         for (String pair : receiveAddress.split("[,，]")) {
             String[] keyValue = pair.split("[:：]", 2);
@@ -648,9 +660,19 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl<WelfareProject
                 values.put(keyValue[0].trim(), keyValue[1].trim());
             }
         }
-        row.put("recipient", values.get("收件人"));
-        row.put("phone", values.get("联系方式"));
-        row.put("address", values.get("收货地址"));
+        String recipient = StrUtil.blankToDefault(values.get("收件人"), values.get("收货人"));
+        String phone = StrUtil.blankToDefault(values.get("联系方式"),
+                StrUtil.blankToDefault(values.get("手机号码"), values.get("手机号")));
+        String address = StrUtil.blankToDefault(values.get("收货地址"), values.get("详细地址"));
+        if (StrUtil.isNotBlank(recipient)) {
+            row.put("recipient", recipient);
+        }
+        if (StrUtil.isNotBlank(phone)) {
+            row.put("phone", phone);
+        }
+        if (StrUtil.isNotBlank(address)) {
+            row.put("address", address);
+        }
     }
 
     /**
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 4a00be9..87e2ef2 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,17 +1,85 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <configuration scan="false" scanPeriod="60000" debug="false">
 
-    <!-- 定义日志文件的存储路径 -->
+    <!-- 日志存储路径 -->
     <property name="LOG_HOME" value="./logs"/>
 
-    <!-- 控制台输出配置 -->
+    <!-- 控制台输出 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
-    <!-- INFO级别日志文件配置 -->
+
+    <!--
+    #################################################################################
+    #                                                                               #
+    #                          全文输出日志（一个文件存储）start                          #
+    #                                                                               #
+    #################################################################################
+    -->
+
+    <!-- 所有级别日志写入同一个文件 -->
+    <appender name="ALL_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_HOME}/app.log</file>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_HOME}/app-%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>300</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+    <!-- 框架日志级别（按需调整） -->
+    <logger name="org.eclipse.jetty" level="INFO"/>
+    <logger name="org.quartz" level="INFO"/>
+    <logger name="org.nutz" level="DEBUG"/>
+
+    <!-- root logger：DEBUG 级别，输出到控制台和全量文件 -->
+    <root level="DEBUG">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="ALL_FILE"/>
+    </root>
+
+    <!--
+    #################################################################################
+    #                                                                               #
+    #                          全文输出日志（一个文件存储）end                           #
+    #                                                                               #
+    #################################################################################
+    -->
+
+
+
+
+    <!--
+    #################################################################################
+    #                                                                               #
+    #                        debug、info、error分文件输出 start                        #
+    #                                                                               #
+    #################################################################################
+    -->
+
+    <!-- DEBUG级别日志文件配置 -->
+    <!--<appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_HOME}/debug.log</file>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_HOME}/debug-%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>300</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+    &lt;!&ndash; INFO级别日志文件配置 &ndash;&gt;
     <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${LOG_HOME}/info.log</file>
         <encoder>
@@ -24,11 +92,11 @@
         </filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${LOG_HOME}/info-%d{yyyy-MM-dd}.log</fileNamePattern>
-            <maxHistory>30</maxHistory>
+            <maxHistory>300</maxHistory>
         </rollingPolicy>
     </appender>
 
-    <!-- ERROR级别日志文件配置 -->
+    &lt;!&ndash; ERROR级别日志文件配置 &ndash;&gt;
     <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${LOG_HOME}/error.log</file>
         <encoder>
@@ -41,19 +109,31 @@
         </filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${LOG_HOME}/error-%d{yyyy-MM-dd}.log</fileNamePattern>
-            <maxHistory>30</maxHistory>
+            <maxHistory>300</maxHistory>
         </rollingPolicy>
     </appender>
 
-    <logger name="java" additivity="false" />
+    &lt;!&ndash; 框架日志级别 &ndash;&gt;
+    &lt;!&ndash;    <logger name="java" additivity="false" />&ndash;&gt;
     <logger name="org.eclipse.jetty" level="INFO"/>
     <logger name="org.quartz" level="INFO"/>
     <logger name="org.nutz" level="DEBUG"/>
 
-    <!-- 日志级别和appender的关联 -->
+    &lt;!&ndash; 日志级别和appender的关联 &ndash;&gt;
     <root level="DEBUG">
         <appender-ref ref="STDOUT"/>
+        <appender-ref ref="DEBUG_FILE"/>
         <appender-ref ref="INFO_FILE"/>
         <appender-ref ref="ERROR_FILE"/>
-    </root>
+    </root>-->
+
+    <!--
+    #################################################################################
+    #                                                                               #
+    #                        debug、info、error分文件输出 end                          #
+    #                                                                               #
+    #################################################################################
+    -->
+
 </configuration>
+