Sfoglia il codice sorgente

微信移动端支付

guomengjiao 5 mesi fa
parent
commit
442a2c3aeb

+ 10 - 10
.idea/workspace.xml

@@ -29,8 +29,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="fc9366aa-6566-4981-8149-d75e02f8e884" name="默认的" comment="微信移动端支付">
-      <change afterPath="$PROJECT_DIR$/modules/core/src/main/java/com/jeesite/modules/exception/JeesiteExceptionHandler.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserService.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -458,14 +458,7 @@
       <workItem from="1735970618647" duration="252000" />
       <workItem from="1735970895886" duration="8433000" />
       <workItem from="1736126123480" duration="510000" />
-      <workItem from="1736127959643" duration="35881000" />
-    </task>
-    <task id="LOCAL-00032" summary="用户订单">
-      <created>1734768659538</created>
-      <option name="number" value="00032" />
-      <option name="presentableId" value="LOCAL-00032" />
-      <option name="project" value="LOCAL" />
-      <updated>1734768659538</updated>
+      <workItem from="1736127959643" duration="36636000" />
     </task>
     <task id="LOCAL-00033" summary="修改密码">
       <created>1734774529374</created>
@@ -803,7 +796,14 @@
       <option name="project" value="LOCAL" />
       <updated>1736232303457</updated>
     </task>
-    <option name="localTasksCounter" value="81" />
+    <task id="LOCAL-00081" summary="微信移动端支付">
+      <created>1736241238227</created>
+      <option name="number" value="00081" />
+      <option name="presentableId" value="LOCAL-00081" />
+      <option name="project" value="LOCAL" />
+      <updated>1736241238227</updated>
+    </task>
+    <option name="localTasksCounter" value="82" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

+ 6 - 0
modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserService.java

@@ -117,6 +117,12 @@ public class WebsiteUserService extends CrudService<WebsiteUserDao, WebsiteUser>
 			}
 			websiteUser.setEmail(user.getEmail());
 		}
+		if (StringUtils.isNotEmpty(user.getContact()) && !websiteUser.getContact().equals(user.getContact())) {
+			if (findContact(user.getContact()) != null) {
+				return R.fail("手机号已存在");
+			}
+			websiteUser.setContact(user.getContact());
+		}
 		dao.update(websiteUser);
 		return R.ok();
 	}