From 2a0c16616beef33ecbda2f168ffd76134bf2a1fc Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 12 Nov 2025 09:19:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=95=BF=E8=80=85?= =?UTF-8?q?=E7=AB=AF=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E7=9A=84=E9=92=B1?= =?UTF-8?q?=E6=98=AF=E4=BB=8E=E7=AE=A1=E7=90=86=E7=AB=AF=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E8=A1=A8=E6=8B=BF=E7=9A=84=20=20=E4=BD=86=E6=98=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=87=91=E9=A2=9D=E7=9A=84=E5=9C=B0=E6=96=B9=20?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E4=BB=8E=E4=B8=9A=E5=8A=A1=E7=AB=AF=E6=8B=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrgApplyInfoServiceImpl.java | 10 ---------- .../com/nu/modules/wechat/elder/api/ElderApi.java | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java index a9773ac..320617c 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java @@ -1,14 +1,12 @@ package com.nu.modules.orgapplyinfo.service.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.google.common.collect.Maps; import com.nu.dto.OrgApplyInfoMQDto; import com.nu.entity.NuWxNoticeEntity; import com.nu.entity.WxNoticeEntity; @@ -20,25 +18,17 @@ import com.nu.modules.orgapplyinfo.entity.OrgApplyInfo; import com.nu.modules.orgapplyinfo.entity.OrgApplyInfoApiEntity; import com.nu.modules.orgapplyinfo.mapper.OrgApplyInfoMapper; import com.nu.modules.orgapplyinfo.service.IOrgApplyInfoService; -import com.nu.modules.weixin.utils.TemplateMessageSender; -import com.nu.modules.weixin.utils.WechatMiniProgramUtils; import com.nu.modules.wxnotice.IWxNoticeApi; import com.nu.utils.DictUtils; import com.nu.utils.RabbitMQUtil; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.DateUtils; import org.jeecg.modules.base.service.BaseCommonService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.lang.reflect.Field; import java.text.SimpleDateFormat; import java.util.*; 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 d8a8099..f6bdd30 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 @@ -27,6 +27,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -189,6 +190,19 @@ public class ElderApi { return Result.ok(null); } OrgAllInfoApiEntity result = records.get(0); + //获取机构设置的金额 + DynamicDataSourceContextHolder.push(orgCode); + JSONObject orgInfo = null; + try { + orgInfo = sysBaseAPI.getOrgInfo(orgCode); + } finally { + DynamicDataSourceContextHolder.clear(); + } + if (orgInfo != null && StringUtils.isNotBlank(orgInfo.getString("payableAmount"))) { + result.setPayableAmount(new BigDecimal(orgInfo.getString("payableAmount"))); + } else { + return Result.ok(null); + } NuBaseInfoEntity baseInfo = nuBaseInfoApi.queryInfoByNuId(orgCode, nuId); if (baseInfo == null) {