自购立减/分享爆款返回数据修改修改

admin

2019-08-28 a99de6e3ab8c984ad274f53ac350fa56548f2374

 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;

@@ -255,7 +256,6 @@
      }
      
      String giveMin = configTaoLiJinService.getValueByKey("give_min_amount");



      JSONObject data = new JSONObject();

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

@@ -647,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);



@@ -794,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);



@@ -835,9 +853,9 @@
      out.print(JsonUtil.loadTrueResult(data));

   }

   

	
   /**

    * 赠送淘礼金

    * 
    * @param acceptData

    * @param uid

    * @param amount