Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-01 ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc

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

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

      }



      // 过期

      userTaoLiJinOriginService.overdueHongBao(uid);

      // 过期 -取消收回

      // userTaoLiJinOriginService.overdueHongBao(uid);



      // 我的淘礼金

      BigDecimal tlj = null;

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

@@ -671,13 +670,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 +800,6 @@
         // 去掉标签

         detailVO.setLabels(null);

         

			


         MoneyInfoVO moneyInfo = detailVO.getMoneyInfo();

         moneyInfo.setMoneyType(2);

@@ -811,8 +808,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());