Merge remote-tracking branch 'origin/master'

admin

2019-04-15 debb3a579f798d71072f037f74e3e6b43b5fe0ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java

@@ -14,6 +14,7 @@
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderTradeMapMapper;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoOrderTradeMap;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -80,6 +81,22 @@
   @Transactional

   @Override

   public void addTaoBaoOrder(String orderId, List<TaoBaoOrder> list) {

      LogHelper.test("订单号与订单数量:" + orderId + "-" + list.size());

      // 验证orderby是否正确

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

         int maxOrderBy = list.get(0).getOrderBy();

         if (list.size() > 1)

            for (TaoBaoOrder order : list) {

               if (order.getOrderBy() > maxOrderBy)

                  maxOrderBy = order.getOrderBy();

            }



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

            LogHelper.test("捕捉到排序值错误:" + orderId);

            return;

         }

      }



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

      if (oldOrderList == null || oldOrderList.size() == 0) {

         for (TaoBaoOrder taoBaoOrder : list) {

@@ -105,8 +122,10 @@
                  addTaoBaoOrderTradeMap(taoBaoOrder);

               } else {

                  taoBaoOrder.setId(order.getId());

                  taoBaoOrder.setRelationId(order.getRelationId());

                  taoBaoOrder.setSpecialId(order.getSpecialId());

                  if (!StringUtil.isNullOrEmpty(order.getRelationId()))

                     taoBaoOrder.setRelationId(order.getRelationId());

                  if (!StringUtil.isNullOrEmpty(order.getSpecialId()))

                     taoBaoOrder.setSpecialId(order.getSpecialId());

                  taoBaoOrder.setLatestUpdateTime(new Date());

                  taoBaoOrderMapper.updateByPrimaryKeySelective(taoBaoOrder);

                  addTaoBaoOrderTradeMap(taoBaoOrder);