From 93e47c42334cf7f103957bcaa47d3a7ecc856a48 Mon Sep 17 00:00:00 2001 From: lhb <495598773@qq.com> Date: Tue, 22 Apr 2025 16:11:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=85=AC=E5=8F=B8=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=8A=E8=A7=A3=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/entity/wechat/WechatUser.java | 3 ++ .../customer/WechatUserController.java | 12 ++++++-- .../request/PageListWechatUserRequest.java | 5 ++++ .../hd/cloud/service/WechatUserService.java | 4 ++- .../service/impl/WechatUserServiceImpl.java | 30 ++++++++++++++++++- 5 files changed, 49 insertions(+), 5 deletions(-) diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java index 0e1122d..8becf80 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java @@ -71,4 +71,7 @@ public class WechatUser extends BaseEntity implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date bindtime; + + @Schema(description = "审核失败原因") + private String reason; } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/customer/WechatUserController.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/customer/WechatUserController.java index 8f32717..7d84dd3 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/customer/WechatUserController.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/customer/WechatUserController.java @@ -42,7 +42,7 @@ public class WechatUserController { } - @Operation(summary = "pc-微信用户-关联公司") + @Operation(summary = "pc-微信用户-绑定关联公司") @PostMapping("/companyrelation") public Result companyRelation(String wuid, String pcode, String pname) { return wechatUserService.companyRelation(wuid, pcode, pname); @@ -50,8 +50,14 @@ public class WechatUserController { @Operation(summary = "处理待审核数据") @PostMapping("/alterState") - public Result alterState(String wuid, String state) { - return wechatUserService.alterState(wuid, state); + public Result alterState(String wuid, String state, String reason) { + return wechatUserService.alterState(wuid, state,reason); + } + + @Operation(summary = "pc-微信用户-解绑关联公司") + @PostMapping("/companyunbind") + public Result companyunbind(String wuid, String pcode) { + return wechatUserService.companyunbind(wuid, pcode); } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/PageListWechatUserRequest.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/PageListWechatUserRequest.java index ce3e506..dbe0457 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/PageListWechatUserRequest.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/PageListWechatUserRequest.java @@ -33,4 +33,9 @@ public class PageListWechatUserRequest extends BasePageRequest { @Schema(description = "父账户编码") private String pcode; + @Schema(description = "父账户名称") + private String pname; + + @Schema(description = "状态") + private String state; } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/WechatUserService.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/WechatUserService.java index 40d171b..4e07481 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/WechatUserService.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/WechatUserService.java @@ -17,5 +17,7 @@ public interface WechatUserService { public WechatUser selectUcode(String phone, String uname); - public Result alterState(String wuid, String state); + public Result alterState(String wuid, String state,String reason); + + public Result companyunbind(String wuid, String pcode); } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/WechatUserServiceImpl.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/WechatUserServiceImpl.java index ee74e25..0b5b227 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/WechatUserServiceImpl.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/WechatUserServiceImpl.java @@ -6,6 +6,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -38,7 +39,11 @@ public class WechatUserServiceImpl implements WechatUserService { .eq(plwur.getType() != null, "type", plwur.getType()) .eq(StringUtils.hasText(plwur.getNickName()), "nick_name", plwur.getNickName()) .eq(StringUtils.hasText(plwur.getName()), "name", plwur.getName()) + + .like(StringUtils.hasText(plwur.getPname()), "pname", plwur.getPname()) .eq(StringUtils.hasText(plwur.getPcode()), "pcode", plwur.getPcode()) + + .eq(StringUtils.hasText(plwur.getState()), "state", plwur.getState()) .orderByDesc("pk_id")); if (page.getRecords().isEmpty()) { return new Result>().error(CodeMsg.DATABASE_RESULT_NULL); @@ -63,13 +68,14 @@ public class WechatUserServiceImpl implements WechatUserService { } @Override - public Result alterState(String wuid, String state) { + public Result alterState(String wuid, String state, String reason) { if (!(StringUtils.hasText(wuid) || StringUtils.hasText(state))) { return new Result().error(CodeMsg.PARAM_IS_NULL); } WechatUser user = new WechatUser(); user.setState(Integer.valueOf(state)); + user.setReason(reason); Date currentDate = new Date(); // 创建一个SimpleDateFormat对象，并设置格式 @@ -102,6 +108,7 @@ public class WechatUserServiceImpl implements WechatUserService { WechatUser user = new WechatUser(); user.setPcode(pcode); user.setPname(pname); + user.setState(2); int n = wechatUserDao.update(user, new QueryWrapper().eq("wuid", wuid)); if (n == 1) { return new Result().success(n); @@ -118,5 +125,26 @@ public class WechatUserServiceImpl implements WechatUserService { .eq("name", uname)); } + @Override + public Result companyunbind(String wuid, String pcode) { + if (!(StringUtils.hasText(pcode))) { + return new Result().error(CodeMsg.PARAM_IS_NULL); + } + +// 这种方式实际上是通过UpdateWrapper来构建更新条件，然后执行更新操作 + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.set("state", null) // 将name字段设置为null + .set("pcode", null).set("pname", null) + .eq("wuid", wuid); // 根据id来更新 + + int n = wechatUserDao.update(null, updateWrapper); // 注意这里的第一个参数是null，因为没有指定更新的实体属性值，因为我们只想设置某些字段为null + + if (n == 1) { + return new Result().success(n); + } + + return new Result().error("解绑公司信息出错！"); + } + }