'合并'

src/main/java/com/futu/course/cupons/service/CouponService.java

@@ -5,9 +5,6 @@ import com.futu.course.cupons.domain.Coupon;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.futu.course.cupons.dto.CouponDto;
 
-import java.math.BigDecimal;
-import java.util.List;
-
 /**
 * @author yuu
 * @description 针对表【coupon(优惠券)】的数据库操作Service
@@ -18,16 +15,4 @@ public interface CouponService extends IService<Coupon> {
 //    获取能使用的优惠券
     R findAll(CouponDto primary);
 
-
-
-
-
-//    订单界面
-
-
-
-
-
-
-
 }

src/main/java/com/futu/course/cupons/service/impl/CouponServiceImpl.java

@@ -1,14 +1,13 @@
 package com.futu.course.cupons.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.futu.course.common.entity.R;
-import com.futu.course.common.utils.CopyUtil;
 import com.futu.course.cupons.domain.Coupon;
 import com.futu.course.cupons.dto.CouponDto;
 import com.futu.course.cupons.service.CouponService;
 import com.futu.course.cupons.mapper.CouponMapper;
+import com.futu.course.orders.mapper.Order1Mapper;
 import com.futu.course.user.domain.User;
 import com.futu.course.user.domain.UserCoupon;
 import com.futu.course.user.mapper.UserCouponMapper;
@@ -16,7 +15,6 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -35,6 +33,12 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon>
     @Resource
     private RedisTemplate redisTemplate;
 
+
+    @Resource
+    private Order1Mapper order1Mapper;
+
+
+
     @Override
     public R findAll(CouponDto primary) {
         User user = (User) redisTemplate.opsForValue().get("user");
@@ -55,13 +59,6 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon>
 
 
 
-
-
-
-
-
-
-
 }
 
 

src/main/java/com/futu/course/es/Service/impl/ESCourseService.java

@@ -143,8 +143,10 @@ public class ESCourseService {
      * @date: 2025/5/7 17:09
      */
     public HashSet<ESCourse> CourseList(int categoryId) throws IOException {
+
         SearchRequest searchRequest = new SearchRequest("course");
         // 创建搜索容器
+
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         HashSet<ESCourse> esCourses = new HashSet<>();
         if (categoryId != 0) {
@@ -155,6 +157,7 @@ public class ESCourseService {
             searchSourceBuilder.query(boolQueryBuilder);
             // 添加数据为搜索容器
             searchRequest.source(searchSourceBuilder);
+            System.out.println("111111");
             try {
                 // 执行请求，并获取响应
                 SearchResponse search = client.search(searchRequest, RequestOptions.DEFAULT);
@@ -378,4 +381,4 @@ public class ESCourseService {
         return true;
     }
 
-}
+}

src/main/java/com/futu/course/es/controller/ESCourseController.java

@@ -1,7 +1,9 @@
 package com.futu.course.es.controller;
 
 import com.futu.course.es.Service.impl.ESCourseService;
+import com.futu.course.es.dto.CourseDto;
 import com.futu.course.es.domain.ESCourse;
+import com.futu.course.es.dto.SearchDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,20 +22,23 @@ public class ESCourseController {
     @Autowired
     ESCourseService esCourseService;
     @PostMapping("/search")
-    public ArrayList<String> search(@RequestParam("name") String name) throws IOException {
-      return esCourseService.search(name);
+    public ArrayList<String> search(@RequestBody SearchDto dto) throws IOException {
+        System.out.println(dto.getName());
+      return esCourseService.search(dto.getName());
     }
     @GetMapping("/MysqlInterES")
     public void MysqlInterES() throws IOException {
         esCourseService.MysqlInterES();
     }
     @PostMapping("/CourseList")
-    public HashSet<ESCourse> CourseList(@RequestParam("categoryId") int categoryId) throws IOException {
-        return esCourseService.CourseList(categoryId);
+    public HashSet<ESCourse> CourseList(@RequestBody CourseDto courseDto) throws IOException {
+        System.out.println("categoryId:"+courseDto.getCategoryId());
+        return esCourseService.CourseList(courseDto.getCategoryId());
     }
     @PostMapping("/SelCourse")
-    public HashSet<ESCourse> SelCourse(@RequestParam("name") String name) throws IOException {
-        return esCourseService.SelCourse(name);
+    public HashSet<ESCourse> SelCourse(@RequestBody SearchDto dto) throws IOException {
+        System.out.println(dto.getName());
+        return esCourseService.SelCourse(dto.getName());
     }
     @GetMapping("checkAndCreateIndex")
     public boolean checkAndCreateIndex() throws IOException {

src/main/java/com/futu/course/es/dto/CourseDto.java

@@ -0,0 +1,8 @@
+package com.futu.course.es.dto;
+
+import lombok.Data;
+
+@Data
+public class CourseDto {
+    private Integer categoryId;
+}

src/main/java/com/futu/course/es/dto/SearchDto.java

@@ -0,0 +1,8 @@
+package com.futu.course.es.dto;
+
+import lombok.Data;
+
+@Data
+public class SearchDto {
+    private  String name;
+}

src/main/java/com/futu/course/orders/dto/Orders.java

@@ -0,0 +1,17 @@
+package com.futu.course.orders.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@Data
+@NoArgsConstructor
+public class Orders {
+
+    private Long courseId;
+
+
+    private Long couponId;
+
+}

src/main/java/com/futu/course/orders/service/Order1Service.java

@@ -1,5 +1,6 @@
 package com.futu.course.orders.service;
 
+import com.futu.course.common.entity.R;
 import com.futu.course.orders.domain.Order1;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,7 +14,7 @@ public interface Order1Service extends IService<Order1> {
 
 
 //    订单
-
+//    R AddOrder1();