增加优惠券相关接口

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/AdminApplication.java

@@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.yonge.cooleshow")
-@MapperScan(basePackages = {"com.yonge.cooleshow.biz.dal.dao", "com.yonge.toolset.payment.core.dao"})
+@MapperScan(basePackages = {"com.yonge.cooleshow.biz.dal.dao", "com.yonge.cooleshow.biz.dal.mapper", "com.yonge.toolset.payment.core.dao"})
 @ComponentScan(basePackages = {"com.yonge.cooleshow", "com.yonge.toolset"})
 @Configuration
 @EnableSwagger2Doc

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/coupon/CouponInfoController.java

@@ -0,0 +1,44 @@
+package com.yonge.cooleshow.admin.controller.coupon;
+
+
+import com.yonge.cooleshow.admin.io.request.coupon.CouponInfoVO;
+import com.yonge.cooleshow.biz.dal.service.CouponInfoService;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.base.page.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 优惠券信息 前端控制器
+ * </p>
+ *
+ * @author Eric
+ * @since 2022-09-02
+ */
+@Controller
+@RequestMapping("/couponInfo")
+@Api(value = "优惠券信息", tags = "优惠券信息")
+public class CouponInfoController {
+
+    @Autowired
+    private CouponInfoService couponInfoService;
+
+    /**
+     * 优惠券信息
+     * @param request CouponInfoVO.RequestInfo
+     * @return HttpResponseResult<PageInfo<CouponInfoVO.ResponseInfo>>
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询优惠券分页", notes = "传入activityPlanSearch")
+    public HttpResponseResult<PageInfo<CouponInfoVO.ResponseInfo>> queryCouponPageInfo(@RequestBody CouponInfoVO.RequestInfo request) {
+
+        return null;
+    }
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/coupon/CouponIssueController.java

@@ -0,0 +1,22 @@
+package com.yonge.cooleshow.admin.controller.coupon;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 优惠券发放 前端控制器
+ * </p>
+ *
+ * @author Eric
+ * @since 2022-09-02
+ */
+@Controller
+@RequestMapping("/couponIssue")
+@Api(value = "优惠券发放信息", tags = "优惠券发放信息")
+public class CouponIssueController {
+
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/coupon/CouponInfoVO.java

@@ -0,0 +1,89 @@
+package com.yonge.cooleshow.admin.io.request.coupon;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yonge.toolset.base.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 优惠券信息
+ * Created by Eric.Shang on 2022/9/2.
+ */
+public class CouponInfoVO {
+
+    /**
+     * 优惠券信息
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(value = "优惠券信息分页请求", description = "优惠券信息分页")
+    public static class RequestInfo extends QueryInfo {
+
+        @ApiModelProperty("优惠券名称")
+        private String name;
+        @ApiModelProperty("客户类型")
+        private String clientType;
+        @ApiModelProperty("优惠券类型")
+        private String couponType;
+        @ApiModelProperty("可用品类")
+        private String category;
+
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(value = "优惠券信息分页信息", description = "优惠券信息分页信息")
+    public static class ResponseInfo implements Serializable {
+
+        @ApiModelProperty("优惠券ID")
+        private Long id;
+
+        @ApiModelProperty("优惠券名称")
+        private String name;
+
+        @ApiModelProperty("描述")
+        private String describe;
+
+        @ApiModelProperty("客户端类型")
+        private String clientType;
+
+        @ApiModelProperty("可用品类")
+        private String category;
+
+        @ApiModelProperty("优惠券类型")
+        private String couponType;
+
+        @ApiModelProperty("可以库存")
+        private Integer inventory;
+
+        @ApiModelProperty("领取次数限制")
+        private Integer quantityLimit;
+
+        @ApiModelProperty("状态")
+        private Integer status;
+
+        @ApiModelProperty("最后更新人")
+        private String updatedUser;
+
+        @ApiModelProperty("最后更新时间")
+        private Long updateTime;
+
+        @ApiModelProperty("创建时间")
+        private LocalDateTime createdTime;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CouponInfo.java

@@ -0,0 +1,108 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+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 java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 优惠券信息
+ * </p>
+ *
+ * @author Eric
+ * @since 2022-09-02
+ */
+@Getter
+@Setter
+@TableName("coupon_info")
+@ApiModel(value = "CouponInfo对象", description = "优惠券信息")
+public class CouponInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("优惠券ID")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("优惠券名称")
+    @TableField("name_")
+    private String name;
+
+    @ApiModelProperty("优惠券编号")
+    @TableField("serial_num_")
+    private String serialNum;
+
+    @ApiModelProperty("描述")
+    @TableField("describe_")
+    private String describe;
+
+    @ApiModelProperty("客户端类型")
+    @TableField("client_type_")
+    private String clientType;
+
+    @ApiModelProperty("可用品类")
+    @TableField("category_")
+    private String category;
+
+    @ApiModelProperty("使用门槛")
+    @TableField("use_limit_")
+    private BigDecimal useLimit;
+
+    @ApiModelProperty("优惠金额")
+    @TableField("discount_price_")
+    private BigDecimal discountPrice;
+
+    @ApiModelProperty("优惠券类型")
+    @TableField("coupon_type_")
+    private String couponType;
+
+    @ApiModelProperty("有效天数")
+    @TableField("valid_day_")
+    private Integer validDay;
+
+    @ApiModelProperty("生效时间")
+    @TableField("start_time_")
+    private Long startTime;
+
+    @ApiModelProperty("失效时间")
+    @TableField("end_time_")
+    private Long endTime;
+
+    @ApiModelProperty("库存量")
+    @TableField("inventory_")
+    private Integer inventory;
+
+    @ApiModelProperty("领取次数限制")
+    @TableField("quantity_limit_")
+    private Integer quantityLimit;
+
+    @ApiModelProperty("启禁状态")
+    @TableField("status_")
+    private Integer status;
+
+    @ApiModelProperty("更新用户")
+    @TableField("updated_by_")
+    private Long updatedBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time_")
+    private Long updateTime;
+
+    @ApiModelProperty("创建用户")
+    @TableField("created_by_")
+    private Long createdBy;
+
+    @ApiModelProperty("创建时间")
+    @TableField("created_time_")
+    private LocalDateTime createdTime;
+
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CouponIssue.java

@@ -0,0 +1,87 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+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 java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 优惠券发放
+ * </p>
+ *
+ * @author Eric
+ * @since 2022-09-02
+ */
+@Getter
+@Setter
+@TableName("coupon_issue")
+@ApiModel(value = "CouponIssue对象", description = "优惠券发放")
+public class CouponIssue implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("会员记录id")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("用户ID")
+    @TableField("user_id_")
+    private Long userId;
+
+    @ApiModelProperty("优惠券ID")
+    @TableField("coupon_id_")
+    private Long couponId;
+
+    @ApiModelProperty("客户端类型")
+    @TableField("client_type_")
+    private String clientType;
+
+    @ApiModelProperty("使用状态")
+    @TableField("use_state_")
+    private String useState;
+
+    @ApiModelProperty("订单编号")
+    @TableField("order_no_")
+    private Long orderNo;
+
+    @ApiModelProperty("生效时间")
+    @TableField("start_time_")
+    private Long startTime;
+
+    @ApiModelProperty("失效时间")
+    @TableField("end_time_")
+    private Long endTime;
+
+    @ApiModelProperty("发放方式")
+    @TableField("issue_way_")
+    private String issueWay;
+
+    @ApiModelProperty("发放人")
+    @TableField("issuer_")
+    private Long issuer;
+
+    @ApiModelProperty("发放时间")
+    @TableField("issue_time_")
+    private Long issueTime;
+
+    @ApiModelProperty("备注")
+    @TableField("remark_")
+    private String remark;
+
+    @ApiModelProperty("启禁状态")
+    @TableField("status_")
+    private Integer status;
+
+    @ApiModelProperty("创建时间")
+    @TableField("created_time_")
+    private LocalDateTime createdTime;
+
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/CouponInfoMapper.java

@@ -0,0 +1,18 @@
+package com.yonge.cooleshow.biz.dal.mapper;
+
+import com.yonge.cooleshow.biz.dal.entity.CouponInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 优惠券信息 Mapper 接口
+ * </p>
+ *
+ * @author Eric
+ * @since 2022-09-02
+ */
+@Repository
+public interface CouponInfoMapper extends BaseMapper<CouponInfo> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/CouponIssueMapper.java

@@ -0,0 +1,18 @@
+package com.yonge.cooleshow.biz.dal.mapper;
+
+import com.yonge.cooleshow.biz.dal.entity.CouponIssue;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 优惠券发放 Mapper 接口
+ * </p>
+ *
+ * @author Eric
+ * @since 2022-09-02
+ */
+@Repository
+public interface CouponIssueMapper extends BaseMapper<CouponIssue> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CouponInfoService.java

@@ -0,0 +1,16 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.CouponInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 优惠券信息 服务类
+ * </p>
+ *
+ * @author Eric
+ * @since 2022-09-02
+ */
+public interface CouponInfoService extends IService<CouponInfo> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CouponIssueService.java

@@ -0,0 +1,16 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.CouponIssue;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 优惠券发放 服务类
+ * </p>
+ *
+ * @author Eric
+ * @since 2022-09-02
+ */
+public interface CouponIssueService extends IService<CouponIssue> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CouponInfoServiceImp.java

@@ -0,0 +1,20 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.biz.dal.entity.CouponInfo;
+import com.yonge.cooleshow.biz.dal.mapper.CouponInfoMapper;
+import com.yonge.cooleshow.biz.dal.service.CouponInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 优惠券信息 服务实现类
+ * </p>
+ *
+ * @author Eric
+ * @since 2022-09-02
+ */
+@Service
+public class CouponInfoServiceImp extends ServiceImpl<CouponInfoMapper, CouponInfo> implements CouponInfoService {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CouponIssueServiceImp.java

@@ -0,0 +1,20 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.biz.dal.entity.CouponIssue;
+import com.yonge.cooleshow.biz.dal.mapper.CouponIssueMapper;
+import com.yonge.cooleshow.biz.dal.service.CouponIssueService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 优惠券发放 服务实现类
+ * </p>
+ *
+ * @author Eric
+ * @since 2022-09-02
+ */
+@Service
+public class CouponIssueServiceImp extends ServiceImpl<CouponIssueMapper, CouponIssue> implements CouponIssueService {
+
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/CouponInfoMapper.xml

@@ -0,0 +1,33 @@
+<?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.yonge.cooleshow.biz.dal.mapper.CouponInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.CouponInfo">
+        <id column="id_" property="id" />
+        <result column="name_" property="name" />
+        <result column="serial_num_" property="serialNum" />
+        <result column="describe_" property="describe" />
+        <result column="client_type_" property="clientType" />
+        <result column="category_" property="category" />
+        <result column="use_limit_" property="useLimit" />
+        <result column="discount_price_" property="discountPrice" />
+        <result column="coupon_type_" property="couponType" />
+        <result column="valid_day_" property="validDay" />
+        <result column="start_time_" property="startTime" />
+        <result column="end_time_" property="endTime" />
+        <result column="inventory_" property="inventory" />
+        <result column="quantity_limit_" property="quantityLimit" />
+        <result column="status_" property="status" />
+        <result column="updated_by_" property="updatedBy" />
+        <result column="update_time_" property="updateTime" />
+        <result column="created_by_" property="createdBy" />
+        <result column="created_time_" property="createdTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id_, name_, serial_num_, describe_, client_type_, category_, use_limit_, discount_price_, coupon_type_, valid_day_, start_time_, end_time_, inventory_, quantity_limit_, status_, updated_by_, update_time_, created_by_, created_time_
+    </sql>
+
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/CouponIssueMapper.xml

@@ -0,0 +1,28 @@
+<?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.yonge.cooleshow.biz.dal.mapper.CouponIssueMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.CouponIssue">
+        <id column="id_" property="id" />
+        <result column="user_id_" property="userId" />
+        <result column="coupon_id_" property="couponId" />
+        <result column="client_type_" property="clientType" />
+        <result column="use_state_" property="useState" />
+        <result column="order_no_" property="orderNo" />
+        <result column="start_time_" property="startTime" />
+        <result column="end_time_" property="endTime" />
+        <result column="issue_way_" property="issueWay" />
+        <result column="issuer_" property="issuer" />
+        <result column="issue_time_" property="issueTime" />
+        <result column="remark_" property="remark" />
+        <result column="status_" property="status" />
+        <result column="created_time_" property="createdTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id_, user_id_, coupon_id_, client_type_, use_state_, order_no_, start_time_, end_time_, issue_way_, issuer_, issue_time_, remark_, status_, created_time_
+    </sql>
+
+</mapper>

cooleshow-user/user-classroom/src/main/java/com/yonge/cooleshow/classroom/ClassroomApplication.java

@@ -14,7 +14,7 @@ import org.springframework.context.annotation.Configuration;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.yonge.cooleshow")
-@MapperScan(basePackages = {"com.yonge.cooleshow.biz.dal.dao", "com.yonge.toolset.payment.core.dao"})
+@MapperScan(basePackages = {"com.yonge.cooleshow.biz.dal.dao", "com.yonge.cooleshow.biz.dal.mapper", "com.yonge.toolset.payment.core.dao"})
 @ComponentScan(basePackages = {
         "com.yonge.cooleshow", "com.yonge.toolset"
 })

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/StudentApplication.java

@@ -18,7 +18,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.yonge.cooleshow")
-@MapperScan(basePackages = {"com.yonge.cooleshow.biz.dal.dao", "com.yonge.toolset.payment.core.dao"})
+@MapperScan(basePackages = {"com.yonge.cooleshow.biz.dal.dao", "com.yonge.cooleshow.biz.dal.mapper", "com.yonge.toolset.payment.core.dao"})
 @ComponentScan(basePackages = {"com.yonge.cooleshow", "com.yonge.toolset"})
 @Configuration
 @EnableSwagger2Doc

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/TeacherApplication.java

@@ -19,7 +19,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.yonge.cooleshow")
-@MapperScan(basePackages = {"com.yonge.cooleshow.biz.dal.dao", "com.yonge.toolset.payment.core.dao"})
+@MapperScan(basePackages = {"com.yonge.cooleshow.biz.dal.dao", "com.yonge.cooleshow.biz.dal.mapper", "com.yonge.toolset.payment.core.dao"})
 @ComponentScan(basePackages = {"com.yonge.cooleshow","com.yonge.toolset"})
 @Configuration
 @EnableSwagger2Doc

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/WebsiteApplication.java

@@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.yonge.cooleshow")
-@MapperScan(basePackages = {"com.yonge.cooleshow.biz.dal.dao", "com.yonge.toolset.payment.core.dao"})
+@MapperScan(basePackages = {"com.yonge.cooleshow.biz.dal.dao", "com.yonge.cooleshow.biz.dal.mapper", "com.yonge.toolset.payment.core.dao"})
 @ComponentScan(basePackages = {"com.yonge.cooleshow","com.yonge.toolset"})
 @Configuration
 @EnableSwagger2Doc