From 47a2ced150c8ff59861ad3e33b80908ccff2fad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Thu, 17 Apr 2025 08:42:21 +0800
Subject: [PATCH] debug

---
 .../com/ruoyi/bst/bonus/domain/Bonus.java     | 20 +++++++++++++++++--
 .../service/impl/BonusConverterImpl.java      | 11 +++++++---
 .../ruoyi/bst/order/mapper/OrderMapper.xml    |  5 +++++
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/bonus/domain/Bonus.java b/ruoyi-service/src/main/java/com/ruoyi/bst/bonus/domain/Bonus.java
index 6f9cb5e..36c8c72 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/bonus/domain/Bonus.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/bonus/domain/Bonus.java
@@ -2,6 +2,7 @@ package com.ruoyi.bst.bonus.domain;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.format.annotation.DateTimeFormat;
@@ -60,7 +61,7 @@ public class Bonus extends BaseEntity
     @Excel(name = "未出账金额")
     @ApiModelProperty("未出账金额")
     private BigDecimal invalidAmount;
-    
+
     @Excel(name = "待分成金额")
     @ApiModelProperty("待分成金额")
     private BigDecimal waitAmount;
@@ -96,6 +97,21 @@ public class Bonus extends BaseEntity
     private Long areaId;
 
     @Excel(name = "其他可见用户ID列表")
-    @ApiModelProperty("其他可见用户ID列表") 
+    @ApiModelProperty("其他可见用户ID列表")
     private List<Long> viewUserIds;
+
+
+    public void addViewUserId(Long userId) {
+        if (userId == null) {
+            return;
+        }
+        if (this.viewUserIds == null) {
+            this.viewUserIds = new ArrayList<>();
+        }
+        if (viewUserIds.contains(userId)) {
+            return;
+        }
+        viewUserIds.add(userId);
+
+    }
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/bonus/service/impl/BonusConverterImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/bonus/service/impl/BonusConverterImpl.java
index 7e30a50..43f2134 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/bonus/service/impl/BonusConverterImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/bonus/service/impl/BonusConverterImpl.java
@@ -112,7 +112,9 @@ public class BonusConverterImpl implements BonusConverter {
             Bonus bonus = BonusUtil.getInitBonus(BonusArrivalType.JOIN, joinUserId, join.getUserName(), join.getPoint());
             if (bonus != null) {
                 result.add(bonus);
-                bonus.setViewUserIds(Arrays.asList(areaUserId, areaAgentId));   // 代理商、运营商可见
+                // 代理商、运营商可见
+                bonus.addViewUserId(areaUserId);
+                bonus.addViewUserId(areaAgentId);
                 totalPoint = totalPoint.add(bonus.getPoint());
             }
         }
@@ -123,7 +125,9 @@ public class BonusConverterImpl implements BonusConverter {
                 Bonus bonus = BonusUtil.getInitBonus(BonusArrivalType.PARTNER, partner.getUserId(), partner.getUserName(), partner.getPoint());
                 if (bonus != null) {
                     result.add(bonus);
-                    bonus.setViewUserIds(Arrays.asList(areaUserId, areaAgentId));   // 代理商、运营商可见
+                    // 代理商、运营商可见
+                    bonus.addViewUserId(areaUserId);
+                    bonus.addViewUserId(areaAgentId);
                     totalPoint = totalPoint.add(bonus.getPoint());
                 }
             }
@@ -134,7 +138,8 @@ public class BonusConverterImpl implements BonusConverter {
             Bonus bonus = BonusUtil.getInitBonus(BonusArrivalType.MCH, areaUserId, device.getAreaUserName(), device.getAreaUserPoint().subtract(totalPoint));
             if (bonus != null) {
                 result.add(bonus);
-                bonus.setViewUserIds(Arrays.asList(areaAgentId));   // 代理商可见
+                // 代理商可见
+                bonus.addViewUserId(areaAgentId);
                 totalPoint = totalPoint.add(bonus.getPoint());
             }
         }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/order/mapper/OrderMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/order/mapper/OrderMapper.xml
index 47c7689..c8d7c62 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/order/mapper/OrderMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/order/mapper/OrderMapper.xml
@@ -51,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bo.verify_remark,
             bo.area_user_id,
             bo.area_agent_id,
+            bo.cancel_remark,
             ba.name as area_name,
             su.nick_name as user_name,
             su.user_name as user_phone,
@@ -119,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.areaUserId != null "> and bo.area_user_id = #{query.areaUserId}</if>
         <if test="query.areaAgentId != null "> and bo.area_agent_id = #{query.areaAgentId}</if>
         <if test="query.createDate != null "> and date(bo.create_time) = #{query.createDate}</if>
+        <if test="query.cancelRemark != null  and query.cancelRemark != ''"> and bo.cancel_remark like concat('%', #{query.cancelRemark}, '%')</if>
         <if test="query.bonusUserId != null ">
             and bo.id in (
                 select distinct bb.bst_id from bst_bonus bb
@@ -216,6 +218,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="verifyRemark != null">verify_remark,</if>
             <if test="areaUserId != null">area_user_id,</if>
             <if test="areaAgentId != null">area_agent_id,</if>
+            <if test="cancelRemark != null">cancel_remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="no != null and no != ''">#{no},</if>
@@ -257,6 +260,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="verifyRemark != null">#{verifyRemark},</if>
             <if test="areaUserId != null">#{areaUserId},</if>
             <if test="areaAgentId != null">#{areaAgentId},</if>
+            <if test="cancelRemark != null">#{cancelRemark},</if>
          </trim>
     </insert>
 
@@ -308,6 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="data.verifyRemark != null">verify_remark = #{data.verifyRemark},</if>
         <if test="data.areaUserId != null">area_user_id = #{data.areaUserId},</if>
         <if test="data.areaAgentId != null">area_agent_id = #{data.areaAgentId},</if>
+        <if test="data.cancelRemark != null">cancel_remark = #{data.cancelRemark},</if>
     </sql>
 
     <delete id="deleteOrderById" parameterType="Long">