Merge remote-tracking branch 'origin/div' into div

admin

2020-06-29 48934b8c3da5a6791d0805ff0c1d327da834cc2d

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

@@ -1217,7 +1217,7 @@


      // 查询记录

      UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo,

            UserSystemCouponRecord.STATE_SUCCESS);

            sourceType, UserSystemCouponRecord.STATE_SUCCESS);

      if (record == null) {

         throw new UserSystemCouponException(1, "没有使用券记录");

      }

@@ -1295,7 +1295,7 @@
      }



      // 查询记录

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

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

      if (record == null) {

         throw new UserSystemCouponException(1, "没有使用券记录");

      }

@@ -1491,18 +1491,16 @@


   @Transactional(rollbackFor = Exception.class)

   @Override

   public void updateStateByDrawback(String orderNo) throws Exception {

   public void updateStateByDrawback(String orderNo, Integer sourceType) throws Exception {



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

         return;

      }



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

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

      if (record == null) {

         return;

      }



      record.setOrderNo(orderNo);

      record.setUpdateTime(new Date());

      record.setState(UserSystemCouponRecord.STATE_FAIL_DRAWBACK);

      userSystemCouponRecordService.updateByPrimaryKeySelective(record);

@@ -1513,18 +1511,15 @@


   @Transactional(rollbackFor = Exception.class)

   @Override

   public void updateStateByArrivalAccount(String orderNo) throws Exception {



   public void updateStateByArrivalAccount(String orderNo, Integer sourceType) throws Exception {

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

         return;

      }



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

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

      if (record == null) {

         return;

      }



      record.setOrderNo(orderNo);

      record.setUpdateTime(new Date());

      record.setState(UserSystemCouponRecord.STATE_SUCCESS);

      userSystemCouponRecordService.updateByPrimaryKeySelective(record);

@@ -1537,15 +1532,13 @@


   @Transactional(rollbackFor = Exception.class)

   @Override

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

   public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long gId,Integer sourceType)

         throws Exception {



      boolean isfree = false;



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

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

         throw new Exception("传递参数不能为空");

      }



		
      boolean isfree = false;

      // 查询等待匹配的券记录

      List<UserSystemCouponRecord> list = userSystemCouponRecordService.getRecordByState(uid,

            UserSystemCouponRecord.STATE_WAIT);

@@ -1559,7 +1552,11 @@


      for (UserSystemCouponRecord userSystemCouponRecord : list) {

         Long goodId = userSystemCouponRecord.getGoodId();

         if (auctionId.equals(goodId)) {

         Integer goodSource = userSystemCouponRecord.getGoodSource();

         if (goodSource == null)

            continue;

				
         if (gId.equals(goodId) && goodSource == sourceType) {

            matching = true; // 匹配成功

            record = userSystemCouponRecord;

            break;

@@ -1568,7 +1565,7 @@


      // 商品匹配成功

      if (matching) {



         record.setGoodSource(sourceType);

         record.setOrderNo(orderNo);

         record.setUpdateTime(new Date());