奖励详情跳转地址调整

yujian

2019-02-28 70c9043f312a52a922cb15490d90a172b3515060

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

@@ -28,6 +28,7 @@
import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.system.SystemCoupon;

import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.exception.user.UserSystemCouponException;

import com.yeshi.fanli.log.LogHelper;

@@ -49,7 +50,9 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.order.CommonOrderVO;

import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;

@@ -62,6 +65,9 @@


   @Resource(name = "taskExecutor")

   private TaskExecutor executor;

	
   @Resource

   private RedisManager redisManager;

   

   @Resource

   private UserSystemCouponMapper userSystemCouponMapper;

@@ -214,7 +220,7 @@
         } else if (coupon.getType() != CouponTypeEnum.freeCoupon) {

            userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);

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

            userOtherMsgNotificationService.rewardCouponGet(userCoupon);

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

         }

         

      } catch(Exception e) {

@@ -227,7 +233,7 @@
   }



   

	
   @Transactional

   @Override

   public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid)

         throws UserSystemCouponException, Exception {

@@ -334,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);

@@ -420,8 +426,9 @@


         Integer stateActivated = userCouponVO.getStateActivated();

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

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

            userCouponVO.setState(0);

            userCouponVO.setCouponEffect("待激活");

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

         } else {

            userCouponVO.setCouponPicture(systemCoupon.getPicture());

         }

@@ -477,6 +484,7 @@
      return hasCoupon;

   }



   @Transactional

   @Override

   public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {

      if (uid == null) {

@@ -497,10 +505,16 @@
      return getEnableListByCouponId(uid, 1, couponList);

   }



   @Transactional

   @Override

   public List<UserSystemCouponVO> getGoodsCouponList(Long uid) throws UserSystemCouponException, Exception {

   public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception {

		
      if (uid == null) {

         throw new UserSystemCouponException(1, "用户未登录");

      }

		
      if (auctionId == null) {

         throw new UserSystemCouponException(1, "商品ID为空");

      }

      

      // 更新过期券

@@ -514,9 +528,29 @@
         return null;

      }



      return getEnableListByCouponId(uid, null, couponList);

      List<UserSystemCouponVO> list = getEnableListByCouponId(uid, null, couponList);

		
      // 获取商品详情

      TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);

      if (taoBaoGoodsBrief != null) {

         BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);

			
         // 券后价 大于10元 不能免单

         if (quanPrice.compareTo(new BigDecimal(10)) > 0) {

            if (list != null && list.size() > 0) {

               for (UserSystemCouponVO userCouponVO: list) {

                  // 显示不能使用

                  userCouponVO.setState(0);

                  userCouponVO.setCouponPicture(PIC_INVALID);

               }

            }

         }

      }

		
      return list;

   }



   @Transactional

   @Override

   public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception {

      if (uid == null) {

@@ -570,9 +604,9 @@
      // 消息推送

      try {

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

            userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon);

//            userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order);

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

            userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);

//            userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);

         }

         

      } catch(Exception e) {

@@ -687,7 +721,7 @@
         

         // 消息推送

         try {

            userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon);

            userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, orderNo);

         } catch(Exception e) {

            LogHelper.errorDetailInfo(e);

         }

@@ -754,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>();

@@ -773,6 +807,7 @@
      return userRecordVO;

   }



	
   @Override

   public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception {



@@ -974,7 +1009,7 @@
      return userRecordVO;

   }

   

	
   @Transactional

   @Override

   public void activatedWelfareFreeCoupon(Long uid) {

      if (uid == null) {

@@ -1011,11 +1046,50 @@
            }

         }

      }

		
		
   }

   

   @Transactional

   @Override

   public void updateStateByDrawback(String orderNo) throws Exception {

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

         return;

      }



      UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo, null);

      if (record == null) {

         return;

      }

		
      record.setOrderNo(orderNo);

      record.setUpdateTime(new Date());

      record.setState(UserSystemCouponRecord.STATE_FAIL_DRAWBACK);

      userSystemCouponRecordService.updateByPrimaryKeySelective(record);

		
      // 券退回

      sendBackCoupon(record.getUserSystemCoupon());

   }

	
   @Transactional

   @Override

   public void updateStateByArrivalAccount(String orderNo) throws Exception {

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

         return;

      }



      UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo, 2);

      if (record == null) {

         return;

      }

		
      record.setOrderNo(orderNo);

      record.setUpdateTime(new Date());

      record.setState(UserSystemCouponRecord.STATE_SUCCESS);

      userSystemCouponRecordService.updateByPrimaryKeySelective(record);

   }



   @Transactional

   @Override

   public void updateCounponInvalid(Long uid) {

      List<UserSystemCoupon> list = userSystemCouponMapper.getCounponNowInvalid(uid);

@@ -1058,10 +1132,11 @@
      }

   }

   

   @Transactional

   @Override

   public void  sendBackTimeOutCoupon(Long uid) {

      // 超过120秒 未被匹配的券

      List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120);

      List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120L);

      if (list == null || list.size() == 0) {

         return;

      }

@@ -1103,13 +1178,10 @@
      }

   }

   

   @Transactional

   @Override

   public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment,

         Long auctionId) throws  Exception{

		
      //只处理付款金额小于10的

      if(payment==null||payment.compareTo(new BigDecimal(10))<0)

         return false;

      

      boolean isfree = false;

      

@@ -1171,11 +1243,11 @@
            SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());

            if (baseCoupon == null) {

               // 券已使用

               userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);

               userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon, orderNo);

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

               userOtherMsgNotificationService.welfareCouponUsed(userSystemCoupon);

               userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,orderNo,payment);

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

               userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);

               userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon,orderNo);

            } 

         }

      }