From cd72d7e6c3acd087091c4b2d233f35765ddbfda7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 02 Nov 2022 11:31:04 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java                 |    4 +++-
 src/main/resources/templates/febs/views/dapp/member.html            |    3 ++-
 src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java |    4 ++++
 src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml            |   17 +++++++++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
index 6df762e..34eb5bd 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
@@ -27,4 +27,8 @@
     List<IgtOnHookPlanOrder> selectByCreateTime(@Param("createTime")String format);
 
     IPage<AdminIgtOnHookPlanOrderVo> findMemberPlanListInPage(Page<IgtOnHookPlanOrder> page, @Param("record")IgtOnHookPlanOrder igtOnHookPlanOrder);
+
+    List<Long> selectIdsByState(@Param("state")int i);
+
+    void updateByIds(List<Long> ids);
 }
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 9ad8283..33b0684 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -278,9 +278,11 @@
     @Scheduled(cron = "0 0/1 * * * ? ")
     public void updatePlanOrder(){
         Log.info("开始更新挂机主表状态");
-
         List<IgtOnHookPlanOrder> igtOnHookPlanOrders = igtOnHookPlanOrderDao.selectByState(3);
         if(CollUtil.isNotEmpty(igtOnHookPlanOrders)){
+            List<Long> ids = igtOnHookPlanOrderDao.selectIdsByState(3);
+            //更新状态避免重复查询
+            igtOnHookPlanOrderDao.updateByIds(ids);
             for(IgtOnHookPlanOrder igtOnHookPlanOrder : igtOnHookPlanOrders){
                 Long memberId = igtOnHookPlanOrder.getMemberId();
                 BigDecimal planAmount = igtOnHookPlanOrder.getPlanAmount();
diff --git a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
index b72f002..57f1f82 100644
--- a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
+++ b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
@@ -81,4 +81,21 @@
         order by s.create_time desc
     </select>
 
+    <select id="selectIdsByState" resultType="java.lang.Long">
+        SELECT
+            a.id
+        FROM igt_on_hook_plan_order a
+        where a.state = #{state}
+    </select>
+
+    <update id="updateByIds" parameterType="list">
+            update igt_on_hook_plan_order
+            set
+                state = 2
+            where 1=1
+        <foreach collection="list" item="id">
+              or id = #{id}
+        </foreach>
+    </update>
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/dapp/member.html b/src/main/resources/templates/febs/views/dapp/member.html
index 1672978..dec2d30 100644
--- a/src/main/resources/templates/febs/views/dapp/member.html
+++ b/src/main/resources/templates/febs/views/dapp/member.html
@@ -298,7 +298,7 @@
                     {type: 'checkbox'},
                     {type: 'numbers'},
                     {field: 'username', title: '用户名', minWidth: 130},
-                    {field: 'identity', title: '会员等级',
+                    {field: 'identity', title: '会员',
                         templet: function (d) {
                             if (d.identity === 'LEVEL_TM') {
                                 return '<span>游客</span>'
@@ -308,6 +308,7 @@
                                 return ''
                             }
                         }, minWidth: 100, align: 'center'},
+                    {field: 'identity', title: '等级', minWidth: 100, align: 'center'},
                     // {field: 'address', title: '地址', minWidth: 130},
                     // {title: '余额(USDT)', templet: '#balance', minWidth: 120},
                     // {title: '授权列表', templet: '#approve-list', minWidth: 110},

--
Gitblit v1.9.1