From 7afc484640cdb6e48342c22dfa540b7cb2c1486f Mon Sep 17 00:00:00 2001 From: sangchengzhi <2305486879@qq.com> Date: Fri, 6 Feb 2026 14:43:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=80=E8=B4=B9bug?= =?UTF-8?q?=EF=BC=8C=E6=94=B6=E8=B4=B9=E5=AE=A4=E6=A8=A1=E5=9D=97=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=A2=84=E4=BC=B0=E4=BD=99=E9=A2=9D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/guahao/api/task/GuahaoTask.java | 9 ++++--- .../api/walkinto/service/WxPayService.java | 19 ++++++++++++-- .../reserve/controller/ReserveController.java | 10 +++++--- .../h5/reserve/mapper/Reserve8Mapper.java | 1 + .../h5/sfs/controller/SfsController.java | 25 +++++++++++++++++++ 5 files changed, 56 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/guahao/api/task/GuahaoTask.java b/src/main/java/com/guahao/api/task/GuahaoTask.java index 84787b8..16a4b77 100644 --- a/src/main/java/com/guahao/api/task/GuahaoTask.java +++ b/src/main/java/com/guahao/api/task/GuahaoTask.java @@ -89,10 +89,13 @@ public class GuahaoTask { // 2. 执行退费 Map refundResult = reserve8Service.MOP_BillsPayedRefund(vo); log.info("退费结果: {}", refundResult + ",判断结果：" + (refundResult != null ? refundResult.get("return_code") : "null")); + boolean isSuccess = refundResult != null && + ("1".equals(refundResult.get("returncode")) || + "SUCCESS".equals(refundResult.get("return_code"))) && + ("success".equals(refundResult.get("refundResult")) || + "SUCCESS".equals(refundResult.get("result_code"))); - if (refundResult == null || - !"SUCCESS".equals(refundResult.get("return_code")) || - !"SUCCESS".equals(refundResult.get("result_code"))) { + if (!isSuccess) { reserve8Mapper.insertRefundError(vo); log.warn("退费接口返回失败: {}", refundResult); log.warn("退费失败，继续处理下一个记录"); diff --git a/src/main/java/com/guahao/api/walkinto/service/WxPayService.java b/src/main/java/com/guahao/api/walkinto/service/WxPayService.java index 60bf745..548f9f7 100644 --- a/src/main/java/com/guahao/api/walkinto/service/WxPayService.java +++ b/src/main/java/com/guahao/api/walkinto/service/WxPayService.java @@ -748,7 +748,10 @@ public class WxPayService { // getMzjfListByFlow HsjcVo hsjcvo = hsjcMapper.getMzjfListByFlow2(outTradeNo); // hsjcvo = list.get(0); - + if (hsjcvo != null && hsjcvo.getAppStatus() == 5){ + log.info("门诊已经退过费用"); + return ""; + } hsjcMapper.updateByOutTradeNo(outTradeNo,5); // refundVo.setPatientid(hsjcvo.getPatientid()); // refundVo.setBillsmsg(hsjcvo.getReferno()); @@ -767,6 +770,10 @@ public class WxPayService { }else if (outTradeNo.substring(0, 2).equals("BA")){ BingAnVO bingAnVO = binganMapper.selectByOrderNo(outTradeNo); + if (bingAnVO != null && bingAnVO.getStatus() == 0){ + log.info("病案已经退过费用"); + return ""; + } // 手动病案退款 binganMapper.updateByOrderNoAndStatus(outTradeNo); @@ -1016,7 +1023,10 @@ public class WxPayService { // getMzjfListByFlow HsjcVo hsjcvo = hsjcMapper.getMzjfListByFlow2(outTradeNo); // hsjcvo = list.get(0); - + if (hsjcvo != null && hsjcvo.getAppStatus() == 5){ + log.info("门诊已经退过费用"); + return ""; + } hsjcMapper.updateByOutTradeNo(outTradeNo,5); refundVo.setPatientid(hsjcvo.getPatientid()); refundVo.setBillsmsg(hsjcvo.getReferno()); @@ -1035,6 +1045,11 @@ public class WxPayService { }else if (outTradeNo.substring(0, 2).equals("BA")){ BingAnVO bingAnVO = binganMapper.selectByOrderNo(outTradeNo); + if (bingAnVO != null && bingAnVO.getStatus() == 0){ + log.info("病案已经退过费用"); + return ""; + } + // 手动病案退款 binganMapper.updateByOrderNoAndStatus(outTradeNo); diff --git a/src/main/java/com/guahao/h5/reserve/controller/ReserveController.java b/src/main/java/com/guahao/h5/reserve/controller/ReserveController.java index 0de5e0f..de78abc 100644 --- a/src/main/java/com/guahao/h5/reserve/controller/ReserveController.java +++ b/src/main/java/com/guahao/h5/reserve/controller/ReserveController.java @@ -195,9 +195,13 @@ public class ReserveController { // 2. 执行退费 refundResult = reserve8Service.MOP_BillsPayedRefund(vo); log.info("退费结果: {}", refundResult + ",判断结果：" + refundResult.get("return_code")); - if (refundResult == null || - !"SUCCESS".equals(refundResult.get("return_code")) || - !"SUCCESS".equals(refundResult.get("result_code"))) { + boolean isSuccess = refundResult != null && + ("1".equals(refundResult.get("returncode")) || + "SUCCESS".equals(refundResult.get("return_code"))) && + ("success".equals(refundResult.get("refundResult")) || + "SUCCESS".equals(refundResult.get("result_code"))); + + if (!isSuccess) { log.warn("退费接口返回失败: {}", refundResult); // 将失败内容存到数据库，进行每1小时一次退款任务 reserve8Service.insertRefundError(vo); diff --git a/src/main/java/com/guahao/h5/reserve/mapper/Reserve8Mapper.java b/src/main/java/com/guahao/h5/reserve/mapper/Reserve8Mapper.java index 6f7e396..259c531 100644 --- a/src/main/java/com/guahao/h5/reserve/mapper/Reserve8Mapper.java +++ b/src/main/java/com/guahao/h5/reserve/mapper/Reserve8Mapper.java @@ -8,6 +8,7 @@ import com.guahao.h5.yb.model.OrderInfoVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/guahao/h5/sfs/controller/SfsController.java b/src/main/java/com/guahao/h5/sfs/controller/SfsController.java index f820fe8..c036a03 100644 --- a/src/main/java/com/guahao/h5/sfs/controller/SfsController.java +++ b/src/main/java/com/guahao/h5/sfs/controller/SfsController.java @@ -8,6 +8,7 @@ import com.guahao.h5.hsjc.mapper.HsjcMapper; import com.guahao.h5.hsjc.vo.HsjcVo; import com.guahao.h5.reserve.mapper.Reserve8Mapper; import com.guahao.h5.reserve.vo.Reserve8Vo; +import com.guahao.h5.sfs.service.SfsService; import com.guahao.h5.token.service.TokenService; import com.guahao.h5.token.vo.TokenVo; import com.guahao.h5.yb.model.OrderInfoVO; @@ -17,7 +18,9 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.math.BigDecimal; import java.util.List; +import java.util.Map; /** * @author SangChengZhi @@ -33,6 +36,8 @@ public class SfsController { private Reserve8Mapper reserve8Mapper; @Autowired private HsjcMapper hsjcMapper; + @Autowired + private SfsService sfsService; @RequestMapping(value = "/selectGuaHaoList", method = RequestMethod.POST) @WebLog(description = "收费室查询用户的挂号记录") @@ -116,6 +121,26 @@ public class SfsController { return ResponseResult.sysError(e.getLocalizedMessage()); } } + @RequestMapping(value = "/SumWxBalance", method = RequestMethod.POST) + @WebLog(description = "查询微信当前账户余额") + public Object SumWxBalance() { + try { + Map balances = sfsService.SumWxBalance(); + return ResponseResult.success(balances); + } catch (Exception e) { + return ResponseResult.sysError(e.getLocalizedMessage()); + } + } + @RequestMapping(value = "/DelWxBalance", method = RequestMethod.POST) + @WebLog(description = "查询微信当前账户退费") + public Object DelWxBalance() { + try { + Map balances = sfsService.DelWxBalance(); + return ResponseResult.success(balances); + } catch (Exception e) { + return ResponseResult.sysError(e.getLocalizedMessage()); + } + } /** * token验证