'合并'

src/main/java/com/futu/course/cupons/ScheduledTask.java

@@ -34,10 +34,8 @@ public class ScheduledTask {
     }
 
     public void forCoursers(List<Coupon> list){
-        System.err.println(list);
         for (Coupon c:list){
             if (c.getEndTime().before(new Date())){
-                System.err.println(1);
                 setUserCoupon(c.getId());
             }
         }

src/main/java/com/futu/course/shop/controller/ShopController.java

@@ -0,0 +1,28 @@
+package com.futu.course.shop.controller;
+
+import com.futu.course.common.entity.R;
+import com.futu.course.shop.dto.ShopDto;
+import com.futu.course.shop.service.ShopService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RequestMapping("/shop")
+@RestController
+public class ShopController {
+
+
+    @Resource
+    private ShopService service;
+
+
+    @PostMapping("/findAll")
+    public R findAll(@RequestBody ShopDto shopDto){
+        return service.findeAdd(shopDto);
+    }
+
+
+}

src/main/java/com/futu/course/shop/domain/Shop.java

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+
+import com.futu.course.course.domain.Course;
 import lombok.Data;
 
 /**
@@ -50,6 +53,8 @@ public class Shop implements Serializable {
      * 
      */
     private Date createTime;
+    @TableField(exist = false)
+    private List<Course> courses;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
@@ -72,7 +77,8 @@ public class Shop implements Serializable {
             && (this.getDescription() == null ? other.getDescription() == null : this.getDescription().equals(other.getDescription()))
             && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getAdminUserId() == null ? other.getAdminUserId() == null : this.getAdminUserId().equals(other.getAdminUserId()))
-            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()));
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getCourses() == null ? other.getCourses() == null : this.getCreateTime().equals(other.getCourses()));
     }
 
     @Override
@@ -86,6 +92,7 @@ public class Shop implements Serializable {
         result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
         result = prime * result + ((getAdminUserId() == null) ? 0 : getAdminUserId().hashCode());
         result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getCourses() == null) ? 0 : getCourses().hashCode());
         return result;
     }
 
@@ -102,6 +109,7 @@ public class Shop implements Serializable {
         sb.append(", status=").append(status);
         sb.append(", adminUserId=").append(adminUserId);
         sb.append(", createTime=").append(createTime);
+        sb.append(", courses=").append(courses);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/futu/course/shop/dto/ShopDto.java

@@ -0,0 +1,16 @@
+package com.futu.course.shop.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+public class ShopDto {
+//     商品id
+    private Long shopId;
+
+}

src/main/java/com/futu/course/shop/service/ShopService.java

@@ -1,7 +1,9 @@
 package com.futu.course.shop.service;
 
+import com.futu.course.common.entity.R;
 import com.futu.course.shop.domain.Shop;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.futu.course.shop.dto.ShopDto;
 
 /**
 * @author yuu
@@ -10,4 +12,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface ShopService extends IService<Shop> {
 
+
+//    进入店铺
+    R findeAdd(ShopDto shopDto);
+
 }

src/main/java/com/futu/course/shop/service/impl/ShopServiceImpl.java

@@ -1,11 +1,19 @@
 package com.futu.course.shop.service.impl;
 
+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.course.domain.Course;
+import com.futu.course.course.mapper.CourseMapper;
 import com.futu.course.shop.domain.Shop;
+import com.futu.course.shop.dto.ShopDto;
 import com.futu.course.shop.service.ShopService;
 import com.futu.course.shop.mapper.ShopMapper;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
 * @author yuu
 * @description 针对表【shop(店铺表)】的数据库操作Service实现
@@ -15,6 +23,18 @@ import org.springframework.stereotype.Service;
 public class ShopServiceImpl extends ServiceImpl<ShopMapper, Shop>
     implements ShopService{
 
+    @Resource
+    private CourseMapper courseMapper;
+
+    @Override
+    public R findeAdd(ShopDto shopDto) {
+        System.err.println(shopDto);
+        Shop shop = this.baseMapper.selectById(shopDto.getShopId());
+        List<Course> courses = courseMapper.selectList(new QueryWrapper<Course>().eq("shop_id", shop.getId()));
+        System.err.println(courses);
+        shop.setCourses(courses);
+        return R.ok(shop);
+    }
 }
 
 

接口文档.txt

@@ -13,4 +13,4 @@
 用户可以使用的优惠券    localhost:8003/Coupon/findAll                       post            CouponDto类
 订单                 localhost:8003/order1/addorder1                     post            OrdersDto类
 展示用户已购买的课程    localhost:8003/course/findAll                       post            无参
-点单页展示
+店铺展示信息          localhost:8003/shop/findAll                         post             ShopDto 类