拍品接口修改

lot/src/main/java/cn/hobbystocks/auc/mapper/LotMapper.java

@@ -27,7 +27,7 @@ public interface LotMapper extends BaseMapper<Lot> {
 
     int deleteLotByIds(Long[] ids);
 
-    int updateOrder(@Param("lotId") Long lotId, @Param("orderId") String orderId);
+
 
     int updateLotEx(Lot lot);
 

lot/src/main/resources/mapper/LotMapper.xml

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dealAccountId"    column="deal_account_id"    />
         <result property="dealAccount"    column="deal_account"    />
         <result property="paid"    column="paid"    />
-        <result property="orderId"    column="order_id"    />
+
         <result property="bidCount"    column="bid_count"    />
         <result property="bidPersionCount"    column="bid_persion_count"    />
         <result property="delFlag"    column="del_flag"    />
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectLotVo">
-        select id, goods_id, auction_id, name, num, unit, imgs, detail, pub_status, pub_time, status, start_time, end_time, real_end_time, rule_type, rule_content, last_price, last_price_time, deal_price, deal_time, deal_account_id, deal_account, paid, order_id, bid_count, bid_persion_count, del_flag, create_by, create_time, update_by, update_time, sort,
+        select id, goods_id, auction_id, name, num, unit, imgs, detail, pub_status, pub_time, status, start_time, end_time, real_end_time, rule_type, rule_content, last_price, last_price_time, deal_price, deal_time, deal_account_id, deal_account, paid,  bid_count, bid_persion_count, del_flag, create_by, create_time, update_by, update_time, sort,
         carousel_imgs,merchant_id,merchant_name,merchant_avatar,goods_name,goods_type,private_domain,delay_publish,pub_status,group_id,deposit,service_tariff
          from lot
     </sql>
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select l.id, l.goods_id, l.auction_id, l.name, l.num, l.unit, l.imgs, l.detail,
         l.pub_status, l.pub_time, l.status, l.start_time, l.end_time, l.real_end_time, l.rule_type,
         l.rule_content, l.last_price, l.last_price_time, l.deal_price, l.deal_time, l.deal_account_id,
-        l.deal_account, l.paid, l.order_id, l.bid_count, l.bid_persion_count, l.del_flag, l.create_by,
+        l.deal_account, l.paid, l.bid_count, l.bid_persion_count, l.del_flag, l.create_by,
         l.create_time, l.update_by, l.update_time, l.sort,l.carousel_imgs,l.merchant_id,l.merchant_name,
         l.merchant_avatar,l.goods_name,l.goods_type,l.private_domain,l.group_id,l.live_id
         from
@@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dealAccountId != null">deal_account_id,</if>
             <if test="dealAccount != null">deal_account,</if>
             <if test="paid != null">paid,</if>
-            <if test="orderId != null">order_id,</if>
+
             <if test="bidCount != null">bid_count,</if>
             <if test="bidPersionCount != null">bid_persion_count,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -167,7 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dealAccountId != null">#{dealAccountId},</if>
             <if test="dealAccount != null">#{dealAccount},</if>
             <if test="paid != null">#{paid},</if>
-            <if test="orderId != null">#{orderId},</if>
+
             <if test="bidCount != null">#{bidCount},</if>
             <if test="bidPersionCount != null">#{bidPersionCount},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -254,9 +254,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
     </insert>
 
-    <update id="updateOrder">
-        update lot set order_id = #{orderId} where id = #{lotId} and order_id is NULL
-    </update>
+
 
     <update id="updateLot" parameterType="cn.hobbystocks.auc.domain.Lot">
         update lot
@@ -283,7 +281,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dealAccountId != null">deal_account_id = #{dealAccountId},</if>
             <if test="dealAccount != null">deal_account = #{dealAccount},</if>
             <if test="paid != null">paid = #{paid},</if>
-            <if test="orderId != null">order_id = #{orderId},</if>
+
             <if test="bidCount != null">bid_count = #{bidCount},</if>
             <if test="bidPersionCount != null">bid_persion_count = #{bidPersionCount},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -332,7 +330,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dealAccountId != null">deal_account_id = #{dealAccountId},</if>
             <if test="dealAccount != null">deal_account = #{dealAccount},</if>
             <if test="paid != null">paid = #{paid},</if>
-            <if test="orderId != null">order_id = #{orderId},</if>
             <if test="bidCount != null">bid_count = #{bidCount},</if>
             <if test="bidPersionCount != null">bid_persion_count = #{bidPersionCount},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>