夏文涛 1 год назад
Родитель
Сommit
967208d3cc

+ 15 - 3
src/main/java/com/sqx/modules/utils/fieYun/FeiYunUtils.java

@@ -955,12 +955,24 @@ public class FeiYunUtils {
                     }
                 }
                 //endregion
+                if(goods_name_start != null){
+                    stringBuilder.append(goods_name_start).append("名称").append(goods_name_end).append("     ");
+                }
+
+                if(goods_price_start != null){
+                    stringBuilder.append(goods_price_start).append("单价").append(goods_price_end).append("  ");
+                }
+
+                if(goods_num_start != null){
+                    stringBuilder.append(goods_num_start).append("数量").append(goods_num_end).append("  ");
+                }
+
                 if (sum_money_start != null) {
-                    stringBuilder.append("名称     单价  数量  金额 <BR>");
-                } else {
-                    stringBuilder.append("名称     单价        数量<BR>");
+                    stringBuilder.append(sum_money_start).append("金额").append(sum_money_end);
                 }
 
+                stringBuilder.append("<BR>");
+
                 stringBuilder.append("--------------------------------<BR>");
                 BigDecimal packMoney = BigDecimal.ZERO;
                 BigDecimal goodsMoney = BigDecimal.ZERO;

+ 1 - 1
src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@ spring:
             driver-class-name: com.mysql.cj.jdbc.Driver
             url: jdbc:mysql://172.16.20.111:3306/tcwm2.5?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
             username: root
-            password: 111111
+            password: ch@2025.wm
             initial-size: 10
             max-active: 100
             min-idle: 10