7.4bug修复明细页面时间，导出列表查询

src/main/java/com/example/demo/controller/AdminController.java

@@ -45,16 +45,10 @@ public class AdminController {
         }
     }
     @PostMapping("/userinfo")
-    public UserDetails getUserInfo(@RequestBody String requestBody) {
-        ObjectMapper objectMapper = new ObjectMapper();
-        TokenPayload token1;
-        try {
-            token1 = objectMapper.readValue(requestBody, TokenPayload.class);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-        String token = token1.getToken();
+    public UserDetails getUserInfo(@RequestHeader("token") String token1) {
 
+        //String token = token1.getToken();
+        String token = token1;
         System.out.println("1/*/*/*/*//*-*-*-*-*-*-1" +token);
         try {
             System.out.println("/+/+/+/+/+/+/+//" + JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class));

src/main/java/com/example/demo/controller/ExportController.java

@@ -42,8 +42,13 @@ public class ExportController {
     @Autowired
     private ExportService exportService;
     @PostMapping("/export")
-    public Result export(@RequestBody Export Export){
-        return Result.success(exportExcelService.getExcel(Export));
+    public Result export(@RequestBody Export Export)throws  Exception{
+        try {
+            return Result.success(exportExcelService.getExcel(Export));
+        } catch (Exception e) {
+            log.error("导出失败", e.getMessage());
+            return Result.error("导出失败"+e.getMessage());
+        }
     }
     @PostMapping("/exportRecharge")
     public Result export(@Valid @RequestBody RechargeDTO dto) {

src/main/java/com/example/demo/domain/export/Goldmingxi.java

@@ -20,7 +20,7 @@ public class Goldmingxi {
     private String payPlatform; // 支付平台
     private Integer type;   // 类型
     private Integer sumGold;    // 总金币
-    private Integer permentGold;    //永久金币
+    private Integer permanentGold;    //永久金币
     private Integer freeJune;   // 免费金币六月到期
     private Integer freeDecember;   // 免费金币七月到期
     private Integer taskGold;   // 任务金币

src/main/java/com/example/demo/domain/vo/GoldDetail.java

@@ -27,7 +27,7 @@ public class GoldDetail {
     private String payPlatform; // 支付平台
     private Integer type;   // 类型
     private Integer sumGold;    // 总金币
-    private Integer permentGold;    //永久金币
+    private Integer permanentGold;    //永久金币
     private Integer freeJune;   // 免费金币六月到期
     private Integer freeDecember;   // 免费金币七月到期
     private Integer taskGold;   // 任务金币
@@ -38,5 +38,7 @@ public class GoldDetail {
     private Date endTime;   // 结束时间
     private String sortField; //排序字段
     private String sortOrder; //排序顺序
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date auditTime;
 
 }

src/main/java/com/example/demo/security/SecurityConfig.java

@@ -60,7 +60,7 @@ public class SecurityConfig {
                         request
                                 .requestMatchers( HttpMethod.POST,
                                         // 用户不登录就可以访问的路径
-                                        "/admin/login","/upload/**","/detailY/ERP","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**","/**").permitAll()
+                                        "/admin/login","/upload/**","/detailY/ERP","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**").permitAll()
                                 .requestMatchers(
                                         "/error","alipay/**","/upload/**","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**"
                                 ).permitAll()

src/main/resources/mapper/ExportMapper.xml

@@ -22,7 +22,6 @@
                 and account = #{account}
             </if>
         </where>
+        order by create_time desc
     </select>
-
-
 </mapper>

src/main/resources/mapper/GoldDetailMapper.xml

@@ -7,7 +7,8 @@
     </insert>
 
     <select id="getGoldDetail" resultType="com.example.demo.domain.vo.GoldDetail">
-        select `user`.name, `user`.jwcode, `user`.market, `ugr`.pay_platform, `ugr`.type, `ugr`.sum_gold, `ugr`.permanent_gold, `ugr`.free_june, `ugr`.free_december, `ugr`.task_gold, `admin`.admin_name, `ugr`.audit_time
+        select `user`.name, `user`.jwcode, `user`.market, `ugr`.pay_platform, `ugr`.type, `ugr`.sum_gold, `ugr`.permanent_gold, `ugr`.free_june, `ugr`.free_december, `ugr`.task_gold, `admin`.admin_name, `ugr`.audit_time,
+        `ugr`.free_june+`ugr`.free_december as free_gold
         from user_gold_record ugr
         left join `user` on `user`.jwcode = `ugr`.jwcode
         left join `admin` on `admin`.id = `ugr`.admin_id

src/main/resources/mapper/RateMapper.xml

@@ -15,11 +15,17 @@
     <update id="update">
         UPDATE
             rate
-        SET
-            rate_name=#{rateName},
-            num=#{num},
-            admin_id=#{adminId},
-            update_time=#{updateTime}
+       <set>
+            <if test="num!=null">
+                num= #{num},
+            </if>
+            <if test="rateName!=null and rateName.length>0">
+                rate_name= #{rateName},
+            </if>
+            <if test="adminId!=null">
+                admin_id= #{adminId},
+            </if>
+        </set>
         WHERE
             id=#{id}
     </update>