Просмотр исходного кода

财务首页会员项目审核修改开发

anderx лет назад: 2
Родитель
Сommit
3644ade890

+ 5 - 5
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -56,11 +56,12 @@ public class AsyncUtils {
 	private TOrderMidMapper tOrderMidMapper;
 	@Autowired
 	private RoleMapper roleMapper;
-@Autowired
-	private UserMapper userMapper;
-@Autowired
+
+	@Autowired
 	private AdminUserCountMapper adminUserCountMapper;
 
+
+
 	/**
 	 * 处理离职意见转交客户
 	 * 	转出去则全部为0,转入则判定当天有没有,有则修改没有新增
@@ -118,10 +119,9 @@ public class AsyncUtils {
 
 	public void send(EmailBo bo){
 		try {
-
 			SendEmailUtil.getInstance().send(bo);
 		} catch (UnsupportedEncodingException | MessagingException e) {
-			e.printStackTrace();
+			LoggerUtils.error(getClass(),"邮件发送错误");
 		}
 	}
 

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

@@ -1279,6 +1279,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		Integer result=0;
 		Integer notice=NoticeStatus.MENBER_YES.getCode();
 		TOrderNewBo ono = tOrderNewMapper.getSaleIdByOno(task.getOrderNo());
+		TTaskMember tTaskMember = tTaskMemberMapper.selectByTid(in.getId());
 		// 1=通过 0=驳回
 		if (in.getResult()==1){
 			//0=财务 1=特批
@@ -1292,25 +1293,53 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 					status=3;
 					result=1;
 				}
+				subtractionFinanceCountMember(task.getOrderNo(),tTaskMember.getCreateTime(),1);
 			}else if(in.getType()==1){
 				if(task.getProcessStatus()!=2)throw  new BusinessException("审核状态错误");
 				nt.setProcessStatus(3);
 				status=3;
 				result=1;
 			}
+
 		}else if (in.getResult()==0){
 			status=2;
 			nt.setProcessStatus(4);
 			notice=NoticeStatus.MENBER_NO.getCode();
+			subtractionFinanceCountMember(task.getOrderNo(),tTaskMember.getCreateTime(),0);
 		}
 		addNoticMember(notice, ono, in.getType(),result);
 		addMemberLog(in.getId(),status,in.getRemarks());
 		if (nt.getProcessStatus()==3){
 			tTaskMemberMapper.updateServiceYearBySplitSuper(task.getSplitSuper());
 		}
+
 		return tOrderTaskMapper.updateByPrimaryKeySelective(nt);
 	}
 
+	/**
+	 *
+	 * @param orderNo
+	 * @param date
+	 * @param type 0双减  1未审核减
+	 */
+	private void subtractionFinanceCountMember(String orderNo, Date date,Integer type) {
+		Admin admin = adminMapper.selectOrderByFinanace(orderNo);
+		String startTime = DateUtils.formatDate(date, AFTConstants.YYYYMMDD);
+		FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
+		if (financeCount != null) {
+			FinanceCount newFinanceCount =new FinanceCount();
+			newFinanceCount.setId(financeCount.getId());
+			if(type==0){
+				newFinanceCount.setMemberCount(financeCount.getMemberCount()-1);
+				newFinanceCount.setMemberUnauditedCount(financeCount.getMemberUnauditedCount()-1);
+			}else if(type==1){
+				newFinanceCount.setMemberUnauditedCount(financeCount.getMemberUnauditedCount()-1);
+			}else {
+				return;
+			}
+			financeCountMapper.updateByPrimaryKeySelective(newFinanceCount);
+		}
+	}
 
 
 	@Override
@@ -1396,6 +1425,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			financeCount = FinanceCount.initialization(admin.getId(), startTime);
 			financeCount.setMemberCount(1);
 			financeCount.setMemberUnauditedCount(1);
+			financeCountMapper.insertSelective(financeCount);
 		}else {
 			FinanceCount newFinanceCount =new FinanceCount();
 			newFinanceCount.setId(financeCount.getId());