增加审核中

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/MerchantReservationDTO.java

@@ -0,0 +1,51 @@
+package com.chelvc.cloud.vehicle.client.dto;
+
+import com.chelvc.cloud.vehicle.client.constant.ReserveStatus;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 商家端预约记录信息
+ *
+ * @author liude
+ * @date 2024/6/9
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MerchantReservationDTO implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 约定时间
+     */
+    private Date appointTime;
+
+    /**
+     * 预约状态
+     */
+    private ReserveStatus status;
+
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 发起预约的时间
+     */
+    private Date createTime;
+    /**
+     *购买的商品详细
+     */
+    private OrderItemDTO goodItem;
+}

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/OrderItemDTO.java

@@ -0,0 +1,42 @@
+package com.chelvc.cloud.vehicle.client.dto;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 订单中所包含的商品对象 oms_order_item
+ *
+ * @author liude
+ * @date 2024-06-08
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString(callSuper = true)
+public class OrderItemDTO implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+    /** $column.columnComment */
+    private Long goodsId;
+
+    /** $column.columnComment */
+    private String goodsPic;
+
+    /** $column.columnComment */
+    private String goodsName;
+
+    /** 销售价格 */
+    private BigDecimal goodsPrice;
+
+    /** 购买数量 */
+    private Integer goodsQuantity;
+
+    /** 商品分类id */
+    private Long goodsCategoryId;
+}

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

@@ -70,4 +70,6 @@ public interface ReservationService extends IService<Reservation> {
      * @return
      */
     ReservationDTO getDetail(Long id);
+
+
 }

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

@@ -47,6 +47,7 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
         AssertUtils.available(count <= 0, "商家认证已存在");
         merchantAuth.setApplicationTime(new Date());
         merchantAuth.setApplicant(userId);
+        merchantAuth.setReviewStatus("2");
         this.save(merchantAuth);
         MerchantModifyParam param1 = new MerchantModifyParam();
         param1.setName(param.getStoreName());
@@ -74,6 +75,7 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
     public void updateMerchantAuth(@NonNull Long id, @NonNull MerchantAuthModifyParam param) {
         MerchantAuth merchantAuth = AssertUtils.available(this.getById(id), "商家认证不存在");
         MerchantAuthCopier.INSTANCE.copying(param, merchantAuth);
+        merchantAuth.setReviewStatus("2");
         this.updateById(merchantAuth);
         MerchantModifyParam param1 = new MerchantModifyParam();
         param1.setName(param.getStoreName());