Explorar el Código

营销首页修改

anderx hace 11 meses
padre
commit
5dd7958fad

+ 0 - 7
src/main/java/com/goafanti/common/dao/AdminUserCountMapper.java

@@ -1,9 +1,6 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.AdminUserCount;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 public interface AdminUserCountMapper {
     int deleteByPrimaryKey(Integer id);
@@ -20,10 +17,6 @@ public interface AdminUserCountMapper {
 
     int updateByAidAndDateSelective(AdminUserCount e);
 
-    int updateByaidAndDate(@Param("aid") String aid,@Param("startTime") String startTime,
-                           @Param("endTime")String endTime);
 
-    List<AdminUserCount> selectByaidAndDate(@Param("aid") String aid, @Param("startTime") String startTime);
 
-    void updateUserCountResetting(String aid);
 }

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

@@ -172,30 +172,8 @@
     </update>
 
 
-  <update id="updateByaidAndDate" >
-    update admin_user_count a,(select aid,dates,sum(sy)pr,sum(syqd)prc,sum(qd)sign
-    from (select  aid,if( share_type=0 and new_channel=0,1,0)sy,
-    if( share_type=0 and new_channel=1,1,0)syqd,if( share_type=2,1,0)qd,DATE_FORMAT(transfer_time , '%Y-%m-%d') dates
-    from user
-    where share_type in (0,2)
-    and  aid = #{aid}
-    and transfer_time BETWEEN #{startTime} and  #{endTime})x group by aid,dates
-    )b
-    set a.private_count =b.pr ,a.channel_count =b.prc,a.sign_count =b.sign
-    where a.aid=b.aid and a.date_time=b.dates
-  </update>
 
 
-  <select id="selectByaidAndDate"  resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from admin_user_count
-    where aid= #{aid} and date_time=#{startTime}
-  </select>
 
-  <update id="updateUserCountResetting">
-    update admin_user_count
-    set  private_count=0,sign_count=0,channel_count=0,order_count=0
-    where aid= #{aid}
-  </update>
+
 </mapper>

+ 5 - 14
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -4,7 +4,10 @@ import com.goafanti.business.bo.OutRestrictProject;
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.bo.userDaysBo;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.*;
+import com.goafanti.common.dao.NoticeMapper;
+import com.goafanti.common.dao.RestrictProjectMapper;
+import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.dao.UserTransferLogMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.NoticeTypes;
 import com.goafanti.common.model.Notice;
@@ -47,8 +50,6 @@ public class ReleaseUserTask {
 	int pointsDataLimit = 50;
 
 
-	@Resource
-	private AdminUserCountMapper adminUserCountMapper;
 
 	@Resource
 	private RestrictProjectMapper restProjectMapper;
@@ -309,9 +310,6 @@ public class ReleaseUserTask {
 			pushSignUser(lockSignList);
 			//处理私有客户
 			pushPrivateUser(lockUserList);
-			//处理每个人重复的天数
-			pushSalesmanCount(lockUserList,lockSignList);
-
 			pushChannel(releaseTime, userList);
 			//客户释放
 			List<LockingReleaseBo> lockList = customerService.selectPendinglockUserList();
@@ -331,14 +329,7 @@ public class ReleaseUserTask {
 	}
 
 
-	private void pushSalesmanCount(List<LockingReleaseBo> list, List<LockingReleaseBo> list2) {
-		list.addAll(list2);
-		for (LockingReleaseBo e : list) {
-			String sartTime= e.getLockTime();
-			String endTime=e.getLockTime()+" 23:59:59";
-			adminUserCountMapper.updateByaidAndDate(e.getAid(), sartTime, endTime);
-		}
-	}
+
 
 	private void pushPrivateUser(List<LockingReleaseBo> lockUserList) throws InterruptedException {
 		List<LockingReleaseBo> newList=new ArrayList<LockingReleaseBo>();

+ 4 - 10
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -3,7 +3,10 @@ package com.goafanti.customer.service;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.userDaysBo;
 import com.goafanti.common.error.BusinessException;
-import com.goafanti.common.model.*;
+import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.OrganizationContactBook;
+import com.goafanti.common.model.User;
+import com.goafanti.common.model.UserMid;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.customer.bo.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -574,15 +577,6 @@ public interface CustomerService {
 	void transferUser(List<String> uList, String aid, String uid);
 
 
-	/**
-	 *
-	 * @param aid
-	 * @param transferTime
-	 */
-	void updateAdminUserCount(String aid,Date transferTime);
-
-
-	AdminUserCount getAdminUserCount(String aid, String startTime);
 
 	Result importExcel(MultipartFile file);
 

+ 5 - 118
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -110,8 +110,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Resource
 	private SystemWebSocketHandler systemWebSocketHandler;
 	@Resource
-	private AdminUserCountMapper adminUserCountMapper;
-	@Resource
 	private RestrictProjectMapper restrictProjectMapper;
 	@Resource
 	private	AsyncUtils asyncUtils;
@@ -445,63 +443,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		addUserLock(uid, TokenManager.getAdminId(), now, uList);
 		addUserTransferLog(uid, TokenManager.getAdminId(), null,0, null, now, uList);
 
-		updateAdminUserCount(user.getAid(),user.getTransferTime());
 		return 1;
 	}
 
-	/**
-	 *
-	 * @param  aid    管理员编号
-	 * @param  transferTime  客户转换时间
-	 */
-	@Override
-	public void updateAdminUserCount(String aid ,Date transferTime) {
-		String startTime=DateUtils.formatDate(transferTime,AFTConstants.YYYYMMDD);
-		String endTime=startTime+" 23:59:59";
-		AdminUserCount adminUserCount=getAdminUserCount(aid,startTime);
-        AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
-        if (adminUserCount==null){
-            if(selectAUC!=null) adminUserCountMapper.insertSelective(selectAUC);
-		}else {
-            AdminUserCount newAUC=new AdminUserCount();
-			newAUC.setId(adminUserCount.getId());
-			if (selectAUC==null){
-				newAUC.setPrivateCount(0);
-				newAUC.setChannelCount(0);
-				newAUC.setSignCount(0);
-			}else {
-				if (selectAUC.getPrivateCount()==null)selectAUC.setPrivateCount(0);
-				if (selectAUC.getChannelCount()==null)selectAUC.setChannelCount(0);
-				if (selectAUC.getSignCount()==null)selectAUC.setSignCount(0);
-				newAUC.setPrivateCount(selectAUC.getPrivateCount());
-				newAUC.setChannelCount(selectAUC.getChannelCount());
-				newAUC.setSignCount(selectAUC.getSignCount());
-			}
-			adminUserCountMapper.updateByPrimaryKeySelective(newAUC);
-		}
-	}
 
 
 
-	/**
-	 * 用于处理异常多产生数据,删除多余数据修改原本数据
-	 * @param aid
-	 * @param startTime
-	 * @return
-	 */
-	@Override
-	public AdminUserCount getAdminUserCount(String aid, String startTime) {
-		List<AdminUserCount> selectList = adminUserCountMapper.selectByaidAndDate(aid, startTime);
-		AdminUserCount selectAUC=null;
-		if(!selectList.isEmpty())selectAUC=selectList.get(0);
-		if (selectList.size()>1){
-			for (int i=1;i<selectList.size();i++){
-				Integer id = selectList.get(i).getId();
-				if(id!=null) adminUserCountMapper.deleteByPrimaryKey(id);
-			}
-		}
-		return selectAUC;
-	}
+
+
 
 
 	@Override
@@ -974,7 +923,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		if (mainStatus==1){
 			followProject(fbb.getUid());
 		}
-		updateADminUserCountFollow(TokenManager.getAdminId(),followTime);
 	}
 
 	private void addUserFollowBusiness(UserFollowBusiness userFollowBusiness, String ub, BusinessListBo ub1, String ufbId, String followId) {
@@ -988,40 +936,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		userFollowBusinessMapper.insert(userFollowBusiness);
 	}
 
-	private void updateADminUserCountFollow(String aid, Date transferTime) {
-		{
-			String startTime= DateUtils.formatDate(transferTime,AFTConstants.YYYYMMDD);
-			String endTime=startTime+" 23:59:59";
-			AdminUserCount adminUserCount = getAdminUserCount(aid,startTime);
-			Integer count = userFollowMapper.selectByaidAndDate(aid, startTime, endTime);
-            AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
-            if (adminUserCount==null){
-                if (selectAUC==null)selectAUC=new AdminUserCount();
-				selectAUC.setFollowCount(count);
-				selectAUC.setAid(aid);
-				selectAUC.setDateTime(transferTime);
-				adminUserCountMapper.insertSelective(selectAUC);
-			}else {
-                AdminUserCount newAUC=new AdminUserCount();
-				newAUC.setId(adminUserCount.getId());
-				newAUC.setFollowCount(count);
-				if (selectAUC==null){
-					newAUC.setPrivateCount(0);
-					newAUC.setChannelCount(0);
-					newAUC.setSignCount(0);
-				}else {
-					if (selectAUC.getPrivateCount()==null)selectAUC.setPrivateCount(0);
-					if (selectAUC.getChannelCount()==null)selectAUC.setChannelCount(0);
-					if (selectAUC.getSignCount()==null)selectAUC.setSignCount(0);
-					newAUC.setPrivateCount(selectAUC.getPrivateCount());
-					newAUC.setChannelCount(selectAUC.getChannelCount());
-					newAUC.setSignCount(selectAUC.getSignCount());
-				}
-				adminUserCountMapper.updateByPrimaryKeySelective(newAUC);
-			}
 
-		}
-	}
 
 	/**
 	 * 跟进更新用户中间表
@@ -1479,32 +1394,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		} else {
 			userMapper.update(user);
 		}
-		//处理用户客户统计
-		if (AFTConstants.USER_RECEIVE.equals(operatorType)){
-			updateAdminUserCount(user.getAid(),user.getTransferTime());
-		}
-		if (typeFlag) {
-			updateAdminUserCountTransfer(useList,newList);
-		}
+
+
 		return errors;
 	}
 
-	/**
-	 *
-	 * @param useList
-	 * @param newList
-	 */
-	private void updateAdminUserCountTransfer(List<User> useList, List<User> newList) {
-		for (User u : useList) {
-
-			updateAdminUserCount(u.getAid(),u.getTransferTime());
-		}
-		for (User u : newList) {
 
-			updateAdminUserCount(u.getAid(),u.getTransferTime());
-		}
 
-	}
 
 	@Override
 	public void transferUser(List<String> uList, String aid, String uid) {
@@ -1624,7 +1520,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		updateUserMid(aid,uid,0,null);
 		addUserTransferLog(uid, aid,null, 15, null, date, null);
 		userMapper.update(u);
-		updateAdminUserCount(use.getAid(),use.getTransferTime());
 		return 1;
 	}
 
@@ -2475,9 +2370,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			utl.setUid(id);
 			userTransferLogMapper.insertSelective(utl);
 			userLockReleaseMapper.updateUserTypeLock(u.getId(), TokenManager.getAdminId(), 0, 2, date);
-			//用户客户统计移除时修改
-			updateAdminUserCount(u.getAid(),u.getTransferTime());
-
 		} else {
 			List<String> list = Arrays.asList(id.split(","));
 			List<UserTransferLog> ulList = new ArrayList<UserTransferLog>();
@@ -2500,16 +2392,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			userMapper.updateList(null, null, null, date, 1, list,null);
 			userLockReleaseMapper.updateUserTypeLockList(list, TokenManager.getAdminId(), 0, 2, date);
 			//批量移除客户,需要单独处理客户每天得计算。
-			updateAdminUserAllCount(userList);
 		}
 		return 1;
 	}
 
-	private void updateAdminUserAllCount(List<User> userList) {
-		for (User user : userList) {
-			updateAdminUserCount(user.getAid(),user.getTransferTime());
-		}
-	}
+
 
 
 	@Override

+ 0 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -223,7 +223,6 @@ public interface OrderNewService {
 
 	int updateTag(String orderNo, Integer tag);
 
-	void updateAdminUserCountOrder(String aid,Date transferTime);
 
 
 	void financeCountOrderUnauditedSubtraction(TOrderNew use, Integer i);

+ 0 - 1
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -216,7 +216,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
 			pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),order, TokenManager.getAdminId(),t.getApproval());
 		}
-		orderNewService.updateAdminUserCountOrder(t.getSalesmanId(),t.getCreateTime());
 		Admin admin=adminMapper.selectFinanceAdminByOrderDep(t.getOrderDep());
 		orderNewService.financeCountOrderUnauditedSubtraction(t,1);
 		return c;

+ 1 - 46
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -23,7 +23,6 @@ import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.LockingReleaseBo;
-import com.goafanti.customer.service.CustomerService;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.enums.*;
 import com.goafanti.order.service.OrderNewService;
@@ -134,14 +133,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Autowired
 	private DepartmentService departmentService;
 	@Autowired
-	private CustomerService	customerService;
-	@Autowired
 	private TOrderPaymentMapper tOrderPaymentMapper;
 	@Autowired
 	private TOrderHighTechMapper tOrderHighTechMapper;
 	@Autowired
-	private AdminUserCountMapper adminUserCountMapper;
-	@Autowired
 	private FinanceCountMapper financeCountMapper;
 	@Autowired
 	private PublicReleaseMapper publicReleaseMapper;
@@ -654,10 +649,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		pushOrderDunContent(t2);
 		//计算公出统计
 		pushOrderPublicReleaseCount(t2);
-		updateAdminUserCountOrder(t2.getSalesmanId(),t2.getCreateTime());
-		if (newOrderFlag){
-			updateAdminUserCountOrder(t2.getSalesmanId(),date);
-		}
+
 		return 1;
 	}
 
@@ -965,41 +957,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 
-	@Override
-	public void updateAdminUserCountOrder(String aid,Date transferTime) {
-		String startTime= DateUtils.formatDate(transferTime,AFTConstants.YYYYMMDD);
-		String endTime=startTime+" 23:59:59";
-		AdminUserCount adminUserCount = customerService.getAdminUserCount(aid,startTime);
-		Integer orderCount = tOrderNewMapper.selectAidAndDate(aid, startTime, endTime);
-		if (adminUserCount==null){
-			AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
-			if (selectAUC==null)selectAUC=new AdminUserCount();
-			selectAUC.setOrderCount(orderCount);
-			selectAUC.setAid(aid);
-			selectAUC.setDateTime(transferTime);
-			adminUserCountMapper.insertSelective(selectAUC);
-		}else {
-			AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
-			AdminUserCount newAUC=new AdminUserCount();
-			newAUC.setId(adminUserCount.getId());
-			if (selectAUC==null){
-				newAUC.setPrivateCount(0);
-				newAUC.setChannelCount(0);
-				newAUC.setSignCount(0);
-				newAUC.setOrderCount(orderCount);
-			}else {
-				if (selectAUC.getPrivateCount()==null)selectAUC.setPrivateCount(0);
-				if (selectAUC.getChannelCount()==null)selectAUC.setChannelCount(0);
-				if (selectAUC.getSignCount()==null)selectAUC.setSignCount(0);
-				newAUC.setPrivateCount(selectAUC.getPrivateCount());
-				newAUC.setChannelCount(selectAUC.getChannelCount());
-				newAUC.setSignCount(selectAUC.getSignCount());
-				newAUC.setOrderCount(orderCount);
-			}
-			adminUserCountMapper.updateByPrimaryKeySelective(newAUC);
-		}
 
-	}
 
 	public void updateFinanceCount(String aid, Date createTime){
 		String startTime= DateUtils.formatDate(createTime,AFTConstants.YYYYMMDD);
@@ -1486,7 +1444,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
 		pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
-		updateAdminUserCountOrder(t2.getSalesmanId(),t2.getCreateTime());
 		return 1;
 	}
 
@@ -1851,7 +1808,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
 		//新增特批催款信息
 		tOrderNewMapper.update(t);
-		updateAdminUserCountOrder(t2.getSalesmanId(),t2.getCreateTime());
 		return 1;
 	}
 
@@ -2087,7 +2043,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(orderNo);
 		pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),order, TokenManager.getAdminId(),t.getApproval());
 		tOrderNewMapper.update(t);
-		updateAdminUserCountOrder(t.getSalesmanId(),t.getCreateTime());
 		financeCountOrderUnauditedSubtraction(t,2);
 		return 1;
 	}

+ 0 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -241,7 +241,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		pushTaskChange(TokenManager.getAdminId(),taskReceiverId,type,t.getOrderNo());
 		//派单后设置用户客户统计
 		if (type==0){
-			customerService.updateAdminUserCount(tn.getSalesmanId(),date);
 			asyncUtils.updateAdminByAid(taskReceiverId);
 		}else {
 			asyncUtils.updateAdminByAid(TokenManager.getAdminId(),taskReceiverId);

+ 0 - 37
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1055,7 +1055,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 		if (p.getStatus()!=null||p.getPublicType()!=null||p.getTechStartProcess()!=null){
 			publicReleaseMapper.update(p);
-			updateAdminUserCountPublicRelease(use.getAid(),use.getReleaseStart());
 		}
 		if (a.getOpenId()!=null) {
 			if (remarks.length()>19) {
@@ -1423,43 +1422,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		orderPublicReleaseLogMapper.insert(log);
 	}
 
-	private void updateAdminUserCountPublicRelease(String aid, Date transferTime) {
-		String startTime= DateUtils.formatDate(transferTime,AFTConstants.YYYYMMDD);
-		String endTime=startTime+" 23:59:59";
-		AdminUserCount adminUserCount = customerService.getAdminUserCount(aid,startTime);
-		Integer count = publicReleaseMapper.selectCountByaidAndDate(aid, startTime, endTime);
-		if (count==null){
-            count=0;
-        }
-		if (adminUserCount==null){
-			AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
-			if (selectAUC==null)selectAUC=new AdminUserCount();
-			selectAUC.setPublicReleaseCount(count);
-			selectAUC.setAid(aid);
-			selectAUC.setDateTime(transferTime);
-			adminUserCountMapper.insertSelective(selectAUC);
-		}else {
-			AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
-			AdminUserCount newAUC=new AdminUserCount();
-			newAUC.setId(adminUserCount.getId());
-			newAUC.setPublicReleaseCount(count);
-			if (selectAUC==null){
-				newAUC.setPrivateCount(0);
-				newAUC.setChannelCount(0);
-				newAUC.setSignCount(0);
-			}else {
-				if (selectAUC.getPrivateCount()==null)selectAUC.setPrivateCount(0);
-				if (selectAUC.getChannelCount()==null)selectAUC.setChannelCount(0);
-				if (selectAUC.getSignCount()==null)selectAUC.setSignCount(0);
-				newAUC.setPrivateCount(selectAUC.getPrivateCount());
-				newAUC.setChannelCount(selectAUC.getChannelCount());
-				newAUC.setSignCount(selectAUC.getSignCount());
-			}
 
-			adminUserCountMapper.updateByPrimaryKeySelective(newAUC);
-		}
-
-	}
 
 	private void addpublicLog(Integer id, Integer status, String remarks) {
 		PublicReleaseLog log = new PublicReleaseLog(id, TokenManager.getAdminId(), status, remarks, new Date());