Przeglądaj źródła

上传渠道客户新增无效联系人

anderx 4 lat temu
rodzic
commit
2b66740996

+ 1 - 0
src/main/java/com/goafanti/common/enums/ChannelStatus.java

@@ -26,6 +26,7 @@ public enum ChannelStatus {
 	YSF(8,"已释放"),
 	/** 非法名称*/ 
 	FFMC(9,"非法名称"),
+	WXLXR(14,"无效联系人"),
 	/** 已存在渠道*/ 
 	YCZWDQD(10,"已存在我的渠道"),
 	/** 已存在渠道*/ 

+ 2 - 2
src/main/java/com/goafanti/common/mapper/UserChannelMapper.xml

@@ -294,7 +294,7 @@
  	a.society_tag societyTag ,a.province,a.city from user_channel a
     left join user b on a.uid=b.id  
     where 1=1
-    and a.status in (3,4,5,9,10,11,12,13)
+    and a.status in (3,4,5,9,10,11,12,13,14)
     <if test="aid !=null">
     and a.aid= #{aid} 
     </if>
@@ -309,7 +309,7 @@
     left join user b on a.uid=b.id  left join organization_identity c on a.uid =c.uid 
     left join district_glossory d1 on c.location_province =d1.id 
     left join district_glossory d2 on c.location_city =d2.id
-    where 1=1 and a.status in (3,4,5,9,10,11,12,13)
+    where 1=1 and a.status in (3,4,5,9,10,11,12,13,14)
     <if test="aid !=null">
     and a.aid= #{aid} 
     </if>

+ 6 - 0
src/main/java/com/goafanti/user/service/impl/UserChannelServiceImpl.java

@@ -38,6 +38,7 @@ import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.ExcelUtils;
 import com.goafanti.common.utils.PasswordUtil;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -193,6 +194,11 @@ public class UserChannelServiceImpl extends BaseMybatisDao<UserChannelMapper> im
 		        	in.setStatus(ChannelStatus.FFMC.getCode());
 					in.setUserStatus(1);
 					list3.add(in);
+				}else if (StringUtils.isBlank(in.getContacts())||StringUtils.isBlank(in.getContactMobile())) {
+		        	in.setUid(uid);
+		        	in.setStatus(ChannelStatus.WXLXR.getCode());
+					in.setUserStatus(1);
+					list3.add(in);
 				} else if (u == null) {
 					in.setUid(uid);
 					in.setUserStatus(0);

+ 4 - 4
src/main/resources/props/config_local.properties

@@ -64,12 +64,12 @@ user_remind_days=15
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开�
-#static.host=//172.16.0.253/1.1.71
-#avatar.host=//172.16.0.253
+static.host=//172.16.0.253/1.1.71
+avatar.host=//172.16.0.253
 
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.71
+#avatar.host=//static.jishutao.com
+#static.host=//static.jishutao.com/1.1.71
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload