admin
2020-07-03 651a15c78f668bef3859d9ed1bb7ad0b669d3600
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
@@ -8,6 +8,8 @@
import javax.annotation.Resource;
import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.service.inter.user.*;
import org.jsoup.Jsoup;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
@@ -45,10 +47,6 @@
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.util.ImageUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
@@ -66,8 +64,7 @@
   @Resource
   private RecommendActivityMapper recommendActivityMapper;
   @Resource
   private ShareGoodsService shareGoodsService;
   @Resource
   private SpreadUserImgService spreadUserImgService;
@@ -90,17 +87,13 @@
   @Resource
   private RedisManager redisManager;
   @Resource
   private TBPidService tbPidService;
   @Resource
   private ConfigService configService;
   @Resource
   private UserInfoMapper userInfoMapper;
    private UserInfoService userInfoService;
   @Resource
   private UserAccountService userAccountService;
   @Resource
   private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
@@ -280,13 +273,15 @@
      FileUploadResult loadResult  = new FileUploadResult();
      loadResult.setUrl(shareRecord.getSharePictureUrl());
        SystemEnum system = userInfoService.getUserSystem(uid);
      JSONObject data = new JSONObject();
      data.put("title", title);
      data.put("revenue", array);
      data.put("fanMoney", shareMoney);
      data.put("shareId", shareRecord.getRedisKey());
      data.put("shareImg", loadResult);
      data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareMultipleNotify.getKey()));
        data.put("notifyDesc", configService.getValue(ConfigKeyEnum.goodsShareMultipleNotify.getKey(),system));
      return data;
@@ -887,6 +882,7 @@
   
   /**
    * web段时间转换
     *
    * @param record
    */
   public void conversionTime(RecommendActivity record) throws ActivityException, Exception {