聚合支付未完成不允许点击进入缴费

src/main/java/cn/hnthyy/thmz/service/impl/his/mzdzfp/BswServerImpl.java

@@ -119,8 +119,8 @@ public class BswServerImpl implements BswServer {
     @Resource
     private ZdChequeTypeService zdChequeTypeService;
 
-    @Value("${wxPayOrderServiceUrl}")
-    private String wxPayOrderServiceUrl;
+    @Value("${zyServiceUrl}")
+    private String zyServiceUrl;
 
     static {
         ghMap.put("reqFee", "BILL01_挂号费");
@@ -1195,11 +1195,11 @@ public class BswServerImpl implements BswServer {
         paramMap.put("times", param.getTimes());
         paramMap.put("ledgerSn", param.getReceiptNo());
         paramMap.put("needChargeDate", true);
-        log.info("requestZyChargeList-->入参url:{}", wxPayOrderServiceUrl + "/chargeList/selectChargeList");
+        log.info("requestZyChargeList-->入参url:{}", zyServiceUrl + "/chargeList/selectChargeList");
         log.info("requestZyChargeList-->入参:{}", paramMap);
         try {
             String res = HttpRequest
-                    .post(wxPayOrderServiceUrl + "/chargeList/selectChargeList")
+                    .post(zyServiceUrl + "/chargeList/selectChargeList")
                     .body(JsonUtil.object2Json(paramMap))
                     .timeout(8000)
                     .execute()

src/main/resources/application-mhyy.yml

@@ -152,6 +152,9 @@ haiciServiceUrl: "https://tbd"
 #泰和微信缴费服务地址生产环境
 wxPayOrderServiceUrl: "http://130.150.161.72:8706"
 
+#泰和微信缴费服务地址生产环境
+zyServiceUrl: "http://130.150.161.72:8706"
+
 #特殊门诊生产地址
 tsmzServiceUrl: "http://130.150.161.72:8706/markMtFees"
 

src/main/resources/static/js/mz/toll_administration.js

@@ -1836,7 +1836,7 @@ function codePay() {
         success: function (res) {
             if (res.code === 9000) {
                 if(res.data && (res.data.state === 2 || res.data.orderState === 2)) {
-                    alert("付款成功");
+                    successMesageSimaple("聚合支付付款成功");
                     $("#paymentCode").attr("disabled", true);
                     refNo = res.data.channelOrderNo;
                     traceNo = res.data.mchOrderNo;
@@ -1855,6 +1855,21 @@ $('#paymentCode').on('input', debounce(codePay, 500));
  * 提交缴费申请
  */
 function saveConfirmFee() {
+    var containerOnLinePay = false;
+    $('.pay-item').each(function() {
+        const $this = $(this);
+        const $select = $this.find('select');
+
+        if ($select.find('option:selected').text() === '聚合支付') {
+            containerOnLinePay = true;
+        }
+    });
+    if(containerOnLinePay && refNo == ''){
+        errorMesageSimaple("请等待完成聚合支付缴费！")
+        codePay()
+        return
+    }
+
     $("#saveConfirmFee").attr("disabled", true);
     if (!checkFee(true)) {
         $("#saveConfirmFee").attr("disabled", false);