From de181ff5d790c6fabcfce42d02940cd0f5060a35 Mon Sep 17 00:00:00 2001 From: donqi Date: Thu, 25 Aug 2022 13:46:40 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B8=88=E5=82=85=E5=85=A5=E9=A9=BB?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8A=80=E8=83=BD=E6=9F=A5=E8=AF=A2=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=88=B6=E7=BA=A7=E5=90=8D=E7=A7=B0=E6=8B=BC=E5=81=9A?= =?UTF-8?q?mergeName=202=E3=80=81=E5=B8=88=E5=82=85=E6=8C=81=E4=B9=85?= =?UTF-8?q?=E5=8C=96=E5=85=A5=E9=A9=BB=E4=BF=A1=E6=81=AF=E5=90=8E=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=9B=B4=E6=96=B0=E5=B8=88=E5=82=85=E5=85=A5=E9=A9=BB?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E6=9C=8D=E5=8A=A1=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/worker/WorkerController.java | 22 ++++++++-------- .../worker/WorkerGoodsCategoryController.java | 25 +++++++++++++++++- .../com/ghy/common/constant/Constants.java | 9 +++++-- .../java/com/ghy/common/enums/WorkerType.java | 26 +++++++++++++++++++ .../worker/domain/WorkerGoodsCategory.java | 2 ++ 5 files changed, 70 insertions(+), 14 deletions(-) create mode 100644 ghy-common/src/main/java/com/ghy/common/enums/WorkerType.java 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 4d55bc21..1c28cab2 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 @@ -7,6 +7,7 @@ import com.ghy.common.core.domain.AjaxResult; import com.ghy.common.core.page.TableDataInfo; import com.ghy.common.enums.GoodsStatus; import com.ghy.common.enums.WorkerStatus; +import com.ghy.common.enums.WorkerType; import com.ghy.common.utils.CacheUtils; import com.ghy.common.utils.ExceptionUtil; import com.ghy.goods.domain.Goods; @@ -296,16 +297,15 @@ public class WorkerController extends BaseController { @ResponseBody @Transactional(rollbackFor = Exception.class) public AjaxResult settled(@RequestBody WorkerSettledRequest request) { - try { - // 入驻区域信息持久化 - workerAreaService.updateWorkerServArea(request.getWorkerId(), request.getWorkerAreas()); - // 入驻服务品类信息持久化 - workerGoodsCategoryService.updateWorkerGoodsCategory(request.getWorkerId(), request.getGoodsCategories()); - return AjaxResult.success("保存成功"); - } catch (Exception e) { - e.printStackTrace(); - logger.error(ExceptionUtil.getExceptionMessage(e)); - return AjaxResult.error(e.getMessage()); - } + // 入驻区域信息持久化 + workerAreaService.updateWorkerServArea(request.getWorkerId(), request.getWorkerAreas()); + // 入驻服务品类信息持久化 + workerGoodsCategoryService.updateWorkerGoodsCategory(request.getWorkerId(), request.getGoodsCategories()); + // 更新师傅入驻类型为服务商 + Worker worker = new Worker(); + worker.setWorkerId(request.getWorkerId()); + worker.setType(WorkerType.SP.getCode()); + workerService.updateWorker(worker); + return AjaxResult.success("保存成功"); } } diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerGoodsCategoryController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerGoodsCategoryController.java index 7a46a015..51148356 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerGoodsCategoryController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerGoodsCategoryController.java @@ -1,17 +1,25 @@ package com.ghy.web.controller.worker; +import com.ghy.common.constant.Constants; import com.ghy.common.core.domain.AjaxResult; import com.ghy.common.core.text.Convert; +import com.ghy.common.utils.StringUtils; +import com.ghy.goods.domain.GoodsCategory; +import com.ghy.goods.service.GoodsCategoryService; import com.ghy.worker.domain.WorkerGoodsCategory; import com.ghy.worker.request.WorkerGoodsCategorySaveRequest; import com.ghy.worker.service.WorkerGoodsCategoryService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -28,6 +36,9 @@ public class WorkerGoodsCategoryController { @Resource private WorkerGoodsCategoryService workerGoodsCategoryService; + @Autowired + private GoodsCategoryService goodsCategoryService; + /** * 查询某个师傅的所有服务类目 * @@ -36,7 +47,19 @@ public class WorkerGoodsCategoryController { @GetMapping("worker") @ResponseBody public AjaxResult getByWorker(Long workerId) { - return AjaxResult.success(workerGoodsCategoryService.getByWorker(workerId)); + List list = workerGoodsCategoryService.getByWorker(workerId); + for (WorkerGoodsCategory item: list) { + List nameList = new ArrayList(); + // 查询所有父级服务类目，拼接服务名称 + GoodsCategory goodsCategory = goodsCategoryService.selectById(item.getGoodsCategoryId()); + while (goodsCategory.getParentCategoryId() != null) { + nameList.add(goodsCategory.getGoodsCategoryName()); + goodsCategory = goodsCategoryService.selectById(goodsCategory.getParentCategoryId()); + } + Collections.reverse(nameList); + item.setMergeName(StringUtils.join(nameList, Constants.JOIN_SYMBOL)); + } + return AjaxResult.success(list); } @PostMapping("save") diff --git a/ghy-common/src/main/java/com/ghy/common/constant/Constants.java b/ghy-common/src/main/java/com/ghy/common/constant/Constants.java index 2fdfd304..9652784d 100644 --- a/ghy-common/src/main/java/com/ghy/common/constant/Constants.java +++ b/ghy-common/src/main/java/com/ghy/common/constant/Constants.java @@ -2,7 +2,7 @@ package com.ghy.common.constant; /** * 通用常量信息 - * + * * @author clunt */ public class Constants @@ -112,4 +112,9 @@ public class Constants */ public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", "org.springframework", "org.apache" }; -} \ No newline at end of file + + /** + * 默认字符串连接符 + * */ + public static final String JOIN_SYMBOL = "-"; +} diff --git a/ghy-common/src/main/java/com/ghy/common/enums/WorkerType.java b/ghy-common/src/main/java/com/ghy/common/enums/WorkerType.java new file mode 100644 index 00000000..7d469a9b --- /dev/null +++ b/ghy-common/src/main/java/com/ghy/common/enums/WorkerType.java @@ -0,0 +1,26 @@ +package com.ghy.common.enums; + +/** + * @author ydq + * @date : 2022-08-25 10:56 + */ +public enum WorkerType { + SP(0, "服务商"), + OBM(1, "品牌商"); + + private Integer code; + private String desc; + + WorkerType(Integer code, String desc) { + this.code = code; + this.desc = desc; + } + + public Integer getCode() { + return code; + } + + public String getDesc() { + return desc; + } +} diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerGoodsCategory.java b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerGoodsCategory.java index 81e75c12..40efbb3d 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerGoodsCategory.java +++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerGoodsCategory.java @@ -30,5 +30,7 @@ public class WorkerGoodsCategory extends BaseEntity { private String goodsCategoryName; + private String mergeName; + private List goodsCategoryIds; }