Forráskód Böngészése

不管是领取还是其他都直接修改数据

anderx 1 hete%!(EXTRA string=óta)
szülő
commit
2999185376

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

@@ -1326,8 +1326,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		user.setTransferTime(now);
 		int flag;
 		//记录旧数据值,与新数据值 将旧数据与新数据都需要更新
-		List<User> useList=new ArrayList<>();
-		List<User> newList=new ArrayList<>();
 		boolean typeFlag = AFTConstants.USER_TRANSFER_TO_OTHER.equals(operatorType)
 				|| AFTConstants.SIGN_USER_TRANSFER_TO_OTHER.equals(operatorType)
 				|| AFTConstants.CHANNEL_USER_TRANSFER_TO_OTHER.equals(operatorType);
@@ -1372,14 +1370,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 						throw new BusinessException(new Error(ErrorConstants.CUSTOMER_TRANSFER_FAIL, ""));
 				}
 				updateUserMid(aid,uid,0,null);
-				//单客户转交,需要将客户原来得数据修改,需要将新数据刷新
-				User use = userMapper.queryById(uid);
-				useList.add(use);
-				User newUser=new User();
-				newUser.setAid(aid);
-				newUser.setTransferTime(now);
-				newUser.setShareType(use.getShareType());
-				newList.add(newUser);
 			} else {
 				for (String us : uList) {
 					if (userMapper.getAidAndUser(us, TokenManager.getAdminId()) <= 0){
@@ -1391,14 +1381,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 					if (data==2||data==3){
 						updateOrderHandOver(uid,aid,oldAid);
 					}
-					//单客户转交,需要将客户原来得数据修改,需要将新数据刷新
-					User use = userMapper.queryById(us);
-					useList.add(use);
-					User newUser=new User();
-					newUser.setAid(aid);
-					newUser.setTransferTime(use.getTransferTime());
-					newUser.setShareType(use.getShareType());
-					newList.add(newUser);
 				}
 				if (AFTConstants.USER_TRANSFER_TO_OTHER.equals(operatorType)) {
 					flag = updateUsersLock(uList, oldAid, UserLockReleaseStatus.LOCKED.getCode(),
@@ -1420,15 +1402,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		}
 		if (isUs) {
 			if (AFTConstants.USER_RECEIVE.equals(operatorType)) {
-				userMapper.updateList(aid, null, 3, null, 2, uList,null);
+				userMapper.updateList(aid, null, 3, now, 2, uList,null);
 			} else {
-				userMapper.updateList(aid, null, 3, null, null, uList,data);
+				userMapper.updateList(aid, null, 3, now, null, uList,data);
 			}
 		} else {
 			userMapper.update(user);
 		}
-
-
 		return errors;
 	}
 

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

@@ -3,8 +3,8 @@ spring.main.lazy-initialization=true
 jdbc.driverClassName=com.mysql.jdbc.Driver
 kede.version=1.3.49
 #kede.version=1.3.39
-#static.host=//static.jishutao.com/${kede.version}
-static.host=//172.16.1.199:8888/${kede.version}
+static.host=//static.jishutao.com/${kede.version}
+#static.host=//172.16.1.199:8888/${kede.version}
 #static.host=//172.16.1.187/${kede.version}
 #avatar.host=//172.16.1.199:3000