From 1cce2502c9d78790a999b7d1c7bb09137bd5aff1 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Thu, 26 Feb 2026 14:09:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AF=B9=E5=90=8C=E4=B8=80=E6=9C=BA=E6=9E=84=E5=90=8C=E4=B8=80?= =?UTF-8?q?=E6=8A=A4=E7=90=86=E5=8D=95=E5=85=83=E8=BF=9B=E8=A1=8C=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E7=BC=B4=E8=B4=B9=E9=83=BD=E8=83=BD=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/baseinfo/entity/NuBaseInfo.java | 5 +++++ .../nu/modules/wechat/elder/api/ElderApi.java | 16 ++++++++++++++++ .../java/com/nu/entity/NuBaseInfoEntity.java | 7 +++++++ 3 files changed, 28 insertions(+) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/entity/NuBaseInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/entity/NuBaseInfo.java index 8667874..b1e068b 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/entity/NuBaseInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/entity/NuBaseInfo.java @@ -119,6 +119,11 @@ public class NuBaseInfo implements Serializable { @ApiModelProperty(value = "是否已同步0已同步 1未同步") private java.lang.String izSync; + /** + * 是否绑定护理单元支付中 Y支付中（有客户正在给护理单元充值） N没有人在绑定缴费（可以让用户绑定） + */ + private String izBindPaying; + @TableField(exist = false) private String deviceId;//摄像头 ID @TableField(exist = false) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java index 49cf050..a550d5c 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java @@ -211,16 +211,32 @@ public class ElderApi { } result.setNuId(nuId); result.setNuStatus(baseInfo.getStatus());//使用状态 0未使用 1占用 2入住 3退住 4留床 + + //===！！！如果改变绑定规则 业务端同时也需要修改！！！=== + //规则一致但是管理、业务分开写 避免因为管理平台访问问题导致客户无法入住 if ("0".equals(baseInfo.getStatus()) || "3".equals(baseInfo.getStatus())) { + //===！！！如果改变绑定规则 业务端同时也需要修改！！！=== result.setNuCanUse("0");//可以绑定 + //===！！！如果改变绑定规则 业务端同时也需要修改！！！=== } else { + //===！！！如果改变绑定规则 业务端同时也需要修改！！！=== result.setNuCanUse("1");//不可绑定 + //===！！！如果改变绑定规则 业务端同时也需要修改！！！=== result.setMsg("护理单元使用中");//不可用提示语 } + if ("Y".equals(baseInfo.getIzBindPaying())) { + //===！！！如果改变绑定规则 业务端同时也需要修改！！！=== + result.setNuCanUse("1");//不可绑定 + //===！！！如果改变绑定规则 业务端同时也需要修改！！！=== + result.setMsg("护理单元绑定中");//不可用提示语 + } + if (!baseInfo.isWechatPayEnabled()) { + //===！！！如果改变绑定规则 业务端同时也需要修改！！！=== result.setNuCanUse("1");//微信支付关闭导致 不可绑定 result.setMsg("护理单元维护中");//不可用提示语 + //===！！！如果改变绑定规则 业务端同时也需要修改！！！=== } result.setNuName(baseInfo.getNuName()); return Result.OK(result); diff --git a/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java index a99ab98..ed520b0 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java @@ -81,6 +81,11 @@ public class NuBaseInfoEntity implements Serializable { * 所属部门 */ private String sysOrgCode; + + /** + * 是否绑定护理单元支付中 Y支付中（有客户正在给护理单元充值） N没有人在绑定缴费（可以让用户绑定） + */ + private String izBindPaying; /** * 是否已同步0已同步 1未同步 */ @@ -102,4 +107,6 @@ public class NuBaseInfoEntity implements Serializable { private String elderTableId; + + }