yujian
2019-05-23 65bcee62ff2ed17b19caf71ea711b6fd017c9a3a
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -111,7 +111,7 @@
      String materialId = inviteMaterial.getId();
      String content = inviteMaterial.getText();
      
      ActivityUser user=activityUserService.selectByPrimaryKey(1L);
      ActivityUser user=activityUserService.selectByPrimaryKey(2L);
      
      if (!StringUtil.isNullOrEmpty(content)) {
         DynamicInfo dynamicTxt= new DynamicInfo();
@@ -129,7 +129,7 @@
         SimpleDateFormat format = new SimpleDateFormat("MM月dd日");
         
         StringBuffer buffer = new StringBuffer();
         buffer.append("------------------------------------------\n");
         buffer.append("-------------------\n");
         buffer.append("今天 : " + format.format(date));
         buffer.append("     ");
         buffer.append(DateLunarUtil.getWeekd(date) + "\n");
@@ -336,7 +336,8 @@
         DaTaoKeDetail daTaoKeDetail = null;
         // 商品列表
         List<GoodsPicture> listPicture = new ArrayList<GoodsPicture>();
         // 商品列表
         List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
         // 分享奖金
         BigDecimal shareMoney = new BigDecimal(0);
@@ -346,8 +347,9 @@
               daTaoKeDetail = daTaoKe;
            }
            // 分享奖金
            TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(daTaoKe);
            listGoods.add(taoBaoGoodsBrief);
            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null);
            if (!taoBaoGoodsBriefExtra.isCoupon()) {
               taoBaoGoodsBriefExtra.setState(1);
@@ -371,6 +373,7 @@
         // 发布用户
         dynamicInfo.setUser(activityUserService.getRandomByDaTaoKeCid(cid));
         dynamicInfo.setImgs(listPicture);
         dynamicInfo.setListGoodsBrief(listGoods);
         ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
         shareMoneyDesc.setColor("#FFFFFF");
@@ -449,13 +452,16 @@
      // 大淘客数据
      DaTaoKeDetail daTaoKe = daTaoKeGoodsService.getGoodsNotInList(subclassId, listId, 1).get(0);
      List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
      TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(daTaoKe);
      listGoods.add(taoBaoGoodsBrief);
      BigDecimal proportion = hongBaoManageService.getFanLiRate();
      TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null);
      if (!taoBaoGoodsBriefExtra.isCoupon()) {
         taoBaoGoodsBriefExtra.setState(1);
      }
      taoBaoGoodsBriefExtra.setTkRate(taoBaoGoodsBrief.getTkRate());
      
      // 分享奖金
      BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief);
@@ -506,6 +512,7 @@
      dynamicInfo.setDesc(shareMoneyDesc);
      dynamicInfo.setShareType(DynamicInfo.SHARE_TYPE_ONE);
      dynamicInfo.setShowType(DynamicInfo.SHOW_TYPE_TWO);
      dynamicInfo.setListGoodsBrief(listGoods);
      
      String desc = DaTaoKeUtil.getDesc(daTaoKe);
      if (!StringUtil.isNullOrEmpty(desc)) {
@@ -633,9 +640,22 @@
         dynamicVO.setShowType(DynamicInfo.SHOW_TYPE_ZERO);
         
         // 介绍内容
         SimpleDateFormat format = new SimpleDateFormat("MM月dd日");
         StringBuffer buffer = new StringBuffer();
         buffer.append("-------------------\n");
         buffer.append("今天 : " + format.format(new Date()));
         buffer.append("     ");
         buffer.append(DateLunarUtil.getWeekd(new Date()) + "\n");
         buffer.append("各位亲爱的你");
         buffer.append("         ");
         buffer.append("早安~\n");
         buffer.append("我的邀请码:【邀请码】\n");
         buffer.append("购物省钱返利券App:【邀请链接】");
         ClientTextStyleVO row1 = new ClientTextStyleVO();
         row1.setColor("#333333");
         row1.setContent(title);
         row1.setContent(title + "\n" + buffer.toString());
         listtitle.add(row1);
         dynamicVO.setTitle(listtitle);
         dynamicInfoDao.insert(dynamicVO);
@@ -732,6 +752,7 @@
                  newExtra.setState(1);
               }
               newExtra.setUpdatetime(new Date());
               newExtra.setTkRate(goodsBrief.getTkRate());
               goodsPicture.setGoods(newExtra);
               
               
@@ -812,6 +833,7 @@
            dynamicInfo.setShareCount(1000 + (int) (Math.random() * 8000));
         }
         List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
         // 商品列表
         List<GoodsPicture> listPicture = new ArrayList<GoodsPicture>();
         BigDecimal proportion = hongBaoManageService.getFanLiRate();
@@ -840,6 +862,8 @@
                   taoBaoGoodsBriefExtra.setState(1);
                   taoBaoGoodsBriefExtra.setCoupon(false);
               }
               listGoods.add(taoBaoGoodsBrief);
               // 商品图片
               taoBaoGoodsBriefExtra.setCouponInfo(null);
               taoBaoGoodsBriefExtra.setUpdatetime(new Date());
@@ -860,7 +884,7 @@
            }
         }
         dynamicInfo.setImgs(listPicture);
         dynamicInfo.setListGoodsBrief(listGoods);
         
         ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
         shareMoneyDesc.setColor("#FFFFFF");
@@ -887,8 +911,6 @@
         }
      }
   }