订单模块

(cherry picked from commit 98b5fb20f3f58bdf7c11985ef2b1546e44f99484)

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/MerchantAuthDTO.java

@@ -0,0 +1,48 @@
+package com.chelvc.cloud.vehicle.api.dto;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 商家认证数据模型
+ *
+ * @author liude
+ * @data 2023/12/10
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MerchantAuthDTO {
+    /**
+     * 主键
+     */
+    private Long id;
+    private String businessLicenseId; // 营业执照编号
+    private String businessLicenseNumber; // 营业执照证件号
+    private Date businessLicenseExpirationDate; // 营业执照有效期
+    private String idCardNumber; // 身份证号
+    private byte[] idCardPhoto; // 身份证照片
+    private Date idCardExpirationDate; // 身份证有效期
+    private String storeImage; // 店铺图
+    private String legalRepresentativeName; // 法人姓名
+    private String applicant; // 申请人
+    private String legalRepresentativeGender; // 法人性别
+    private String mobileNumber; // 手机号
+    private String account; // 账号
+    private Date accountRegistrationDate; // 账号注册日期
+    private String storeType; // 店铺类型
+    private String storeName; // 店名
+    private String storeAddress; // 店铺地址
+    private String businessLicensePhoto; // 经营许可证照片
+    private String businessLicenseNumberValid; // 经营许可证号
+    private Date businessLicenseExpirationDateValid; // 经营许可证有效期
+    private Date applicationTime; // 申请时间
+    private String reviewStatus; // 审核状态
+    private String reviewer; // 审核人
+    private String recommendationUser; // 推荐人
+    private Date reviewTime; // 审核时间
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/NoticeDTO.java

@@ -0,0 +1,63 @@
+package com.chelvc.cloud.vehicle.api.dto;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 通知配置
+ *
+ * @author liude
+ * @date 2023/12/06
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class NoticeDTO  {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 正文
+     */
+    private String centent;
+
+    /**
+     * 通知对象
+     */
+    private String sendObject;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 创建人
+     */
+    private Date creator;
+    /**
+     * 更新人
+     */
+    private Date updater;
+
+
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/MerchantAuthModifyParam.java

@@ -0,0 +1,48 @@
+package com.chelvc.cloud.vehicle.api.param;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 商家认证数据模型
+ *
+ * @author liude
+ * @data 2023/12/10
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MerchantAuthModifyParam {
+    /**
+     * 主键
+     */
+    private Long id;
+    private String businessLicenseId; // 营业执照编号
+    private String businessLicenseNumber; // 营业执照证件号
+    private Date businessLicenseExpirationDate; // 营业执照有效期
+    private String idCardNumber; // 身份证号
+    private byte[] idCardPhoto; // 身份证照片
+    private Date idCardExpirationDate; // 身份证有效期
+    private String storeImage; // 店铺图
+    private String legalRepresentativeName; // 法人姓名
+    private String applicant; // 申请人
+    private String legalRepresentativeGender; // 法人性别
+    private String mobileNumber; // 手机号
+    private String account; // 账号
+    private Date accountRegistrationDate; // 账号注册日期
+    private String storeType; // 店铺类型
+    private String storeName; // 店名
+    private String storeAddress; // 店铺地址
+    private String businessLicensePhoto; // 经营许可证照片
+    private String businessLicenseNumberValid; // 经营许可证号
+    private Date businessLicenseExpirationDateValid; // 经营许可证有效期
+    private Date applicationTime; // 申请时间
+    private String reviewStatus; // 审核状态
+    private String reviewer; // 审核人
+    private String recommendationUser; // 推荐人
+    private Date reviewTime; // 审核时间
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/MerchantAuthPagingParam.java

@@ -0,0 +1,51 @@
+package com.chelvc.cloud.vehicle.api.param;
+import com.chelvc.framework.common.model.Paging;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * 商家认证数据模型
+ *
+ * @author liude
+ * @data 2023/12/10
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MerchantAuthPagingParam {
+    /**
+     * 分页信息
+     */
+    @NotNull(message = "分页不能为空")
+    private Paging paging;
+    private String businessLicenseId; // 营业执照编号
+    private String businessLicenseNumber; // 营业执照证件号
+    private Date businessLicenseExpirationDate; // 营业执照有效期
+    private String idCardNumber; // 身份证号
+    private byte[] idCardPhoto; // 身份证照片
+    private Date idCardExpirationDate; // 身份证有效期
+    private String storeImage; // 店铺图
+    private String legalRepresentativeName; // 法人姓名
+    private String applicant; // 申请人
+    private String legalRepresentativeGender; // 法人性别
+    private String mobileNumber; // 手机号
+    private String account; // 账号
+    private Date accountRegistrationDate; // 账号注册日期
+    private String storeType; // 店铺类型
+    private String storeName; // 店名
+    private String storeAddress; // 店铺地址
+    private String businessLicensePhoto; // 经营许可证照片
+    private String businessLicenseNumberValid; // 经营许可证号
+    private Date businessLicenseExpirationDateValid; // 经营许可证有效期
+    private Date applicationTime; // 申请时间
+    private String reviewStatus; // 审核状态
+    private String reviewer; // 审核人
+    private String recommendationUser; // 推荐人
+    private Date reviewTime; // 审核时间
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/NoticeModifyParam.java

@@ -0,0 +1,41 @@
+package com.chelvc.cloud.vehicle.api.param;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 通知配置
+ *
+ * @author liude
+ * @date 2023/12/06
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class NoticeModifyParam {
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 正文
+     */
+    private String centent;
+
+    /**
+     * 通知对象
+     */
+    private String sendObject;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/NoticePagingParam.java

@@ -0,0 +1,40 @@
+package com.chelvc.cloud.vehicle.api.param;
+import com.chelvc.framework.common.model.Paging;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * 通知配置
+ *
+ * @author liude
+ * @date 2023/12/06
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class NoticePagingParam {
+
+    /**
+     * 分页信息
+     */
+    @NotNull(message = "分页不能为空")
+    private Paging paging;
+
+    /**
+     * 标题
+     */
+    @Size(max = 100, message = "标题长度不能大于100")
+    private String title;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/copier/MerchantAuthCopier.java

@@ -0,0 +1,57 @@
+package com.chelvc.cloud.vehicle.server.copier;
+import com.chelvc.cloud.vehicle.api.dto.MerchantAuthDTO;
+import com.chelvc.cloud.vehicle.api.param.MerchantAuthModifyParam;
+import com.chelvc.cloud.vehicle.server.entity.MerchantAuth;
+import org.mapstruct.Builder;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.factory.Mappers;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商家认证拷贝接口
+ *
+ * @author liude
+ * @date 2023/12/20
+ */
+@Mapper(builder = @Builder(disableBuilder = true))
+public interface MerchantAuthCopier {
+    /**
+     * 对象拷贝接口实例
+     */
+    MerchantAuthCopier INSTANCE = Mappers.getMapper(MerchantAuthCopier.class);
+
+    /**
+     * 商家认证拷贝
+     *
+     * @param merchantAuth 商家认证
+     * @return 商家认证
+     */
+    MerchantAuthDTO copying(MerchantAuth merchantAuth);
+
+    /**
+     * 商家认证信息拷贝
+     *
+     * @param merchantAuths 商家认证信息集合
+     * @return 商家认证信息列表
+     */
+    List<MerchantAuthDTO> copying(Collection<MerchantAuth> merchantAuths);
+
+    /**
+     * 商家认证信息拷贝
+     *
+     * @param param 商家认证更新参数
+     * @return 商家认证信息
+     */
+    MerchantAuth copying(MerchantAuthModifyParam param);
+
+    /**
+     * 商家认证信息拷贝
+     *
+     * @param param    商家认证更新参数
+     * @param merchantAuth 商家认证信息
+     */
+    void copying(MerchantAuthModifyParam param, @MappingTarget MerchantAuth merchantAuth);
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/copier/NoticeCopier.java

@@ -0,0 +1,60 @@
+package com.chelvc.cloud.vehicle.server.copier;
+import com.chelvc.cloud.vehicle.api.dto.NoticeDTO;
+import com.chelvc.cloud.vehicle.api.dto.OmsOrderDTO;
+import com.chelvc.cloud.vehicle.api.param.NoticeModifyParam;
+import com.chelvc.cloud.vehicle.api.param.OmsOrderModifyParam;
+import com.chelvc.cloud.vehicle.server.entity.Notice;
+import com.chelvc.cloud.vehicle.server.entity.OmsOrder;
+import org.mapstruct.Builder;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.factory.Mappers;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 通知配置拷贝接口
+ *
+ * @author liude
+ * @date 2023/12/20
+ */
+@Mapper(builder = @Builder(disableBuilder = true))
+public interface NoticeCopier {
+    /**
+     * 对象拷贝接口实例
+     */
+    NoticeCopier INSTANCE = Mappers.getMapper(NoticeCopier.class);
+
+    /**
+     * 通知配置拷贝
+     *
+     * @param notice 通知配置
+     * @return 通知配置
+     */
+    NoticeDTO copying(Notice notice);
+
+    /**
+     * 通知配置信息拷贝
+     *
+     * @param notices 通知配置信息集合
+     * @return 通知配置信息列表
+     */
+    List<NoticeDTO> copying(Collection<Notice> notices);
+
+    /**
+     * 通知配置信息拷贝
+     *
+     * @param param 通知配置更新参数
+     * @return 通知配置信息
+     */
+    Notice copying(NoticeModifyParam param);
+
+    /**
+     * 通知配置信息拷贝
+     *
+     * @param param    通知配置更新参数
+     * @param notice 通知配置信息
+     */
+    void copying(NoticeModifyParam param, @MappingTarget Notice notice);
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/MerchantAuthMapper.java

@@ -0,0 +1,15 @@
+package com.chelvc.cloud.vehicle.server.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chelvc.cloud.vehicle.server.entity.MerchantAuth;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 商家认证操作接口
+ *
+ * @author liude
+ * @date 2023/12/10
+ */
+@Mapper
+public interface MerchantAuthMapper extends BaseMapper<MerchantAuth> {
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/NoticeMapper.java

@@ -0,0 +1,16 @@
+package com.chelvc.cloud.vehicle.server.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chelvc.cloud.vehicle.server.entity.Article;
+import com.chelvc.cloud.vehicle.server.entity.Notice;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文章数据操作接口
+ *
+ * @author Woody
+ * @date 2023/5/2
+ */
+@Mapper
+public interface NoticeMapper extends BaseMapper<Notice> {
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/MerchantAuth.java

@@ -0,0 +1,56 @@
+package com.chelvc.cloud.vehicle.server.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.chelvc.cloud.vehicle.api.constant.ArticleStatus;
+import com.chelvc.framework.common.model.Platform;
+import com.chelvc.framework.common.model.Terminal;
+import com.chelvc.framework.database.entity.Entity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 商家认证数据模型
+ *
+ * @author liude
+ * @data 2023/12/10
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MerchantAuth implements Entity<Long> {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    private String businessLicenseId; // 营业执照编号
+    private String businessLicenseNumber; // 营业执照证件号
+    private Date businessLicenseExpirationDate; // 营业执照有效期
+    private String idCardNumber; // 身份证号
+    private byte[] idCardPhoto; // 身份证照片
+    private Date idCardExpirationDate; // 身份证有效期
+    private String storeImage; // 店铺图
+    private String legalRepresentativeName; // 法人姓名
+    private String applicant; // 申请人
+    private String legalRepresentativeGender; // 法人性别
+    private String mobileNumber; // 手机号
+    private String account; // 账号
+    private Date accountRegistrationDate; // 账号注册日期
+    private String storeType; // 店铺类型
+    private String storeName; // 店名
+    private String storeAddress; // 店铺地址
+    private String businessLicensePhoto; // 经营许可证照片
+    private String businessLicenseNumberValid; // 经营许可证号
+    private Date businessLicenseExpirationDateValid; // 经营许可证有效期
+    private Date applicationTime; // 申请时间
+    private String reviewStatus; // 审核状态
+    private String reviewer; // 审核人
+    private String recommendationUser; // 推荐人
+    private Date reviewTime; // 审核时间
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/Notice.java

@@ -0,0 +1,71 @@
+package com.chelvc.cloud.vehicle.server.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.chelvc.cloud.vehicle.api.constant.FavoriteType;
+import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
+import com.chelvc.framework.database.entity.Entity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 通知配置数据模型
+ *
+ * @author liude
+ * @date 2023/12/06
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Notice implements Entity<Long> {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 正文
+     */
+    private String centent;
+
+    /**
+     * 通知对象
+     */
+    private String sendObject;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 创建人
+     */
+    private String creator;
+    /**
+     * 更新人
+     */
+    private String updater;
+
+
+}