训练营三期功能上线测试

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsCampRole.java

@@ -5,10 +5,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
@@ -58,6 +55,7 @@ public class KxsCampRole extends Model<KxsCampRole> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
+    @TableLogic
     private String delFlag;
 
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsCampReportServiceImpl.java

@@ -139,7 +139,7 @@ public class KxsCampReportServiceImpl extends ServiceImpl<KxsCampReportMapper, K
             kxsCampBonusLog.setSourceId(kxsCampUser.getUserId());
             kxsCampBonusLog.setUsername(kxsCampUser.getUsername());
             kxsCampBonusLog.setUserCode(kxsCampUser.getUserCode());
-            kxsCampBonusLog.setRemark("系统添加" + param.getRemark());
+            kxsCampBonusLog.setRemark("系统添加-" + param.getRemark());
             kxsCampBonusLog.setKind(KindTypeEnum.ADD.getType());
             kxsCampBonusLog.setSourceNum(param.getSourceNum());
             kxsCampBonusLog.setSourceType(param.getSourceType());

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsCampBonusLogMapper.xml

@@ -26,9 +26,9 @@
                cu.username, cu.user_code, cg.group_name,
                c.title
         FROM  kxs_camp_bonus_log cbl
-        LEFT JOIN kxs_camp_user cu ON cbl.camp_user_id = cu.user_id AND cu.camp_id = #{param.campId}
         LEFT JOIN kxs_camp c ON cbl.camp_id = c.id
         left join kxs_camp_group cg on cg.group_id = cbl.group_id
+        LEFT JOIN kxs_camp_user cu ON cbl.camp_user_id = cu.user_id AND cu.camp_id = cbl.camp_id
         <where>
             AND cbl.del_flag = 0
             <if test="param.campId != null">
@@ -57,9 +57,9 @@
         cu.username, cu.user_code, cg.group_name,
         c.title
         FROM  kxs_camp_bonus_log cbl
-        LEFT JOIN kxs_camp_user cu ON cbl.camp_user_id = cu.user_id AND cu.camp_id = #{param.campId}
         LEFT JOIN kxs_camp c ON cbl.camp_id = c.id
         left join kxs_camp_group cg on cg.group_id = cbl.group_id
+        LEFT JOIN kxs_camp_user cu ON cbl.camp_user_id = cu.user_id AND cu.camp_id = cbl.camp_id
         <where>
             AND cbl.del_flag = 0
             <if test="param.campId != null">