唯品会订单bug修复，APP端佣金比例展示错误bug修复

admin

2020-06-10 271ae63c20fcbe28d29c47f1881138ff6551a2a1

 fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java

@@ -30,6 +30,7 @@
import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;

import com.yeshi.fanli.entity.bus.activity.RecommendActivityTaoBaoGoods;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

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

import com.yeshi.fanli.exception.ActivityException;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

@@ -285,7 +286,7 @@
      data.put("fanMoney", shareMoney);

      data.put("shareId", shareRecord.getRedisKey());

      data.put("shareImg", loadResult);

      data.put("notifyDesc", configService.get("goods_share_multiple_notify"));

      data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareMultipleNotify.getKey()));



      return data;



@@ -320,7 +321,7 @@
      return activityUserMapper.selectList();

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public RecommendActivity addShareGoodsRecommendActivity(Long activityUid, List<Long> goodsList,

         RecommendActivity activity) throws ActivityException , Exception{

@@ -397,7 +398,7 @@
      return activity;

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public RecommendActivity addInviteImgRecommendActivity(Long activityUid, RecommendActivity activity, String url,

          int px, int py, int erCodeSize) throws ActivityException, Exception {

@@ -446,7 +447,7 @@
      return activity;

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public RecommendActivity addTextAndImgRecommendActivity(Long activityUid,  List<String> imgList,

         RecommendActivity activity) throws ActivityException, Exception {

@@ -509,7 +510,7 @@
      return recommendActivityMapper.selectByPrimaryKey(id);

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public RecommendActivity updateShareGoodsRecommendActivity(Long activityUid,

         List<Long> goodsList, RecommendActivity activity) throws ActivityException , Exception{

@@ -592,7 +593,7 @@
      return activity;

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public RecommendActivity updateInviteImgRecommendActivity(Long activityUid, RecommendActivity activity, String url,

         int px, int py, int erCodeSize) throws ActivityException , Exception{

@@ -659,7 +660,7 @@
      return activity;

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public RecommendActivity updateTextAndImgRecommendActivity(Long activityUid, List<String> imgList, 

         RecommendActivity activity) throws ActivityException , Exception{

@@ -755,7 +756,7 @@
      return recommendActivityMapper.getRecommendActivityEffectiveCount();

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void upgradeShareGoodsRecommendActivity(Long id) throws ActivityException {

      // 获取商品