From 93bae131f4db920738e666f8d83c950a34add86e Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Fri, 24 Nov 2023 16:24:41 +0800
Subject: [PATCH] tgdz

---
 src/main/java/com/peanut/config/TGDZ.java           | 13 ++++++++-----
 .../modules/book/service/impl/PointServiceImpl.java |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/peanut/config/TGDZ.java b/src/main/java/com/peanut/config/TGDZ.java
index 259a637b..7e111b8d 100644
--- a/src/main/java/com/peanut/config/TGDZ.java
+++ b/src/main/java/com/peanut/config/TGDZ.java
@@ -1,5 +1,8 @@
 package com.peanut.config;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class TGDZ {
 
     public static final String[] tg = {"甲","乙","丙","丁","戊","己","庚","辛","壬","癸"};
@@ -15,15 +18,15 @@ public class TGDZ {
     public static final String[] lq = {"厥阴","少阴","太阴","少阳","阳明","太阳"};
 
 
-    public static final String[] tianfu = {"己丑","己未","戊寅","戊申","戊子","戊午","乙卯","乙酉","丁巳","丁亥","丙辰","丙戍"};
+    public static final List<String> tianfu = Arrays.asList("己丑","己未","戊寅","戊申","戊子","戊午","乙卯","乙酉","丁巳","丁亥","丙辰","丙戍");
 
-    public static final String[] suihui = {"甲辰","甲戍","己丑","己未","乙酉","丁卯","戊午","丙子"};
+    public static final List<String> suihui = Arrays.asList("甲辰","甲戍","己丑","己未","乙酉","丁卯","戊午","丙子");
 
-    public static final String[] tongtianfu = {"甲辰","甲戍","庚子","庚午","壬寅","壬申"};
+    public static final List<String> tongtianfu = Arrays.asList("甲辰","甲戍","庚子","庚午","壬寅","壬申");
 
-    public static final String[] tongsuihui = {"辛未","辛丑","癸卯","癸酉","癸巳","癸亥"};
+    public static final List<String> tongsuihui = Arrays.asList("辛未","辛丑","癸卯","癸酉","癸巳","癸亥");
 
-    public static final String[] taiyitianfu = {"己丑","己未","乙酉","戊午"};
+    public static final List<String> taiyitianfu = Arrays.asList("己丑","己未","乙酉","戊午");
 
     public static final double D = 0.2422;
     // "小寒", "大寒", "立春", "雨水", "惊蛰", "春分", "清明", "谷雨",
diff --git a/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java
index 2eaf826d..36ec7211 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java
@@ -160,6 +160,7 @@ public class PointServiceImpl extends ServiceImpl<PointDao, PointEntity> impleme
             d=12;
         }
         String c_year_d = dz[d - 1];
+        String tgdz = c_year_t+c_year_d;