Merge remote-tracking branch 'origin/yxp' into text

# Conflicts:
#	src/main/java/com/futu/course/course/controller/CourseController.java
#	src/main/java/com/futu/course/course/domain/Course.java
#	src/main/java/com/futu/course/course/service/impl/CourseServiceImpl.java
#	src/main/java/com/futu/course/orders/service/impl/Order1ServiceImpl.java

src/main/java/com/futu/course/course/domain/Course.java

@@ -8,8 +8,9 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
-import com.futu.course.cupons.domain.Coupon;
-import com.futu.course.user.domain.UserAddress;
+
+import com.futu.course.shop.domain.Shop;
+import com.futu.course.shop.domain.Teacher;
 import lombok.Data;
 
 /**
@@ -34,12 +35,17 @@ public class Course implements Serializable {
      * 所属店铺
      */
     private Long shopId;
+    @TableField(exist = false)
+    private Shop shop;
 
     /**
      * 主讲老师
      */
     private Long teacherId;
 
+    @TableField(exist = false)
+    private Teacher teacher;
+
     private String describeTion;
 
     /**

src/main/java/com/futu/course/course/service/impl/CourseServiceImpl.java

@@ -12,9 +12,12 @@ import com.futu.course.orders.domain.OrderItem;
 import com.futu.course.orders.mapper.Order1Mapper;
 import com.futu.course.orders.mapper.OrderItemMapper;
 import com.futu.course.user.domain.User;
-import org.elasticsearch.common.util.LongHash;
 import org.springframework.data.redis.core.RedisTemplate;
+import com.futu.course.shop.service.impl.ShopServiceImpl;
+import com.futu.course.shop.service.impl.TeacherServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -64,6 +67,16 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
 
 
 
+    @Autowired
+    TeacherServiceImpl teacherService;
+    @Autowired
+    ShopServiceImpl shopService;
+    public Course CourseGetOneById(@RequestParam Long id){
+        Course byId = this.getById(id);
+        byId.setShop(shopService.getById(byId.getShopId()));
+        byId.setTeacher(teacherService.getById(byId.getTeacherId()));
+        return byId;
+    }
 }
 
 

src/main/java/com/futu/course/orders/controller/OrderController.java

@@ -0,0 +1,27 @@
+package com.futu.course.orders.controller;
+
+import com.futu.course.orders.domain.Order1;
+import com.futu.course.orders.service.impl.Order1ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author "杨旭朋"
+ * @ClassName: OrderController
+ * @date 2025年05月12日 19:33
+ */
+@RestController
+@RequestMapping("order")
+public class OrderController {
+    @Autowired
+    private Order1ServiceImpl order1Service;
+    @PostMapping("OrderList")
+    public List<Order1> OrderList(@RequestParam("status") int status) {
+       return order1Service.OrderList(status);
+    }
+}

src/main/java/com/futu/course/orders/service/impl/Order1ServiceImpl.java

@@ -1,5 +1,7 @@
 package com.futu.course.orders.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.futu.course.common.entity.R;
 import com.futu.course.common.utils.SnowflakeIdWorker;
@@ -7,6 +9,7 @@ import com.futu.course.course.domain.Course;
 import com.futu.course.course.mapper.CourseMapper;
 import com.futu.course.cupons.domain.Coupon;
 import com.futu.course.cupons.mapper.CouponMapper;
+import com.futu.course.common.utils.SnowflakeIdWorker;
 import com.futu.course.orders.domain.Order1;
 import com.futu.course.orders.domain.OrderCoupon;
 import com.futu.course.orders.domain.OrderItem;
@@ -26,6 +29,8 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import java.util.List;
+
 /**
 * @author yuu
 * @description 针对表【order1(订单表)】的数据库操作Service实现
@@ -107,8 +112,6 @@ public class Order1ServiceImpl extends ServiceImpl<Order1Mapper, Order1>
 
 
 
-
-
     /** 支持成功执行这个方法
      order1Id 是订单Id
      courseId 是课程ID
@@ -129,22 +132,27 @@ public class Order1ServiceImpl extends ServiceImpl<Order1Mapper, Order1>
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    /**
+     * @title: OrderList
+     * @desc:  订单查询
+     * @params int status
+     * @return: List<Order1>
+     * @author: 杨旭朋
+     * @date: 2025/5/12 19:39
+     */
+    public List<Order1> OrderList(int status) {
+        SnowflakeIdWorker snowflakeIdWorker = new SnowflakeIdWorker(1, 1);
+        long l = snowflakeIdWorker.nextId();
+//        long l = 1919928855523627008L;
+//        查看指定用户所有的订单
+        LambdaQueryWrapper<Order1> eq = Wrappers.<Order1>lambdaQuery()
+                .eq(Order1::getUserId, l);
+        if (status != 0) {
+            eq.eq(Order1::getStatus, status);
+            return this.list(eq);
+        }
+        return this.list(eq);
+    }