支付宝更改

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

@@ -215,11 +218,11 @@
      

      // 消息推送

      try {

         if (coupon.getType() != CouponTypeEnum.welfareFreeCoupon) {

         if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {

            userOtherMsgNotificationService.welfareCouponGet(userCoupon);

         } else if (coupon.getType() != CouponTypeEnum.freeCoupon) {

         } else if (coupon.getType() == CouponTypeEnum.freeCoupon) {

            userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);

         } else if (coupon.getType() != CouponTypeEnum.rebatePercentCoupon) {

         } else if (coupon.getType() == CouponTypeEnum.rebatePercentCoupon) {

            userOtherMsgNotificationService.rewardCouponGet(userCoupon,coupon.getPercent().intValue());

         }

         

@@ -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,15 +428,8 @@
         userCouponVO.setCouponName(systemCoupon.getName());

         userCouponVO.setCouponEffect(systemCoupon.getEffect());

         userCouponVO.setCouponRule(systemCoupon.getRule());

         userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());



         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 +451,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(systemCoupon.getPictureInvalid());

				
            remainDaysFontColor = "#CCCCCC";

				
         } else {

            userCouponVO.setCouponPicture(systemCoupon.getPicture());

				
            remainDaysFontColor = "#F14242";

         }

			
         remainDays.put("fontColor", remainDaysFontColor);

         userCouponVO.setRemainDays(remainDays);

      }



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

                  // 显示不能使用

                  userCouponVO.setState(0);

                  userCouponVO.setCouponPicture(PIC_INVALID);

                  userCouponVO.setCouponPicture(userCouponVO.getCouponPictureInvalid());

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

                  if (map != null) {

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

                  }

                  userCouponVO.setRemainDays(map);

						
               }

            }

         }

@@ -603,10 +624,10 @@
      

      // 消息推送

      try {

         if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {

//            userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order);

         } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {

//            userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);

         if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {

            //userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order.get);

         } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {

            //userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);

         }

         

      } catch(Exception e) {

@@ -1067,7 +1088,7 @@
      userSystemCouponRecordService.updateByPrimaryKeySelective(record);

      

      // 券退回

      sendBackCoupon(record.getUserSystemCoupon());

      sendBackCoupon(record.getUserSystemCoupon(), record);

   }

   

   @Transactional

@@ -1087,6 +1108,13 @@
      record.setUpdateTime(new Date());

      record.setState(UserSystemCouponRecord.STATE_SUCCESS);

      userSystemCouponRecordService.updateByPrimaryKeySelective(record);

		
      // 消息推送

      if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {

         userOtherMsgNotificationService.welfareCouponUsed(record.getUserSystemCoupon(), orderNo);

      } else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {

         userOtherMsgNotificationService.freeSheetCouponUsed(record.getUserSystemCoupon(), orderNo);

      } 
   }



   @Transactional

@@ -1114,11 +1142,11 @@
         

         // 消息推送

         try {

            if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {

            if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {

               userOtherMsgNotificationService.welfareCouponAlreadyOutOfDate(userSystemCoupon);

            } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {

            } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {

               userOtherMsgNotificationService.freeSheetCouponAlreadyOutOfDate(userSystemCoupon);

            } else if (baseCoupon.getType() != CouponTypeEnum.rebatePercentCoupon) {

            } else if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {

               userOtherMsgNotificationService.rewardCouponAlreadyOutOfDate(userSystemCoupon);

            }

            

@@ -1223,7 +1251,7 @@
            userSystemCouponRecordService.updateByPrimaryKeySelective(record);

            

            // 退回券

            sendBackCoupon(userSystemCoupon);

            sendBackCoupon(userSystemCoupon, record);

            

         } else {

            // 免单匹配成功

@@ -1238,16 +1266,15 @@
            userSystemCoupon.setUpdateTime(new Date());

            userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);

            

            SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();

            String couponType = record.getCouponType();

            if (couponType == null || couponType.trim().length() == 0) {

               throw new Exception("券类型未被记录");

            }

            

            SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());

            if (baseCoupon == null) {

               // 券已使用

               userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon, orderNo);

            } else    if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {

             if (CouponTypeEnum.welfareFreeCoupon.name().equals(couponType)) {

               userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,orderNo,payment);

            } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {

               userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon,orderNo);

            } else if (CouponTypeEnum.freeCoupon.name().equals(couponType)) {

               userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon, orderNo, payment);

            } 

         }

      }

@@ -1259,7 +1286,7 @@
    * 退回券 初始数据

    * @param userSystemCoupon

    */

   public void sendBackCoupon(UserSystemCoupon userSystemCoupon) throws Exception{

   public void sendBackCoupon(UserSystemCoupon userSystemCoupon, UserSystemCouponRecord record) throws Exception{



      int expiryDay = 15;



@@ -1288,6 +1315,13 @@
      userSystemCoupon.setUpdateTime(new Date());

      

      userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);

		
		
      if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {

         userOtherMsgNotificationService.welfareCouponDrawBack(userSystemCoupon, record.getOrderNo());

      } else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {

         userOtherMsgNotificationService.freeSheetCouponDrawBack(userSystemCoupon, record.getOrderNo());

      } 
   }