Merge branch 'test6.8.6' into dev_order_6.8.6

@@ -185,20 +185,20 @@
     select 
     select 
     count(*)
     count(*)
     from seller_wallet_detail
     from seller_wallet_detail
-    where uid = #{uid,jdbcType=INTEGER} and is_batch = 0 and type in (1,31,32,33,34,61)
+    where uid = #{uid,jdbcType=INTEGER} and is_batch = 0 and type in (1,31,32,33,34,35,61)
   </select>
   </select>
     <select id="selectUserDetail" resultMap="BaseResultMap" >
     <select id="selectUserDetail" resultMap="BaseResultMap" >
     select 
     select 
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
     from seller_wallet_detail
     from seller_wallet_detail
-    where uid = #{uid,jdbcType=INTEGER} and is_batch = 0 and type in (1,31,32,33,34,61) order by id desc limit #{start},#{count}
+    where uid = #{uid,jdbcType=INTEGER} and is_batch = 0 and type in (1,31,32,33,34,35,61) order by id desc limit #{start},#{count}
   </select>
   </select>
   
   
   <select id="selectUserPunishAmount" resultMap="BaseResultMap" >
   <select id="selectUserPunishAmount" resultMap="BaseResultMap" >
     select 
     select 
     uid, sum(amount) as amount
     uid, sum(amount) as amount
     from seller_wallet_detail
     from seller_wallet_detail
-    where uid = #{uid,jdbcType=INTEGER} and is_batch = 0 and type in (31,32,33,34)
+    where uid = #{uid,jdbcType=INTEGER} and is_batch = 0 and type in (31,32,33,34,35)
   </select>
   </select>
   <delete id="clearUserHistoryData">
   <delete id="clearUserHistoryData">
     delete from seller_wallet_detail
     delete from seller_wallet_detail

+package com.yohoufo.order.mq.consumer;
+
+import com.yohoufo.order.event.SellerCancelDeliverEvent;
+import com.yohoufo.order.mq.TopicConstants;
+import com.yohoufo.order.service.impl.BuyerOrderCancelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 卖家超时发货
+ * Created by chenchao on 2018/9/30.
+ */
+@Component
+public class SellerOrderCancelDeliverDelayMsgConsumer120 extends JsonObjectMessageConsumer<SellerCancelDeliverEvent> {
+
+    @Autowired
+    private BuyerOrderCancelService buyerOrderCancelService;
+
+    @Override
+    public String getTopic() {
+        return TopicConstants.SELLER_ORDER_AUTO_CANCEL_DELIVER_120;
+    }
+
+    @Override
+    public void handle(SellerCancelDeliverEvent event) {
+        buyerOrderCancelService.cancelForSellerSendOutTimeout(event.getUid(), event.getOrderCode(), event.getSkup(), event.getSellerOrderGoods());
+    }
+}

@@ -39,7 +39,7 @@ consumer:
                     interval: 1440
                     interval: 1440
 
 
             #春节期间发货时间延长的120小时
             #春节期间发货时间延长的120小时
-            - class: com.yohoufo.order.mq.consumer.SellerOrderCancelDeliverDelayMsgConsumer
+            - class: com.yohoufo.order.mq.consumer.SellerOrderCancelDeliverDelayMsgConsumer120
               topic: sellerOrder.autoCancelDeliver_120
               topic: sellerOrder.autoCancelDeliver_120
               delay:
               delay:
                     interval: 7200
                     interval: 7200

@@ -40,7 +40,7 @@ consumer:
                     interval: 1440
                     interval: 1440
 
 
             #春节期间发货时间延长的120小时
             #春节期间发货时间延长的120小时
-            - class: com.yohoufo.order.mq.consumer.SellerOrderCancelDeliverDelayMsgConsumer
+            - class: com.yohoufo.order.mq.consumer.SellerOrderCancelDeliverDelayMsgConsumer120
               topic: sellerOrder.autoCancelDeliver_120
               topic: sellerOrder.autoCancelDeliver_120
               delay:
               delay:
                     interval: 7200
                     interval: 7200