Merge remote-tracking branch 'origin/master'

admin

2019-02-28 1b34473ec51df64e21a5fd3abd5b02690f978cbb

Merge remote-tracking branch 'origin/master'

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

@@ -1988,7 +1988,7 @@
            

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

                // 免单商品

                hongBao = quanPrice.toString();

                hongBao = "¥" + quanPrice.toString();

            }

            

            


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java

@@ -340,7 +340,7 @@


                    } else if (CouponTypeEnum.rebatePercentCoupon == type) {

                        // 返利奖励券- 跳转至订单到账界面

                        jumpLink.put("state", 2);

                        jumpLink.put("state", "2");

                        

                        jumpBtn = new HashMap<String, Object>();

                        jumpBtn.put("params", jumpLink);

@@ -788,8 +788,8 @@
        }

        userRecordVO.setCouponEffect("返利¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN) + "已返" + percent + "%");



        // 跳转福利中心

        JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("welfareCore");

        // 资金明细

        JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("capitalDetails");

        Map<String, Object> jumpWelfare = new HashMap<String, Object>();

        jumpWelfare.put("jumpDetail", welfareCore);

        Map<String, Object> jumpparms = new HashMap<String, Object>();