Browse Source

财务统计报销模块修改

anderx 2 years ago
parent
commit
2d3b9c8276

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

@@ -1308,7 +1308,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			if(in.getType()==0){
 				subtractionFinanceCountMember(task.getOrderNo(),tTaskMember.getCreateTime(),0);
 			}else {
-				subtractionFinanceCountMember(task.getOrderNo(),tTaskMember.getCreateTime(),1);
+				subtractionFinanceCountMember(task.getOrderNo(),tTaskMember.getCreateTime(),2);
 			}
 
 		}
@@ -1325,7 +1325,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	 *
 	 * @param orderNo
 	 * @param date
-	 * @param type 0双减  1未审核减
+	 * @param type 0双减  1未审核减 2 总数减
 	 */
 	private void subtractionFinanceCountMember(String orderNo, Date date,Integer type) {
 		Admin admin = adminMapper.selectOrderByFinanace(orderNo);
@@ -1339,6 +1339,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				newFinanceCount.setMemberUnauditedCount(financeCount.getMemberUnauditedCount()-1);
 			}else if(type==1){
 				newFinanceCount.setMemberUnauditedCount(financeCount.getMemberUnauditedCount()-1);
+			}else if(type==2){
+				newFinanceCount.setMemberCount(financeCount.getMemberCount()-1);
 			}else {
 				return;
 			}
@@ -1355,10 +1357,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		t.setProcessStatus(1);
 		TOrderNewBo ono = tOrderNewMapper.getSaleIdByOno(task.getOrderNo());
 		addNoticMember(NoticeStatus.MENBER_START.getCode(), ono, null,0);
-		if (task.getMemberType()==0){
-			TTaskMember tTaskMember = tTaskMemberMapper.selectByTid(t.getId());
-			addFinanceCountMember(task.getOrderNo(), tTaskMember.getCreateTime());
-		}
+		TTaskMember tTaskMember = tTaskMemberMapper.selectByTid(t.getId());
+		addFinanceCountMember(task.getOrderNo(), tTaskMember.getCreateTime());
 		return orderNewService.updateOrderTask(t);
 	}
 	@Override