Browse Source

修改提示语,修复客户释放BUG

anderx 6 years ago
parent
commit
2c3c273c83

+ 17 - 2
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -22,10 +22,12 @@ import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminLocationMapper;
 import com.goafanti.common.dao.AdminMapper;
+import com.goafanti.common.dao.UserBusinessMapper;
 import com.goafanti.common.dao.UserLockReleaseMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.UserBusiness;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.StringUtils;
@@ -44,7 +46,9 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	@Autowired
 	private AdminLocationMapper	adminLocationMapper;
 	@Autowired
-	private UserLockReleaseMapper	UserLockReleaseMapper;
+	private UserLockReleaseMapper	userLockReleaseMapper;
+	@Autowired
+	private UserBusinessMapper	userBusinessMapper;
 	@Resource(name = "passwordUtil")
 	private PasswordUtil					passwordUtil;
 	@Override
@@ -390,7 +394,18 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	@Override
 	public int updatePrivateBusinessTransfer(String inputId, String uid, String pid) {
 		String aid=TokenManager.getAdminId();
-		int i=UserLockReleaseMapper.updatePrivateBusinessTransfer( inputId,  uid,  pid,aid);
+		int i=userLockReleaseMapper.updatePrivateBusinessTransfer( inputId,  uid,  pid,aid);
+		if (i>0) {
+			UserBusiness ub=new UserBusiness();
+			ub.setId(UUID.randomUUID().toString());
+			ub.setAid(inputId);
+			ub.setUid(uid);
+			ub.setBusinessProjectId(pid);
+			ub.setCustomerStatus(0);
+			ub.setFollowSituation(5);
+			ub.setRemarks("转交客户业务触发");
+			userBusinessMapper.insertSelective(ub);
+		}
 		return i;
 	}
 

+ 9 - 6
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -8,6 +8,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.customer.service.CustomerService;
 import com.goafanti.user.service.UserService;
@@ -36,12 +37,14 @@ public class ReleaseUserTask {
 			List<LockingReleaseBo> userTmpList = null;
 			List<LockingReleaseBo> businessTmpList = null;
 			for(User u : userList){
-				userTmpList = customerServiceImpl.selectWaitReleaseCustomer(u.getId());
-//				userTmpList = customerServiceImpl.selectWaitReleaseCustomer("1");
-				lockUserList.addAll(userTmpList);
-				businessTmpList = customerServiceImpl.selectWaitReleaseBusiness(u.getId());
-//				businessTmpList = customerServiceImpl.selectWaitReleaseBusiness("1");
-				lockBusinessList.addAll(businessTmpList);
+				if(StringUtils.isNotBlank(u.getId())) {
+					userTmpList = customerServiceImpl.selectWaitReleaseCustomer(u.getId());
+//					userTmpList = customerServiceImpl.selectWaitReleaseCustomer("1");
+					lockUserList.addAll(userTmpList);
+					businessTmpList = customerServiceImpl.selectWaitReleaseBusiness(u.getId());
+//					businessTmpList = customerServiceImpl.selectWaitReleaseBusiness("1");
+					lockBusinessList.addAll(businessTmpList);
+				}
 			}
 		List<LockingReleaseBo> newList=new ArrayList<LockingReleaseBo>();
 			  if (lockUserList.size()>0) {

+ 4 - 0
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -1156,6 +1156,10 @@ public class AdminCustomerApiController extends BaseApiController{
 	@RequestMapping(value = "/privateBusinessTransfer", method = RequestMethod.POST)
 	public Result privateBusinessTransfer(String inputId,String uid,String pid ) {
 		Result res = new Result();
+		if (StringUtils.isBlank(inputId)) {
+			res.getError().add(buildError("请确正确的接收者。","请确正确的接收者。"));
+			return res;
+		}
 		int i= adminService.updatePrivateBusinessTransfer( inputId, uid, pid );
 		if (i<1) {
 			res.getError().add(buildError("请确认客户与业务归属是否正确。","请确认客户与业务归属是否正确。"));