Merge remote-tracking branch 'origin/mater-1.6.0' into div

admin

2019-08-19 9c09cead959dbeef292628f345e5f80c30fc3d17

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java

@@ -39,6 +39,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

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

import com.yeshi.fanli.exception.tlj.UserTaoLiJinOriginException;

import com.yeshi.fanli.exception.tlj.UserTaoLiJinRecordException;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

@@ -212,8 +213,8 @@
         return;

      }



      // 过期

      userTaoLiJinOriginService.overdueHongBao(uid);

      // 过期 -取消收回

      // userTaoLiJinOriginService.overdueHongBao(uid);



      // 我的淘礼金

      BigDecimal tlj = null;

@@ -252,14 +253,17 @@
      if (lastMonthUse == null || lastMonthUse.compareTo(zero) > 0) {

         lastMonthUse = zero;

      }

		
		
      String giveMin = configTaoLiJinService.getValueByKey("give_min_amount");



      // 问号链接

      String helpLink = configTaoLiJinService.getValueByKey("hongbao_help_link");



      String helpLink = configTaoLiJinService.getValueByKey("hongbao_help_link",null);


      JSONObject data = new JSONObject();

      data.put("tlj", tlj.setScale(2).toString());

      data.put("helpLink", helpLink);

      data.put("giveMin", giveMin);

      data.put("giveTip", "注:赠送推广红包金额至少"+ giveMin +"元");

      data.put("helpLink", configTaoLiJinService.getValueByKey("hongbao_help_link"));

      data.put("countShare", countShare);

      data.put("todayWin", todayWin.setScale(2).toString());

      data.put("yesterdayWin", yesterdayWin.setScale(2).toString());

@@ -398,7 +402,7 @@
            // 已领取

            money = deviceRecord.getMoney();

         } else {

            String value = configTaoLiJinService.getValueByKey("hongbao_newbies");

            String value = configTaoLiJinService.getValueByKey("hongbao_newbies",null);

            if (StringUtil.isNullOrEmpty(value)) {

               out.print(JsonUtil.loadFalseResult(1, "系统红包不存在"));

               return;

@@ -408,7 +412,7 @@
         }



         JSONObject data = new JSONObject();

         data.put("icon", configTaoLiJinService.getValueByKey("taolijin_system_icon"));

         data.put("icon", configTaoLiJinService.getValueByKey("taolijin_system_icon",null));

         data.put("title", "新人红包");

         data.put("content", "自购直接抵现，优惠真实可见！");

         data.put("type", 1);

@@ -416,8 +420,8 @@
         data.put("usage", "领取成功，已存入“我的-推广红包”");

         data.put("jumpName", "去使用");

         data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));

         data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip"));

         data.put("rules", configTaoLiJinService.getValueByKey("newbies_rules_link"));

         data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip",null));

         data.put("rules", configTaoLiJinService.getValueByKey("newbies_rules_link",null));



         out.print(JsonUtil.loadTrueResult(data));

         return;

@@ -426,7 +430,7 @@
      // 登录用户

      boolean isReceive = false;

      JSONObject data = new JSONObject();

      data.put("icon", configTaoLiJinService.getValueByKey("taolijin_system_icon"));

      data.put("icon", configTaoLiJinService.getValueByKey("taolijin_system_icon",null));



      if (type.equals(TaoLiJinOriginEnum.newbiesWin.name())) {

         BigDecimal hasMoney = null;

@@ -450,8 +454,8 @@
         data.put("usage", "领取成功，已存入“我的-推广红包”");

         data.put("jumpName", "去使用");

         data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));

         data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip"));

         data.put("rules", configTaoLiJinService.getValueByKey("newbies_rules_link"));

         data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip",null));

         data.put("rules", configTaoLiJinService.getValueByKey("newbies_rules_link",null));



      } else if (type.equals(TaoLiJinOriginEnum.rankWin.name())) {

         boolean isRank = false;

@@ -487,8 +491,8 @@
            data.put("money", "本月账户等级未达到\r\n继续加油");

            data.put("jumpName", "去查看");

            data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("user_rank"));

            data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_not_enough_tip"));

            data.put("rules", configTaoLiJinService.getValueByKey("rank_rules_link"));

            data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_not_enough_tip",null));

            data.put("rules", configTaoLiJinService.getValueByKey("rank_rules_link",null));

            out.print(JsonUtil.loadTrueResult(data));

            return;

         } else {

@@ -503,8 +507,8 @@
            }

            data.put("jumpName", "去使用");

            data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));

            data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_tip"));

            data.put("rules", configTaoLiJinService.getValueByKey("rank_rules_link"));

            data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_tip",null));

            data.put("rules", configTaoLiJinService.getValueByKey("rank_rules_link",null));

         }



      } else {

@@ -556,7 +560,7 @@
         }



         // 计算推广红包

         String warningRate = configTaoLiJinService.getValueByKey("warning_value");

         String warningRate = configTaoLiJinService.getValueByKey("warning_value",new Date());

         BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, taoBaoGoodsBrief);



         // 推广红包 不能小于1

@@ -580,13 +584,12 @@
         array.add(gson.toJson(extra));

      }



      executor.execute(new Runnable() {

         @Override

         public void run() {

            // 过期

            userTaoLiJinOriginService.overdueHongBao(uid);

         }

      });

      /*// 过期 -取消收回

       * executor.execute(new Runnable() {

       * 
       * @Override public void run() {

       * userTaoLiJinOriginService.overdueHongBao(uid); } });

       */



      JSONObject data = new JSONObject();

      data.put("count", array.size());

@@ -619,7 +622,8 @@
      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

            .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

      

      boolean isNewUser = userInfoExtraService.isNewUser(uid);

      //取消新人自购

      boolean isNewUser = false;//userInfoExtraService.isNewUser(uid);

      if (isNewUser) {

         // 判定为老用户： 新人只要使用了新人红包，也就是那1块钱，那么，他看到的分享爆款中的商品-就只能分享。

         long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);

@@ -629,8 +633,8 @@
      }

      

      

      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

      BigDecimal fanLiRate = hongBaoManageService.getTLJShareRate(System.currentTimeMillis());

      BigDecimal shareRate = hongBaoManageService.getTLJShareRate(System.currentTimeMillis());

      for (ShareHotGoods hotGoods : listHot) {

         TaoBaoGoodsBrief taoBaoGoodsBrief = hotGoods.getGoods();

         if (taoBaoGoodsBrief == null) {

@@ -638,7 +642,7 @@
         }

         

         // 计算推广红包

         String warningRate = configTaoLiJinService.getValueByKey("warning_value");

         String warningRate = configTaoLiJinService.getValueByKey("warning_value",new Date());

         BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, taoBaoGoodsBrief);

         

         // 推广红包 不能小于1

@@ -671,13 +675,12 @@
         array.add(gson.toJson(detailVO));

      }

      

      executor.execute(new Runnable() {

         @Override

         public void run() {

            // 过期

            userTaoLiJinOriginService.overdueHongBao(uid);

         }

      });

      /*

       * executor.execute(new Runnable() {

       * 
       * @Override public void run() { // 过期

       * userTaoLiJinOriginService.overdueHongBao(uid); } });

       */

      

      JSONObject data = new JSONObject();

      data.put("count", array.size());

@@ -802,7 +805,6 @@
         // 去掉标签

         detailVO.setLabels(null);

         

			


         MoneyInfoVO moneyInfo = detailVO.getMoneyInfo();

         moneyInfo.setMoneyType(2);

@@ -811,8 +813,8 @@
         String hongBao = spreadMoney.toString();

         ReduceHongBao vo = new ReduceHongBao();

         vo.setLeft(hotGoods.getLeftHongBaoCount());

         vo.setMoney(hongBao);

         vo.setName("付款立减  ¥" + hongBao);

         vo.setMoney(" ¥" + hongBao);

         vo.setName("付款立减 ");

         vo.setTip("");

         vo.setTotal(hotGoods.getTotalHongBaoCount());

         

@@ -841,5 +843,28 @@
      }

      out.print(JsonUtil.loadTrueResult(data));

   }

	
	
   /**

    * 赠送淘礼金

    * @param acceptData

    * @param uid

    * @param amount

    * @param out

    */

   @RequestMapping(value = "giveTLJ", method = RequestMethod.POST)

   public void giveTLJ(AcceptData acceptData, Long uid, BigDecimal amount, PrintWriter out) {

      if (uid == null || uid <= 0) {

         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

      }

		
      try {

         String tips = userTaoLiJinRecordService.giveTaolijin(uid, amount);

         out.print(JsonUtil.loadTrueResult(tips));

      } catch (UserTaoLiJinRecordException e) {

         out.print(JsonUtil.loadFalseResult(1, e.getMsg()));

      }

   }



}