去掉套餐用户绑定功能逻辑

bms-back/bms-admin/src/main/java/com/bms/web/controller/price/PriceSetController.java

@@ -27,7 +27,6 @@ import com.bms.common.enums.BusinessType;
 import com.bms.common.utils.MessageUtils;
 import com.bms.common.utils.StringUtils;
 import com.bms.price.domain.PrcCustomerPriceSet;
-import com.bms.price.domain.PrcPriceSetUser;
 import com.bms.price.domain.PrcPriceExcelFile;
 import com.bms.price.domain.PrcPriceSet;
 import com.bms.price.domain.PrcPriceSetDetail;
@@ -388,29 +387,4 @@ public class PriceSetController extends BaseController
         return toAjax(priceSetService.deleteCustomerByIds(customerPricesetIds));
     }
 
-    @PreAuthorize("@ss.hasPermi('price:set:list')")
-    @GetMapping("/viewer/list")
-    public TableDataInfo viewerList(PrcPriceSetUser query)
-    {
-        startPage();
-        List<PrcPriceSetUser> list = priceSetService.selectViewerList(query);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('price:set:edit')")
-    @Log(title = "Package viewer bind", businessType = BusinessType.INSERT)
-    @PostMapping("/viewer")
-    public AjaxResult addViewer(@RequestBody PrcPriceSetUser row)
-    {
-        row.setCreateBy(getUsername());
-        return toAjax(priceSetService.insertViewer(row));
-    }
-
-    @PreAuthorize("@ss.hasPermi('price:set:edit')")
-    @Log(title = "Package viewer bind", businessType = BusinessType.DELETE)
-    @DeleteMapping("/viewer/{psuIds}")
-    public AjaxResult removeViewer(@PathVariable Long[] psuIds)
-    {
-        return toAjax(priceSetService.deleteViewerByIds(psuIds));
-    }
 }

bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSet.java

@@ -42,8 +42,6 @@ public class PrcPriceSet extends BaseEntity
     private List<PrcPriceSetDetail> details;
     private List<PrcPriceSetVersion> versions;
     private List<PrcCustomerPriceSet> customers;
-    /** viewers explicitly bound to this package */
-    private List<PrcPriceSetUser> viewers;
     /** async save task id (not persisted) */
     private String saveTaskId;
     /** Y: ignored on save; library pull only via /detail/pullFromLibrary */

bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetUser.java

@@ -1,21 +0,0 @@
-package com.bms.price.domain;
-
-import com.bms.common.core.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/** 套餐可查看人绑定：prc_price_set_user */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PrcPriceSetUser extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    private Long psuId;
-    private Long priceSetId;
-    private Long userId;
-    /** login account */
-    private String userName;
-    /** display only, not a table column */
-    private String nickName;
-}

bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetUserMapper.java

@@ -1,20 +0,0 @@
-package com.bms.price.mapper;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.bms.price.domain.PrcPriceSetUser;
-
-public interface PrcPriceSetUserMapper
-{
-    PrcPriceSetUser selectPrcPriceSetUserById(Long psuId);
-
-    List<PrcPriceSetUser> selectPrcPriceSetUserList(PrcPriceSetUser query);
-
-    int insertPrcPriceSetUser(PrcPriceSetUser row);
-
-    int deletePrcPriceSetUserByIds(Long[] psuIds);
-
-    int deleteByPriceSetId(Long priceSetId);
-
-    int countBySetAndUser(@Param("priceSetId") Long priceSetId, @Param("userId") Long userId);
-}

bms-back/bms-system/src/main/java/com/bms/price/service/IPrcPriceSetService.java

@@ -9,7 +9,6 @@ import com.bms.price.domain.PrcPriceSet;
 import com.bms.price.domain.PrcPriceSetCheckItem;
 import com.bms.price.domain.PrcPriceSetDetail;
 import com.bms.price.domain.PrcPriceSetSaveTask;
-import com.bms.price.domain.PrcPriceSetUser;
 
 /**
  * 价格套餐 服务层
@@ -92,12 +91,6 @@ public interface IPrcPriceSetService
 
     public int deleteCustomerByIds(Long[] customerPricesetIds);
 
-    public List<PrcPriceSetUser> selectViewerList(PrcPriceSetUser query);
-
-    public int insertViewer(PrcPriceSetUser row);
-
-    public int deleteViewerByIds(Long[] psuIds);
-
     /** chain expire_time = next version effective_time, then refresh 0/3/1/2 */
     public int refreshAllVersionStatus();
 

bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPriceSetServiceImpl.java

@@ -30,7 +30,6 @@ import com.bms.price.domain.BmsProductCountry;
 import com.bms.price.domain.PrcCustomerPriceSet;
 import com.bms.price.domain.PrcPriceExcelFile;
 import com.bms.price.domain.PrcPriceSet;
-import com.bms.price.domain.PrcPriceSetUser;
 import com.bms.price.domain.PrcPriceSetCheckItem;
 import com.bms.price.domain.PrcPriceSetDetail;
 import com.bms.price.domain.PrcPriceSetProduct;
@@ -44,12 +43,9 @@ import com.bms.price.mapper.PrcCustomerPriceSetMapper;
 import com.bms.price.mapper.PrcPriceSetDetailMapper;
 import com.bms.price.mapper.PrcPriceSetMapper;
 import com.bms.price.mapper.PrcPriceSetProductMapper;
-import com.bms.price.mapper.PrcPriceSetUserMapper;
 import com.bms.price.mapper.PrcPriceSetVersionMapper;
 import com.bms.price.mapper.PrcSurchargeMapper;
 import com.bms.price.mapper.PrcSurchargeRelMapper;
-import com.bms.common.core.domain.entity.SysUser;
-import com.bms.system.mapper.SysUserMapper;
 import com.bms.price.service.IBmsProductService;
 import com.bms.price.search.IBillSearchStore;
 import com.bms.price.search.PriceChangeEsLog;
@@ -105,12 +101,6 @@ public class PrcPriceSetServiceImpl implements IPrcPriceSetService
     @Autowired
     private PrcCustomerPriceSetMapper customerMapper;
 
-    @Autowired
-    private PrcPriceSetUserMapper priceSetUserMapper;
-
-    @Autowired
-    private SysUserMapper sysUserMapper;
-
     @Autowired
     private BmsProductCountryMapper productCountryMapper;
 
@@ -149,18 +139,14 @@ public class PrcPriceSetServiceImpl implements IPrcPriceSetService
     }
 
     /**
-     * Price-set list data scope: bound customer's sales user (same as customer list),
-     * package creator, or explicit viewer bind. Super admin skips filter in DataScopeAspect.
+     * Price-set list data scope: bound customer's sales user (same as customer list)
+     * or package creator. Super admin skips filter in DataScopeAspect.
      */
     @Override
     @DataScope(deptAlias = "su", deptField = "dept_id", userAlias = "su", userField = "user_id",
         permission = "price:set:list")
     public List<PrcPriceSet> selectPrcPriceSetList(PrcPriceSet set)
     {
-        if (set != null)
-        {
-            set.getParams().put("viewerUserId", SecurityUtils.getUserId());
-        }
         List<PrcPriceSet> list = setMapper.selectPrcPriceSetList(set);
         for (PrcPriceSet item : list)
         {
@@ -2468,49 +2454,6 @@ public class PrcPriceSetServiceImpl implements IPrcPriceSetService
         return customerMapper.deletePrcCustomerPriceSetByIds(customerPricesetIds);
     }
 
-    @Override
-    public List<PrcPriceSetUser> selectViewerList(PrcPriceSetUser query)
-    {
-        return priceSetUserMapper.selectPrcPriceSetUserList(query);
-    }
-
-    @Override
-    @Transactional
-    public int insertViewer(PrcPriceSetUser row)
-    {
-        if (row == null || row.getPriceSetId() == null || row.getUserId() == null)
-        {
-            throw new ServiceException("price set user bind requires priceSetId and userId");
-        }
-        requireSet(row.getPriceSetId());
-        if (priceSetUserMapper.countBySetAndUser(row.getPriceSetId(), row.getUserId()) > 0)
-        {
-            throw new ServiceException("user already bound to this price set");
-        }
-        SysUser user = sysUserMapper.selectUserById(row.getUserId());
-        if (user == null)
-        {
-            throw new ServiceException("user not found");
-        }
-        row.setUserName(user.getUserName());
-        if (StringUtils.isEmpty(row.getCreateBy()))
-        {
-            row.setCreateBy(SecurityUtils.getUsername());
-        }
-        return priceSetUserMapper.insertPrcPriceSetUser(row);
-    }
-
-    @Override
-    @Transactional
-    public int deleteViewerByIds(Long[] psuIds)
-    {
-        if (psuIds == null || psuIds.length == 0)
-        {
-            return 0;
-        }
-        return priceSetUserMapper.deletePrcPriceSetUserByIds(psuIds);
-    }
-
     private void replaceChildren(PrcPriceSet set)
     {
         saveOrUpdateVersion(set);
@@ -3277,9 +3220,6 @@ public class PrcPriceSetServiceImpl implements IPrcPriceSetService
         PrcCustomerPriceSet cquery = new PrcCustomerPriceSet();
         cquery.setPriceSetId(priceSetId);
         set.setCustomers(customerMapper.selectPrcCustomerPriceSetList(cquery));
-        PrcPriceSetUser uquery = new PrcPriceSetUser();
-        uquery.setPriceSetId(priceSetId);
-        set.setViewers(priceSetUserMapper.selectPrcPriceSetUserList(uquery));
     }
 
     private void fillVersionChildren(PrcPriceSetVersion version)

bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml

@@ -105,14 +105,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                           AND su.user_name = s.created_by COLLATE utf8mb4_general_ci
                         ${params.dataScope}
                     )
-                    <if test="params.viewerUserId != null">
-                    OR EXISTS (
-                        SELECT 1
-                        FROM prc_price_set_user psu
-                        WHERE psu.price_set_id = s.price_set_id
-                          AND psu.user_id = #{params.viewerUserId}
-                    )
-                    </if>
                 )
             </if>
         </where>

bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetUserMapper.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.bms.price.mapper.PrcPriceSetUserMapper">
-
-    <resultMap type="PrcPriceSetUser" id="PrcPriceSetUserResult">
-        <id     property="psuId"      column="psu_id" />
-        <result property="priceSetId" column="price_set_id" />
-        <result property="userId"     column="user_id" />
-        <result property="userName"   column="user_name" />
-        <result property="nickName"   column="nick_name" />
-        <result property="createBy"   column="created_by" />
-        <result property="createTime" column="create_time" />
-    </resultMap>
-
-    <sql id="selectVo">
-        select psu.psu_id, psu.price_set_id, psu.user_id, psu.user_name,
-               u.nick_name, psu.created_by, psu.create_time
-        from prc_price_set_user psu
-        left join sys_user u on u.user_id = psu.user_id
-    </sql>
-
-    <select id="selectPrcPriceSetUserById" parameterType="Long" resultMap="PrcPriceSetUserResult">
-        <include refid="selectVo"/>
-        where psu.psu_id = #{psuId}
-    </select>
-
-    <select id="selectPrcPriceSetUserList" parameterType="PrcPriceSetUser" resultMap="PrcPriceSetUserResult">
-        <include refid="selectVo"/>
-        <where>
-            <if test="priceSetId != null">AND psu.price_set_id = #{priceSetId}</if>
-            <if test="userId != null">AND psu.user_id = #{userId}</if>
-            <if test="userName != null and userName != ''">AND psu.user_name = #{userName}</if>
-        </where>
-        order by psu.psu_id asc
-    </select>
-
-    <select id="countBySetAndUser" resultType="int">
-        select count(1) from prc_price_set_user
-        where price_set_id = #{priceSetId} and user_id = #{userId}
-    </select>
-
-    <insert id="insertPrcPriceSetUser" parameterType="PrcPriceSetUser" useGeneratedKeys="true" keyProperty="psuId">
-        insert into prc_price_set_user (price_set_id, user_id, user_name, created_by, create_time)
-        values (#{priceSetId}, #{userId}, #{userName}, #{createBy}, sysdate())
-    </insert>
-
-    <delete id="deletePrcPriceSetUserByIds" parameterType="Long">
-        delete from prc_price_set_user where psu_id in
-        <foreach collection="array" item="id" open="(" separator="," close=")">#{id}</foreach>
-    </delete>
-
-    <delete id="deleteByPriceSetId" parameterType="Long">
-        delete from prc_price_set_user where price_set_id = #{priceSetId}
-    </delete>
-</mapper>

bms-back/sql/bms_init.sql

@@ -806,23 +806,6 @@ CREATE TABLE `prc_customer_price_set` (
   CONSTRAINT `fk_customer_price_set` FOREIGN KEY (`price_set_id`) REFERENCES `prc_price_set` (`price_set_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='客户套餐表-客户某时间段内使用的套餐';
 
--- ----------------------------
--- 表结构：`prc_price_set_user`
--- ----------------------------
-CREATE TABLE `prc_price_set_user` (
-  `psu_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `price_set_id` bigint(20) NOT NULL COMMENT '价格套餐id',
-  `user_id` bigint(20) NOT NULL COMMENT '用户id',
-  `user_name` varchar(64) NOT NULL DEFAULT '' COMMENT '登录账号',
-  `created_by` varchar(64) DEFAULT '' COMMENT '创建人',
-  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-  PRIMARY KEY (`psu_id`),
-  UNIQUE KEY `uk_psu_set_user` (`price_set_id`,`user_id`),
-  KEY `idx_psu_user` (`user_id`),
-  KEY `idx_psu_set` (`price_set_id`),
-  CONSTRAINT `fk_psu_set` FOREIGN KEY (`price_set_id`) REFERENCES `prc_price_set` (`price_set_id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='套餐可见用户绑定';
-
 -- ----------------------------
 -- 表结构：`prc_income_bill`
 -- ----------------------------

bms-back/sql/price/prc_price_set_user.sql

@@ -1,16 +1,4 @@
--- Price set viewer bind
+-- Drop package viewer bind table (feature removed)
 SET NAMES utf8mb4;
 
-CREATE TABLE IF NOT EXISTS prc_price_set_user (
-  psu_id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  price_set_id bigint(20) NOT NULL COMMENT '价格套餐id',
-  user_id bigint(20) NOT NULL COMMENT '用户id',
-  user_name varchar(64) NOT NULL DEFAULT '' COMMENT '登录账号',
-  created_by varchar(64) DEFAULT '' COMMENT '创建人',
-  create_time datetime DEFAULT NULL COMMENT '创建时间',
-  PRIMARY KEY (psu_id),
-  UNIQUE KEY uk_psu_set_user (price_set_id, user_id),
-  KEY idx_psu_user (user_id),
-  KEY idx_psu_set (price_set_id),
-  CONSTRAINT fk_psu_set FOREIGN KEY (price_set_id) REFERENCES prc_price_set (price_set_id) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='套餐可见用户绑定';
+DROP TABLE IF EXISTS prc_price_set_user;