From 92fe22d1e6e615750541ef650d815b9576bdf5de Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 09 九月 2024 19:10:06 +0800
Subject: [PATCH] 1、245-小程序-供应商-商品管理-回收站-平台或花农删除的商品全部到回收站，回收站增加恢复和删除的按钮，恢复可以将商品恢复到原来的状态，删除可以将此商品彻底删除 目前在回收站点击编辑上架等功能显示“商品未找到”点击删除也删不了商品 2、 255-小程序-供应商-增加同品类同等级价格排名，方便花农根据排名改价格(前后端修改) 3、252-小程序-花店-首页搜索、交易大厅搜索-1.点击分类显示下拉选择效果 2.热区扩大一些，点击<无法切换
---
src/main/java/com/mzl/flower/service/customer/CustomerService.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/customer/CustomerService.java b/src/main/java/com/mzl/flower/service/customer/CustomerService.java
index 4fec567..a4aa812 100644
--- a/src/main/java/com/mzl/flower/service/customer/CustomerService.java
+++ b/src/main/java/com/mzl/flower/service/customer/CustomerService.java
@@ -65,6 +65,7 @@
}
customer.create(SecurityUtils.getUserId());
+ customer.setIsEnabled(true);
customerMapper.insert(customer);
} else {//重新修改
customer = customerMapper.selectById(dto.getId());
@@ -167,9 +168,13 @@
if (StringUtils.isNotBlank(c.getPartnerId()) || StringUtils.isNotBlank(c.getPartnerUserId())) {
throw new ValidationException("商户已绑定合伙人，请联系客服人员进行解绑后再进行绑定");
}
-// Partner partner = partnerMapper.selectOne(new QueryWrapper<Partner>()
-// .eq("user_id", dto.getPartnerUserId()));
- Partner partner = partnerMapper.getByIdOrUserId(dto.getPartnerUserId()); //适配id和userId
+ Partner partner;
+ try {
+ long id = Long.parseLong(dto.getPartnerUserId());
+ partner = partnerMapper.selectById(id);
+ } catch (Exception e) {
+ partner =partnerMapper.selectOne(new QueryWrapper<Partner>().eq("user_id", dto.getPartnerUserId()));
+ }
if (partner == null) {
throw new ValidationException("合伙人不存在");
}
@@ -182,7 +187,13 @@
public String getPartnerName(String partnerUserId) {
if (StringUtils.isNotBlank(partnerUserId)) {
- Partner partner = partnerMapper.getByIdOrUserId(partnerUserId);
+ Partner partner;
+ try {
+ long id = Long.parseLong(partnerUserId);
+ partner = partnerMapper.selectById(id);
+ } catch (Exception e) {
+ partner =partnerMapper.selectOne(new QueryWrapper<Partner>().eq("user_id", partnerUserId));
+ }
if (partner == null) {
throw new ValidationException("合伙人不存在");
}
@@ -190,4 +201,17 @@
}
return null;
}
+ public void isEnable(Long id) {
+ Customer customer = customerMapper.selectById(id);
+ if (customer == null) {
+ throw new ValidationException("商户信息不存在");
+ }
+ if (customer.getIsEnabled()) {
+ customer.setIsEnabled(false);
+ } else {
+ customer.setIsEnabled(true);
+ }
+ customer.update(SecurityUtils.getUserId());
+ customerMapper.updateById(customer);
+ }
}
--
Gitblit v1.9.3