Merge branch 'dev' into test

share-framework/src/main/java/share/framework/aspectj/QPServiceImplAspect.java

@@ -155,7 +155,13 @@ public class QPServiceImplAspect {
         lambdaQueryWrapper.in(SConsumerCoupon::getUseStatus, UserStatusEnum.UNUSED.getCode(), UserStatusEnum.USED.getCode());
         List<SConsumerCoupon> list = sConsumerCouponService.list(lambdaQueryWrapper);
         //过滤只有已使用
-        SConsumerCoupon one = list.stream().filter(sConsumerCoupon -> sConsumerCoupon.getUseStatus().equals(UserStatusEnum.USED.getCode())).findFirst().orElse(null);
+        SConsumerCoupon one = null;
+        //判断是否存在已使用的券
+        if (list.stream().anyMatch(sConsumerCoupon -> sConsumerCoupon.getUseStatus().equals(UserStatusEnum.USED.getCode()))) {
+            one = list.stream().filter(sConsumerCoupon -> sConsumerCoupon.getUseStatus().equals(UserStatusEnum.USED.getCode())).findFirst().orElse(null);
+        } else {
+            one = list.stream().filter(sConsumerCoupon -> sConsumerCoupon.getUseStatus().equals(UserStatusEnum.UNUSED.getCode())).findFirst().orElse(null);
+        }
         couponLog.setConsumerId(one.getConsumerId());
         couponLog.setCouponId(one.getId());
         LambdaQueryWrapper<SStore> sStoreLambdaQueryWrapper = new LambdaQueryWrapper<>();