From c19de84fa332a00c651f28e3a52292fd14f143a1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 23 九月 2025 17:30:07 +0800
Subject: [PATCH] 陆常丽反应软件系统财务对账时而数据不准确，分析源码，找到bug原因是，财务对账统计只有用户点击后才会触发统计功能，把历史上及当天进行了统计，如果当天统计时未下班，例如是中午触发统计了，而下午又进行了充值售水，但下班后未再点击触发对账统计，那么今天的对账统计完成了但数据不对。编写自动任务，在下半夜进行对账统计。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StatisticsListener.java | 90 ++++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.java | 7 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeGeneralMapper.java | 8 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml | 9 +
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StAccount.java | 47 +++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StAccountSv.java | 65 +++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StatisticsJob.java | 54 ++++++++++
7 files changed, 280 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeGeneralMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeGeneralMapper.java
index 9303ae4..9962b77 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeGeneralMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeGeneralMapper.java
@@ -8,6 +8,7 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -46,6 +47,13 @@
List<SeGeneral> getGeneralByOperateDate(@Param("operateDate") String operateDate);
/**
+ * 鏍规嵁浜ゆ槗鏃ユ湡鑾峰彇鎬昏处璁板綍鍒楄〃锛堝緟鐢熸垚鐨勶級
+ * @param cashierId 鏀堕摱鍛�
+ * @param operateDate 浜ゆ槗鏃ユ湡
+ * @return 鍙栨�昏处璁板綍鍒楄〃
+ */
+ List<SeGeneral> getGeneralByUserIdAndDt(@Param("cashierId") Long cashierId, @Param("operateDate") Date operateDate) ;
+ /**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鎬昏处璁板綍鏁�
* @param params
* @return
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.java
index 1580c2a..6bc330c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.java
@@ -93,4 +93,11 @@
@Max(message = "瀹℃牳鐘舵�佹渶澶т负3", value = 3)
@Min(message = "瀹℃牳鐘舵�佹渶灏忎负1",value = 1)
private Byte auditStatus;
+
+
+ public void updateFrom(SeGeneral fromPo){
+ this.tradeAmount = fromPo.tradeAmount ;
+ this.gift = fromPo.gift ;
+ this.refundAmount = fromPo.refundAmount ;
+ }
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
index 2fc3c00..c4710a9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
@@ -189,6 +189,15 @@
GROUP BY Date(audit_time)
</select>
+ <!--鏍规嵁鏀堕摱鍛樺拰浜ゆ槗鏃ユ湡鑾峰彇鎬昏处璁板綍鍒楄〃 -->
+ <select id="getGeneralByUserIdAndDt" resultType="com.dy.pipIrrGlobal.pojoSe.SeGeneral">
+ select
+ <include refid="Base_Column_List" />
+ from se_general
+ where cashier_id = #{cashierId,jdbcType=BIGINT}
+ and operate_date = #{operateDate,jdbcType=TIMESTAMP}
+ </select>
+
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鎬昏处璁板綍鏁�-->
<select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
SELECT
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StAccount.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StAccount.java
new file mode 100644
index 0000000..a629946
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StAccount.java
@@ -0,0 +1,47 @@
+package com.dy.pipIrrSell.autoTask;
+
+import com.dy.pipIrrGlobal.pojoSe.SeGeneral;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/9/23 14:44
+ * @Description
+ */
+@Slf4j
+@Component
+public class StAccount {
+
+ @Autowired
+ protected StAccountSv sv ;
+
+
+ protected void statistics4Day(String yyyy_MM_dd){
+ this.statisticsDay(yyyy_MM_dd) ;
+ }
+
+ /**
+ * 鏃ョ粺璁�---瀵硅处
+ */
+ private void statisticsDay(String yyyy_MM_dd){
+ // 鏍规嵁浜ゆ槗鏃ユ湡鑾峰彇鎬昏处璁板綍鍒楄〃锛堝緟鐢熸垚鐨勶級
+ List<SeGeneral> list_general = sv.getGeneralByOperateDate(yyyy_MM_dd) ;
+ if(list_general != null && list_general.size() > 0) {
+ for(int j = 0; j < list_general.size(); j++) {
+ SeGeneral general = list_general.get(j);
+ List<SeGeneral> one_list_general = sv.getGeneralByUserIdAndDt(general.getCashierId(), general.getOperateDate());
+ if(one_list_general == null || one_list_general.size() == 0){
+ sv.addGeneral(general);
+ }else{
+ SeGeneral onePo = one_list_general.get(0);
+ onePo.updateFrom(general);
+ sv.updateGeneral(onePo);
+ }
+ }
+ }
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StAccountSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StAccountSv.java
new file mode 100644
index 0000000..cd34801
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StAccountSv.java
@@ -0,0 +1,65 @@
+package com.dy.pipIrrSell.autoTask;
+
+import com.dy.pipIrrGlobal.daoSe.*;
+import com.dy.pipIrrGlobal.pojoSe.SeGeneral;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/9/23 14:44
+ * @Description
+ */
+@Component
+public class StAccountSv {
+
+ @Autowired
+ private SeGeneralMapper seGeneralMapper;
+
+ /**
+ * 鏍规嵁浜ゆ槗鏃ユ湡鑾峰彇鎬昏处璁板綍鍒楄〃锛堝緟鐢熸垚鐨勶級
+ * @param operateDate 浜ゆ槗鏃ユ湡
+ * @return 鍙栨�昏处璁板綍鍒楄〃
+ */
+ public List<SeGeneral> getGeneralByOperateDate(String operateDate) {
+ return seGeneralMapper.getGeneralByOperateDate(operateDate);
+ }
+
+
+ /**
+ * 鏍规嵁浜ゆ槗鏃ユ湡鑾峰彇鎬昏处璁板綍鍒楄〃锛堝緟鐢熸垚鐨勶級
+ * @param cashierId 鏀堕摱鍛�
+ * @param operateDate 浜ゆ槗鏃ユ湡
+ * @return 鍙栨�昏处璁板綍鍒楄〃
+ */
+ public List<SeGeneral> getGeneralByUserIdAndDt(Long cashierId, Date operateDate) {
+ return seGeneralMapper.getGeneralByUserIdAndDt(cashierId, operateDate);
+ }
+
+ /**
+ * 娣诲姞鎬昏处
+ * @param po 鎬昏处瀵硅薄
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public Integer addGeneral(SeGeneral po) {
+ return seGeneralMapper.insert(po);
+ }
+
+
+ /**
+ * 娣诲姞鎬昏处
+ * @param po 鎬昏处瀵硅薄
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public Integer updateGeneral(SeGeneral po) {
+ return seGeneralMapper.updateByPrimaryKey(po);
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StatisticsJob.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StatisticsJob.java
new file mode 100644
index 0000000..e774998
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StatisticsJob.java
@@ -0,0 +1,54 @@
+package com.dy.pipIrrSell.autoTask;
+
+import com.dy.common.multiDataSource.DataSourceContext;
+import com.dy.common.schedulerTask.TaskJob;
+import com.dy.common.springUtil.SpringContextUtil;
+import com.dy.common.util.DateTime;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/9/23 14:21
+ * @Description
+ */
+public class StatisticsJob extends TaskJob {
+
+ private static Logger log = LogManager.getLogger(StatisticsJob.class.getName()) ;
+
+ private String orgTag ;
+
+ private StAccount stAccount;
+
+ private String yesterday;
+
+ @Override
+ public void execute(JobExecutionContext ctx) throws JobExecutionException {
+ JobDataMap jobDataMap = ctx.getJobDetail().getJobDataMap() ;
+ if(jobDataMap != null){
+ orgTag = (String)jobDataMap.get(StatisticsListener.orgKey) ;
+ }
+ if(orgTag == null){
+ return ;
+ }
+ DataSourceContext.set(orgTag);//璁剧疆鏁版嵁婧�
+ stAccount = SpringContextUtil.getBean(StAccount.class);
+ if(stAccount != null){
+ yesterday = DateTime.lastXDay_yyyy_MM_dd(1) ;//寰楀埌鏄ㄥぉ锛岄浂鏅ㄦ椂鍒荤粺璁★紝缁熻鏄ㄥぉ鐨勬暟
+ //缁熻鏃ョ殑閲�
+ doStatisticsDay() ;
+ }else{
+ log.error("鏈兘浠嶴pring瀹瑰櫒涓緱鍒扮粺璁ean");
+ }
+ }
+
+ /**
+ * 缁熻
+ */
+ private void doStatisticsDay(){
+ stAccount.statistics4Day(yesterday) ;
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StatisticsListener.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StatisticsListener.java
new file mode 100644
index 0000000..98b5715
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/autoTask/StatisticsListener.java
@@ -0,0 +1,90 @@
+package com.dy.pipIrrSell.autoTask;
+
+
+import com.dy.common.schedulerTask.SchedulerTaskSupport;
+import com.dy.pipIrrGlobal.util.Org;
+import com.dy.pipIrrGlobal.util.OrgListenerSupport;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.lang.NonNull;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/9/23 14:15
+ * @Description
+ * 鐩戝惉鍣紝瀹炵幇鍔熻兘锛氬惎鍔ㄦ棩 缁熻 鏀堕摱鍛樺璐� 瀹氭椂浠诲姟
+ * 鏈洃鍚櫒涓嶈兘閲囩敤ServletContextListener鏂瑰紡锛屽洜涓篠ervlet涓婁笅鏂嘋ontext鍒涘缓鍚�
+ * Spring瀹瑰櫒骞舵病鏈夊垱寤哄畬锛岃�屾湰绫讳腑鐢ㄤ簡Spring瀹瑰櫒涓殑Bean锛屽嵆*Dao 銆�
+ * 鎵�浠ラ噰鐢ㄤ簡Spring浜嬩欢鐩戝惉鍣ㄦ潵瀹炵幇
+ */
+@Slf4j
+@Component
+public class StatisticsListener extends OrgListenerSupport implements ApplicationListener<ApplicationReadyEvent> {
+
+ protected static final String orgKey = "tag" ;
+ private static final String JobName = "statisticsAccountJob" ;
+ private static final String JobGroupName = "statisticsAccountGroup" ;
+ private static final Integer ThreadPoolMaxCount = 1 ;//绾跨▼姹犵嚎绋嬫渶澶т釜鏁�
+ private static final Integer ThreadPoolPriority = 5 ;//绾跨▼浼樺厛绾�
+
+ /**
+ * 缁熻寮�濮嬪皬鏃讹紝蹇呴』0鐐规垨涔嬪悗锛岃StatisticsJob涓粺璁★紝鏃ョ粺璁℃槸缁熻鏄ㄥぉ鐨�
+ */
+ @Value("${auto-statistics.startHour: 0}")
+ protected Integer startHour;//缁熻寮�濮嬪皬鏃�
+
+ @Value("${auto-statistics.startMinute: 5}")
+ protected Integer startMinute;//缁熻寮�濮嬪垎閽�
+
+
+ @Autowired
+ protected ResourceLoader resourceLoader ;
+
+ /**
+ * SpringBoot瀹瑰櫒宸茬粡鍑嗗濂戒簡锛屾墽琛屼笅闈㈡柟娉�
+ * @param event 浜嬩欢
+ */
+ @Override
+ public void onApplicationEvent(@NonNull ApplicationReadyEvent event) {
+ try {
+ //绛�1绉掞紝绛夊緟com.alibaba.druid.pool.DruidDataSource鍒濆鍖栧畬鎴�
+ Thread.sleep(1000L);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }finally {
+ try{
+ super.init(resourceLoader);
+ this.start(event);
+ }catch (Exception e){
+ log.error("娉ㄥ唽缁熻瀹氭椂浠诲姟鍑洪敊", e);
+ }
+
+ }
+ }
+ /**
+ * 鍒濆鍖�
+ */
+ private void start(ApplicationReadyEvent event) throws Exception{
+ if(startHour < 0 || startHour > 5){
+ startHour = 0 ;
+ }
+ List<Org.OrgVo> orgList = Org.OrgList ;
+ if(orgList != null && orgList.size() >0){
+ SchedulerTaskSupport.setThreadPoolPro(ThreadPoolMaxCount * orgList.size(), ThreadPoolPriority);
+ for(Org.OrgVo vo : orgList){
+ HashMap<String , Object> jobDataMap = new HashMap<String , Object>() ;
+ jobDataMap.put(orgKey, vo.tag) ;
+ SchedulerTaskSupport.addDailyJob(JobName + vo.tag, JobGroupName, StatisticsJob.class, jobDataMap, startHour, startMinute ) ;
+ }
+ }
+ }
+}
+
--
Gitblit v1.8.0