增加失败码功能

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

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="successStatus"  column="success_status" />
         <result property="billTime"       column="bill_time" />
         <result property="billId"         column="bill_id" />
+        <result property="failCode"       column="fail_code" />
         <result property="errorMessage"   column="error_message" />
         <result property="createBy"       column="create_by" />
         <result property="createTime"     column="create_time" />
@@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectPrcBillingTaskVo">
         select task_id, transfer_no, tracking_no, order_no, bill_type, success_status,
-               bill_time, bill_id, error_message, create_by, create_time, update_by, update_time
+               bill_time, bill_id, fail_code, error_message, create_by, create_time, update_by, update_time
         from prc_billing_task
     </sql>
 
@@ -49,6 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="successStatus != null and successStatus != ''">
                 AND success_status = #{successStatus}
             </if>
+            <if test="failCode != null and failCode != ''">
+                AND fail_code = #{failCode}
+            </if>
             <if test="params.beginTime != null and params.beginTime != ''">
                 AND create_time &gt;= #{params.beginTime}
             </if>
@@ -62,10 +66,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertPrcBillingTask" parameterType="PrcBillingTask" useGeneratedKeys="true" keyProperty="taskId">
         insert into prc_billing_task (
             transfer_no, tracking_no, order_no, bill_type, success_status,
-            bill_time, bill_id, error_message, create_by, create_time
+            bill_time, bill_id, fail_code, error_message, create_by, create_time
         ) values (
             #{transferNo}, #{trackingNo}, #{orderNo}, #{billType}, #{successStatus},
-            #{billTime}, #{billId}, #{errorMessage}, #{createBy}, sysdate()
+            #{billTime}, #{billId}, #{failCode}, #{errorMessage}, #{createBy}, sysdate()
         )
     </insert>
 
@@ -79,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="successStatus != null">success_status = #{successStatus},</if>
             <if test="billTime != null">bill_time = #{billTime},</if>
             <if test="billId != null">bill_id = #{billId},</if>
+            <if test="failCode != null">fail_code = #{failCode},</if>
             <if test="errorMessage != null">error_message = #{errorMessage},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             update_time = sysdate()
@@ -91,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update prc_billing_task
         set success_status = #{successStatus},
             bill_id = #{billId},
+            fail_code = #{failCode},
             error_message = #{errorMessage},
             update_time = sysdate()
         where task_id = #{taskId}

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

@@ -98,8 +98,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         inner join prc_price_set s on s.price_set_id = c.price_set_id
         where c.customer_id = #{customerId}
           and ifnull(s.status, 'D') <> 'S'
-          and (c.pr_begindate is null or c.pr_begindate <= #{bizDate})
-          and ifnull(c.pr_enddate, '9999-12-31') >= #{bizDate}
         order by c.bind_priority asc, c.pr_begindate desc, c.customer_priceset_id asc
     </select>
 
@@ -111,8 +109,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         inner join prc_price_set s on s.price_set_id = c.price_set_id
         where c.customer_code = #{customerCode}
           and ifnull(s.status, 'D') &lt;&gt; 'S'
-          and (c.pr_begindate is null or c.pr_begindate &lt;= #{bizDate})
-          and ifnull(c.pr_enddate, '9999-12-31') &gt;= #{bizDate}
         order by c.bind_priority asc, c.pr_begindate desc, c.customer_priceset_id asc
     </select>