消息通知配置与商家认证

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

@@ -0,0 +1,73 @@
+package com.chelvc.cloud.vehicle.api.dto;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 意见反馈数据模型
+ *
+ * @author liude
+ * @data 2023/1/12
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FeedBackDTO implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 回复评价 1-非常满意 2-满意 3- 一般 4 -较为不满意 5- 很不满意
+     */
+    private String replyEvaluate;
+    /**
+     * 状态  1 - 待处理 2- 已处理 3- 已完结
+     */
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 评价时间
+     */
+    private Date evaluateTime;
+    /**
+     * 渠道类型  0- 用户端 1-商家端
+     */
+    private String channel;
+}

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

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -16,33 +17,97 @@ import java.util.Date;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class MerchantAuthDTO {
+public class MerchantAuthDTO implements Serializable {
     /**
      * 主键
      */
     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 businessLicenseId;
+    /**
+     * 营业执照证件号
+     */
+    private String businessLicenseNumber;
+    /**
+     * 营业执照有效期
+     */
+    private Date businessLicenseExpirationDate;
+    /**
+     * 身份证号
+     */
+    private String idCardNumber;
+    /**
+     * 身份证照片
+     */
+    private byte[] idCardPhoto;
+    /**
+     * 身份证有效期
+     */
+    private Date idCardExpirationDate;
+    /**
+     * 店铺图
+     */
+    private String storeImage;
+    /**
+     * 法人姓名
+     */
+    private String legalRepresentativeName;
+    /**
+     * 法人性别
+     */
+    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 String reviewStatus; // 审核状态
-    private String reviewer; // 审核人
+    /**
+     * 审核人
+     */
+    private Long reviewer; // 审核人
+    /**
+     * 推荐人
+     */
     private String recommendationUser; // 推荐人
+    /**
+     * 审核时间
+     */
     private Date reviewTime; // 审核时间
 }

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

@@ -0,0 +1,80 @@
+package com.chelvc.cloud.vehicle.api.param;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 意见反馈数据模型
+ *
+ * @author liude
+ * @data 2023/1/12
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FeedBackModifyParam implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 标题
+     */
+    @NotEmpty(message = "标题不能为空")
+    @Size(max = 255, message = "标题长度不能大于20")
+    private String title;
+
+    /**
+     * 内容
+     */
+    @NotEmpty(message = "内容不能为空")
+    @Size(max = 5000, message = "内容长度不能大于20")
+    private String content;
+
+    /**
+     * 类型
+     */
+    @NotEmpty(message = "类型不能为空")
+    private String type;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 回复评价 1-非常满意 2-满意 3- 一般 4 -较为不满意 5- 很不满意
+     */
+    private String replyEvaluate;
+    /**
+     * 状态  1 - 待处理 2- 已处理 3- 已完结
+     */
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 评价时间
+     */
+    private Date evaluateTime;
+    /**
+     * 渠道类型  0- 用户端 1-商家端
+     */
+    private String channel;
+}

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

@@ -4,6 +4,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -18,29 +20,42 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 public class MerchantAuthModifyParam implements Serializable {
+    /**
+     * 主键ID
+     */
+    private Long id;
     /**
      * 营业执照编号
      */
+    @NotEmpty(message = "营业执照编号不能为空")
+    @Size(max = 100, message = "营业执照编号长度不能大于64")
     private String businessLicenseId;
     /**
      * 营业执照证件号
      */
+    @NotEmpty(message = "营业执照证件号不能为空")
+    @Size(max = 100, message = "营业执照证件号长度不能大于64")
     private String businessLicenseNumber;
     /**
      * 营业执照有效期
      */
+    @NotEmpty(message = "营业执照有效期不能为空")
     private Date businessLicenseExpirationDate;
     /**
      * 身份证号
      */
+    @NotEmpty(message = "身份证号不能为空")
+    @Size(max = 100, message = "身份证号长度不能大于32")
     private String idCardNumber;
     /**
      * 身份证照片
      */
+    @NotEmpty(message = "身份证照片不能为空")
     private byte[] idCardPhoto;
     /**
      * 身份证有效期
      */
+    @NotEmpty(message = "身份证有效期不能为空")
     private Date idCardExpirationDate;
     /**
      * 店铺图
@@ -49,22 +64,25 @@ public class MerchantAuthModifyParam implements Serializable {
     /**
      * 法人姓名
      */
+    @NotEmpty(message = "法人姓名不能为空")
+    @Size(max = 100, message = "法人姓名长度不能大于255")
     private String legalRepresentativeName;
-    /**
-     * 申请人
-     */
-    private String applicant;
     /**
      * 法人性别
      */
+    @NotEmpty(message = "法人性别不能为空")
+    @Size(max = 100, message = "营业执照编号长度不能大于1")
     private String legalRepresentativeGender;
     /**
      * 手机号
      */
+    @NotEmpty(message = "手机号不能为空")
+    @Size(max = 100, message = "手机号长度不能大于20")
     private String mobileNumber;
     /**
      * 账号
      */
+    @Size(max = 100, message = "账号长度不能大于64")
     private String account;
     /**
      * 账号注册日期
@@ -77,10 +95,13 @@ public class MerchantAuthModifyParam implements Serializable {
     /**
      *店名
      */
+    @NotEmpty(message = "店名不能为空")
+    @Size(max = 100, message = "店名长度不能大于255")
     private String storeName;
     /**
      * 店铺地址
      */
+    @Size(max = 100, message = "店铺地址长度不能大于255")
     private String storeAddress;
     /**
      * 经营许可证照片
@@ -89,29 +110,16 @@ public class MerchantAuthModifyParam implements Serializable {
     /**
      * 经营许可证号
      */
+    @NotEmpty(message = "经营许可证号不能为空")
+    @Size(max = 100, message = "经营许可证号长度不能大于20")
     private String businessLicenseNumberValid;
     /**
      * 经营许可证有效期
      */
+    @NotEmpty(message = "经营许可证有效期不能为空")
     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/service/FeedbackService.java

@@ -0,0 +1,34 @@
+package com.chelvc.cloud.vehicle.api.service;
+import com.chelvc.cloud.vehicle.api.dto.FeedBackDTO;
+import com.chelvc.cloud.vehicle.api.param.FeedBackModifyParam;
+
+/**
+ * 意见反馈接口
+ *
+ * @author liude
+ * @data 2024/1/12
+ */
+public interface FeedbackService {
+
+    /**
+     * 新增意见反馈
+     *
+     * @param param 新增参数
+     * @return 主键
+     */
+    Long addFeedback(FeedBackModifyParam param);
+
+    /**
+     * 修改意见反馈
+     *
+     * @param id    主键
+     * @param param 修改参数
+     */
+    void updateFeedback(Long id, FeedBackModifyParam param);
+
+    /**
+     * 获取意见反馈信息
+     * @return
+     */
+    FeedBackDTO getFeedback();
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/MerchantAuthService.java

@@ -35,4 +35,17 @@ public interface MerchantAuthService {
      * @return 商家认证分页信息
      */
     Pagination<MerchantAuthDTO> getMerchantAuthPaging(MerchantAuthPagingParam param);
+
+    /**
+     * 查询商家认证信息
+     * @return
+     */
+    MerchantAuthDTO queryById();
+
+    /**
+     * 商家认证是否通过
+     * @param id 主键ID
+     * @param state 0-拒绝 1-通过
+     */
+    void certificationAudit(Long id,String state);
 }

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

@@ -0,0 +1,58 @@
+package com.chelvc.cloud.vehicle.server.copier;
+
+import com.chelvc.cloud.vehicle.api.dto.FeedBackDTO;
+import com.chelvc.cloud.vehicle.api.param.FeedBackModifyParam;
+import com.chelvc.cloud.vehicle.server.entity.FeedBack;
+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 2024/1/16
+ */
+@Mapper(builder = @Builder(disableBuilder = true))
+public interface FeedbackCopier {
+    /**
+     * 对象拷贝接口实例
+     */
+    FeedbackCopier INSTANCE = Mappers.getMapper(FeedbackCopier.class);
+
+    /**
+     * 意见反馈信息拷贝
+     *
+     * @param carouselImages 意见反馈信息
+     * @return 意见反馈信息
+     */
+    FeedBackDTO copying(FeedBack carouselImages);
+
+    /**
+     * 意见反馈信息拷贝
+     *
+     * @param feedBacks 意见反馈信息集合
+     * @return 意见反馈信息列表
+     */
+    List<FeedBackDTO> copying(Collection<FeedBack> feedBacks);
+
+    /**
+     * 意见反馈信息拷贝
+     *
+     * @param param 意见反馈更新参数
+     * @return 意见反馈信息
+     */
+    FeedBack copying(FeedBackModifyParam param);
+
+    /**
+     * 意见反馈信息拷贝
+     *
+     * @param param    意见反馈更新参数
+     * @param feedBack 意见反馈信息
+     */
+    void copying(FeedBackModifyParam param, @MappingTarget FeedBack feedBack);
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/FeedbackMapper.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.FeedBack;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 意见反馈数据操作接口
+ *
+ * @author liude
+ * @date 2023/1/12
+ */
+@Mapper
+public interface FeedbackMapper extends BaseMapper<FeedBack> {
+}

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

@@ -87,7 +87,7 @@ public interface OmsOrderMapper extends BaseMapper<OmsOrder>
     /**
      * 获取订单及下单商品详情
      */
-    OmsOrderDetailDTO getDetail(@Param("orderId") Long orderId);
+    List<OmsOrderItemDTO> getDetail(@Param("orderId") Long orderId);
 
     /**
      * 修改 pms_sku_stock表的锁定库存及真实库存

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

@@ -0,0 +1,80 @@
+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/1/12
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FeedBack implements Entity<Long> {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 回复评价 1-非常满意 2-满意 3- 一般 4 -较为不满意 5- 很不满意
+     */
+    private String replyEvaluate;
+    /**
+     * 状态  1 - 待处理 2- 已处理 3- 已完结
+     */
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 评价时间
+     */
+    private Date evaluateTime;
+    /**
+     * 渠道类型  0- 用户端 1-商家端
+     */
+    private String channel;
+}

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

@@ -0,0 +1,57 @@
+package com.chelvc.cloud.vehicle.server.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+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/1/12
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FeedBackReply implements Entity<Long> {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 意见反馈id
+     */
+    private Long feedbackId;
+
+    /**
+     * 回复内省 1-答复 2-提出人反馈
+     */
+    private String replyType;
+
+    /**
+     * 内容
+     */
+    private String content;
+    /**
+     * 创建人
+     */
+    private Long creator;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 是否已提醒 0-否 1- 是
+     */
+    private String readed;
+
+}

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

@@ -2,9 +2,6 @@ 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;
@@ -37,7 +34,7 @@ public class MerchantAuth implements Entity<Long> {
     private Date idCardExpirationDate; // 身份证有效期
     private String storeImage; // 店铺图
     private String legalRepresentativeName; // 法人姓名
-    private String applicant; // 申请人
+    private Long applicant; // 申请人
     private String legalRepresentativeGender; // 法人性别
     private String mobileNumber; // 手机号
     private String account; // 账号
@@ -50,7 +47,7 @@ public class MerchantAuth implements Entity<Long> {
     private Date businessLicenseExpirationDateValid; // 经营许可证有效期
     private Date applicationTime; // 申请时间
     private String reviewStatus; // 审核状态
-    private String reviewer; // 审核人
+    private Long reviewer; // 审核人
     private String recommendationUser; // 推荐人
     private Date reviewTime; // 审核时间
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/FeedbackService.java

@@ -0,0 +1,13 @@
+package com.chelvc.cloud.vehicle.server.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.chelvc.cloud.vehicle.server.entity.FeedBack;
+
+/**
+ * 意见反馈操作接口
+ *
+ * @author liude
+ * @date 2024/1/12
+ */
+public interface FeedbackService extends IService<FeedBack> {
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/FeedbackServiceImpl.java

@@ -0,0 +1,44 @@
+package com.chelvc.cloud.vehicle.server.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chelvc.cloud.vehicle.api.dto.FeedBackDTO;
+import com.chelvc.cloud.vehicle.api.param.FeedBackModifyParam;
+import com.chelvc.cloud.vehicle.server.copier.FeedbackCopier;
+import com.chelvc.cloud.vehicle.server.dao.FeedbackMapper;
+import com.chelvc.cloud.vehicle.server.entity.FeedBack;
+import com.chelvc.cloud.vehicle.server.service.FeedbackService;
+import com.chelvc.framework.base.context.SessionContextHolder;
+import com.chelvc.framework.base.util.ResourceUtils;
+import lombok.NonNull;
+import org.apache.dubbo.config.annotation.DubboService;
+
+/**
+ * 意见反馈业务操作实现
+ *
+ * @author liude
+ * @date 2024/1/16
+ */
+@DubboService(interfaceClass = com.chelvc.cloud.vehicle.api.service.FeedbackService.class)
+public class FeedbackServiceImpl extends ServiceImpl<FeedbackMapper, FeedBack> implements FeedbackService,
+        com.chelvc.cloud.vehicle.api.service.FeedbackService {
+    @Override
+    public Long addFeedback(@NonNull FeedBackModifyParam param) {
+        FeedBack feedBack = FeedbackCopier.INSTANCE.copying(param);
+        this.save(feedBack);
+        return feedBack.getId();
+    }
+
+    @Override
+    public void updateFeedback(@NonNull Long id, @NonNull FeedBackModifyParam param) {
+        FeedBack feedBack = ResourceUtils.required(this.getById(id), "该意见反馈不存在");
+        FeedbackCopier.INSTANCE.copying(param, feedBack);
+        this.updateById(feedBack);
+    }
+    @Override
+    public FeedBackDTO getFeedback(){
+        Long userId = SessionContextHolder.getId();
+        FeedBack feedBack = this.lambdaQuery()
+                .eq(FeedBack::getUserId, userId).one();
+        return FeedbackCopier.INSTANCE.copying(feedBack);
+    }
+
+ }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/IncomeRecordServiceImpl.java

@@ -29,6 +29,7 @@ public class IncomeRecordServiceImpl extends ServiceImpl<IncomeRecordMapper, Inc
         incomeRecord.setCreateTime(new Date());
         incomeRecord.setUpdateTime(new Date());
         incomeRecord.setInviterId(userId);
+        List<IncomeRecord> recordList = this.lambdaQuery().eq(IncomeRecord :: getInviteeId,userId).list();
 
         this.save(incomeRecord);
         return incomeRecord.getId();

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/MerchantAuthServiceImpl.java

@@ -26,8 +26,10 @@ import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.Date;
+
 /**
- * 通知配置业务操作实现
+ * 商家认证业务操作实现
  *
  * @author liude
  * @date 2023/12/2
@@ -37,9 +39,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, MerchantAuth> implements MerchantAuthService,
         com.chelvc.cloud.vehicle.api.service.MerchantAuthService {
     @Override
-    public Long addMerchantAuth(MerchantAuthModifyParam param){
+    public Long addMerchantAuth(@NonNull MerchantAuthModifyParam param){
         MerchantAuth merchantAuth = MerchantAuthCopier.INSTANCE.copying(param);
         Long userId = SessionContextHolder.getId();
+        merchantAuth.setApplicationTime(new Date());
+        merchantAuth.setApplicant(userId);
         this.save(merchantAuth);
         return merchantAuth.getId();
     }
@@ -58,4 +62,21 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
                 .orderByAsc(MerchantAuth::getReviewTime).page(PagingUtils.convert(param.getPaging()));
         return PagingUtils.convert(page, MerchantAuthCopier.INSTANCE::copying);
     }
+    @Override
+   public MerchantAuthDTO queryById(){
+        Long userId = SessionContextHolder.getId();
+        MerchantAuth merchantAuth = this.lambdaQuery()
+                .eq(MerchantAuth::getApplicant, userId).one();
+        return MerchantAuthCopier.INSTANCE.copying(merchantAuth);
+    }
+
+    @Override
+    public void certificationAudit(Long id,String state){
+        Long userId = SessionContextHolder.getId();
+        MerchantAuth merchantAuth = ResourceUtils.required(this.getById(id), "商家认证不存在");
+        merchantAuth.setReviewStatus(state);
+        merchantAuth.setReviewTime(new Date());
+        merchantAuth.setReviewer(userId);
+        this.updateById(merchantAuth);
+    }
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -250,8 +250,8 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         order.setPayType(payType);
         this.baseMapper.updateById(order);
         //恢复所有下单商品的锁定库存，扣减真实库存
-        OmsOrderDetailDTO orderDetail = this.baseMapper.getDetail(orderId);
-        int count = this.baseMapper.updateSkuStock(orderDetail.getOrderItemList());
+        List<OmsOrderItemDTO> orderDetailList = this.baseMapper.getDetail(orderId);
+        int count = this.baseMapper.updateSkuStock(orderDetailList);
         return count;
     }
 

vehicle-server/src/main/resources/mapper/OmsOrderMapper.xml

@@ -836,7 +836,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--                    resultMap="com.chelvc.cloud.vehicle.server.dao.OmsOrderItemMapper.BaseResultMap">-->
 <!--        </collection>-->
 <!--    </resultMap>-->
-    <select id="getDetail" resultType="com.chelvc.cloud.vehicle.api.dto.OmsOrderDetailDTO">
+    <select id="getDetail" resultType="com.chelvc.cloud.vehicle.api.dto.OmsOrderItemDTO">
         SELECT
             o.id,
             o.order_sn,