Merge branch 'dev-hongbao'

admin

2019-01-03 5981b2cae7c20ec9021c8ccbe1a926f35f640210

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

@@ -239,13 +239,18 @@
      JSONObject contentJson1 = new JSONObject();

      contentJson1.put("color", fontColor1);

      contentJson1.put("content", "预估分享奖金:");



      String shareMoney = "0";

      String revenue = "¥0";

      String totalGetMoney = activity.getTotalGetMoney();

      if (totalGetMoney != null && totalGetMoney.trim().length() > 0) {

         String[] split = totalGetMoney.split("：");

         if (split != null) {

            revenue = split[1];

         }



         String[] splitMoney = totalGetMoney.split("¥");

         if (splitMoney != null) {

            shareMoney = splitMoney[1];

         }

      }



@@ -263,6 +268,7 @@


      data.put("title", title);

      data.put("revenue", array);

      data.put("fanMoney", shareMoney);

      data.put("shareId", map.get("shareId"));

      data.put("shareImg", map.get("loadResult"));

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

@@ -699,4 +705,26 @@
   public ActivityUser selectActivityUserByPrimaryKey(Long id) {

      return activityUserMapper.selectByPrimaryKey(id);

   }



   @Override

   public void updateRecommendActivityGoods(TaoBaoGoodsBrief goods) {

      List<RecommendActivityTaoBaoGoods> list = recommendActivityTaoBaoGoodsMapper

            .selectByAuctionId(goods.getAuctionId());

		
      BigDecimal d = TaoBaoUtil.getAfterUseCouplePrice(goods);

		
      RecommendActivityTaoBaoGoods updateGoods = new RecommendActivityTaoBaoGoods();

      if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"无".equalsIgnoreCase(goods.getCouponInfo())) {

         updateGoods.setDesc("券后价：¥" + d);

         updateGoods.setState(RecommendActivityTaoBaoGoods.STATE_NORMAL);

      } else {

         updateGoods.setState(RecommendActivityTaoBaoGoods.STATE_UNSHELVE);

      }



      if (list != null)

         for (RecommendActivityTaoBaoGoods tbGoods : list) {

            updateGoods.setId(tbGoods.getId());

            recommendActivityTaoBaoGoodsMapper.updateByPrimaryKeySelective(updateGoods);

         }

   }

}