'合并'

src/main/java/com/futu/course/course/controller/CourseController.java

@@ -47,4 +47,6 @@ public class CourseController {
 
 
 
+
+
 }

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

@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 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 lombok.Data;
 
 /**

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

@@ -45,7 +45,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
 
         User user = (User) redisTemplate.opsForValue().get("user");
 
-        List<Long> order1Id = order1Mapper.selectObjs(new QueryWrapper<Order1>().eq("user_id", user.getId()).select("id"));
+        List<Long> order1Id = order1Mapper.selectObjs(new QueryWrapper<Order1>().eq("user_id", user.getId()).select("id").eq("status",1));
 
         List<Long>  orderItemId=new ArrayList<>();
         for (Long id:order1Id){

src/main/java/com/futu/course/orders/domain/Order1.java

@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 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 lombok.Data;
 
 /**

src/main/java/com/futu/course/orders/mapper/OrderItemMapper.java

@@ -11,6 +11,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface OrderItemMapper extends BaseMapper<OrderItem> {
 
+
+
+
 }
 
 

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

@@ -22,4 +22,7 @@ public interface Order1Service extends IService<Order1> {
 
 
 
+
+
+
 }

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

@@ -18,6 +18,7 @@ import com.futu.course.orders.mapper.Order1Mapper;
 import com.futu.course.user.domain.User;
 import com.futu.course.user.domain.UserAddress;
 import com.futu.course.user.mapper.UserAddressMapper;
+import com.futu.course.user.mapper.UserCouponMapper;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
@@ -53,6 +54,9 @@ public class Order1ServiceImpl extends ServiceImpl<Order1Mapper, Order1>
     @Resource
     private OrderItemMapper orderItemMapper;
 
+    @Resource
+    private UserCouponMapper userCouponMapper;
+
 
     @Override
     public R AddOrder1(OrdersDto ordersDto) {
@@ -96,14 +100,16 @@ public class Order1ServiceImpl extends ServiceImpl<Order1Mapper, Order1>
             orderCoupon1.setDiscountAmount(coupon.getDiscount());
             orderCouponMapper.insert(orderCoupon1);
         }
-//        AddOrderItme(order1.getId(), course.getId(),bigDecimal);
+        AddOrderItme(order1.getId(), course.getId(),bigDecimal);
 
         return R.failed("添加成功");
     }
 
 
 
-/** 支持成功执行这个方法
+
+
+    /** 支持成功执行这个方法
      order1Id 是订单Id
      courseId 是课程ID
      BigDecimal是支付价格
@@ -117,7 +123,6 @@ public class Order1ServiceImpl extends ServiceImpl<Order1Mapper, Order1>
         orderItem.setPrice(bigDecimal);
         orderItem.setCourseId(courseId);
         orderItemMapper.insert(orderItem);
-
         return R.failed("添加成功");
     }
 
@@ -141,6 +146,8 @@ public class Order1ServiceImpl extends ServiceImpl<Order1Mapper, Order1>
 
 
 
+
+
 }
 
 

接口文档.txt

@@ -9,6 +9,8 @@
 
 
 
-   路径                                       请求方式           参数是
-   localhost:8003/Coupon/findAll                post            CouponDto类
-    localhost:8003/order1/addorder1             post            OrdersDto类
+   作用                         路径                                       请求方式           参数是
+用户可以使用的优惠券    localhost:8003/Coupon/findAll                       post            CouponDto类
+订单                 localhost:8003/order1/addorder1                     post            OrdersDto类
+展示用户已购买的课程    localhost:8003/course/findAll                       post            无参
+点单页展示