添加自助机交预交金接口

src/main/java/thyyxxk/wxservice_server/controller/InpatientController.java

@@ -23,17 +23,22 @@ public class InpatientController {
     }
 
     @GetMapping("/getInpatientInfo")
-    public ResultVo<InpatientInfo> getInpatientInfo(String patientId) {
+    public ResultVo<InpatientInfo> getInpatientInfo(@RequestParam("patientId") String patientId) {
         return service.getInpatientInfo(patientId);
     }
 
+    @GetMapping("/getInpatientBaseInfo")
+    public ResultVo<InpatientInfo> getInpatientBaseInfo(@RequestParam("inpatientNo") String inpatientNo) {
+        return service.getInpatientBaseInfo(inpatientNo);
+    }
+
     @PostMapping("/getZyFees")
     public ResultVo<Map<String, Object>> getZyFees(@RequestBody GetZyFeeParam param) {
         return service.getZyFees(param);
     }
 
     @GetMapping("/getPrepaidHistory")
-    public ResultVo<Map<String, Object>> getPrepaidHistory(String patientId) {
+    public ResultVo<Map<String, Object>> getPrepaidHistory(@RequestParam("patientId") String patientId) {
         return service.getPrepaidHistory(patientId);
     }
 }

src/main/java/thyyxxk/wxservice_server/controller/WxApiController.java

@@ -102,4 +102,9 @@ public class WxApiController {
     public ResultVo<DoctorInfo> getDoctorInfo(@RequestParam("doctorCode") String doctorCode) {
         return service.getDoctorInfo(doctorCode);
     }
+
+    @GetMapping("/saveInpatientPrepay")
+    public ResultVo<Object> saveInpatientPrepay(@RequestParam("tradeNo") String tradeNo) {
+        return service.saveInpatientPrepay(tradeNo);
+    }
 }

src/main/java/thyyxxk/wxservice_server/service/InpatientService.java

@@ -41,6 +41,14 @@ public class InpatientService {
         return ResultVoUtil.success(info);
     }
 
+    public ResultVo<InpatientInfo> getInpatientBaseInfo(String inpatientNo) {
+        InpatientInfo info = dao.getInpatientInfo(inpatientNo);
+        if (null == info) {
+            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有找到此住院号的在院信息。");
+        }
+        return ResultVoUtil.success(info);
+    }
+
     public ResultVo<Map<String, Object>> getZyFees(GetZyFeeParam param) {
         dao.receiveProjectFees(param.getInpatientNo(), param.getAdmissTimes());
         dao.receiveMedicineFees(param.getInpatientNo(), param.getAdmissTimes());

src/main/java/thyyxxk/wxservice_server/service/WxApiService.java

@@ -412,4 +412,16 @@ public class WxApiService {
         return ResultVoUtil.success(doctorInfo);
     }
 
+    public ResultVo<Object> saveInpatientPrepay(String tradeNo) {
+        WxPayOrder order = dao.selectOrderByTradeNo(tradeNo);
+        if (null == order) {
+            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "没有找到订单号【"
+                    + tradeNo + "】对应的订单。");
+        }
+        if (StringUtil.isBlank(order.getInpatientNo()) || null == order.getAdmissTimes()) {
+            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "预交金订单的住院号和住院次数不能为空。");
+        }
+        return savePayResultService.saveZyYjjInfo(order);
+    }
+
 }

src/main/resources/application.yml

@@ -9,8 +9,8 @@ spring:
     cache: false
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://172.16.32.179:1433;databaseName=thxyhisdb
-#    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:
@@ -34,8 +34,8 @@ mybatis:
 
 #hrgApiUrl: http://172.16.30.33:8089/thmz/api/v1
 #hrgApiUrl: http://172.16.30.33:8889/thmz/api/v1
-#hrgApiUrl: http://172.16.32.160:81/thmz/api/v1
-hrgApiUrl: http://172.16.30.22:8089/thmz/api/v1
+hrgApiUrl: http://172.16.32.160:81/thmz/api/v1
+#hrgApiUrl: http://172.16.30.22:8089/thmz/api/v1
 
 inspectionUrl: http://172.16.32.178:622/pushservice.asmx?wsdl
 physicalCheck: http://172.16.32.183:8888/bdp/dataservice/api/