Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoOrderServiceImpl.java

@@ -137,8 +137,17 @@


         // 有重复的交易ID不处理

         if (tradesIds.size() != list.size()) {

            // 去除重复交易ID

            tradesIds = new HashSet<>();

            for (int i = 0; i < list.size(); i++) {

               if (tradesIds.contains(list.get(i).getTradeId())) {

                  list.remove(i--);

               } else

                  tradesIds.add(list.get(i).getTradeId());

            }



            LogHelper.test("检测到交易ID重复问题:" + orderId);

            throw new Exception();

//            throw new Exception();

         }



         List<TaoBaoOrder> oldOrderList = taoBaoOrderMapper.selectTaoBaoOrderByOrderId(orderId);