Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java

@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.order;



import java.util.ArrayList;

import java.util.Date;

import java.util.List;

import java.util.Map;

import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;

@@ -16,10 +17,10 @@
import com.yeshi.fanli.entity.bus.user.LostOrder;

import com.yeshi.fanli.entity.bus.user.Order;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.msg.UserOrderMsgNotificationService;

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

@@ -33,9 +34,12 @@


   @Resource

   private LostOrderMapper lostOrderMapper;

	


   @Resource

   private ConfigService configService;



   @Resource

   private UserOrderMsgNotificationService userOrderMsgNotificationService;



   @Transactional

   @Override

@@ -48,7 +52,7 @@
      }



      // 订单是否已申诉

      List<LostOrder> orderList = lostOrderMapper.selectByOrderId(orderId);

      List<LostOrder> orderList = lostOrderMapper.selectByOrderIdAndType(orderId, type);

      if (orderList != null && orderList.size() > 0) {

         if (orderList.get(0).getState() == 0 || orderList.get(0).getResultCode() == LostOrder.RESULT_CODE_VERFING) {

            return -2;

@@ -67,17 +71,16 @@
      }



      // 是否为分享赚订单

      if (hongBaoOrderService.countByOrderNoAndHongBaoType(orderId, HongBaoV2.TYPE_SHARE_GOODS) > 0)

      if (hongBaoOrderService.countByOrderNoAndHongBaoType(orderId, HongBaoV2.TYPE_SHARE_GOODS, type) > 0)

         return -5;



		
      // 次数限制

      long count = lostOrderMapper.countTodayAppeal(lostOrder.getUserInfo().getId());

      String countMax = configService.get("order_appeal_count_day");

      if (countMax != null && countMax.trim().length() > 0 && count >= Long.parseLong(countMax)) {

         return -7;

      }

		


      WriteLock lostOrderwriteLock = lostOrderLock.writeLock();

      ReadLock lostOrderReadLock = lostOrderLock.readLock();

      try {

@@ -100,8 +103,8 @@
            lostOrderReadLock.lock();

            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) {

@@ -114,7 +117,6 @@
            lostOrder.setJudge("不匹配");

         }



			
         try {

            Order addorder = new Order();

            addorder.setBeizhu("补单");

@@ -123,7 +125,7 @@
            addorder.setOrderType(lostOrder.getType());

            addorder.setState(1);

            addorder.setUserInfo(lostOrder.getUserInfo());

				


            boolean b = orderService.addOrder(addorder);

            if (b) {

               lostOrder.setRemake("处理成功");

@@ -142,12 +144,12 @@
            lostOrder.setRemake(e.getMessage());

            lostOrder.setState(LostOrder.STATE_REJECT);

         }

			


         lostOrder.setResultCode(LostOrder.RESULT_CODE_VERFING);

         lostOrder.setHandleTime(System.currentTimeMillis());

         lostOrder.setCreateTime(System.currentTimeMillis());

         lostOrderMapper.insertSelective(lostOrder);

			


      } finally {

         lostOrderReadLock.unlock();

      }

@@ -210,38 +212,58 @@


   @Transactional

   @Override

   public void processSuceess(String orderId) {

   public void processSuceess(String orderId, int orderType) {

      // 查询订单号是否在申诉列表中

      List<LostOrder> list = lostOrderMapper.selectByOrderId(orderId);

      List<LostOrder> list = lostOrderMapper.selectByOrderIdAndType(orderId, orderType);

      if (list == null || list.size() == 0)

         return;

      for (LostOrder lo : list) {

         if (lo.getState() == 1 && lo.getResultCode() != null

         if (lo.getState() == LostOrder.STATE_PASS && lo.getResultCode() != null

               && lo.getResultCode() == LostOrder.RESULT_CODE_VERFING) {

            LostOrder update = new LostOrder();

            update.setId(lo.getId());

            update.setResultCode(LostOrder.RESULT_CODE_SUCCESS);

            lostOrderMapper.updateByPrimaryKeySelective(update);

            Order order = orderService.findOrderByOrderIdAndType(orderId, Order.ORDER_TYPE_TAOBAO);

            if (order != null)

               // 添加通知

               userOrderMsgNotificationService.orderFoundSuccess(lo.getUserInfo().getId(), lo.getOrderId(),

                     order.getMoney(), 1, new Date(lo.getHandleTime()));

         }

      }

   }



   @Override

   public void processFail(String orderId) {

      List<LostOrder> list = lostOrderMapper.selectByOrderId(orderId);

   public void processFail(String orderId, int orderType) {

      List<LostOrder> list = lostOrderMapper.selectByOrderIdAndType(orderId, orderType);

      if (list != null)

         for (LostOrder order : list) {

            LostOrder update = new LostOrder();

            update.setId(order.getId());

            update.setResultCode(LostOrder.RESULT_CODE_FAIL);

            lostOrderMapper.updateByPrimaryKeySelective(update);

            // 添加通知

            userOrderMsgNotificationService.orderFoundFail(order.getUserInfo().getId(), order.getOrderId(), null, 1,

                  new Date(order.getHandleTime()));

         }

   }



   @Override

   public void processFail() {

      // 订单申诉人工通过后，但是隔了3天还未处理成功就视为该订单申诉失败

      lostOrderMapper.processFail();

      List<LostOrder> list = lostOrderMapper.listByMaxHandleTimeAndStateAndResultCode(

            System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 3L, LostOrder.STATE_PASS,

            LostOrder.RESULT_CODE_VERFING);

      if (list != null)

         for (LostOrder order : list) {

            LostOrder update = new LostOrder();

            update.setId(order.getId());

            update.setResultCode(LostOrder.RESULT_CODE_FAIL);

            lostOrderMapper.updateByPrimaryKeySelective(update);

            // 添加通知

            userOrderMsgNotificationService.orderFoundFail(order.getUserInfo().getId(), order.getOrderId(), null, 1,

                  new Date(order.getHandleTime()));

         }

   }



   @Override

@@ -269,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

@@ -295,4 +317,9 @@
      return lostOrderMapper.listByStateAndResultCode(state, resultCode, (page - 1) * pageSize, pageSize);

   }



   @Override

   public void saveLostOrder(LostOrder lostOrder) {

      lostOrderMapper.insertSelective(lostOrder);

   }



}