修复前端支付时偶尔缺少参数的问题。

pom.xml

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

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

@@ -70,15 +70,18 @@ public class WxApiService {
         }
         if (null != existOrder) {
             if (existOrder.getPayStatus() == 1) {
-                return CompletableFuture.completedFuture(ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "您已成功支付过一笔相同金额的订单，请勿重复支付。"));
+                return CompletableFuture.completedFuture(ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR,
+                        "您已成功支付过一笔相同金额的订单，请勿重复支付。"));
             }
-            if (existOrder.getPayStatus() == 99 || existOrder.getPayStatus() == 0) {
-                if (DateUtil.orderValid(existOrder.getCreateDatetime())) {
-                    return CompletableFuture.completedFuture(ResultVoUtil.success(existOrder));
+            if (StringUtil.notBlank(existOrder.getPaySign()) && StringUtil.notBlank(existOrder.getPrepayId())) {
+                if (existOrder.getPayStatus() == 99 || existOrder.getPayStatus() == 0) {
+                    if (DateUtil.orderValid(existOrder.getCreateDatetime())) {
+                        return CompletableFuture.completedFuture(ResultVoUtil.success(existOrder));
+                    }
+                }
+                if (null == param.getYjReqNo()) {
+                    param.setYjReqNo(existOrder.getYjReqNo());
                 }
-            }
-            if (null == param.getYjReqNo()) {
-                param.setYjReqNo(existOrder.getYjReqNo());
             }
         }
         String appId = PropertiesUtil.getProperty("appId");
@@ -170,11 +173,10 @@ public class WxApiService {
                 dao.insertNewOrder(order);
                 log.info("统一下单成功：{}", order);
                 return CompletableFuture.completedFuture(ResultVoUtil.success(order));
-            } else {
-                final String message = root.element("return_msg").getStringValue();
-                log.info("微信统一下单失败：{}", message);
-                return CompletableFuture.completedFuture(ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, message));
             }
+            final String message = root.element("return_msg").getStringValue();
+            log.info("微信统一下单失败：{}", message);
+            return CompletableFuture.completedFuture(ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, message));
         } catch (DocumentException e) {
             e.printStackTrace();
             return CompletableFuture.completedFuture(ResultVoUtil.fail(ExceptionEnum.INTERNAL_SERVER_ERROR, e.getMessage()));

src/main/resources/application.yml

@@ -8,8 +8,8 @@ spring:
   thymeleaf:
     cache: false
   datasource:
-    url: jdbc:jtds:sqlserver://172.16.32.179:1433/thxyhisdb
-#    url: jdbc:jtds:sqlserver://172.16.32.168:1433/thxyhisdb
+#    url: jdbc:jtds:sqlserver://172.16.32.179:1433/thxyhisdb
+    url: jdbc:jtds:sqlserver://172.16.32.168:1433/thxyhisdb
     hikari:
       username: sa
       password:
@@ -31,6 +31,6 @@ mybatis:
   configuration:
     map-underscore-to-camel-case: true
 
-hrgApiUrl: http://172.16.30.33:8089/thmz/api/v1
-#hrgApiUrl: http://webhis.thyy.cn:81/thmz/api/v1
+#hrgApiUrl: http://172.16.30.33:8089/thmz/api/v1
+hrgApiUrl: http://webhis.thyy.cn:81/thmz/api/v1
 inspectionUrl: http://172.16.32.178:622/pushservice.asmx?wsdl