优化 只有下架才会出现分享奖金0

yujian

2019-05-23 f0b45fd50863cc322858730c55b53c06d11f6dd2

 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);

@@ -711,8 +731,9 @@
            }

         }

         

         // 更新

         BigDecimal shareMoney = new BigDecimal(0);

         // 商品列表

         List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();

						
         for (GoodsPicture goodsPicture: imgs) {

            TaoBaoGoodsBriefExtra oldExtra = goodsPicture.getGoods();

            if (oldExtra == null) {

@@ -726,6 +747,18 @@
            

            try {

               TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(oldExtra.getAuctionId());

               listGoods.add(goodsBrief);

					
               // 更新热销单品的分享奖金  ，其余不做更新

               if (classId == 1) {

                  BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(goodsBrief);

                  ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();

                  shareMoneyDesc.setColor("#FFFFFF");

                  shareMoneyDesc.setBottomColor("#E8AE48");

                  shareMoneyDesc.setContent("预估分享奖金：¥" + shareMoney);

                  dynamicInfo.setDesc(shareMoneyDesc);

               }

					
               TaoBaoGoodsBriefExtra newExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null);

               

               if (!newExtra.isCoupon()) {

@@ -734,29 +767,52 @@
               newExtra.setUpdatetime(new Date());

               goodsPicture.setGoods(newExtra);

               

					
               // 更新热销单品的分享奖金  ，其余不做更新

               if (classId == 1) {

                  BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(goodsBrief);

                  shareMoney = MoneyBigDecimalUtil.add(shareMoney, money);

               }

					
            } catch (TaobaoGoodsDownException e) {

               oldExtra.setState(1);

               oldExtra.setCoupon(false);

               oldExtra.setUpdatetime(new Date());

               goodsPicture.setGoods(oldExtra);

					
               // 更新热销单品的分享奖金  ，其余不做更新

               if (classId == 1) {

                  ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();

                  shareMoneyDesc.setColor("#FFFFFF");

                  shareMoneyDesc.setBottomColor("#E8AE48");

                  shareMoneyDesc.setContent("预估分享奖金：¥" + new BigDecimal(0));

                  dynamicInfo.setDesc(shareMoneyDesc);

               }

               e.printStackTrace();

            }

         }

         

         // 更新热销单品的分享奖金  ，其余不做更新

         if (classId == 1) {

            ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();

            shareMoneyDesc.setColor("#FFFFFF");

            shareMoneyDesc.setBottomColor("#E8AE48");

            shareMoneyDesc.setContent("预估分享奖金：¥" + shareMoney);

            dynamicInfo.setDesc(shareMoneyDesc);

			
			
         // 更新商品

         List<TaoBaoGoodsBrief> listGoodsBrief = dynamicInfo.getListGoodsBrief();

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

				
            if (classId == 1) {

               dynamicInfo.setListGoodsBrief(listGoods);

            } else {

               for (int i =0; i < listGoodsBrief.size(); i ++) {

                  TaoBaoGoodsBrief taoBaoGoodsBrief = listGoodsBrief.get(i);

                  Long auctionId = taoBaoGoodsBrief.getAuctionId();

						
                  boolean isadd = true;

                  for (TaoBaoGoodsBrief goods: listGoods) {

                     if(goods.getAuctionId().equals(auctionId) || goods.getAuctionId() == auctionId) {

                        isadd = false;

                        break;

                     } 
                  }

						
                  // 商品已下架 则添加原来商品信息

                  if (isadd) {

                     listGoods.add(taoBaoGoodsBrief);

                  }

               }

               dynamicInfo.setListGoodsBrief(listGoods);

            }

         }

         

         dynamicInfo.setImgs(imgs);

@@ -812,6 +868,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 +897,8 @@
                   taoBaoGoodsBriefExtra.setState(1);

                   taoBaoGoodsBriefExtra.setCoupon(false);

               }

               listGoods.add(taoBaoGoodsBrief);

					
               // 商品图片

               taoBaoGoodsBriefExtra.setCouponInfo(null);

               taoBaoGoodsBriefExtra.setUpdatetime(new Date());

@@ -860,7 +919,7 @@
            }

         }

         dynamicInfo.setImgs(listPicture);

			
         dynamicInfo.setListGoodsBrief(listGoods);

         

         ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();

         shareMoneyDesc.setColor("#FFFFFF");

@@ -887,8 +946,6 @@
         }

      }

   }