diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java
index a6989d28..c31c83d6 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java
@@ -155,11 +155,11 @@ public class WorkerCertificationController extends BaseController
@Transactional(rollbackFor = Exception.class)
public AjaxResult appAddCertify(@RequestBody WorkerCertification request) {
// 将师傅状态设置为冻结
- Worker worker = new Worker();
- worker.setWorkerId(request.getWorkerId());
- worker.setStatus(WorkerStatus.DISABLE.getCode());
- int updateRows = workerService.updateWorker(worker);
- Assert.isTrue(updateRows == 1, "实名认证记录新增失败");
+// Worker worker = new Worker();
+// worker.setWorkerId(request.getWorkerId());
+// worker.setStatus(WorkerStatus.DISABLE.getCode());
+// int updateRows = workerService.updateWorker(worker);
+// Assert.isTrue(updateRows == 1, "实名认证记录新增失败");
// 删除存在的认证记录
workerCertificationService.deleteCertificationByWorkerId(request.getWorkerId());
// 插入新的认证记录
diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
index 127dabc6..4d55bc21 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
@@ -301,13 +301,6 @@ public class WorkerController extends BaseController {
workerAreaService.updateWorkerServArea(request.getWorkerId(), request.getWorkerAreas());
// 入驻服务品类信息持久化
workerGoodsCategoryService.updateWorkerGoodsCategory(request.getWorkerId(), request.getGoodsCategories());
- // 入驻特殊技能信息持久化
-// specialSkillService.updateWorkerSpecialSkill(request.getWorkerId(), request.getSpecialSkills());
- // 更新师傅状态为审核中
-// Worker worker = new Worker();
-// worker.setWorkerId(request.getWorkerId());
-// worker.setStatus(WorkerStatus.AUDITING.getCode());
-// workerService.updateWorker(worker);
return AjaxResult.success("保存成功");
} catch (Exception e) {
e.printStackTrace();
diff --git a/ghy-common/src/main/java/com/ghy/common/enums/StoreStatus.java b/ghy-common/src/main/java/com/ghy/common/enums/StoreStatus.java
new file mode 100644
index 00000000..c679afe3
--- /dev/null
+++ b/ghy-common/src/main/java/com/ghy/common/enums/StoreStatus.java
@@ -0,0 +1,26 @@
+package com.ghy.common.enums;
+
+/**
+ * @author ydq
+ * @date : 2022-08-23 19:14
+ */
+public enum StoreStatus {
+ INIT(0, "初始"),
+ OK(1, "通过");
+
+ private Integer code;
+ private String desc;
+
+ StoreStatus(Integer code, String desc) {
+ this.code = code;
+ this.desc = desc;
+ }
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+}
diff --git a/ghy-common/src/main/java/com/ghy/common/enums/WorkerStatus.java b/ghy-common/src/main/java/com/ghy/common/enums/WorkerStatus.java
index 12ceab95..dcad7e5e 100644
--- a/ghy-common/src/main/java/com/ghy/common/enums/WorkerStatus.java
+++ b/ghy-common/src/main/java/com/ghy/common/enums/WorkerStatus.java
@@ -9,9 +9,7 @@ package com.ghy.common.enums;
public enum WorkerStatus {
OK(0, "正常"),
DISABLE(1, "冻结"),
- DELETED(2, "删除"),
- AUDITING(3, "审核中"),
- AUDITFAILED(4, "审核未通过");
+ DELETED(2, "删除");
private final Integer code;
private final String desc;
diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
index e945b6d7..c5d8c243 100644
--- a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
+++ b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
@@ -45,6 +45,9 @@ public class Worker extends BaseEntity {
@Excel(name = "用户状态 0生效 1冻结 2删除", readConverterExp = "0=生效,1=冻结,2=删除")
private Integer status;
+ @Excel(name = "店铺状态")
+ private Integer storeStatus;
+
@Excel(name = "用户头像", cellType = Excel.ColumnType.STRING)
private String workerLogoUrl;
diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerCertification.java b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerCertification.java
index 39157db7..f0ac7eb0 100644
--- a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerCertification.java
+++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerCertification.java
@@ -24,10 +24,14 @@ public class WorkerCertification extends BaseEntity
@Excel(name = "师傅者id")
private Long workerId;
- /** 真实姓名 */
- @Excel(name = "真实姓名")
+ /** 真实名 */
+ @Excel(name = "真实名字")
private String name;
+ /** 真实姓 */
+ @Excel(name = "真实姓氏")
+ private String surname;
+
/** 身份证号 */
@Excel(name = "身份证号")
private String idCardNum;
@@ -286,11 +290,20 @@ public class WorkerCertification extends BaseEntity
this.mergerName = mergerName;
}
+ public String getSurname() {
+ return surname;
+ }
+
+ public void setSurname(String surname) {
+ this.surname = surname;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("workerCertificationId", getWorkerCertificationId())
.append("workerId", getWorkerId())
+ .append("surname", getSurname())
.append("name", getName())
.append("idCardNum", getIdCardNum())
.append("idCardUrl1", getIdCardUrl1())
diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml
index a3eed9a0..17551137 100644
--- a/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml
+++ b/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select worker_certification_id, worker_id, name, id_card_num, id_card_url_1, id_card_url_2, brand_name, company_size, company_name, business_license_num, business_license_url, company_province_id, company_city_id, company_country_id, company_address, legal_persion_name, legal_persion_phone_num, other_serv, status, create_by, create_time, update_by, update_time, remark from worker_certification
+ select worker_certification_id, worker_id, surname, name, id_card_num, id_card_url_1, id_card_url_2, brand_name, company_size, company_name, business_license_num, business_license_url, company_province_id, company_city_id, company_country_id, company_address, legal_persion_name, legal_persion_phone_num, other_serv, status, create_by, create_time, update_by, update_time, remark from worker_certification