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

@@ -70,6 +70,7 @@ public interface BuyerOrderMapper {
 
     int selectCntByUid(@Param("uid")int uid);
 
+    @Deprecated
     int selectCntBySellerUid(@Param("sellerUid")int sellerUid, @Param("statusList")Collection<Integer> statusList);
 
     List<BuyerOrder> selectByOrderCodes(@Param("orderCodes") Collection<Long> orderCodes,

@@ -116,7 +116,7 @@ public class SellerOrderViewService {
             Integer num = sellerOrderGoodsMapper.selectCntByUidStatusList(uid, Arrays.asList(SkupStatus.CAN_SELL.getCode()), orderTypes);
             List<SellerOrderListType> types = Arrays.asList(SellerOrderListType.SEND_OUT, SellerOrderListType.WAITING_PAY);
             List<Integer> statusList = types.parallelStream().flatMap(solt -> solt.getStatus().parallelStream()).collect(Collectors.toList());
-            Integer buyerOrderNum = buyerOrderMapper.selectCntBySellerUid(uid, statusList);
+            Integer buyerOrderNum = buyerOrderMapper.selectCntBySellerUidStatus(uid, statusList, orderTypes);
             logger.info("in seller order count uid {}, num {}, buyerOrderNum {}", uid, num, buyerOrderNum);
             if (num == null) {
                 cnt = 0;
@@ -154,7 +154,7 @@ public class SellerOrderViewService {
                     SellerOrderListType.ORDER_FAILED);
             for (SellerOrderListType solt : types) {
                 List<Integer> statusList = solt.getStatus();
-                int buyerOrderNum = buyerOrderMapper.selectCntBySellerUid(uid, statusList);
+                int buyerOrderNum = buyerOrderMapper.selectCntBySellerUidStatus(uid, statusList, orderTypes);
                 logger.info("in seller order count uid {}, num {}, buyerOrderNum {}", uid, num, buyerOrderNum);
                 //
                 OrderSummaryResp osResp = new OrderSummaryResp();