diff --git a/cloud-market-common/src/main/java/com/muyu/market/admain/Product.java b/cloud-market-common/src/main/java/com/muyu/market/admain/Product.java index 38c4e53..eb3c212 100644 --- a/cloud-market-common/src/main/java/com/muyu/market/admain/Product.java +++ b/cloud-market-common/src/main/java/com/muyu/market/admain/Product.java @@ -58,11 +58,6 @@ public class Product extends BaseEntity { */ @Excel(name = "商品状态(1: 在售, 0: 下架)") private String status; - /** - * 类型 - */ - @Excel(name = "类型") - private String type; /** * 创建时间 */ @@ -75,16 +70,13 @@ public class Product extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date") private Date updateTime; - /** - * 接口地址 - */ - @Excel(name = "接口地址") - private String apiAddr; - /** - * 请求方式 - */ - @Excel(name = "请求方式") - private String apiMoth; + + + + private String createBy; + private String updateBy; + private String remark; + diff --git a/cloud-market-common/src/main/java/com/muyu/market/admain/request/ProductListReq.java b/cloud-market-common/src/main/java/com/muyu/market/admain/request/ProductListReq.java index 34054c3..ebfd20c 100644 --- a/cloud-market-common/src/main/java/com/muyu/market/admain/request/ProductListReq.java +++ b/cloud-market-common/src/main/java/com/muyu/market/admain/request/ProductListReq.java @@ -48,11 +48,6 @@ public class ProductListReq { */ @Schema(description = "商品状态:同数据字典",defaultValue = "Y",type = "String") private String status; - /** - * 类型 - */ - @Schema(description = "类型",defaultValue = "",type = "String") - private String type; /** * 创建时间 */ @@ -65,16 +60,6 @@ public class ProductListReq { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date") private Date updateTime; - /** - * 接口地址 - */ - @Schema(description = "接口地址",defaultValue = "",type = "String") - private String apiAddr; - /** - * 请求方式 - */ - @Schema(description = "请求方式",defaultValue = "",type = "String") - private String apiMoth; diff --git a/cloud-market-common/src/main/java/com/muyu/market/admain/request/ProductSaveReq.java b/cloud-market-common/src/main/java/com/muyu/market/admain/request/ProductSaveReq.java index d3bbe46..6e6fe35 100644 --- a/cloud-market-common/src/main/java/com/muyu/market/admain/request/ProductSaveReq.java +++ b/cloud-market-common/src/main/java/com/muyu/market/admain/request/ProductSaveReq.java @@ -41,13 +41,8 @@ public class ProductSaveReq { /** * 商品状态(1: 在售, 0: 下架) */ - @Schema(description = "商品状态:同数据字典",defaultValue = "Y",type = "String") + @Schema(description = "商品状态",defaultValue = "y",type = "String") private String status; - /** - * 类型 - */ - @Schema(description = "类型",defaultValue = "",type = "String") - private String type; /** * 创建时间 */ @@ -60,16 +55,7 @@ public class ProductSaveReq { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date") private Date updateTime; - /** - * 接口地址 - */ - @Schema(description = "接口地址",defaultValue = "",type = "String") - private String apiAddr; - /** - * 请求方式 - */ - @Schema(description = "请求方式",defaultValue = "",type = "String") - private String apiMoth; + private BigDecimal begin; diff --git a/cloud-market-common/src/main/java/com/muyu/market/admain/request/ProductUpdReq.java b/cloud-market-common/src/main/java/com/muyu/market/admain/request/ProductUpdReq.java index 62e4039..92e74fc 100644 --- a/cloud-market-common/src/main/java/com/muyu/market/admain/request/ProductUpdReq.java +++ b/cloud-market-common/src/main/java/com/muyu/market/admain/request/ProductUpdReq.java @@ -48,11 +48,6 @@ public class ProductUpdReq { */ @Schema(description = "商品状态:同数据字典",defaultValue = "Y",type = "String") private String status; - /** - * 类型 - */ - @Schema(description = "类型",defaultValue = "",type = "String") - private String type; /** * 创建时间 */ @@ -65,16 +60,7 @@ public class ProductUpdReq { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date") private Date updateTime; - /** - * 接口地址 - */ - @Schema(description = "接口地址",defaultValue = "",type = "String") - private String apiAddr; - /** - * 请求方式 - */ - @Schema(description = "请求方式",defaultValue = "",type = "String") - private String apiMoth; + diff --git a/cloud-market-common/src/main/java/com/muyu/market/admain/response/ProductListResp.java b/cloud-market-common/src/main/java/com/muyu/market/admain/response/ProductListResp.java index 7d38fc8..f4632bd 100644 --- a/cloud-market-common/src/main/java/com/muyu/market/admain/response/ProductListResp.java +++ b/cloud-market-common/src/main/java/com/muyu/market/admain/response/ProductListResp.java @@ -49,11 +49,6 @@ public class ProductListResp { */ @Schema(description = "商品状态:同数据字典",defaultValue = "Y",type = "String") private String status; - /** - * 类型 - */ - @Schema(description = "类型",defaultValue = "",type = "String") - private String type; /** * 创建时间 */ @@ -66,16 +61,6 @@ public class ProductListResp { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date") private Date updateTime; - /** - * 接口地址 - */ - @Schema(description = "接口地址",defaultValue = "",type = "String") - private String apiAddr; - /** - * 请求方式 - */ - @Schema(description = "请求方式",defaultValue = "",type = "String") - private String apiMoth; private BigDecimal begin; private BigDecimal end; diff --git a/cloud-market-common/src/main/java/com/muyu/market/admain/response/ProductSaveResp.java b/cloud-market-common/src/main/java/com/muyu/market/admain/response/ProductSaveResp.java index d8c987f..64eef8a 100644 --- a/cloud-market-common/src/main/java/com/muyu/market/admain/response/ProductSaveResp.java +++ b/cloud-market-common/src/main/java/com/muyu/market/admain/response/ProductSaveResp.java @@ -44,11 +44,6 @@ public class ProductSaveResp { */ @Schema(description = "同数据字典",defaultValue = "Y",type = "String") private String status; - /** - * 类型 - */ - @Schema(description = "类型",defaultValue = "",type = "String") - private String type; /** * 创建时间 */ @@ -61,16 +56,7 @@ public class ProductSaveResp { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date") private Date updateTime; - /** - * 接口地址 - */ - @Schema(description = "接口地址",defaultValue = "",type = "String") - private String apiAddr; - /** - * 请求方式 - */ - @Schema(description = "请求方式",defaultValue = "",type = "String") - private String apiMoth; + diff --git a/cloud-market-server/src/main/java/com/muyu/market/server/controller/OrdersController.java b/cloud-market-server/src/main/java/com/muyu/market/server/controller/OrdersController.java index 7c3befc..88791bf 100644 --- a/cloud-market-server/src/main/java/com/muyu/market/server/controller/OrdersController.java +++ b/cloud-market-server/src/main/java/com/muyu/market/server/controller/OrdersController.java @@ -56,18 +56,17 @@ public class OrdersController { } - /** - * 查询订信息(测试) - * @param 】 - * @return - */ - @RequestMapping(path = "/orderSelect",method = RequestMethod.GET) - @Operation(summary = "查询所有",description = "查询所有") - public Result> findAll(){ - return Result.success(orderService.findAll()); - } +// /** +// * 查询订信息(测试) +// * @param 】 +// * @return +// */ +// @RequestMapping(path = "/orderSelect",method = RequestMethod.GET) +// @Operation(summary = "查询所有",description = "查询所有") +// public Result> findAll(){ +// return Result.success(orderService.findAll()); +// } -//你歇会儿 把 /** diff --git a/cloud-market-server/src/main/java/com/muyu/market/server/mapper/OrdersMapper.java b/cloud-market-server/src/main/java/com/muyu/market/server/mapper/OrdersMapper.java index f1c578a..e2cf386 100644 --- a/cloud-market-server/src/main/java/com/muyu/market/server/mapper/OrdersMapper.java +++ b/cloud-market-server/src/main/java/com/muyu/market/server/mapper/OrdersMapper.java @@ -16,6 +16,6 @@ public interface OrdersMapper extends BaseMapper { * 查询所有 * @return */ - List findAll(); +// List findAll(); } diff --git a/cloud-market-server/src/main/java/com/muyu/market/server/service/Impl/OrdersServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/market/server/service/Impl/OrdersServiceImpl.java index d1c7fc6..d594472 100644 --- a/cloud-market-server/src/main/java/com/muyu/market/server/service/Impl/OrdersServiceImpl.java +++ b/cloud-market-server/src/main/java/com/muyu/market/server/service/Impl/OrdersServiceImpl.java @@ -59,10 +59,10 @@ public class OrdersServiceImpl extends ServiceImpl impleme - @Override - public List findAll() { - return orderMapper.findAll(); - } +// @Override +// public List findAll() { +// return orderMapper.findAll(); +// } @Override public List findByorderList(OrdersSelectResp ordersSelectResp) { diff --git a/cloud-market-server/src/main/java/com/muyu/market/server/service/OrdersService.java b/cloud-market-server/src/main/java/com/muyu/market/server/service/OrdersService.java index e2d7d88..1a097d7 100644 --- a/cloud-market-server/src/main/java/com/muyu/market/server/service/OrdersService.java +++ b/cloud-market-server/src/main/java/com/muyu/market/server/service/OrdersService.java @@ -15,7 +15,7 @@ public interface OrdersService extends IService { List findByorderList(OrdersSelectResp ordersSelectResp); - List findAll(); +// List findAll(); } diff --git a/cloud-market-server/src/main/resources/Mapper/OrdersMapper.xml b/cloud-market-server/src/main/resources/Mapper/OrdersMapper.xml index 5abef15..1b9864a 100644 --- a/cloud-market-server/src/main/resources/Mapper/OrdersMapper.xml +++ b/cloud-market-server/src/main/resources/Mapper/OrdersMapper.xml @@ -15,6 +15,8 @@ + + - + + + + + + + + + + + + + + +