Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

coolstore-partner-model/src/main/java/com/cool/store/dto/AccountAuditDTO.java

@@ -0,0 +1,29 @@
+package com.cool.store.dto;
+
+import com.cool.store.enums.ShopAccountEnum;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/4/8 20:32
+ * @Version 1.0
+ */
+@Data
+public class AccountAuditDTO {
+
+    @ApiModelProperty(value = "门店ID",required = true)
+    @NotNull(message = "门店ID不能为空")
+    private Long shopId;
+
+    @ApiModelProperty("审核标识 1-通过 2-拒绝 推送数据时不需要传 审核开通数据时必传")
+    private Integer auditFlag;
+
+    @ApiModelProperty(value = "HUOMA-火码 YLS-云流水 XZG-新掌柜" ,required = true)
+    private ShopAccountEnum shopAccountEnum;
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/AccountEntryStatusAuditDTO.java

@@ -0,0 +1,26 @@
+package com.cool.store.dto;
+
+import com.cool.store.enums.ShopAccountEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/4/8 21:13
+ * @Version 1.0
+ */
+@Data
+public class AccountEntryStatusAuditDTO {
+
+    @ApiModelProperty(value = "门店ID",required = true)
+    @NotNull(message = "门店ID不能为空")
+    private Long shopId;
+
+    @ApiModelProperty(value = "审核标识 1-通过 2-拒绝",required = true)
+    private Integer auditFlag;
+
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/AccountEntryStatusChangeDTO.java

@@ -0,0 +1,29 @@
+package com.cool.store.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/4/8 21:15
+ * @Version 1.0
+ */
+@Data
+public class AccountEntryStatusChangeDTO {
+
+
+    @ApiModelProperty(value = "门店ID" ,required = true)
+    @NotNull(message = "门店ID不能为空")
+    private Long shopId;
+
+    @ApiModelProperty(value = "进件状态 5-进件成功 6-进件失败",required = true)
+    @Max(6)
+    @Min(5)
+    private Integer entryStatus;
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/GetAccessTokenDTO.java

@@ -0,0 +1,17 @@
+package com.cool.store.dto;
+
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/4/9 15:08
+ * @Version 1.0
+ */
+@Data
+public class GetAccessTokenDTO {
+
+    private String mobile;
+
+    private String shopCode;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/ModifyPasswordDTO.java

@@ -3,6 +3,8 @@ package com.cool.store.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author suzhuhong
  * @Date 2025/4/7 16:31
@@ -11,12 +13,14 @@ import lombok.Data;
 @Data
 public class ModifyPasswordDTO {
 
-    @ApiModelProperty("盐值")
+    @ApiModelProperty(value = "盐值",required = true)
     String passwordSalt;
-    @ApiModelProperty("密码")
+    @ApiModelProperty(value = "密码",required = true)
     String password;
-    @ApiModelProperty("门店ID")
+    @ApiModelProperty(value = "门店ID",required = true)
     Long shopId;
+    @ApiModelProperty(value = "门店ID",hidden = true)
+    List<String> shopCode;
 
 
 }

coolstore-partner-model/src/main/java/com/cool/store/dto/StatusRefreshDTO.java

@@ -3,7 +3,6 @@ package com.cool.store.dto;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 
 /**
  * @Author suzhuhong

coolstore-partner-model/src/main/java/com/cool/store/response/bigdata/ApiResponse.java

@@ -1,6 +1,9 @@
 package com.cool.store.response.bigdata;
 
+import com.cool.store.constants.CommonConstants;
+import com.cool.store.enums.ResponseCodeEnum;
 import lombok.Data;
+import org.slf4j.MDC;
 
 /**
  * @Author suzhuhong
@@ -12,4 +15,18 @@ public class ApiResponse<T> {
     private String msg;
     private int code;
     private T data;
+    private String stackTrace;
+    private String requestId;
+
+
+    public ApiResponse(int code, String msg, T data) {
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+        this.requestId = MDC.get(CommonConstants.REQUEST_ID);
+    }
+
+    public static<T> ApiResponse<T> success(T data) {
+        return new ApiResponse(ResponseCodeEnum.SUCCESS.getCode(), "ok", data);
+    }
 }