的

yujian

2019-08-16 b2901a0793cfe3a1eb04318c1f8786c988e83108

 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;

@@ -253,13 +254,13 @@
         lastMonthUse = zero;

      }

      



      // 问号链接

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



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

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

@@ -670,13 +671,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());

@@ -839,5 +839,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()));

      }

   }



}