完善了积分兑换优惠券

src/main/java/com/cultural/heritage/controller/good/CategoryController.java

@@ -1,7 +1,6 @@
 package com.cultural.heritage.controller.good;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.cultural.heritage.common.BaseResponse;
 import com.cultural.heritage.common.ErrorCode;
 import com.cultural.heritage.common.ResultUtils;
@@ -18,13 +17,11 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.util.CollectionUtils;
 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 java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/java/com/cultural/heritage/mapper/CartRecordMapper.java

@@ -0,0 +1,7 @@
+package com.cultural.heritage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cultural.heritage.model.entity.CartRecord;
+
+public interface CartRecordMapper extends BaseMapper<CartRecord> {
+}

src/main/java/com/cultural/heritage/model/dto/coupon/CouponAddRequest.java

@@ -46,6 +46,10 @@ public class CouponAddRequest implements Serializable {
      */
     private Integer limitNum;
 
+    /**
+     * 作用范围
+     */
+    private String useScope;
 
     /**
      * 有效开始日期

src/main/java/com/cultural/heritage/model/dto/coupon/CouponUpdateRequest.java

@@ -1,7 +1,5 @@
 package com.cultural.heritage.model.dto.coupon;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.io.Serial;
@@ -56,12 +54,18 @@ public class CouponUpdateRequest implements Serializable {
      */
     private Date startTime;
 
-
     /**
      * 有效截止日期
      */
     private Date endTime;
 
+
+    /**
+     * 作用范围
+     */
+    private String useScope;
+
+
     /**
      * 使用说明
      */

src/main/java/com/cultural/heritage/model/entity/Address.java

@@ -3,6 +3,7 @@ package com.cultural.heritage.model.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serial;

src/main/java/com/cultural/heritage/model/entity/CartRecord.java

@@ -0,0 +1,59 @@
+package com.cultural.heritage.model.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 购物车添加记录
+ * @TableName cart_record
+ */
+@Data
+@TableName("cart_record")
+public class CartRecord implements Serializable {
+
+
+    /**
+     * 购物车记录id
+     */
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 商品id
+     */
+    private Long goodId;
+
+    /**
+     * 数量
+     */
+    private Integer quantity;
+
+    /**
+     * 小计
+     */
+    private BigDecimal subtotal;
+
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/cultural/heritage/model/entity/Category.java

@@ -4,6 +4,7 @@ package com.cultural.heritage.model.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serial;
@@ -47,11 +48,13 @@ public class Category implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
      * 更新时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     /**

src/main/java/com/cultural/heritage/model/entity/Coupon.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serial;
@@ -80,6 +81,11 @@ public class Coupon implements Serializable {
      */
     private Date endTime;
 
+    /**
+     * 作用范围
+     */
+    private String useScope;
+
     /**
      * 使用说明
      */
@@ -88,12 +94,14 @@ public class Coupon implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
 
     /**
      * 更新时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
 

src/main/java/com/cultural/heritage/model/entity/Exchange.java

@@ -3,6 +3,7 @@ package com.cultural.heritage.model.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serial;
@@ -47,11 +48,13 @@ public class Exchange implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
      * 更新时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
 

src/main/java/com/cultural/heritage/model/entity/Good.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serial;
@@ -91,11 +92,13 @@ public class Good {
     /**
      * 创建时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
      * 更新时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     /**

src/main/java/com/cultural/heritage/model/entity/User.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serial;
@@ -72,11 +73,13 @@ public class User implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
      * 更新时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     /**

src/main/java/com/cultural/heritage/service/good/CartRecordService.java

@@ -0,0 +1,8 @@
+package com.cultural.heritage.service.good;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cultural.heritage.model.entity.CartRecord;
+
+public interface CartRecordService extends IService<CartRecord> {
+
+}

src/main/java/com/cultural/heritage/service/good/impl/CartRecordServiceImpl.java

@@ -0,0 +1,4 @@
+package com.cultural.heritage.service.good.impl;
+
+public class CartRecordServiceImpl {
+}

src/main/resources/mapper/CartRecordMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cultural.heritage.mapper.CartRecordMapper">
+
+</mapper>