update activity

src/main/java/com/example/afrishop_v3/controllers/ActivityController.java

@@ -53,16 +53,14 @@ public class ActivityController {
 
     //查询商品活动
     @GetMapping("item/{itemId}")
-    public Result getItemActivity(@PathVariable("itemId") String itemId) throws ParseException, ExecutionException, InterruptedException {
+    public Result getItemActivity(@PathVariable("itemId") String itemId) throws ParseException {
         Result result = new Result();
         Activity activity = null;
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         //全场活动
         if (activityRepository.existsByUseType(1)) {
-            Optional<Activity> fullAct = activityRepository.findFirstByUseType(1);
-            if (fullAct.isPresent()) {
-                activity = fullAct.get();
-            }
+            List<Activity> fullList = activityRepository.findAllByUseType(1);
+            activity = fullList.get(0);
         }
 
         //商品分类活动

src/main/java/com/example/afrishop_v3/models/TbCfOrder.java

@@ -344,9 +344,8 @@ public class TbCfOrder {
          */
         boolean fullAct = activityRepository.existsByUseType(1);
         if (this.open && fullAct) {
-            Optional<Activity> allAct = activityRepository.findFirstByUseType(1);
-            if (allAct.isPresent()) {
-                Activity activity = allAct.get();
+            Activity activity = activityRepository.findAllByUseType(1).get(0);
+
             String type = String.valueOf(activity.getType());
             if ("1".equals(type)) {
                 reduceAmount = caculateActFee(false, false, activity, itemsPrice, null);
@@ -362,7 +361,6 @@ public class TbCfOrder {
                 itemsPrice = rate.multiply(itemsPrice);
             }
         }
-        }
 
         totalPrice = itemsPrice.add(fee).add(tax).add(expressCost).subtract(reduceAmount);
 

src/main/java/com/example/afrishop_v3/repository/ActivityRepository.java

@@ -24,10 +24,10 @@ public interface ActivityRepository extends JpaRepository<Activity, String> {
 
     boolean existsByUseType(Integer useType);
 
-    @Query(value = "select * from Activity a where CURRENT_TIMESTAMP between a.start_time and a.end_time and a.status=1 and use_type=:useType order by a.create_time desc limit 1", nativeQuery = true)
-    Optional<Activity> findFirstByUseType(Integer useType);
+//    @Query(value = "select * from Activity a where CURRENT_TIMESTAMP between a.start_time and a.end_time and a.status=1 and use_type=:useType order by a.create_time desc limit 1", nativeQuery = true)
+//    Optional<Activity> findFirstByUseType(Integer useType);
 
-    @Query(value = "select * from Activity a where CURRENT_TIMESTAMP between a.start_time and a.end_time and a.status=1 and use_type=:useType", nativeQuery = true)
+    @Query(value = "select * from Activity a where CURRENT_TIMESTAMP between a.start_time and a.end_time and a.status=1 and a.use_type=:useType order by a.create_time desc ", nativeQuery = true)
     List<Activity> findAllByUseType(Integer useType);
 
 }