冲突解决

yujian

2019-04-08 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d

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

@@ -143,9 +143,10 @@
      Map<String, List<TaoBaoOrder>> shareOrderMap = new HashMap<>();

      while (its.hasNext()) {

         String orderId = its.next();



         if (orders.get(orderId) != null && orders.get(orderId).size() > 0) {

            List<TaoBaoOrder> list = orders.get(orderId);



            LogHelper.test(String.format("订单处理:订单号-%s  订单数量-%s", orderId, list.size() + ""));

            if (!StringUtil.isNullOrEmpty(list.get(0).getRelationId())) {

               shareOrderMap.put(orderId, list);

            } else if (!StringUtil.isNullOrEmpty(list.get(0).getSpecialId())) {

@@ -450,9 +451,9 @@
         UserMoneyDetail userMoneyDetail = null;

         // 插入新版资金明细

         try {

            //此处不用订单号做唯一性索引

            // 此处不用订单号做唯一性索引

            userMoneyDetail = UserMoneyDetailFactory.createFanLi(uid, hongBaoOrder.getCommonOrder().getOrderNo(),

                  hongBaoOrder.getCommonOrder().getSourceType(), System.currentTimeMillis()+"", money);

                  hongBaoOrder.getCommonOrder().getSourceType(), null, money);

         } catch (UserMoneyDetailException e1) {

            try {

               LogHelper.errorDetailInfo(e1, "订单号:" + hongBaoOrder.getCommonOrder().getOrderNo(), "");

@@ -510,8 +511,8 @@
                  olist = TaoKeOrderApiUtil.getTaoBaoAllOrder(TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"),

                        TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);

                  List<TaoBaoOrder> thirdOList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(

                        TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"), 30, 1, TaoBaoConstant.TAOBAO_AUTH_APPKEY,

                        TaoBaoConstant.TAOBAO_AUTH_APPSECRET);

                        TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"), 30, 1,

                        TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);

                  if (thirdOList != null && thirdOList.size() > 0)

                     olist.addAll(thirdOList);