Merge remote-tracking branch 'origin/milestone-20251104-现金管理二期' into milestone-20251104-现金管理二期

src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java

@@ -34,6 +34,8 @@ public class BeanConsumeArticle {
     private String type;    //类型source_type 9、10打赏，11付费
     @ExcelIgnore
     private Integer payMode;   // 0 打赏  1 付费 2 其他
+    @ExcelIgnore
+    private Integer flag;
     @ExcelProperty("金豆总数")
     private String beanNum; //金豆数量
     @ExcelProperty("付费金豆数")

src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java

@@ -44,6 +44,8 @@ public class BeanConsumeFan {
     @ExcelIgnore
     private Integer payType;    //支付方式（直播：12345，铁粉：7，文章：8）
     @ExcelIgnore
+    private Integer flag;       //是否包含员工
+    @ExcelIgnore
     private String sortField; //排序字段
     @ExcelIgnore
     private String sortOrder; //排序顺序

src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java

@@ -36,6 +36,8 @@ public class BeanConsumeLive {
     //文章：    1. 打赏2. 付费
     //@ExcelProperty("类型" )
     @ExcelIgnore
+    private Integer flag;
+    @ExcelIgnore
     private String type;    //类型
     @ExcelProperty("礼物")
     private String gift;    //礼物名称

src/main/java/com/example/demo/domain/vo/bean/BeanUser.java

@@ -20,6 +20,7 @@ public class BeanUser {
     private String name;        //姓名
     private Integer jwcode;     //精网号
     private String dept;        //分部
+    private String flag;        //是否包含员工
     private Integer beanNum;    //金豆数量
     private Integer buyBean;    //付费金豆
     private Integer freeBean;   //免费金豆

src/main/resources/jindouMapper/BeanConsumeMapper.xml

@@ -142,6 +142,9 @@
             <if test="beanConsumeFan.jwcode != null and beanConsumeFan.jwcode != ''">
                 AND fm.jwcode = #{beanConsumeFan.jwcode}
             </if>
+            <if test="beanConsumeFan.flag !=0">
+                AND fm.employee = 0
+            </if>
             <if test="beanConsumeFan.dept != null and beanConsumeFan.dept != ''">
                 AND fm.dept = #{beanConsumeFan.dept}
             </if>
@@ -182,6 +185,9 @@
             <if test="beanConsumeFan.jwcode != null and beanConsumeFan.jwcode != ''">
                 AND fm.jwcode = #{beanConsumeFan.jwcode}
             </if>
+            <if test="beanConsumeFan.flag !=0">
+                AND fm.employee = 0
+            </if>
             <if test="beanConsumeFan.dept != null and beanConsumeFan.dept != ''">
                 AND fm.dept = #{beanConsumeFan.dept}
             </if>
@@ -222,6 +228,9 @@
             <if test="beanConsumeArticle.jwcode != null and beanConsumeArticle.jwcode != ''">
                 AND fm.jwcode = #{beanConsumeArticle.jwcode}
             </if>
+            <if test="beanConsumeArticle.flag !=0">
+                AND fm.employee = 0
+            </if>
             <if test="beanConsumeArticle.dept != null and beanConsumeArticle.dept != ''">
                 AND fm.dept = #{beanConsumeArticle.dept}
             </if>
@@ -283,6 +292,9 @@
             <if test="beanConsumeArticle.jwcode != null and beanConsumeArticle.jwcode != ''">
                 AND fm.jwcode = #{beanConsumeArticle.jwcode}
             </if>
+            <if test="beanConsumeArticle.flag !=0">
+                AND fm.employee = 0
+            </if>
             <if test="beanConsumeArticle.dept != null and beanConsumeArticle.dept != ''">
                 AND fm.dept = #{beanConsumeArticle.dept}
             </if>

src/main/resources/jindouMapper/BeanUser.xml

@@ -33,13 +33,16 @@
         FROM fx_member fm
         INNER JOIN fx_yaoqing fy ON fy.uid = fm.id
         <where>
+            1=1
             <if test="beanUser.jwcode != null and beanUser.jwcode != ''">
                 AND fm.jwcode = #{beanUser.jwcode}
             </if>
+            <if test="beanUser.flag !=0">
+                AND fm.employee = 0
+            </if>
             <if test="beanUser.dept != null and beanUser.dept != ''">
                 AND fm.dept = #{beanUser.dept}
             </if>
-
         </where>
         <choose>
 
@@ -72,6 +75,9 @@
             <if test="beanUser.jwcode != null and beanUser.jwcode != ''">
                 AND fm.jwcode = #{beanUser.jwcode}
             </if>
+            <if test="beanUser.flag !=0">
+                AND fm.employee = 0
+            </if>
             <if test="beanUser.dept != null and beanUser.dept != ''">
                 AND fm.dept = #{beanUser.dept}
             </if>

src/main/resources/liveMapper/LiveMapper.xml

@@ -22,9 +22,13 @@
         LEFT JOIN live_pindao lp  ON lp.pd_id = l.channel_id
         LEFT JOIN member_info mi  ON mi.jwcode = lgg.jwcode
         <where>
+            1=1
             <if test="beanConsumeLive.jwcode != null and beanConsumeLive.jwcode != ''">
                 AND lgg.jwcode = #{beanConsumeLive.jwcode}
             </if>
+            <if test="beanConsumeLive.flag!=0">/*是否看员工数据，live表1是员工，0是非员工，与金币表相反*/
+                AND mi.employee = 0
+            </if>
             <if test="beanConsumeLive.dept != null and beanConsumeLive.dept != ''">
                 AND mi.deptName = #{beanConsumeLive.dept}
             </if>
@@ -77,6 +81,10 @@
         <if test="beanConsumeLive.jwcode != null and beanConsumeLive.jwcode != ''">
             AND lgg.jwcode = #{beanConsumeLive.jwcode}
         </if>
+        <if test="beanConsumeLive.flag!=0">/*是否看员工数据，live表1是员工，0是非员工，与金币表相反*/
+            AND EXISTS (SELECT 1 FROM member_info mi
+            WHERE mi.jwcode = lgg.jwcode AND mi.employee = 0)
+        </if>
         <if test="beanConsumeLive.startTime != null and beanConsumeLive.endTime != null">
             AND lgg.created_at BETWEEN #{beanConsumeLive.startTime} AND #{beanConsumeLive.endTime}
         </if>