baolei 5 mesi fa
parent
commit
76263062ee

+ 16 - 3
08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/OrderDetailMapper.xml

@@ -16,6 +16,8 @@
         <result property="price"    column="price"    />
         <result property="orderAmount"    column="orderAmount"    />
         <result property="payAmount"    column="payAmount"    />
+        <result property="confirmTime"    column="confirmTime"    />
+        <result property="finishTime"    column="finishTime"    />
         <result property="delFlag"    column="delFlag"    />
         <result property="createUser"    column="createUser"    />
         <result property="createTime"    column="createTime"    />
@@ -24,7 +26,7 @@
     </resultMap>
 
     <sql id="selectOrderDetail">
-        select orderDetailId, orderId, orderDetailStatus, prodId, prodName, prodAttrId, prodAttrName, vendorId, quantity, afterSalesQty, refundQty, price, orderAmount, payAmount, delFlag, createUser, createTime, updateUser, updateTime from t_order_detail
+        select orderDetailId, orderId, orderDetailStatus, prodId, prodName, prodAttrId, prodAttrName, vendorId, quantity, afterSalesQty, refundQty, price, orderAmount, payAmount, confirmTime, finishTime, delFlag, createUser, createTime, updateUser, updateTime from t_order_detail
     </sql>
 
     <select id="selectOrderDetailList" parameterType="OrderDetail" resultMap="OrderDetailResult">
@@ -43,6 +45,8 @@
             <if test="price != null "> and price = #{price}</if>
             <if test="orderAmount != null "> and orderAmount = #{orderAmount}</if>
             <if test="payAmount != null "> and payAmount = #{payAmount}</if>
+            <if test="confirmTime != null "> and confirmTime = #{confirmTime}</if>
+            <if test="finishTime != null "> and finishTime = #{finishTime}</if>
             <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
             <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
             <if test="createTime != null "> and createTime = #{createTime}</if>
@@ -72,6 +76,8 @@
             <if test="price != null">price,</if>
             <if test="orderAmount != null">orderAmount,</if>
             <if test="payAmount != null">payAmount,</if>
+            <if test="confirmTime != null">confirmTime,</if>
+            <if test="finishTime != null">finishTime,</if>
             <if test="delFlag != null">delFlag,</if>
             <if test="createUser != null">createUser,</if>
             <if test="createTime != null">createTime,</if>
@@ -92,6 +98,8 @@
             <if test="price != null">#{price},</if>
             <if test="orderAmount != null">#{orderAmount},</if>
             <if test="payAmount != null">#{payAmount},</if>
+            <if test="confirmTime != null">#{confirmTime},</if>
+            <if test="finishTime != null">#{finishTime},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createUser != null">#{createUser},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -101,9 +109,9 @@
     </insert>
 
     <insert id="batchInsertOrderDetail">
-        insert into t_order_detail( orderId, orderDetailStatus, prodId, prodName, prodAttrId, prodAttrName, vendorId, quantity, afterSalesQty, refundQty, price, orderAmount, payAmount, delFlag, createUser, createTime, updateUser, updateTime) values
+        insert into t_order_detail( orderId, orderDetailStatus, prodId, prodName, prodAttrId, prodAttrName, vendorId, quantity, afterSalesQty, refundQty, price, orderAmount, payAmount,confirmTime, finishTime,  delFlag, createUser, createTime, updateUser, updateTime) values
         <foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.orderId}, #{item.orderDetailStatus}, #{item.prodId}, #{item.prodName}, #{item.prodAttrId}, #{item.prodAttrName}, #{item.vendorId}, #{item.quantity}, #{item.afterSalesQty}, #{item.refundQty}, #{item.price}, #{item.orderAmount}, #{item.payAmount}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+            ( #{item.orderId}, #{item.orderDetailStatus}, #{item.prodId}, #{item.prodName}, #{item.prodAttrId}, #{item.prodAttrName}, #{item.vendorId}, #{item.quantity}, #{item.afterSalesQty}, #{item.refundQty}, #{item.price}, #{item.orderAmount}, #{item.payAmount}, #{item.confirmTime}, #{item.finishTime}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
         </foreach>
     </insert>
 
@@ -123,6 +131,8 @@
             <if test="price != null">price = #{price},</if>
             <if test="orderAmount != null">orderAmount = #{orderAmount},</if>
             <if test="payAmount != null">payAmount = #{payAmount},</if>
+            <if test="confirmTime != null">confirmTime = #{confirmTime},</if>
+            <if test="finishTime != null">finishTime = #{finishTime},</if>
             <if test="delFlag != null">delFlag = #{delFlag},</if>
             <if test="createUser != null">createUser = #{createUser},</if>
             <if test="createTime != null">createTime = #{createTime},</if>
@@ -175,6 +185,9 @@
             <if test="price != null "> and price = #{price}</if>
             <if test="orderAmount != null "> and orderAmount = #{orderAmount}</if>
             <if test="payAmount != null "> and payAmount = #{payAmount}</if>
+
+            <if test="confirmTime != null "> and confirmTime = #{confirmTime}</if>
+            <if test="finishTime != null "> and finishTime = #{finishTime}</if>
             <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
             <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
             <if test="createTime != null "> and createTime = #{createTime}</if>