Merge branch 'auction-dev' of AHX-Bid/poyee-app into dev

poyee-order/src/main/resources/mapper/LotOrderMapper.xml

@@ -21,9 +21,10 @@
         <result column="service_expense" property="serviceExpense"/>
         <result column="total_amount" property="totalAmount"/>
         <result column="lot_image" property="lotImage"/>
+        <result column="expire_time" property="expireTime"/>
     </resultMap>
     <select id="selectLotOrder" resultMap="lotOrderResultMap" parameterType="com.tzy.entity.LotOrder">
-        select id,order_no,auction_name,lot_name,user_id,status,payment_amount,merchant_id,shipping_address_id,express_id,lot_id,auction_id,create_time,pay_time,service_expense,total_amount,lot_image from lot_order_info
+        select id,order_no,auction_name,lot_name,user_id,status,payment_amount,merchant_id,shipping_address_id,express_id,lot_id,auction_id,create_time,pay_time,service_expense,total_amount,lot_image,expire_time from lot_order_info
         <where>
 
             <if test="orderNo!=null and orderNo!=''">
@@ -39,15 +40,15 @@
         order by create_time desc
     </select>
     <select id="selectLotOrderById" resultMap="lotOrderResultMap">
-        select id,order_no,auction_name,lot_name,user_id,status,payment_amount,merchant_id,shipping_address_id,express_id,lot_id,auction_id,create_time,pay_time,service_expense,total_amount,lot_image from lot_order_info
+        select id,order_no,auction_name,lot_name,user_id,status,payment_amount,merchant_id,shipping_address_id,express_id,lot_id,auction_id,create_time,pay_time,service_expense,total_amount,lot_image,expire_time from lot_order_info
         where id=#{id}
     </select>
     <select id="countLotOrderByLotId" parameterType="com.tzy.entity.LotOrder" resultType="int">
         select count(*) from lot_order_info where lot_id=#{lotId}
     </select>
     <insert id="insertLotOrder" parameterType="com.tzy.entity.LotOrder">
-        insert into lot_order_info (order_no,auction_name,lot_name,user_id,status,payment_amount,merchant_id,shipping_address_id,express_id,lot_id,auction_id,create_time,pay_time,service_expense,total_amount,lot_image)
-        values (#{orderNo},#{auctionName},#{lotName},#{userId},#{status},#{paymentAmount},#{merchantId},#{shippingAddressId},#{expressId},#{lotId},#{auctionId},#{createTime},#{payTime},#{serviceExpense},#{totalAmount},#{lotImage})
+        insert into lot_order_info (order_no,auction_name,lot_name,user_id,status,payment_amount,merchant_id,shipping_address_id,express_id,lot_id,auction_id,create_time,pay_time,service_expense,total_amount,lot_image,expire_time)
+        values (#{orderNo},#{auctionName},#{lotName},#{userId},#{status},#{paymentAmount},#{merchantId},#{shippingAddressId},#{expressId},#{lotId},#{auctionId},#{createTime},#{payTime},#{serviceExpense},#{totalAmount},#{lotImage},#{expire_time})
     </insert>
     <update id="updateLotOrderAddress" parameterType="com.tzy.entity.LotOrder">
         update lot_order_info set shipping_address_id=#{shippingAddressId},shipping_address=#{shippingAddress},shipping_address_likename=#{shippingAddressLinkname},shipping_address_phone=#{shippingAddressPhone}