bug修改

yujian

2019-02-28 f92377709d27a03726001e8fb1de51512c43d5e2

 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);

@@ -424,14 +424,6 @@
         userCouponVO.setCouponEffect(systemCoupon.getEffect());

         userCouponVO.setCouponRule(systemCoupon.getRule());



         Integer stateActivated = userCouponVO.getStateActivated();

         if (stateActivated == null || stateActivated == 0) {

            userCouponVO.setState(0);

            userCouponVO.setCouponEffect("待激活");

            userCouponVO.setCouponPicture(PIC_INVALID); // 未激活图片

         } else {

            userCouponVO.setCouponPicture(systemCoupon.getPicture());

         }



         int differentDays = 0;

         String couponTerm = "有效期：";

@@ -453,7 +445,23 @@
         // 剩余天数

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

         remainDays.put("content", "还剩" + differentDays + "天过期");

         remainDays.put("fontColor", "#F14242");

         String  remainDaysFontColor = "";

			
         Integer stateActivated = userCouponVO.getStateActivated();

         if (stateActivated == null || stateActivated == 0) {

            userCouponVO.setState(0);

            userCouponVO.setCouponEffect("待激活");

            userCouponVO.setCouponPicture(PIC_INVALID); // 未激活图片

				
            remainDaysFontColor = "#CCCCCC";

				
         } else {

            userCouponVO.setCouponPicture(systemCoupon.getPicture());

				
            remainDaysFontColor = "#F14242";

         }

			
         remainDays.put("fontColor", remainDaysFontColor);

         userCouponVO.setRemainDays(remainDays);

      }



@@ -542,6 +550,13 @@
                  // 显示不能使用

                  userCouponVO.setState(0);

                  userCouponVO.setCouponPicture(PIC_INVALID);

						
                  Map<String, Object> map = userCouponVO.getRemainDays();

                  if (map != null) {

                     map.put("fontColor", "#CCCCCC");

                  }

                  userCouponVO.setRemainDays(map);

						
               }

            }

         }

@@ -788,8 +803,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>();