From cad716e4970193b81579b671f6542b5f10fac657 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期三, 07 十二月 2022 16:36:25 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
index 323a520..c973642 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
@@ -125,6 +125,7 @@
if (isNull(convenientMerchantDO)) {
return R.fail("商家不存在");
}
+ Long createBy = convenientMerchantDO.getCreatedBy();
BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
if (nonNull(merchantDO) && !merchantDO.getId().equals(convenientMerchantDO.getId())) {
R.fail("该微信手机号:" + mobilePhone + "已被使用！请更换");
@@ -152,7 +153,7 @@
serviceIds.forEach(serviceId -> {
ConvenientServiceCategoryDO convenientServiceCategoryDO = convenientServiceCategoryDAO.selectById(serviceId);
convenientServiceCategoryDAO.createMerchantServiceRelation(Snowflake.getId(), merchantId, serviceId,
- convenientServiceCategoryDO.getName(), convenientMerchantDO.getCreatedBy());
+ convenientServiceCategoryDO.getName(), createBy);
});
}
--
Gitblit v1.7.1