激活状态修改

yujian

2019-02-27 163aee1c38d062f1f3e6e80ce23487cba5014839

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

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

         }

@@ -1011,10 +1012,46 @@
            }

         }

      }

		
		
   }

   

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

   }

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

   }



   @Override

   public void updateCounponInvalid(Long uid) {

@@ -1061,7 +1098,7 @@
   @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;

      }

@@ -1106,10 +1143,6 @@
   @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;