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

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

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

+ 1 - 1
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -198,5 +198,5 @@ public interface AdminMapper {
     List<ConsultantUserCount> consultantthisMonthUser(@Param("firstDay")String firstDay, @Param("endDay")String endDay,
                                                       @Param("aid")String aid);
 
-    Admin selectOrderByFinanacial(String orderNo);
+    Admin selectOrderByFinanace(String orderNo);
 }

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

@@ -1385,7 +1385,7 @@
     and a.release_start  BETWEEN #{firstDay} and #{endDay})x
     group by x.dates
   </select>
-  <select id="selectOrderByFinanacial" resultType="com.goafanti.common.model.Admin">
+  <select id="selectOrderByFinanace" resultType="com.goafanti.common.model.Admin">
     select c.id,c.name
     from t_order_new a left join department b on a.order_dep=b.id
     left join admin c on b.finance_id=c.id

+ 4 - 4
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -56,7 +56,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		//非特批直接发到财务
 		if (o.getApproval()==0){
 			String startTime = DateUtils.formatDate(o.getCreateTime(),AFTConstants.YYYYMMDD);
-			Admin admin = adminMapper.selectOrderByFinanacial(o.getOrderNo());
+			Admin admin = adminMapper.selectOrderByFinanace(o.getOrderNo());
 			FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
 			addFinanceCount(startTime, admin, financeCount);
 		}
@@ -123,7 +123,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		if (o.getApproval()==0){
 			TOrderInvoice use = tOrderInvoiceMapper.selectByPrimaryKey(o.getId());
 			String startTime = DateUtils.formatDate(use.getCreateTime(),AFTConstants.YYYYMMDD);
-			Admin admin = adminMapper.selectOrderByFinanacial(o.getOrderNo());
+			Admin admin = adminMapper.selectOrderByFinanace(o.getOrderNo());
 			FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
 			addFinanceCount(startTime, admin, financeCount);
 		}
@@ -297,7 +297,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 	 */
 	private void pushInvoiceFinancialCount(TOrderInvoice t2, Integer examine) {
 		String startTime = DateUtils.formatDate(t2.getCreateTime(),AFTConstants.YYYYMMDD);
-		Admin admin = adminMapper.selectOrderByFinanacial(t2.getOrderNo());
+		Admin admin = adminMapper.selectOrderByFinanace(t2.getOrderNo());
 		FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
 		if (examine==2){
 			//特批通过和特批是财务审核
@@ -394,7 +394,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 				aids.addAll(adminMapper.listNameByDepAndName(ts.getOrderDep(), AFTConstants.SALESMAN_ADMIN));
 			}
 			String startTime = DateUtils.formatDate(o.getCreateTime(),AFTConstants.YYYYMMDD);
-			Admin admin = adminMapper.selectOrderByFinanacial(o.getOrderNo());
+			Admin admin = adminMapper.selectOrderByFinanace(o.getOrderNo());
 			FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
 			addFinanceCount(startTime,admin,financeCount);
 		}

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

@@ -126,7 +126,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	private CustomerService customerService;
 	@Autowired
 	private TaskTimeMapper taskTimeMapper;
-
+	@Autowired
+	private FinanceCountMapper financeCountMapper;
 
 
 
@@ -1381,9 +1382,28 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		addMemberLog(tOrderTask.getId(),0,"新增会员项目");
 		if(memberType!=null){
 			addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask.getOrderNo(),null,0);
+			addFinanceCountMember(tOrderTask.getOrderNo(),date);
 		}
 		return tb;
 	}
+
+	private void addFinanceCountMember(String orderNo, Date date) {
+		Admin admin = adminMapper.selectOrderByFinanace(orderNo);
+		String startTime = DateUtils.formatDate(date, AFTConstants.YYYYMMDD);
+		FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
+		if (financeCount == null) {
+			financeCount = FinanceCount.initialization(admin.getId(), startTime);
+			financeCount.setMemberCount(1);
+			financeCount.setMemberUnauditedCount(1);
+		}else {
+			FinanceCount newFinanceCount =new FinanceCount();
+			newFinanceCount.setId(financeCount.getId());
+			newFinanceCount.setMemberCount(financeCount.getMemberCount()+1);
+			newFinanceCount.setMemberUnauditedCount(financeCount.getMemberUnauditedCount()+1);
+			financeCountMapper.updateByPrimaryKeySelective(newFinanceCount);
+		}
+	}
+
 	public void addNoticMember(Integer type,  String orderNo,Integer shiroType,Integer result) {
 		TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(orderNo);
 		addNoticMember(NoticeStatus.MENBER_START.getCode(),tn,null,0);