加入任务

admin

2019-09-06 2012b3b5db3c6b06535a68f775bcc81b16151b90

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

@@ -17,6 +17,7 @@
import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.JsonUtil;



import com.fasterxml.jackson.core.util.VersionUtil;

import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.google.gson.JsonElement;

@@ -39,6 +40,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,12 +255,13 @@
         lastMonthUse = zero;

      }



      // 问号链接

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

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

@@ -644,6 +647,15 @@
         }



         GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate);

			
         // 大于1.6.5的才会显示福利价

         if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {

            if (detailVO.getCouponPrice() != null && detailVO.getCouponPrice().compareTo(new BigDecimal(0)) > 0)

               detailVO.setCouponPrice(detailVO.getCouponPrice().subtract(spreadMoney));

            else

               detailVO.setZkPrice(detailVO.getZkPrice().subtract(spreadMoney));

         }

			
         // 去掉标签

         detailVO.setLabels(null);



@@ -791,6 +803,15 @@
         }



         GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, proportion, proportion);



         // 大于1.6.5的才会显示福利价

         if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {

            if (detailVO.getCouponPrice() != null && detailVO.getCouponPrice().compareTo(new BigDecimal(0)) > 0)

               detailVO.setCouponPrice(detailVO.getCouponPrice().subtract(spreadMoney));

            else

               detailVO.setZkPrice(detailVO.getZkPrice().subtract(spreadMoney));

         }



         // 去掉标签

         detailVO.setLabels(null);



@@ -832,4 +853,27 @@
      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()));

      }

   }



}