yujian
2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
@@ -21,7 +21,6 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.Utils;
@Service
@@ -72,7 +71,7 @@
      }
      // 是否为分享赚订单
      if (hongBaoOrderService.countByOrderNoAndHongBaoType(orderId, HongBaoV2.TYPE_SHARE_GOODS) > 0)
      if (hongBaoOrderService.countByOrderNoAndHongBaoType(orderId, HongBaoV2.TYPE_SHARE_GOODS, type) > 0)
         return -5;
      // 次数限制
@@ -105,7 +104,7 @@
            lostOrderwriteLock.unlock();
         }
         Order or = orderService.getSystemOrderByUid(Constant.TAOBAO, lostOrder.getUserInfo().getId());
         Order or = orderService.getSystemOrderByUid(type, lostOrder.getUserInfo().getId());
         if (or != null) {
            boolean b = Utils.isUserOrder(or.getOrderId(), lostOrder.getOrderId());
            if (b) {
@@ -292,13 +291,13 @@
    * @return
    */
   @Override
   public List<LostOrder> listQuery(long start, int count, String key, Integer state, Integer handleType) {
      return lostOrderMapper.listQuery(start, count, key, state, handleType);
   public List<LostOrder> listQuery(long start, int count, String key, Integer state, Integer handleType, Integer type) {
      return lostOrderMapper.listQuery(start, count, key, state, handleType, type);
   }
   @Override
   public long countQuery(String key, Integer state, Integer handleType) {
      return lostOrderMapper.countQuery(key, state, handleType);
   public long countQuery(String key, Integer state, Integer handleType, Integer type) {
      return lostOrderMapper.countQuery(key, state, handleType, type);
   }
   @Override