支付宝更改

admin

2019-03-04 cdaacd7f7ba10c00696e14de498085af59caa402

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

@@ -118,9 +118,6 @@
   private UserOtherMsgNotificationService userOtherMsgNotificationService;

   



   // 券失效图片

   public final static String PIC_INVALID = "http://192.168.1.200/icon/mian_invalid.png";



   @Override

   public int insertSelective(UserSystemCoupon record) {

      return userSystemCouponMapper.insertSelective(record);

@@ -202,7 +199,13 @@
            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

            // 添加一条消息

            if (userInfoExtra != null) {

               userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);

               if (userInfoExtra.getCouponNews() == null) {

                  userInfoExtra.setCouponNews(1);

               } else {

                  userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);

               }

					
					
               try {

                  userInfoExtraService.saveUserInfoExtra(userInfoExtra);

               } catch (UserInfoExtraException e) {

@@ -283,10 +286,14 @@
         userCouponVO.setCouponPicture(systemCoupon.getPicture());

         userCouponVO.setCouponEffect(systemCoupon.getEffect());

         userCouponVO.setCouponRule(systemCoupon.getRule());

         userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());



         // 使用状态

         Integer state = userCouponVO.getState();



			
         // 券类型

         CouponTypeEnum type = systemCoupon.getType();

			
         // 按钮跳转

         Map<String, Object> jumpBtn = null;

         

@@ -303,22 +310,21 @@
            }



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

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

            

            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

            

            // 邀请队员界面

            if (userInfoExtra != null && userInfoExtra.getInviteCode() != null

                  && userInfoExtra.getInviteCode().trim().length() > 0) {

               // 邀请激活成功界面

               jumpLink.put("url", configService.get("invite_activation_success_url") + "?alert=true");

            } else {

               // 激活邀请码界面

               jumpLink.put("url", configService.get("invite_activation_url"));

            }

            /*

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

             *UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

             * if (userInfoExtra != null && userInfoExtra.getInviteCode() != null &&

             * userInfoExtra.getInviteCode().trim().length() > 0) { // 邀请激活成功界面

             * jumpLink.put("url", configService.get("invite_activation_success_url") +

             * "?alert=true"); } else { // 激活邀请码界面 jumpLink.put("url",

             * configService.get("invite_activation_url")); }

             *   jumpBtn.put("params", jumpLink);

             */

            

            jumpBtn.put("params", jumpLink);

            jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_web"));

            jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));



         } else if (stateActivated == 1) {

            // 显示规则

@@ -327,7 +333,6 @@
            if (UserSystemCoupon.STATE_CAN_USE == state) {

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



               CouponTypeEnum type = systemCoupon.getType();

               if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type) {

                  // 免单券、 福利免单券

                  

@@ -356,8 +361,8 @@
         

         // 券失效图片替换

         if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) {

            userCouponVO.setCouponPicture(PIC_INVALID);

         }

            userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());

         } 
         

         userCouponVO.setJumpBtn(jumpBtn);



@@ -423,6 +428,7 @@
         userCouponVO.setCouponName(systemCoupon.getName());

         userCouponVO.setCouponEffect(systemCoupon.getEffect());

         userCouponVO.setCouponRule(systemCoupon.getRule());

         userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());





         int differentDays = 0;

@@ -451,7 +457,7 @@
         if (stateActivated == null || stateActivated == 0) {

            userCouponVO.setState(0);

            userCouponVO.setCouponEffect("待激活");

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

            userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());

            

            remainDaysFontColor = "#CCCCCC";

            

@@ -549,7 +555,7 @@
               for (UserSystemCouponVO userCouponVO: list) {

                  // 显示不能使用

                  userCouponVO.setState(0);

                  userCouponVO.setCouponPicture(PIC_INVALID);

                  userCouponVO.setCouponPicture(userCouponVO.getCouponPictureInvalid());

                  

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

                  if (map != null) {