浏览代码

微信移动端支付

guomengjiao 5 月之前
父节点
当前提交
16ba46eb39

+ 9 - 14
.idea/workspace.xml

@@ -457,14 +457,7 @@
       <workItem from="1735970618647" duration="252000" />
       <workItem from="1735970895886" duration="8433000" />
       <workItem from="1736126123480" duration="510000" />
-      <workItem from="1736127959643" duration="15681000" />
-    </task>
-    <task id="LOCAL-00027" summary="修改密码">
-      <created>1734684410671</created>
-      <option name="number" value="00027" />
-      <option name="presentableId" value="LOCAL-00027" />
-      <option name="project" value="LOCAL" />
-      <updated>1734684410671</updated>
+      <workItem from="1736127959643" duration="16341000" />
     </task>
     <task id="LOCAL-00028" summary="修改密码">
       <created>1734689905955</created>
@@ -802,7 +795,14 @@
       <option name="project" value="LOCAL" />
       <updated>1736152541359</updated>
     </task>
-    <option name="localTasksCounter" value="76" />
+    <task id="LOCAL-00076" summary="微信移动端支付">
+      <created>1736154267302</created>
+      <option name="number" value="00076" />
+      <option name="presentableId" value="LOCAL-00076" />
+      <option name="project" value="LOCAL" />
+      <updated>1736154267302</updated>
+    </task>
+    <option name="localTasksCounter" value="77" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -892,11 +892,6 @@
           <line>272</line>
           <option name="timeStamp" value="2" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderService.java</url>
-          <line>188</line>
-          <option name="timeStamp" value="7" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserControllerApi.java</url>
           <line>204</line>

+ 3 - 0
modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserControllerApi.java

@@ -88,6 +88,9 @@ public class WebsiteUserControllerApi extends AbstractController {
                 return R.fail("用户不存在,请先注册");
             }
         }
+        if (oldUser.getStatus().equals(WebsiteUser.STATUS_DISABLE)) {
+            return R.fail("用户被禁用,无法登录");
+        }
         String newLogin = oldUser.getLoginCode();
         //验证密码
         String passwordEncode = PasswordUtil.encrypt(newLogin, password, oldUser.getSalt());