Browse Source

首页统计开发

anderx 2 years ago
parent
commit
6cb86d83cf

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

@@ -23,7 +23,7 @@ public interface FinanceCountMapper {
 
     void updateOrderCountAdd(@Param("aid") String aid, @Param("startTime") String startTime);
 
-    void updateOrderUnauditedSubtraction(@Param("aid") String aid, @Param("startTime") String startTime,@Param("type") Integer type);
+
 
     FinanceCount selectByAidAndDates(@Param("aid") String aid, @Param("startTime") String startTime);
 

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

@@ -233,17 +233,7 @@
     where aid = #{aid,jdbcType=VARCHAR} and date_time = #{dateTime}
 
   </update>
-  <update id="updateOrderUnauditedSubtraction">
-    update finance_count
-    <if test="type==0">
-      set order_unaudited_count=order_unaudited_count-1
-    </if>
-    <if test="type==1">
-      set order_unaudited_count=order_unaudited_count-1,
-          order_count=order_count-1
-    </if>
-      where aid = #{aid} and date_time = #{startTime}
-  </update>
+
   <update id="updateOrderCountAdd">
     update finance_count
       set order_unaudited_count=order_unaudited_count+1,

+ 16 - 5
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1112,6 +1112,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 						aids.add(e.getAid());
 					}
 				}
+				Admin admin=adminMapper.selectFinanceAdminByOrderDep(t2.getOrderDep());
+				updateFinanceCount(admin.getId(),t2.getCreateTime());
 			}
 
 			type=NoticeStatus.ORDER_YES.getCode();
@@ -1135,8 +1137,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());
-		Admin admin=adminMapper.selectFinanceAdminByOrderDep(t2.getOrderDep());
-		updateFinanceCount(admin.getId(),t2.getCreateTime());
 		return 1;
 	}
 
@@ -1738,20 +1738,31 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),order, TokenManager.getAdminId(),t.getApproval());
 		tOrderNewMapper.updateByPrimaryKeySelective(t);
 		updateAdminUserCountOrder(t.getSalesmanId(),t.getCreateTime());
-		financeCountOrderUnauditedSubtraction(t,1);
+		financeCountOrderUnauditedSubtraction(t,0);
 		return 1;
 	}
 
 	/**
 	 *
 	 * @param use
-	 * @param type 0 未审核减一 1未审核与派单数都减一
+	 * @param type 0 未审核减一 1未审核与派单数都减一  2 派单减一
 	 */
 	@Override
 	public void financeCountOrderUnauditedSubtraction(TOrderNew use,Integer type) {
 		Admin admin = adminMapper.selectFinanceAdminByOrderDep(use.getOrderDep());
 		String startTime= DateUtils.formatDate(use.getCreateTime(),AFTConstants.YYYYMMDD);
-		financeCountMapper.updateOrderUnauditedSubtraction(admin.getId(),startTime,type);
+		FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
+		FinanceCount newFinance=new FinanceCount();
+		newFinance.setId(newFinance.getId());
+		if(type==0){
+			newFinance.setOrderUnauditedCount(financeCount.getOrderUnauditedCount()-1);
+		}else if(type==1){
+			newFinance.setOrderCount(financeCount.getOrderCount()-1);
+			newFinance.setOrderUnauditedCount(financeCount.getOrderUnauditedCount()-1);
+		}else if(type==2){
+			newFinance.setOrderCount(financeCount.getOrderCount()-1);
+		}
+		financeCountMapper.updateByPrimaryKeySelective(newFinance);
 	}
 
 	private TOrderNew checkDeleteSign(String orderNo) {