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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -11,6 +11,7 @@
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoBuyRelationMapMapper;

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

import com.yeshi.fanli.exception.taobao.TaoBaoBuyRelationMapException;

import com.yeshi.fanli.log.LogHelper;

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

import com.yeshi.fanli.util.StringUtil;



@@ -20,7 +21,7 @@
   @Resource

   private TaoBaoBuyRelationMapMapper taoBaoBuyRelationMapMapper;



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public String getRelationId(Long uid) throws TaoBaoBuyRelationMapException {

      TaoBaoBuyRelationMap relationMap = taoBaoBuyRelationMapMapper.selectByUid(uid);

@@ -45,7 +46,11 @@
            taoBaoBuyRelationMapMapper.insertSelective(map);

            relationId = map.getRelationId();

         } catch (Exception e) {

            e.printStackTrace();

            try {

               LogHelper.errorDetailInfo(e);

            } catch (Exception e1) {

               e1.printStackTrace();

            }

         }

      }