修改基础价格版本功能

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

@@ -7,6 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="BmsProductCountry" id="BmsProductCountryResult">
         <id     property="detailId"         column="detail_id"         />
         <result property="productId"        column="product_id"        />
+        <result property="ppvId"            column="ppv_id"            />
+        <result property="versionNo"        column="version_no"        />
         <result property="productCode"      column="product_code"      />
         <result property="countryName"      column="country_name"      />
         <result property="countryCode"      column="country_code"      />
@@ -29,64 +31,69 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectVo">
-        select detail_id, product_id, product_code, country_name, country_code, zone_id, zone_code, zone_name,
-               weight_min, weight_max,
-               freight_price, registration_fee, size_limit, last_mile, lead_time,
-               effective_date, expire_date, status, create_time, update_time
-        from bms_product_country
+        select c.detail_id, c.product_id, c.ppv_id, v.version_no, c.product_code, c.country_name, c.country_code,
+               c.zone_id, c.zone_code, c.zone_name,
+               c.weight_min, c.weight_max,
+               c.freight_price, c.registration_fee, c.size_limit, c.last_mile, c.lead_time,
+               c.effective_date, c.expire_date, c.status, c.create_time, c.update_time
+        from bms_product_country c
+        left join bms_product_price_version v on v.ppv_id = c.ppv_id
     </sql>
 
     <select id="selectBmsProductCountryList" parameterType="BmsProductCountry" resultMap="BmsProductCountryResult">
         <include refid="selectVo"/>
         <where>
             <if test="productId != null">
-                AND product_id = #{productId}
+                AND c.product_id = #{productId}
+            </if>
+            <if test="ppvId != null">
+                AND c.ppv_id = #{ppvId}
             </if>
             <if test="productCode != null and productCode != ''">
-                AND product_code = #{productCode}
+                AND c.product_code = #{productCode}
             </if>
             <if test="countryName != null and countryName != ''">
-                AND country_name like concat('%', #{countryName}, '%')
+                AND c.country_name like concat('%', #{countryName}, '%')
             </if>
             <if test="countryCode != null and countryCode != ''">
-                AND country_code = #{countryCode}
+                AND c.country_code = #{countryCode}
             </if>
             <if test="zoneId != null">
-                AND zone_id = #{zoneId}
+                AND c.zone_id = #{zoneId}
             </if>
             <if test="zoneCode != null and zoneCode != ''">
-                AND zone_code = #{zoneCode}
+                AND c.zone_code = #{zoneCode}
             </if>
             <if test="weightMin != null">
-                AND weight_min = #{weightMin}
+                AND c.weight_min = #{weightMin}
             </if>
             <if test="weightMax != null">
-                AND weight_max = #{weightMax}
+                AND c.weight_max = #{weightMax}
             </if>
             <if test="effectiveDate != null">
-                AND effective_date = #{effectiveDate}
+                AND c.effective_date = #{effectiveDate}
             </if>
             <if test="openOnly != null and openOnly">
-                AND expire_date is null
+                AND c.expire_date is null
             </if>
             <if test="status != null and status != ''">
-                AND status = #{status}
+                AND c.status = #{status}
             </if>
             <if test="effectStatus != null and effectStatus != ''">
-                AND status = #{effectStatus}
+                AND c.status = #{effectStatus}
             </if>
         </where>
-        order by effective_date desc, country_name asc, zone_code asc, weight_min asc, detail_id asc
+        order by c.effective_date desc, c.country_name asc, c.zone_code asc, c.weight_min asc, c.detail_id asc
     </select>
 
     <insert id="insertBmsProductCountry" parameterType="BmsProductCountry" useGeneratedKeys="true" keyProperty="detailId">
         insert into bms_product_country (
-            product_id, product_code, country_name, country_code, zone_id, zone_code, zone_name,
+            product_id, ppv_id, product_code, country_name, country_code, zone_id, zone_code, zone_name,
             weight_min, weight_max,
             freight_price, registration_fee, size_limit, last_mile, lead_time,
             effective_date, expire_date, status, create_time
         ) values (
-            #{productId}, #{productCode}, #{countryName}, #{countryCode}, #{zoneId}, #{zoneCode}, #{zoneName},
+            #{productId}, #{ppvId}, #{productCode}, #{countryName}, #{countryCode}, #{zoneId}, #{zoneCode}, #{zoneName},
             #{weightMin}, #{weightMax},
             #{freightPrice}, #{registrationFee}, #{sizeLimit}, #{lastMile}, #{leadTime},
             #{effectiveDate}, #{expireDate}, IFNULL(#{status}, '0'), sysdate()
@@ -110,6 +117,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where detail_id = #{detailId}
     </update>
 
+    <update id="updateBmsProductCountryImport" parameterType="BmsProductCountry">
+        update bms_product_country
+        set product_id        = #{productId},
+            ppv_id            = #{ppvId},
+            country_code      = #{countryCode},
+            zone_id           = #{zoneId},
+            zone_code         = #{zoneCode},
+            zone_name         = #{zoneName},
+            weight_min        = #{weightMin},
+            weight_max        = #{weightMax},
+            freight_price     = #{freightPrice},
+            registration_fee  = #{registrationFee},
+            size_limit        = #{sizeLimit},
+            last_mile         = #{lastMile},
+            lead_time         = #{leadTime},
+            effective_date    = #{effectiveDate},
+            expire_date       = #{expireDate},
+            status            = IFNULL(#{status}, status),
+            update_time       = sysdate()
+        where detail_id = #{detailId}
+    </update>
+
+    <update id="updatePpvId">
+        update bms_product_country
+        set ppv_id = #{ppvId},
+            update_time = sysdate()
+        where detail_id = #{detailId}
+    </update>
+
     <delete id="deleteByProductId" parameterType="Long">
         delete from bms_product_country where product_id = #{productId}
     </delete>
@@ -170,15 +206,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectMatchByProductCountryWeight" resultMap="BmsProductCountryResult">
         <include refid="selectVo"/>
-        where product_code = #{productCode}
-          and weight_min &lt;= #{weight}
-          and weight_max &gt;= #{weight}
+        where c.product_code = #{productCode}
+          and c.weight_min &lt;= #{weight}
+          and c.weight_max &gt;= #{weight}
           <choose>
             <when test="countryCode != null and countryCode != ''">
-              and upper(country_code) = upper(#{countryCode})
+              and upper(c.country_code) = upper(#{countryCode})
             </when>
             <when test="countryName != null and countryName != ''">
-              and country_name = #{countryName}
+              and c.country_name = #{countryName}
             </when>
             <otherwise>
               and 1 = 0
@@ -186,20 +222,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           </choose>
           <choose>
             <when test="zoneCode != null and zoneCode != ''">
-              and upper(ifnull(zone_code,'')) = upper(#{zoneCode})
+              and upper(ifnull(c.zone_code,'')) = upper(#{zoneCode})
             </when>
             <otherwise>
-              and (zone_code is null or zone_code = '')
+              and (c.zone_code is null or c.zone_code = '')
             </otherwise>
           </choose>
           <if test="bizDate != null">
-              and (effective_date is null or effective_date &lt;= #{bizDate})
-              and (expire_date is null or expire_date &gt; #{bizDate})
+              and (c.effective_date is null or c.effective_date &lt;= #{bizDate})
+              and (c.expire_date is null or c.expire_date &gt; #{bizDate})
           </if>
           <if test="bizDate == null">
-              and expire_date is null
+              and c.expire_date is null
           </if>
-        order by effective_date desc, weight_min asc, detail_id asc
+        order by c.effective_date desc, c.weight_min asc, c.detail_id asc
         limit 1
     </select>
 
@@ -228,4 +264,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           </if>
     </select>
 
+    <select id="selectOpenByProductCode" resultMap="BmsProductCountryResult">
+        <include refid="selectVo"/>
+        where c.product_code = #{productCode}
+          and c.expire_date is null
+        order by c.country_name asc, c.zone_code asc, c.weight_min asc, c.detail_id asc
+    </select>
+
+    <select id="selectByPpvId" resultMap="BmsProductCountryResult">
+        <include refid="selectVo"/>
+        where c.ppv_id = #{ppvId}
+        order by c.country_name asc, c.zone_code asc, c.weight_min asc, c.detail_id asc
+    </select>
+
+    <insert id="copyCountriesFromVersion">
+        insert into bms_product_country (
+            product_id, ppv_id, product_code, country_name, country_code, zone_id, zone_code, zone_name,
+            weight_min, weight_max, freight_price, registration_fee, size_limit, last_mile, lead_time,
+            effective_date, expire_date, status, create_time
+        )
+        select
+            #{productId}, #{newPpvId}, #{productCode}, country_name, country_code, zone_id, zone_code, zone_name,
+            weight_min, weight_max, freight_price, registration_fee, size_limit, last_mile, lead_time,
+            #{effectiveDate}, null, IFNULL(#{status}, '0'), sysdate()
+        from bms_product_country
+        where ppv_id = #{srcPpvId}
+        order by detail_id asc
+    </insert>
+
+    <insert id="copyOpenCountriesToVersion">
+        insert into bms_product_country (
+            product_id, ppv_id, product_code, country_name, country_code, zone_id, zone_code, zone_name,
+            weight_min, weight_max, freight_price, registration_fee, size_limit, last_mile, lead_time,
+            effective_date, expire_date, status, create_time
+        )
+        select
+            #{productId}, #{newPpvId}, product_code, country_name, country_code, zone_id, zone_code, zone_name,
+            weight_min, weight_max, freight_price, registration_fee, size_limit, last_mile, lead_time,
+            #{effectiveDate}, null, IFNULL(#{status}, '0'), sysdate()
+        from bms_product_country
+        where product_code = #{productCode}
+          and expire_date is null
+        order by detail_id asc
+    </insert>
+
 </mapper>

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

@@ -0,0 +1,123 @@
+<?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.BmsProductPriceVersionMapper">
+
+    <resultMap type="BmsProductPriceVersion" id="BmsProductPriceVersionResult">
+        <id     property="ppvId"          column="ppv_id"          />
+        <result property="productCode"    column="product_code"    />
+        <result property="productId"      column="product_id"      />
+        <result property="versionNo"      column="version_no"      />
+        <result property="versionSeq"     column="version_seq"     />
+        <result property="effectiveDate"  column="effective_date"  />
+        <result property="expireDate"     column="expire_date"     />
+        <result property="status"         column="status"          />
+        <result property="productCount"   column="product_count"   />
+        <result property="createBy"       column="created_by"      />
+        <result property="createTime"     column="create_time"     />
+        <result property="updateBy"       column="updated_by"      />
+        <result property="updateTime"     column="update_time"     />
+    </resultMap>
+
+    <sql id="selectVo">
+        select ppv_id, product_code, product_id, version_no, version_seq,
+               effective_date, expire_date, status,
+               created_by, create_time, updated_by, update_time
+        from bms_product_price_version
+    </sql>
+
+    <select id="selectBmsProductPriceVersionById" parameterType="Long" resultMap="BmsProductPriceVersionResult">
+        <include refid="selectVo"/>
+        where ppv_id = #{ppvId}
+    </select>
+
+    <select id="selectOpenByProductCode" resultMap="BmsProductPriceVersionResult">
+        <include refid="selectVo"/>
+        where product_code = #{productCode}
+          and expire_date is null
+        order by effective_date desc, version_seq desc, ppv_id desc
+        limit 1
+    </select>
+
+    <select id="selectByProductCodeAndEffectiveDate" resultMap="BmsProductPriceVersionResult">
+        <include refid="selectVo"/>
+        where product_code = #{productCode}
+          and effective_date = #{effectiveDate}
+        limit 1
+    </select>
+
+    <select id="selectMaxVersionSeq" resultType="java.lang.Integer">
+        select max(version_seq) from bms_product_price_version where product_code = #{productCode}
+    </select>
+
+    <select id="selectVersionOptions" resultMap="BmsProductPriceVersionResult">
+        select
+            min(ppv_id) as ppv_id,
+            null as product_code,
+            null as product_id,
+            version_no,
+            max(version_seq) as version_seq,
+            max(effective_date) as effective_date,
+            max(expire_date) as expire_date,
+            case
+                when sum(case when expire_date is null then 1 else 0 end) &gt; 0
+                     and max(effective_date) &lt;= curdate() then '1'
+                when max(effective_date) &gt; curdate() then '0'
+                else '2'
+            end as status,
+            count(distinct product_code) as product_count,
+            null as created_by,
+            null as create_time,
+            null as updated_by,
+            null as update_time
+        from bms_product_price_version
+        where version_no is not null and version_no &lt;&gt; ''
+        group by version_no
+        order by max(version_seq) desc, version_no desc
+    </select>
+
+    <insert id="insertBmsProductPriceVersion" parameterType="BmsProductPriceVersion" useGeneratedKeys="true" keyProperty="ppvId">
+        insert into bms_product_price_version (
+            product_code, product_id, version_no, version_seq,
+            effective_date, expire_date, status, created_by, create_time
+        ) values (
+            #{productCode}, #{productId}, #{versionNo}, #{versionSeq},
+            #{effectiveDate}, #{expireDate}, IFNULL(#{status}, '0'), #{createBy}, sysdate()
+        )
+    </insert>
+
+    <update id="updateBmsProductPriceVersion" parameterType="BmsProductPriceVersion">
+        update bms_product_price_version
+        <set>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="versionNo != null and versionNo != ''">version_no = #{versionNo},</if>
+            <if test="versionSeq != null">version_seq = #{versionSeq},</if>
+            <if test="effectiveDate != null">effective_date = #{effectiveDate},</if>
+            expire_date = #{expireDate},
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="updateBy != null and updateBy != ''">updated_by = #{updateBy},</if>
+            update_time = sysdate()
+        </set>
+        where ppv_id = #{ppvId}
+    </update>
+
+    <update id="expireOpenByProductCode">
+        update bms_product_price_version
+        set expire_date = #{newEffectiveDate},
+            update_time = sysdate()
+        where product_code = #{productCode}
+          and expire_date is null
+          and (effective_date is null or effective_date &lt; #{newEffectiveDate})
+    </update>
+
+    <update id="refreshStatusByDates">
+        update bms_product_price_version
+        set status = case
+                when expire_date is not null and expire_date &lt;= curdate() then '2'
+                when effective_date is null or effective_date &gt; curdate() then '0'
+                else '1'
+            end
+    </update>
+
+</mapper>

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

@@ -151,23 +151,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c.effective_date,
             c.expire_date,
             sysdate()
-        from bms_product p
-        inner join bms_product_country c on c.product_id = p.product_id
-        where p.status = '1'
-          and p.product_id = (
-            select max(p2.product_id) from bms_product p2
-            where p2.product_code = p.product_code and p2.status = '1'
-          )
-          and ifnull(c.status, '1') <> '2'
-        <choose>
-          <when test="openOnly">
-          and (c.expire_date is null or date(c.expire_date) &gt; curdate())
-          </when>
-          <otherwise>
-          and date(c.effective_date) &lt;= date(#{asOf})
-          and (c.expire_date is null or date(c.expire_date) &gt; date(#{asOf}))
-          </otherwise>
-        </choose>
+        from bms_product_country c
+        inner join bms_product p on p.product_id = c.product_id
+        <where>
+          <choose>
+            <when test="baseVersionNo != null and baseVersionNo != ''">
+              and exists (
+                select 1 from bms_product_price_version v
+                where v.ppv_id = c.ppv_id
+                  and v.version_no = #{baseVersionNo}
+              )
+            </when>
+            <otherwise>
+              and p.status = '1'
+              and p.product_id = (
+                select max(p2.product_id) from bms_product p2
+                where p2.product_code = p.product_code and p2.status = '1'
+              )
+              and ifnull(c.status, '1') &lt;&gt; '2'
+              <choose>
+                <when test="openOnly">
+                and (c.expire_date is null or date(c.expire_date) &gt; curdate())
+                </when>
+                <otherwise>
+                and date(c.effective_date) &lt;= date(#{asOf})
+                and (c.expire_date is null or date(c.expire_date) &gt; date(#{asOf}))
+                </otherwise>
+              </choose>
+            </otherwise>
+          </choose>
+        </where>
         order by p.product_code asc, c.country_name asc, c.zone_code asc, c.weight_min asc, c.detail_id asc
     </insert>
 
@@ -183,11 +196,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             'HALF_UP',
             sysdate()
         from bms_product p
-        where p.status = '1'
-          and p.product_id = (
-            select max(p2.product_id) from bms_product p2
-            where p2.product_code = p.product_code and p2.status = '1'
-          )
+        <where>
+          <choose>
+            <when test="baseVersionNo != null and baseVersionNo != ''">
+              and exists (
+                select 1 from bms_product_country c
+                inner join bms_product_price_version v on v.ppv_id = c.ppv_id
+                where c.product_id = p.product_id
+                  and v.version_no = #{baseVersionNo}
+              )
+            </when>
+            <otherwise>
+              and p.status = '1'
+              and p.product_id = (
+                select max(p2.product_id) from bms_product p2
+                where p2.product_code = p.product_code and p2.status = '1'
+              )
+            </otherwise>
+          </choose>
+        </where>
         order by p.product_code asc
     </insert>