From 11e77c26b6bed7e07ff8c9be9d99d1f5bac5af8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 5 Aug 2024 17:14:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E7=BA=AA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jjr/controller/JjrDataController.java     | 29 +++---
 .../bl/commission/jjr/dao/JjrDataDao.java     |  2 +
 .../jjr/service/JjrDataService.java           |  2 +
 .../jjr/service/impl/JjrDataServiceImpl.java  | 11 +++
 .../mapper/bl/commission/jjr/JjrDataDao.xml   | 90 +++++++++++++++----
 5 files changed, 108 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrDataController.java b/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrDataController.java
index dda6090..affad5d 100644
--- a/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrDataController.java
+++ b/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrDataController.java
@@ -25,17 +25,24 @@ public class JjrDataController {
         return service.findPage(jjrData);
     }
 
-//    @GetMapping("/invitationArtificerPage")
-//    @ApiOperation("邀请技师（分页）")
-//    public Result invitationArtificerPage(JjrData jjrData){
-//        return service.invitationArtificerPage(jjrData);
-//    }
-//
-//    @GetMapping("/cancelInvitation")
-//    @ApiOperation("邀请技师（分页）")
-//    public Result invitationArtificerPage(JjrData jjrData){
-//        return service.invitationArtificerPage(jjrData);
-//    }
+    @GetMapping("/invitationArtificerPage")
+    @ApiOperation("邀请技师（分页）")
+    public Result invitationArtificerPage(JjrData jjrData){
+        return service.invitationArtificerPage(jjrData);
+    }
+
+    @GetMapping("/artificerPage")
+    @ApiOperation("技师（分页）")
+    public Result artificerPage(JjrData jjrData){
+        return service.artificerPage(jjrData);
+    }
+
+    @PostMapping("/cancelInvitation")
+    @ApiOperation("取消邀请技师")
+    public Result cancelInvitation(JjrData jjrData){
+        service.cancelInvitation(jjrData);
+        return Result.success();
+    }
 
     @GetMapping("/jjrList")
     @ApiOperation("经纪人列表")
diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrDataDao.java b/src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrDataDao.java
index 93f0691..aeb56ae 100644
--- a/src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrDataDao.java
+++ b/src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrDataDao.java
@@ -14,7 +14,9 @@ import java.util.List;
 public interface JjrDataDao extends BaseMapper<JjrData> {
     IPage<JjrData> findPage(Page<JjrData> page, @Param("params") JjrData jjrData);
     IPage<JjrData> invitationArtificerPage(Page<JjrData> page, @Param("params") JjrData jjrData);
+    IPage<JjrData> artificerPage(Page<JjrData> page, @Param("params") JjrData jjrData);
     IPage<JjrData> findJjrPage(Page<JjrData> page, @Param("params") JjrData jjrData);
+    void cancelInvitation(JjrData jjrData);
     JjrData getByCode(String invitationCode);
     void modifyJjr(JjrData jjrData);
 }
\ No newline at end of file
diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrDataService.java b/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrDataService.java
index 0b05f8c..0a9cab6 100644
--- a/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrDataService.java
+++ b/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrDataService.java
@@ -7,7 +7,9 @@ import com.sqx.modules.bl.commission.jjr.entity.JjrData;
 public interface JjrDataService extends IService<JjrData> {
     Result findPage(JjrData jjrData);
     Result invitationArtificerPage(JjrData jjrData);
+    Result artificerPage(JjrData jjrData);
     Result findJjrPage(JjrData jjrData);
+    void cancelInvitation(JjrData jjrData);
     JjrData getByCode(String invitationCode);
     void modifyJjr(JjrData jjrData);
 }
\ No newline at end of file
diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrDataServiceImpl.java b/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrDataServiceImpl.java
index 26a99ca..c3cba31 100644
--- a/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrDataServiceImpl.java
+++ b/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrDataServiceImpl.java
@@ -34,6 +34,17 @@ public class JjrDataServiceImpl extends ServiceImpl<JjrDataDao, JjrData> impleme
         return Result.success().put("data",new PageUtils(baseMapper.invitationArtificerPage(pages,jjrData)));
     }
 
+    @Override
+    public Result artificerPage(JjrData jjrData){
+        Page<JjrData> pages=new Page<>(jjrData.getPage(),jjrData.getLimit());
+        return Result.success().put("data",new PageUtils(baseMapper.artificerPage(pages,jjrData)));
+    }
+
+    @Override
+    public void cancelInvitation(JjrData jjrData){
+        baseMapper.cancelInvitation(jjrData);
+    }
+
     @Override
     public Result findJjrPage(JjrData jjrData){
         Page<JjrData> pages=new Page<>(jjrData.getPage(),jjrData.getLimit());
diff --git a/src/main/resources/mapper/bl/commission/jjr/JjrDataDao.xml b/src/main/resources/mapper/bl/commission/jjr/JjrDataDao.xml
index d821f8d..00c4121 100644
--- a/src/main/resources/mapper/bl/commission/jjr/JjrDataDao.xml
+++ b/src/main/resources/mapper/bl/commission/jjr/JjrDataDao.xml
@@ -4,38 +4,92 @@
 <mapper namespace="com.sqx.modules.bl.commission.jjr.dao.JjrDataDao">
 
     <select id="findPage" resultType="com.sqx.modules.bl.commission.jjr.entity.JjrData">
-        select a.id,a.user_id,b.avatar,b.user_name,a.name,a.phone,a.remarks,a.create_time,a.status,a.opinion,b.invitation_code,a.approve_time
-
-        from bl_jjr_apply a
-        inner join tb_user b on a.user_id = b.user_id
-        where a.status= 1
+        select
+        x.id,x.user_id,y.avatar,y.user_name,x.name,x.phone,x.remarks,x.create_time,x.status,x.opinion,y.invitation_code,x.approve_time,
+        (select count(*) from tb_user ac where ac.bl_jjr_code = y.invitation_code) as artificerCount,
+        ifnull(t1.ordersCount,0) as ordersCount,
+        ifnull(t2.money,0) as money
+        from bl_jjr_apply x
+        inner join tb_user y on x.user_id = y.user_id
+        left join (
+            select count(*) as ordersCount, aa.user_id, bb.bl_jjr_code
+            from (
+                select o1.orders_id,a.user_id
+                from orders o1
+                left join orders o2 on o1.old_orders_id = o2.orders_id and o2.status != 4
+                left join orders o3 on o2.old_orders_id = o3.orders_id and o3.status != 4
+                left join artificer a on a.artificer_id=o1.artificer_id
+                where o1.old_orders_id is not null
+                and o1.status in (3,5)
+                union all
+                select o1.orders_id,a.user_id
+                from orders o1
+                left join artificer a on a.artificer_id=o1.artificer_id
+                where o1.parent_id = 0
+                and o1.old_orders_id is null
+                and o1.orders_id not in (
+                    select orders_id from orders
+                    where old_orders_id is not null
+                    and status != 4
+                )
+                    and o1.orders_id not in (
+                    select old_orders_id from orders
+                    where old_orders_id is not null
+                    and status != 4
+                )
+                and o1.status in (3,5)
+            ) aa inner join tb_user bb on aa.user_id = bb.user_id
+            group by aa.user_id, bb.bl_jjr_code
+        ) t1 on t1.bl_jjr_code = y.invitation_code
+        left join (
+            select sum(money) money,user_id
+            from user_money_details
+            where state = 2
+            and type = 1
+            group by user_id
+        ) t2 on t2.user_id = x.user_id
+        where x.status= 1
         <if test="params.name!=null and params.name!=''">
-            and a.name like concat('%',#{params.name},'%')
+            and x.name like concat('%',#{params.name},'%')
         </if>
         <if test="params.phone!=null and params.phone!=''">
-            and a.phone like concat('%',#{params.phone},'%')
+            and x.phone like concat('%',#{params.phone},'%')
         </if>
         <if test="params.startTime!=null and params.startTime!=''">
-            and a.approve_time >= #{params.startTime}
+            and x.approve_time >= #{params.startTime}
         </if>
         <if test="params.endTime!=null and params.endTime!=''">
-            and a.approve_time &lt;= #{params.endTime}
+            and x.approve_time &lt;= #{params.endTime}
         </if>
-        order by id desc
+        order by x.id desc
     </select>
 
     <select id="invitationArtificerPage" resultType="com.sqx.modules.bl.commission.jjr.entity.JjrData">
-        select a.user_id,a.artificer_img as avatar,a.artificer_name as name,a.phone,b.invitation_code
+        select a.user_id,a.artificer_img as avatar,a.artificer_name as name,b.phone,b.invitation_code
         from artificer a
         inner join tb_user b on a.user_id = b.user_id
-        where b.bl_jjr_code= #{invitationCode}
+        where b.bl_jjr_code= #{params.invitationCode}
         <if test="params.name!=null and params.name!=''">
             and a.artificer_name like concat('%',#{params.name},'%')
         </if>
         <if test="params.phone!=null and params.phone!=''">
-            and a.phone like concat('%',#{params.phone},'%')
+            and b.phone like concat('%',#{params.phone},'%')
         </if>
-        order by id desc
+        order by a.user_id desc
+    </select>
+
+    <select id="artificerPage" resultType="com.sqx.modules.bl.commission.jjr.entity.JjrData">
+        select a.user_id,a.artificer_img as avatar,a.artificer_name as name,b.phone,b.invitation_code
+        from artificer a
+        inner join tb_user b on a.user_id = b.user_id
+        where ifnull(b.bl_jjr_code,'') = ''
+        <if test="params.name!=null and params.name!=''">
+            and a.artificer_name like concat('%',#{params.name},'%')
+        </if>
+        <if test="params.phone!=null and params.phone!=''">
+            and b.phone like concat('%',#{params.phone},'%')
+        </if>
+        order by a.user_id desc
     </select>
 
     <select id="findJjrPage" resultType="com.sqx.modules.bl.commission.jjr.entity.JjrData">
@@ -58,6 +112,12 @@
         order by id desc
     </select>
 
+    <update id="cancelInvitation" parameterType="com.sqx.modules.bl.commission.jjr.entity.JjrData">
+        update tb_user
+        set bl_jjr_code=null
+        where user_id=#{artificerUserId}
+    </update>
+
     <select id="getByCode" resultType="com.sqx.modules.bl.commission.jjr.entity.JjrData">
         select a.id,a.user_id,b.avatar,b.user_name,a.name,a.phone,a.remarks,a.create_time,a.status,a.opinion
         from bl_jjr_apply a
@@ -65,7 +125,7 @@
         where b.invitation_code= #{invitationCode}
     </select>
 
-    <update id="modifyJjr" parameterType="com.sqx.modules.bl.commission.jjr.entity.JjrApply">
+    <update id="modifyJjr" parameterType="com.sqx.modules.bl.commission.jjr.entity.JjrData">
         update tb_user
         set bl_jjr_code=#{invitationCode}
         where user_id=#{artificerUserId}