lighter 1 年之前
父节点
当前提交
cc8fffe365

+ 1 - 1
pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>SiMzFeeOprnSystm</artifactId>
-    <version>2.4.0</version>
+    <version>2.4.1</version>
     <name>SiMzFeeOprnSystm</name>
     <description>SiMzFeeOprnSystm</description>
     <properties>

+ 2 - 2
src/main/java/thyyxxk/simzfeeoprnsystm/service/SiMzFeeService.java

@@ -412,9 +412,9 @@ public class SiMzFeeService {
         fundDetail.setCardType(getCardType(setlinfo.getInsuplcAdmdvs()));
         fundDetail.setTotalCost(String.valueOf(setlinfo.getMedfeeSumamt()));
         fundDetail.setFundPay(String.valueOf(setlinfo.getFundPaySumamt()));
-        fundDetail.setCashPay(String.valueOf(setlinfo.getPsnCashPay()));
         fundDetail.setAcctPay(String.valueOf(setlinfo.getAcctPay()));
-        fundDetail.setSelfPay(String.valueOf(setlinfo.getPsnPartAmt()));
+        fundDetail.setCashPay(String.valueOf(setlinfo.getPsnCashPay()));
+        fundDetail.setSelfPay(String.valueOf(setlinfo.getPsnCashPay()));
         if (setlinfo.getRevoked() == 1) {
             fundDetail.reverseAll();
         }

+ 9 - 4
src/main/java/thyyxxk/simzfeeoprnsystm/utils/rxsign/HseEncAndDecUtil.java

@@ -13,10 +13,15 @@ import com.alibaba.fastjson.JSONObject;
 import thyyxxk.simzfeeoprnsystm.utils.StringUtil;
 
 public class HseEncAndDecUtil {
-    private final static String chnlId = "BABDC3CDA4CE434A9F5887FC31B6415F";
-    private final static String sm4key = "2809E305E2AA4438B751409C5AF1E9DD";
-    private final static String prvKey = "ANhQT/Ok+ANQjSl3hmG/a9PmMXZS7SG91bm82mFx1h2Y";
-    private final static String pubKey = "BEkfB7YO51rtfLV0HrfuvWTXgUmNSHgksdPPDQUTbiRacf+rPlvO2+TXDR7qi8UKxCxjZ1wLjoP0u80dvGVgNQE=";
+    private final static String chnlId = "7304C76CE4184A00A3DA1460BE84E816";
+    private final static String sm4key = "44EAE9EE423045BCBA92E8A3C69E7480";
+    private final static String prvKey = "SpPKV8JZc3AWgGjx6KX++qYBp5R3zjqlw1a7k2RERMA=";
+    private final static String pubKey = "BFH4M003lE5DsI/o8r8AQ/14Q2Z/yx+LJU0VV/gtRCqSFdyJFWNwuCOuQqGsbsEIVZUKJOEQ39H/NirfpFVFRCA=";
+//    测试环境
+//    private final static String chnlId = "BABDC3CDA4CE434A9F5887FC31B6415F";
+//    private final static String sm4key = "2809E305E2AA4438B751409C5AF1E9DD";
+//    private final static String prvKey = "ANhQT/Ok+ANQjSl3hmG/a9PmMXZS7SG91bm82mFx1h2Y";
+//    private final static String pubKey = "BEkfB7YO51rtfLV0HrfuvWTXgUmNSHgksdPPDQUTbiRacf+rPlvO2+TXDR7qi8UKxCxjZ1wLjoP0u80dvGVgNQE=";
 
 
     /**

+ 10 - 10
src/main/resources/application.yml

@@ -56,15 +56,15 @@ mybatis-plus:
     map-underscore-to-camel-case: true
 
 #正式环境
-#si-api-url: http://dms.hun.hsip.gov.cn/isp-api/powercsb/1101
-#si-access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO
-#si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
-#web-his-url: http://172.16.32.160:8077
-#thmz-url: http://172.16.32.160:81/thmz
+si-api-url: http://dms.hun.hsip.gov.cn/isp-api/powercsb/1101
+si-access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO
+si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
+web-his-url: http://172.16.32.160:8077
+thmz-url: http://172.16.32.160:81/thmz
 
 #测试环境
-si-api-url: http://10.93.28.242:80/isp-api/powercsb/
-si-access-key: ohksRseHwPk9JAVGAQ5lghF5euo6NQZjiv8O2V
-si-secret-key: SKQgruu508MeFbQmLZs4Oyj5Qk0GjLstGVtWJB3Y
-web-his-url: http://localhost:8706
-thmz-url: http://demo.hnthyy.cn:8089/thmz
+#si-api-url: http://10.93.28.242:80/isp-api/powercsb/
+#si-access-key: ohksRseHwPk9JAVGAQ5lghF5euo6NQZjiv8O2V
+#si-secret-key: SKQgruu508MeFbQmLZs4Oyj5Qk0GjLstGVtWJB3Y
+#web-his-url: http://localhost:8706
+#thmz-url: http://demo.hnthyy.cn:8089/thmz