Merge branch 'mater-1.6.0' into div

admin

2019-08-26 1d1c321cdb8905d8c89c26637d36b975c4b12742

Merge branch 'mater-1.6.0' into div

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

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java

@@ -2185,6 +2185,8 @@
        // 红包

        if (hongBao == null) {

            BigDecimal proportion = manageService.getFanLiRate();

            if ("taolijin".equalsIgnoreCase(from))

                proportion = manageService.getTLJShareRate(System.currentTimeMillis());

            hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

        }

        goodsJson.put("hongBao", hongBao);


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

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



        // 问号链接

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


        JSONObject data = new JSONObject();

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

@@ -552,7 +550,7 @@
            }

        }



        BigDecimal proportion = hongBaoManageService.getFanLiRate();

        BigDecimal proportion = hongBaoManageService.getTLJShareRate(System.currentTimeMillis());

        for (ShareHotGoods hotGoods : listHot) {

            TaoBaoGoodsBrief taoBaoGoodsBrief = hotGoods.getGoods();

            if (taoBaoGoodsBrief == null) {

@@ -584,8 +582,8 @@
            array.add(gson.toJson(extra));

        }



        /*// 过期 -取消收回

         * executor.execute(new Runnable() {

        /*

         * // 过期 -取消收回 executor.execute(new Runnable() {

         * 

         * @Override public void run() {

         * userTaoLiJinOriginService.overdueHongBao(uid); } });

@@ -597,9 +595,9 @@
        out.print(JsonUtil.loadTrueResult(data));

    }

    

	
    /**

     * 分享爆款商品-限于淘礼金

     * 
     * @param acceptData

     * @param uid

     * @param out

@@ -617,7 +615,6 @@
            listHot = new ArrayList<ShareHotGoods>(); 

        }

        

		
        JSONArray array = new JSONArray();

        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

@@ -631,7 +628,6 @@
                isNewUser = false;

            }

        }

		
        

        BigDecimal fanLiRate = hongBaoManageService.getTLJShareRate(System.currentTimeMillis());

        BigDecimal shareRate = hongBaoManageService.getTLJShareRate(System.currentTimeMillis());

@@ -687,8 +683,6 @@
        data.put("list", array);

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

    }



	
    

    /**

     * 分享爆款商品-限于淘礼金

@@ -764,7 +758,6 @@
        out.print(JsonUtil.loadTrueResult(data));

    }

    

	
    /**

     * 分享爆款商品-限于淘礼金

     * 

@@ -800,11 +793,9 @@
                continue;

            }





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

            // 去掉标签

            detailVO.setLabels(null);

			


            MoneyInfoVO moneyInfo = detailVO.getMoneyInfo();

            moneyInfo.setMoneyType(2);