Browse Source

修改渠道导入

Administrator 4 years ago
parent
commit
903b6db7d2

+ 3 - 0
src/main/java/com/goafanti/common/dao/UserChannelMapper.java

@@ -80,6 +80,9 @@ public interface UserChannelMapper {
 	int selectSignByUid(String uid);
 
 
+	UserChannel selectByUid(String id);
+
+
 	
 
 

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

@@ -27,9 +27,9 @@ public enum ChannelStatus {
 	/** 非法名称*/ 
 	FFMC(9,"非法名称"),
 	WXLXR(14,"无效联系人"),
-	/** 已存在渠道*/ 
+	/** 已存在我的渠道*/ 
 	YCZWDQD(10,"已存在我的渠道"),
-	/** 已存在渠道*/ 
+	/** 已存在别人渠道*/ 
 	YCZBRQD(11,"已存在别人渠道"),
 	/** 0已存在私有*/ 
 	YCZBRSY(12,"已存在别人私有"),

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

@@ -43,6 +43,8 @@
     from user_channel
     where id = #{id,jdbcType=INTEGER}
   </select>
+  
+  
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     <!--
       WARNING - @mbg.generated
@@ -367,4 +369,10 @@
     </foreach>
     )
     </select>
+    <select id="selectByUid"  resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from user_channel
+    where uid = #{id}
+  </select>
 </mapper>

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1651,7 +1651,7 @@
     select 
     <include refid="Base_Column_List" />
     from user
-    where nickname  = #{name}
+    where nickname  = #{name} limit 1
   </select>
   
 </mapper>

+ 7 - 4
src/main/java/com/goafanti/user/service/impl/UserChannelServiceImpl.java

@@ -37,6 +37,7 @@ import com.goafanti.common.enums.ChannelStatus;
 import com.goafanti.common.enums.SocietyTag;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.User;
+import com.goafanti.common.model.UserChannel;
 import com.goafanti.common.utils.ExcelUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.PasswordUtil;
@@ -214,8 +215,9 @@ public class UserChannelServiceImpl extends BaseMybatisDao<UserChannelMapper> im
     			in.setStatus(ChannelStatus.WFP.getCode());
     			list.add(in);
     		}else {
+    			//判断是自己的客户还是别人的,渠道不用此做判断
     			Integer i=0;
-    			if (u.getAid()!=null&&u.getAid().equals(TokenManager.getAdminId())) {
+    			if (u.getAid()!=null&&u.getAid().equals(aid)) {
     				i=1;
     			}
 //    			共享类型 0-私有 1-公共 2 签单 
@@ -223,9 +225,10 @@ public class UserChannelServiceImpl extends BaseMybatisDao<UserChannelMapper> im
     				if(u.getChannel()==0) {
     					if(i==1)in.setStatus(ChannelStatus.YCZWDSY.getCode());
     					else in.setStatus(ChannelStatus.YCZBRSY.getCode());
-    				}
-    				else {
-    					if(i==1)in.setStatus(ChannelStatus.YCZWDQD.getCode());
+    				}else {
+    					UserChannel uc=userChannelMapper.selectByUid(u.getId());
+    					if(uc.getAid().equals(aid))
+    					in.setStatus(ChannelStatus.YCZWDQD.getCode());
     					else in.setStatus(ChannelStatus.YCZBRQD.getCode());
     				}
     			}