zhangbin před 1 rokem
rodič
revize
73c0c4c09c

+ 12 - 12
xpgx-common/src/main/java/com/miaxis/common/config/ShiShenConfig.java

@@ -1139,18 +1139,18 @@ public class ShiShenConfig {
         wuGui.put("戌", "寅");
         wuGui.put("亥", "卯");
 
-        wuGuiShengXiao.put("子", "");
-        wuGuiShengXiao.put("丑", "");
-        wuGuiShengXiao.put("寅", "");
-        wuGuiShengXiao.put("卯", "");
-        wuGuiShengXiao.put("辰", "");
-        wuGuiShengXiao.put("巳", "");
-        wuGuiShengXiao.put("午", "");
-        wuGuiShengXiao.put("未", "");
-        wuGuiShengXiao.put("申", "");
-        wuGuiShengXiao.put("酉", "");
-        wuGuiShengXiao.put("戌", "");
-        wuGuiShengXiao.put("亥", "");
+        wuGuiShengXiao.put("子", "");
+        wuGuiShengXiao.put("丑", "");
+        wuGuiShengXiao.put("寅", "");
+        wuGuiShengXiao.put("卯", "");
+        wuGuiShengXiao.put("辰", "");
+        wuGuiShengXiao.put("巳", "");
+        wuGuiShengXiao.put("午", "");
+        wuGuiShengXiao.put("未", "");
+        wuGuiShengXiao.put("申", "");
+        wuGuiShengXiao.put("酉", "");
+        wuGuiShengXiao.put("戌", "");
+        wuGuiShengXiao.put("亥", "");
 
     }
 

+ 13 - 5
xpgx-service/src/main/java/com/miaxis/gan/service/impl/GanZhiServiceImpl.java

@@ -1795,14 +1795,21 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
 
         int totalCount = pianCaiCount + zhengCaiCount;
         if (totalCount >= 2) {
-            caiContent.append("财旺");
+            caiContent.append("财旺;");
         } else if (totalCount >= 1) {
-            caiContent.append("财弱");
+            caiContent.append("财弱;");
         } else if (totalCount == 0) {
-            caiContent.append("四柱无财");
+            caiContent.append("四柱无财;");
+        }
+        if (totalCount != 0) {
+            if (pianCaiCount == 0) {
+                caiContent.append("八字无偏财,尽量不要做投机性生意;");
+            }
+            if (zhengCaiCount == 0) {
+                caiContent.append("八字没有正财,有偏财,投资要谨慎,不要借贷;");
+            }
         }
 
-        caiContent.append(":");
 
         if (caiContent.toString().contains("身强") && caiContent.toString().contains("财旺")) {
             caiContent.append("遇大运流年,见食伤财才则发大财。年份为" + xiYong.get(0) + "、" + xiYong.get(1) + "均带有食伤财才。");
@@ -1818,11 +1825,12 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
             caiContent.append("不好发财,俗称和尚命。");
         }
 
+
         String monthZhi = ganZhiRowVoList.get(3).getName();
         String nian = shiShenConfig.getWuGui().get(monthZhi);
         String shengXiao = shiShenConfig.getWuGuiShengXiao().get(monthZhi);
 
-        caiContent.append("遇到" + shengXiao + "年("+nian+"年),遇五鬼神煞比较容易得到偏财,但是同时也较易惹上小人、是非和灾害等。五鬼煞入命,会出现莫名其妙无风起浪的危险,因此一定要防患于未然,于官府当中更应该提防,在交友方面也应该小心,否则会有刑讼官司、破财牢狱之灾。");
+        caiContent.append("遇到" + shengXiao + "年(" + nian + "年),遇五鬼神煞比较容易得到偏财,但是同时也较易惹上小人、是非和灾害等。五鬼煞入命,会出现莫名其妙无风起浪的危险,因此一定要防患于未然,于官府当中更应该提防,在交友方面也应该小心,否则会有刑讼官司、破财牢狱之灾。");
 
         return caiContent.toString();
     }