Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

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

@@ -53,7 +53,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;

@@ -213,9 +213,9 @@


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

@@ -235,8 +235,8 @@
   }



   @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();