需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -1584,7 +1584,7 @@ public class UserLogic {
 
         Integer yrz = websitUserService.lambdaQuery()
                 .eq(WebsitUser::getUserId, currentCompanyWechat.getUserId())
-                .notIn(WebsitUser::getExamineStatus, "OK")
+                .in(WebsitUser::getExamineStatus, "OK")
                 .count();
 
         Integer dsh = websitUserService.lambdaQuery()

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -1415,26 +1415,40 @@ public class WechatLogic {
         if (payService == null)
             throw new RemoteServiceException("未查到支付配置");
 
+        try {
 
-        WxPayOrderQueryResult wxPayOrderQueryResult = payService.queryOrder("", orderId);
-
+            WxPayOrderQueryResult wxPayOrderQueryResult = payService.queryOrder("", orderId);
+            log.info("商户扫码支付生成订单响应: {}", wxPayOrderQueryResult);
 
-        if (!wxPayOrderQueryResult.getReturnCode().equals("SUCCESS")
-                || !wxPayOrderQueryResult.getResultCode().equals("SUCCESS") || !wxPayOrderQueryResult.getTradeState().equals("SUCCESS")) {
+            if (!wxPayOrderQueryResult.getReturnCode().equals("SUCCESS")
+                    || !wxPayOrderQueryResult.getResultCode().equals("SUCCESS") || !wxPayOrderQueryResult.getTradeState().equals("SUCCESS")) {
 
-            if (!wxPayOrderQueryResult.getErrCode().equals("ORDERNOTEXIST")) {
-                WxPayOrderReverseRequest wxPayOrderReverseRequest = new WxPayOrderReverseRequest();
-                wxPayOrderReverseRequest.setOutTradeNo(orderId);
-                payService.reverseOrder(wxPayOrderReverseRequest);
-                return IdWorker.getIdStr();
+                if (!wxPayOrderQueryResult.getErrCode().equals("ORDERNOTEXIST")) {
+                    WxPayOrderReverseRequest wxPayOrderReverseRequest = new WxPayOrderReverseRequest();
+                    wxPayOrderReverseRequest.setOutTradeNo(orderId);
+                    payService.reverseOrder(wxPayOrderReverseRequest);
+                    return IdWorker.getIdStr();
+                }
             }
-        }
 
-        if (wxPayOrderQueryResult.getReturnCode().equals("SUCCESS")
-                && wxPayOrderQueryResult.getResultCode().equals("SUCCESS") && wxPayOrderQueryResult.getTradeState().equals("SUCCESS")) {
+            if (wxPayOrderQueryResult.getReturnCode().equals("SUCCESS")
+                    && wxPayOrderQueryResult.getResultCode().equals("SUCCESS") && wxPayOrderQueryResult.getTradeState().equals("SUCCESS")) {
                 throw new RemoteServiceException("订单已支付，请稍等更新订单");
+            }
+
+        } catch (WxPayException e) {
+
+            log.error("商户扫码查询订单: {}", e.toString());
+            return null;
         }
 
+
+
+
+
+
+
+
         return null;
     }
 }