Browse Source

更名BUG修复

anderx 4 years ago
parent
commit
b6afba6d5e

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

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 import com.goafanti.common.model.UserNames;
 import com.goafanti.customer.bo.UserNamesListBo;
+import com.goafanti.user.bo.InputUserChannel;
 
 public interface UserNamesMapper {
     /**
@@ -61,4 +62,6 @@ public interface UserNamesMapper {
 	int updateAddUserName(@Param("uid") String uid, @Param("userName")String userName);
 
 	int checkUserName(String userName);
+
+	void insertBatch(List<InputUserChannel> list);
 }

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

@@ -2087,12 +2087,12 @@ inner join(
 	
 	<insert id="insertBatch" parameterType="com.goafanti.user.bo.InputUserChannel">
 	INSERT INTO `user` (id, mobile, password,
-	nickname,identify_name,
+	nickname,identify_name,username,
 	share_type,type,society_tag,channel,source,status)VALUES
 	<foreach item="item" index="index" collection="list"
 		separator=",">
 		(#{item.uid,jdbcType=VARCHAR}, #{item.contactMobile,jdbcType=VARCHAR},#{item.password,jdbcType=VARCHAR},
-		#{item.userName},#{item.userName},
+		#{item.userName},#{item.userName},#{item.userName},
 		#{item.shareType,jdbcType=TIMESTAMP}, 1,#{item.societyTag},1,1 ,#{item.userStatus})
     </foreach>
   </insert>

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

@@ -143,4 +143,12 @@
   <select id="checkUserName" resultType="java.lang.Integer">
   select count(*) from user_names where name= #{userName}
   </select>
+  
+  <insert id="insertBatch" parameterType="com.goafanti.user.bo.InputUserChannel">
+	INSERT INTO `user_names` (uid,name)VALUES
+	<foreach item="item" index="index" collection="list"
+		separator=",">
+		(#{item.uid,jdbcType=VARCHAR},#{item.userName})
+    </foreach>
+  </insert>
 </mapper>

+ 0 - 1
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -92,7 +92,6 @@ public class OrderDunTask {
 	public void updateNewOrderDun(){
   		try {
   			LoggerUtils.debug(logger, "======================新催款任务轮询启动===================");
-  		
   		List<OutNewOrderDunBo> list= newOrderDunService.selectAllOrderDun();
   		Calendar calendar=Calendar.getInstance();   
   		Calendar calendar2=Calendar.getInstance();

+ 6 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -352,9 +352,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		String uid = UUID.randomUUID().toString();
 		String identifyId = UUID.randomUUID().toString();
 		user.setId(uid);
-		user.setIdentifyName(name);
 		user.setSource(1);// 客户来源为录入
+		user.setIdentifyName(name);
 		user.setNickname(name);
+		user.setUsername(name);
 		user.setStatus(AFTConstants.USER_STATUS_NORMAL);
 		user.setShareType(AFTConstants.NO);
 		user.setAid(TokenManager.getAdminId());
@@ -409,6 +410,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			organizationIdentityMapper.insert(oi);
 		}
 		userMapper.insert(user);
+		UserNames un=new UserNames();
+		un.setUid(user.getId());
+		un.setName(user.getNickname());
+		userNamesMapper.insertSelective(null);
 		// 新增企业联系人
 		OrganizationContactBook cob = new OrganizationContactBook();
 		cob.setAid(TokenManager.getAdminId());

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

@@ -32,6 +32,7 @@ import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.UserChannelMapper;
 import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.dao.UserNamesMapper;
 import com.goafanti.common.dao.UserTransferLogMapper;
 import com.goafanti.common.enums.ChannelStatus;
 import com.goafanti.common.enums.SocietyTag;
@@ -64,6 +65,8 @@ public class UserChannelServiceImpl extends BaseMybatisDao<UserChannelMapper> im
 	private UserTransferLogMapper userTransferLogMapper;
 	@Autowired
 	private UserChannelMapper userChannelMapper;
+	@Autowired
+	private UserNamesMapper	userNamesMapper;
 	@Resource(name = "passwordUtil")
 	private PasswordUtil	passwordUtil;
 	
@@ -249,6 +252,7 @@ public class UserChannelServiceImpl extends BaseMybatisDao<UserChannelMapper> im
         //已存在则是不用新增直接关联,非法名称则不用关联也不用新增
         if (!list.isEmpty()) {
         	userMapper.insertBatch(list);
+        	userNamesMapper.insertBatch(list);
         	organizationIdentityMapper.insertBatch(list);
         	organizationContactBookMapper.insertBatch(list);
         	userChannelMapper.insertBatch(list);