Administrator
2018-11-29 ebb3551170b255defc25fe93bbf6eb1e84cd321d
fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java
@@ -89,6 +89,9 @@
   @Resource
   private RedisManager redisManager;
   // @Resource
   // private LostOrderService lostOrderService;
   @Override
   @Transactional
   public void addPidOrderFromTaoBao(Map<String, List<PidOrder>> map) {
@@ -201,11 +204,13 @@
      while (its.hasNext()) {
         String orderId = its.next();
         // 订单锁定
//         if (isRedisLockOrder(orderId))
//            continue;
//         redisLockOrder(orderId);
         // if (isRedisLockOrder(orderId))
         // continue;
         // redisLockOrder(orderId);
         doPidOrder(orderId);
//         redisUnlockOrder(orderId);
         // 处理订单找回
         // lostOrderService.processSuceess(orderId);
         // redisUnlockOrder(orderId);
      }
   }
@@ -267,7 +272,10 @@
                        HongBao.TYPE_SHARE_GOODS, HongBao.STATE_BUKELINGQU, new Date().getTime(),
                        new Date().getTime(), 0, "192.168.1.1", "系统添加");
                  hongBao.setOrderId(order.getOrderId());
                  hongBao.setPayMoney(order.getPayMoney());
                  if ("订单结算".equalsIgnoreCase(order.getState()))
                     hongBao.setPayMoney(order.getFinalMoney());
                  else
                     hongBao.setPayMoney(order.getPayMoney());
                  if (order.getBalanceTime() != null)
                     hongBao.setBalanceTime(order.getBalanceTime());