瀏覽代碼

bugfix-注册链接

Aslee 2 年之前
父節點
當前提交
bd79cf7683

+ 3 - 0
src/main/java/com/caimei/utils/SmsUtils.java

@@ -39,6 +39,9 @@ public class SmsUtils {
         try {
             List<String> passList = new ArrayList<>();
             passList.add("15113936829");
+            passList.add("18476937515");
+            passList.add("15917362709");
+            passList.add("15872950940");
             if ("prod".equals(active) || passList.contains(mobile)) {
                 if (StringUtils.isNotBlank(mobile) && mobile.length() == 11) {
                     String regex = "^(1[3-9]\\d{9}$)";

+ 2 - 2
src/main/resources/mapper/AuthMapper.xml

@@ -106,7 +106,7 @@
             ifnull(cp.productNum,0) as productNum
         from cm_brand_auth a
         left join cm_brand_auth_user cu on a.createBy = cu.authUserId
-        left join cm_brand_club_user cbcu1 on a.createBy = cbcu1.id
+        left join cm_brand_club_user cbcu1 on a.createBy = cbcu1.id and cbcu1.delFlag = 0
         left join cm_brand_auth_user au on a.auditBy = au.authUserId
         left join cm_brand_auth_user au1 on a.shopAuditBy = au1.authUserId
         left join cm_brand_club_user cbcu2 on a.id = cbcu2.authId and cbcu2.delFlag = 0
@@ -249,7 +249,7 @@
     <select id="getAuthBaseInfo" resultType="com.caimei.model.vo.AuthFormVo">
         select a.id as authId, authParty, auditStatus, shopAuditStatus,if(u.id is null,0,1) as bindStatus
         from cm_brand_auth a
-        left join cm_brand_club_user u on a.id = u.authId
+        left join cm_brand_club_user u on a.id = u.authId and u.delFlag = 0
         <where>
             <if test="authUserId != null">
                 and a.authUserId = #{authUserId}

+ 2 - 2
src/main/resources/mapper/AuthProductMapper.xml

@@ -162,7 +162,7 @@
         left join cm_brand_auth_user cu on p.createBy = cu.authUserId
         left join cm_brand_auth_user au on p.auditBy = au.authUserId
         left join cm_brand_auth_user au1 on p.shopAuditBy = au1.authUserId
-        left join cm_brand_club_user cbcu on p.createBy = cbcu.id
+        left join cm_brand_club_user cbcu on p.createBy = cbcu.id and cbcu.delFlag = 0
         where p.authId = #{authId}
         <if test="productName != null and productName != ''">
             and (t.name like CONCAT('%',#{productName},'%') or t.name like CONCAT('%',#{productName},'%'))
@@ -374,7 +374,7 @@
         from cm_brand_product_type t
         left join cm_brand_auth_user cu on t.createBy = cu.authUserId
         left join cm_brand_auth_user au on t.auditBy = au.authUserId
-        left join cm_brand_club_user cbcu on t.createBy = cbcu.id
+        left join cm_brand_club_user cbcu on t.createBy = cbcu.id and cbcu.delFlag = 0
         where t.authUserId = #{authUserId} and t.delFlag = 0
         <if test="name != null and name != ''">
             and t.name like CONCAT('%',#{name},'%')

+ 2 - 2
src/main/resources/mapper/ShopMapper.xml

@@ -323,7 +323,7 @@
         select cf.id as feedbackId, a.authParty as clubName, cu.mobile, content, commitTime, handleStatus, handleResult,
         handleTime
         from cm_brand_club_feedback cf
-        left join cm_brand_club_user cu on cf.clubUserId = cu.id
+        left join cm_brand_club_user cu on cf.clubUserId = cu.id and cu.delFlag = 0
         left join cm_brand_auth a on cu.authId = a.id
         left join cm_brand_auth_user au on cu.authUserId = au.authUserId
         where (a.authUserId = #{authUserId} or au.authUserId = #{authUserId})
@@ -340,7 +340,7 @@
     <select id="getFeedback" resultType="com.caimei.model.vo.FeedbackVo">
         select cf.id as feedbackId, a.authParty as clubName, cu.mobile, content, commitTime, handleStatus, handleResult, handleTime
         from cm_brand_club_feedback cf
-                 left join cm_brand_club_user cu on cf.clubUserId = cu.id
+                 left join cm_brand_club_user cu on cf.clubUserId = cu.id and cu.delFlag = 0
                  left join cm_brand_auth a on cu.authId = a.id
         where cf.id = #{feedbackId}
     </select>