fanli-server.git

parent: b6cf0023 | 补丁 | 提交 | ignore whitespace

admin

2019-08-28 a99de6e3ab8c984ad274f53ac350fa56548f2374

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

3个文件已修改

	fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -467,6 +467,15 @@
            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,

@@ -495,11 +504,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());

@@ -507,6 +516,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);


 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;

@@ -252,15 +253,14 @@
        BigDecimal lastMonthUse = userTaoLiJinDetailService.countUseMoneyByDate(uid, 4);

        if (lastMonthUse == null || lastMonthUse.compareTo(zero) > 0) {

            lastMonthUse = zero;

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




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



        JSONObject data = new JSONObject();

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

        data.put("giveMin", giveMin);

        data.put("giveTip", "注:赠送推广红包金额至少"+ giveMin +"元");

        data.put("giveTip", "注:赠送推广红包金额至少" + giveMin + "元");

        data.put("helpLink", configTaoLiJinService.getValueByKey("hongbao_help_link"));

        data.put("countShare", countShare);

        data.put("todayWin", todayWin.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);



@@ -834,10 +852,10 @@
        }

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

    }

	
	


    /**

     * 赠送淘礼金

     * 
     * @param acceptData

     * @param uid

     * @param amount

@@ -849,7 +867,7 @@
            out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

            return;

        }

		


        try {

            String tips = userTaoLiJinRecordService.giveTaolijin(uid, amount);

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


 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java

@@ -707,7 +707,6 @@
                            String key = its.next();

                            Long hongBaoId = map.get(key);

                            try {



                                HongBaoV2 hongBaoV2 = hongBaoV2Service.selectByPrimaryKey(hongBaoId);

                                if (hongBaoV2 != null && hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU) {

                                    if (hongBaoV2.getType() == HongBaoV2.TYPE_ZIGOU) {// 自购

			@@ -467,6 +467,15 @@
			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,
			@@ -495,11 +504,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());
			@@ -507,6 +516,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);

			@@ -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;
			@@ -252,15 +253,14 @@
			BigDecimal lastMonthUse = userTaoLiJinDetailService.countUseMoneyByDate(uid, 4);
			if (lastMonthUse == null \|\| lastMonthUse.compareTo(zero) > 0) {
			lastMonthUse = zero;
			}

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


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

			JSONObject data = new JSONObject();
			data.put("tlj", tlj.setScale(2).toString());
			data.put("giveMin", giveMin);
			data.put("giveTip", "注:赠送推广红包金额至少"+ giveMin +"元");
			data.put("giveTip", "注:赠送推广红包金额至少" + giveMin + "元");
			data.put("helpLink", configTaoLiJinService.getValueByKey("hongbao_help_link"));
			data.put("countShare", countShare);
			data.put("todayWin", todayWin.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);

			@@ -834,10 +852,10 @@
			}
			out.print(JsonUtil.loadTrueResult(data));
			}



			/**
			* 赠送淘礼金
			*
			* @param acceptData
			* @param uid
			* @param amount
			@@ -849,7 +867,7 @@
			out.print(JsonUtil.loadFalseResult(1, "用户未登录"));
			return;
			}


			try {
			String tips = userTaoLiJinRecordService.giveTaolijin(uid, amount);
			out.print(JsonUtil.loadTrueResult(tips));

			@@ -707,7 +707,6 @@
			String key = its.next();
			Long hongBaoId = map.get(key);
			try {

			HongBaoV2 hongBaoV2 = hongBaoV2Service.selectByPrimaryKey(hongBaoId);
			if (hongBaoV2 != null && hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU) {
			if (hongBaoV2.getType() == HongBaoV2.TYPE_ZIGOU) {// 自购