From 302b525c1bd459b2fc6e27d3b4073aee6e8b3f2b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 28 十月 2024 17:28:30 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
index 17081dc..7cc909c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
@@ -11,9 +11,11 @@
 import com.dy.pipIrrGlobal.command.enums.LastOperateENUM;
 import com.dy.pipIrrGlobal.command.result.CommandResultCode;
 import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
+import com.dy.pipIrrGlobal.daoPr.PrCommonIntakesMapper;
 import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
 import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper;
 import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
+import com.dy.pipIrrGlobal.pojoPr.PrCommonIntakes;
 import com.dy.pipIrrGlobal.pojoPr.PrController;
 import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
 import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
@@ -78,6 +80,9 @@
 
     @Autowired
     private SeVirtualCardMapper seVirtualCardMapper;
+
+    @Autowired
+    private PrCommonIntakesMapper prCommonIntakesMapper;
 
     public static ComSupport comSupport;
 
@@ -279,6 +284,9 @@
         rmCommandHistoryMapper.insert(rmCommandHistory);
         comId = rmCommandHistory.getComId();
 
+        // 娣诲姞甯哥敤鍙栨按鍙f垨鏇存柊浣跨敤淇℃伅
+        addCommonIntake(operator, intakeId);
+
         /**
          * 澶勭悊鍥炶皟
          * feature鍑嗗灏辩华鍚庡彂閫佸懡浠�
@@ -357,4 +365,25 @@
         return response_CallBack;
 
     }
+
+    /**
+     * 娣诲姞甯哥敤鍙栨按鍙f垨鏇存柊浣跨敤淇℃伅
+     * @param intakeId
+     * @return
+     */
+    public Integer addCommonIntake(Long operatorId, Long intakeId) {
+        PrCommonIntakes commonIntake = prCommonIntakesMapper.selectByOperatorAndIntake(operatorId, intakeId);
+        if(commonIntake == null) {
+            commonIntake = new PrCommonIntakes();
+            commonIntake.setOperatorId(operatorId);
+            commonIntake.setIntakeId(intakeId);
+            commonIntake.setLastUsedTime(new Date());
+            commonIntake.setUsageCount(1);
+            return prCommonIntakesMapper.insert(commonIntake);
+        }
+
+        commonIntake.setLastUsedTime(new Date());
+        commonIntake.setUsageCount(commonIntake.getUsageCount() + 1);
+        return prCommonIntakesMapper.updateByPrimaryKeySelective(commonIntake);
+    }
 }

--
Gitblit v1.8.0