金币明细bug

yujian

2019-09-03 d1dccd08a249b830a95eeeb04af25f87d5c056be

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

@@ -3,6 +3,7 @@
import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;



import javax.annotation.Resource;

@@ -45,6 +46,7 @@
import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

@@ -169,6 +171,9 @@
   @Resource

   private PinDuoDuoCacheUtil pinDuoDuoCacheUtil;



   @Resource

   private IntegralGetService integralGetService;

	
   /**

    * 淘宝商品详情

    * 

@@ -412,7 +417,7 @@
      // 推广红包

      if (from != null && from.equals("taolijin")) {

         // 计算推广红包

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

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

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



         // 推广红包 不能小于1

@@ -421,8 +426,8 @@
            return;

         }



         // 是否为新用户

         boolean isNewUser = userInfoExtraService.isNewUser(uid);

         // 取消新用户自购

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

         if (isNewUser) {

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

            long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);

@@ -466,6 +471,20 @@
         otherInfo.setSpreadHongBao(spreadHongBao);

         goodsDetail.setOtherInfo(otherInfo);



         // 1.6.5后改为福利价

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

            if (goodsDetail.getCouponPrice() != null

                  && goodsDetail.getCouponPrice().compareTo(new BigDecimal(0)) > 0)

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

            else

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

         }



         goodsDetail.getMoneyInfo().setFanliMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods,

               hongBaoManageService.getTLJShareRate(System.currentTimeMillis())));

         goodsDetail.getMoneyInfo().setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods,

               hongBaoManageService.getTLJShareRate(System.currentTimeMillis())));



         // 用户淘礼金

         UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);

         if (userMoneyExtra == null || userMoneyExtra.getTlj() == null) {

@@ -473,7 +492,7 @@
         } else {

            extraVO.setUserTLJ(userMoneyExtra.getTlj().setScale(2).toString());

         }

         helpLink = configTaoLiJinService.getValueByKey("share_goods_help_link");

         helpLink = configTaoLiJinService.getValueByKey("share_goods_help_link", new Date());



      } else if (from != null && from.equals("taolijin_buy")) {

         // 查询分享库

@@ -489,11 +508,11 @@
         shareValid = false;

         helpLink = configService.get("zigoulijian_nofanli_help");



         String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70)).toString();

         BigDecimal tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);



         ReduceHongBao reduceHongBao = new ReduceHongBao();

         reduceHongBao.setLeft(buyGoods.getLeftHongBaoCount());

         reduceHongBao.setMoney(tljHongBao);

         reduceHongBao.setMoney(tljHongBao.toString());

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

         reduceHongBao.setTip("当日领取，当日内使用，过期失效");

         reduceHongBao.setTotal(buyGoods.getTotalHongBaoCount());

@@ -501,6 +520,16 @@
         OtherInfo otherInfo = new OtherInfo();

         otherInfo.setReduceHongBao(reduceHongBao);

         goodsDetail.setOtherInfo(otherInfo);



         // 1.6.5后改为福利价

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

            if (goodsDetail.getCouponPrice() != null

                  && goodsDetail.getCouponPrice().compareTo(new BigDecimal(0)) > 0)

               goodsDetail.setCouponPrice(goodsDetail.getCouponPrice().subtract(tljHongBao));

            else

               goodsDetail.setZkPrice(goodsDetail.getZkPrice().subtract(tljHongBao));

         }



      }

      extraVO.setFanliValid(fanliValid);

      extraVO.setShareValid(shareValid);

@@ -808,7 +837,7 @@
      extraVO.setShare(shareInfoVO);



      if (convertUrl != null) {

         extraVO.setCouponJumpLink(convertUrl.getShortUrl());

         extraVO.setCouponJumpLink(convertUrl.getUrl());

         extraVO.setNativeCouponJumpLink(PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));

      }



@@ -937,9 +966,7 @@
         try {

            goodsList = TaoKeApiUtil.getBatchGoodsInfo(ids);

         } catch (TaoKeApiException e1) {

            e1.printStackTrace();

         } catch (TaobaoGoodsDownException e1) {

            e1.printStackTrace();

         }



         if (goodsList != null && goodsList.size() > 0) {

@@ -1042,6 +1069,9 @@
      data.put("native", true);

      data.put("jumpLink", jumpLink);

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

		
      // 获得金币

      integralGetService.addCouponRebate(uid);

   }



   /**

@@ -1084,6 +1114,9 @@
      data.put("jumpLink", convertUrl.getUrl());

      data.put("nativeJumpLink", PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));

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

		
      // 获得金币

      integralGetService.addCouponRebate(uid);

   }



   /**