Browse Source

门诊挂号时段切片

lighter 2 years ago
parent
commit
dc73963766

+ 2 - 2
src/main/java/thyyxxk/wxservice_server/dao/WxApiDao.java

@@ -32,11 +32,11 @@ public interface WxApiDao {
             "patient_name,inpatient_no,admiss_times,app_id,mch_id,prepay_id," +
             "time_stamp,trade_no,create_order_sign,pay_sign,spbill_create_ip," +
             "create_datetime,pay_status,serial_no,order_type,his_ord_num," +
-            "mzy_request_id,yj_req_no,his_status,query_state_times) " +
+            "mzy_request_id,yj_req_no,his_status,query_state_times,ap_time) " +
             "values (#{body},#{openId},#{totalFee},#{patientId},#{patientName},#{inpatientNo}," +
             "#{admissTimes},#{appId},#{mchId},#{prepayId},#{timeStamp},#{tradeNo},#{createOrderSign}," +
             "#{paySign},#{spbillCreateIp},#{createDatetime},#{payStatus},#{serialNo},#{orderType}," +
-            "#{hisOrdNum},#{mzyRequestId},#{yjReqNo},0,0)")
+            "#{hisOrdNum},#{mzyRequestId},#{yjReqNo},0,0,#{apTime})")
     void insertNewOrder(WxPayOrder param);
 
     @Update("update t_wechat_pay_order set pay_status=#{status}, pay_datetime=#{successTime}, " +

+ 1 - 0
src/main/java/thyyxxk/wxservice_server/entity/appointment/MzyReqrec.java

@@ -28,6 +28,7 @@ public class MzyReqrec {
     private Integer serialNo;
     private String opDay;
     private BigDecimal amount;
+    private String apTime;
 
     //  0 未接诊  1 已经接诊
     private String visitedMark;

+ 1 - 0
src/main/java/thyyxxk/wxservice_server/entity/appointment/WeChatPayParam.java

@@ -28,6 +28,7 @@ public class WeChatPayParam {
     private String patientId;
     private String hisOrdNum;
     private Integer mzyRequestId;
+    private String apTime;
     private Integer yjReqNo;
     private String inpatientNo;
     private Integer admissTimes;

+ 1 - 0
src/main/java/thyyxxk/wxservice_server/entity/wxapi/WxPayOrder.java

@@ -59,4 +59,5 @@ public class WxPayOrder {
      * */
     private String inpatientNo;
     private Integer admissTimes;
+    private String apTime;
 }

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

@@ -107,6 +107,7 @@ public class SavePayResultService {
         mzyReqrec.setPaymode("WX");
         mzyReqrec.setPsordnum(order.getTradeNo());
         mzyReqrec.setAgtordnum(order.getSerialNo());
+        mzyReqrec.setApTime(order.getApTime());
         param.setMzyReqrec(mzyReqrec);
         RestTemplate template = new RestTemplate();
         SaveGhFeeResponse data = template.postForObject(hrgApiUrl + "/payRegistrationFormHaiCi",

+ 2 - 0
src/main/java/thyyxxk/wxservice_server/service/WxApiService.java

@@ -172,6 +172,7 @@ public class WxApiService {
                 order.setYjReqNo(param.getYjReqNo());
                 order.setInpatientNo(param.getInpatientNo());
                 order.setAdmissTimes(param.getAdmissTimes());
+                order.setApTime(param.getApTime());
                 dao.insertNewOrder(order);
                 log.info("统一下单成功:{}", order);
                 return ResultVoUtil.success(order);
@@ -410,4 +411,5 @@ public class WxApiService {
         }
         return ResultVoUtil.success(doctorInfo);
     }
+
 }

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

@@ -32,8 +32,8 @@ mybatis:
   configuration:
     map-underscore-to-camel-case: true
 
-#hrgApiUrl: http://172.16.30.33:8089/thmz/api/v1
-hrgApiUrl: http://172.16.30.33:8889/thmz/api/v1
+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
 
 inspectionUrl: http://172.16.32.178:622/pushservice.asmx?wsdl