lighter 2 년 전
부모
커밋
970f3e3d99

+ 1 - 1
pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>wxservice-server</artifactId>
-    <version>8.2</version>
+    <version>8.3</version>
     <name>wxservice-server</name>
     <description>server for wxservice-web</description>
 

+ 0 - 8
src/main/java/thyyxxk/wxservice_server/controller/WxApiController.java

@@ -1,13 +1,9 @@
 package thyyxxk.wxservice_server.controller;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
-import thyyxxk.wxservice_server.constant.Constants;
 import thyyxxk.wxservice_server.constant.QuerySource;
 import thyyxxk.wxservice_server.entity.ResultVo;
 import thyyxxk.wxservice_server.entity.appointment.DoctorInfo;
@@ -18,13 +14,9 @@ import thyyxxk.wxservice_server.service.PushWxMessageService;
 import thyyxxk.wxservice_server.service.WxApiService;
 import thyyxxk.wxservice_server.utils.PropertiesUtil;
 import thyyxxk.wxservice_server.utils.ResultVoUtil;
-import thyyxxk.wxservice_server.utils.StringUtil;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 /**
  * @author dj

+ 1 - 1
src/main/java/thyyxxk/wxservice_server/service/SavePayResultService.java

@@ -159,7 +159,7 @@ public class SavePayResultService {
         SaveMzFeeResponse saveMzFeeResponse = template.postForObject(hrgApiUrl + "/payChargeDetailFormHaiCi",
                 hrgParam, SaveMzFeeResponse.class);
         log.info("保存门诊缴费信息:\n参数:{},\n结果:{}", hrgParam, saveMzFeeResponse);
-        if (saveMzFeeResponse != null && saveMzFeeResponse.getResultCode() == 0) {
+        if (null != saveMzFeeResponse && null != saveMzFeeResponse.getResultCode() && saveMzFeeResponse.getResultCode() == 0) {
             dao.updateSuccessHisStatus(order.getTradeNo());
             updateSiMzSavedFlag(order.getHisOrdNum());
             if (source == QuerySource.INTERFACE) {

+ 5 - 3
src/main/resources/application.yml

@@ -9,7 +9,8 @@ spring:
     cache: false
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://172.16.32.168:1433;databaseName=thxyhisdb
+    url: jdbc:sqlserver://172.16.32.179:1433;databaseName=thxyhisdb
+#    url: jdbc:sqlserver://172.16.32.168:1433;databaseName=thxyhisdb
     hikari:
       username: sa
       password:
@@ -31,8 +32,9 @@ mybatis:
   configuration:
     map-underscore-to-camel-case: true
 
-#hrgApiUrl: http://172.16.30.33:8089/thmz/api/v1
-hrgApiUrl: http://172.16.32.160:81/thmz/api/v1
+hrgApiUrl: http://172.16.30.33:8089/thmz/api/v1
+#hrgApiUrl: http://172.16.32.160:81/thmz/api/v1
+
 inspectionUrl: http://172.16.32.178:622/pushservice.asmx?wsdl
 physicalCheck: http://172.16.32.183:8888/bdp/dataservice/api/
 production: false