anderx 4 years ago
parent
commit
0ffd6dde0b

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

@@ -463,7 +463,7 @@
     <select id="selectChannelUserDays" resultType="com.goafanti.common.bo.userDaysBo">
   	select a.id uid,a.aid,a.nickname name,2 type from user a 
 		left join user_channel b on a.id=b.uid 
-		where a.channel=1 and b.status =1 
+		where a.channel=1 and b.status in (1,2)
 		 and a.share_type =0 and datediff(now(),b.distribution_time) &gt; #{z}
   </select>
   

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

@@ -2091,7 +2091,7 @@ inner join(
     left join district_glossory d2 on c.location_city =d2.id
     left join admin e on a.aid =e.id
     left join admin f on b.aid=f.id
-    where a.status in (0,1,2,5)
+    where a.status in (0,1,2,6)
     <if test="status !=null">
     and a.status = #{status}
     </if>
@@ -2124,7 +2124,7 @@ inner join(
   <select id="selectChannelCustomerCount" resultType="java.lang.Integer">
    select count(*) from user_channel a
     left join user b on a.uid=b.id  left join organization_identity c on a.uid =c.uid 
-    where a.status in(0,1,2,5)
+    where a.status in (0,1,2,6)
     <if test="status !=null">
     and a.status = #{status}
     </if>

+ 0 - 2
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2084,8 +2084,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		Date date = new Date();
 		Integer i = userMapper.updatechannelCustomerDeliver(uids, receiveId);
 		Integer status=null;
-		
-		
 		if (i > 0) {
 			List<UserTransferLog> l = new ArrayList<UserTransferLog>();
 			for (String string : uids) {

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

@@ -28,6 +28,7 @@ import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.UserChannelMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserTransferLogMapper;
+import com.goafanti.common.enums.ChannelStatus;
 import com.goafanti.common.enums.SocietyTag;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.User;
@@ -182,14 +183,14 @@ public class UserChannelServiceImpl extends BaseMybatisDao<UserChannelMapper> im
 		        in.setPassword(passwordUtil.getEncryptPwd("123456", now.getTime()));
 		        User u=userMapper.selectByName(in.getUserName());
 		        if (u==null) {
-		        	in.setStatus(0);
+		        	in.setStatus(ChannelStatus.WFP.getCode());
 					in.setUid(uid);
 					list.add(in);
 				}else {
 //					共享类型 0-私有 1-公共 2 签单
-					if(u.getShareType()==0)in.setStatus(3);
-					else if(u.getShareType()==1)in.setStatus(4);
-					else if(u.getShareType()==2)in.setStatus(5);
+					if(u.getShareType()==0)in.setStatus(ChannelStatus.YCZSY.getCode());
+					else if(u.getShareType()==1)in.setStatus(ChannelStatus.YCZGG.getCode());
+					else if(u.getShareType()==2)in.setStatus(ChannelStatus.YCZQD.getCode());
 					in.setUid(u.getId());
 					list2.add(in);
 				}