Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8

@@ -100,13 +100,17 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<SkupDo
                 successOrders.add(skupDtoMap.get(skup).getSellerOrder());
             }
             try {
-                boolean isSuper = sellerService.isSuperEntrySeller(uid);
+
                 boolean isQuickDeliver = SellerGoodsHelper.isQuickDeliver(sdspDto.getSkupType());
                 if (!isQuickDeliver) {
+                    boolean isSuper = sellerService.isSuperEntrySeller(uid);
                     //退保证金
                     SellerWallet sellerWallet = postRefundEarnest(uid, taskId, isSuper, result, successOrders);
                     //明细
                     addWalletDetail(uid, taskId, isSuper, sellerWallet, successOrders);
+
+                    //消息盒子
+                    inboxNotify(uid, skupDtoMap);
                 }else{
                     try {
                         depositService.changeSaleStatusOffBatch(uid, new ArrayList<>(result.successSkups));
@@ -114,11 +118,7 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<SkupDo
                         log.warn("in batch off shelve 4 quick deliver prd fail , uid {} skups {}",
                                 uid, result.successSkups, ex);
                     }
-
                 }
-                //消息盒子
-                inboxNotify(uid, skupDtoMap);
-
                 //清理缓存
                 cleanCache(uid, skupDtoMap);
             } catch (Exception ex) {

@@ -485,8 +485,9 @@ public class SkupListService {
      * @return
      */
     public OrderListInfo getOrderListInfo(SellerGoodsRequest req){
-        SkupListType skupListType = SkupListType.ENTIRELY_NEW;
-        List<Integer> skupTypeCodes = skupListType.getSkupTypeCodes(true);
+        SkupListType skupListType = req.getSkupListType();
+        boolean isEntryNecessary = SkupListType.QUICK_DELIVER.equals(skupListType) ? false : true;
+        List<Integer> skupTypeCodes = skupListType.getSkupTypeCodes(isEntryNecessary);
         SkupStatus ss = SkupStatus.CAN_SELL;
         Integer status = ss.getCode();
         Integer uid = req.getUid();
@@ -495,13 +496,13 @@ public class SkupListService {
         sogCondition.setProductId(productId=req.getProductId());
         sogCondition.setUid(uid);
         sogCondition.setStatus(status);
-        boolean isEntry = true;
-        List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectEntryListByUidStatusGBSku(sogCondition, skupTypeCodes , 0, 1, isEntry);
+        
+        List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectEntryListByUidStatusGBSku(sogCondition, skupTypeCodes , 0, 1, isEntryNecessary);
         if (CollectionUtils.isEmpty(sogList)){
             logger.warn("in getOrderListInfo soglist is empty req {}", req);
             return null;
         }
-        return buildEntryOrderListInfo(sogList.get(0), ss, skupTypeCodes, isEntry);
+        return buildEntryOrderListInfo(sogList.get(0), ss, skupTypeCodes, isEntryNecessary);
     }
 
     OrderListInfo buildEntryOrderListInfo(SellerOrderGoods sellerOrderGoods, SkupStatus skupStatus,