修改打单套餐功能

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

@@ -6,37 +6,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByChannelAndType" resultType="com.bms.price.domain.ChannelProductMap">
         select id, channel_id as channelId, channel_code as channelCode, product_id as productId,
-               price_set_id as priceSetId, pay_type as payType, create_by as createBy, create_time as createTime,
+               pay_type as payType, create_by as createBy, create_time as createTime,
                update_by as updateBy, update_time as updateTime
         from srv_channel_product_map
         where channel_id = #{channelId} and pay_type = #{payType}
         limit 1
     </select>
 
-    <select id="selectByPriceSetId" resultType="com.bms.price.domain.ChannelProductMap">
-        select m.id, m.channel_id as channelId, m.channel_code as channelCode, m.product_id as productId,
-               m.price_set_id as priceSetId, m.pay_type as payType,
-               c.channel_name as channelName, p.product_name as productName,
-               m.create_by as createBy, m.create_time as createTime,
-               m.update_by as updateBy, m.update_time as updateTime
-        from srv_channel_product_map m
-        left join srv_service_channel c on c.id = m.channel_id
-        left join pay_product p on p.product_id = m.product_id
-        where m.price_set_id = #{priceSetId}
-          and m.pay_type = 'AR'
-        order by m.update_time desc, m.id desc
-    </select>
 
     <insert id="upsert">
         insert into srv_channel_product_map (
-            channel_id, channel_code, product_id, price_set_id, pay_type, create_by, create_time, update_by, update_time
+            channel_id, channel_code, product_id, pay_type, create_by, create_time, update_by, update_time
         ) values (
-            #{channelId}, #{channelCode}, #{productId}, #{priceSetId}, #{payType}, #{createBy}, sysdate(), #{updateBy}, sysdate()
+            #{channelId}, #{channelCode}, #{productId}, #{payType}, #{createBy}, sysdate(), #{updateBy}, sysdate()
         )
         on duplicate key update
             channel_code = values(channel_code),
             product_id = values(product_id),
-            price_set_id = values(price_set_id),
             update_by = values(update_by),
             update_time = sysdate()
     </insert>
@@ -46,13 +32,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where channel_id = #{channelId} and pay_type = #{payType}
     </delete>
 
-    <delete id="deleteByChannelTypeAndPriceSet">
-        delete from srv_channel_product_map
-        where channel_id = #{channelId}
-          and pay_type = #{payType}
-          and price_set_id = #{priceSetId}
-    </delete>
-
     <delete id="deleteByProductId">
         delete from srv_channel_product_map where product_id = #{productId}
     </delete>

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

@@ -41,15 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         limit 1
     </select>
 
-    <select id="selectLabelPriceSetIdByProduct" resultType="long">
-        select price_set_id
-        from pay_product_term
-        where product_id = #{productId}
-          and price_set_id is not null
-        order by case when status = '1' then 0 when status = '0' then 1 else 2 end, version_no desc, term_id desc
-        limit 1
-    </select>
-
     <!-- 打单套餐产品列表：待生效+生效 -->
     <select id="selectByPriceSetId" resultType="com.bms.price.domain.PayProductTerm">
         select t.term_id as termId, t.dict_value as dictValue, t.product_id as productId, t.price_set_id as priceSetId,