From fbb458bd23ff021f9c26e492e8b425c51db94149 Mon Sep 17 00:00:00 2001 From: linfso Date: Sun, 16 Jun 2024 20:55:01 +0800 Subject: [PATCH] md --- .../web/emis/EmisSiteAccountController.java | 37 +++++++++++++++++++ .../emis/mapper/EmisSiteAccountMapper.java | 9 +++++ .../erp/emis/service/EmisBaseService.java | 10 +++++ .../mapper/EmisSiteAccountMapper.xml | 7 ++++ 4 files changed, 63 insertions(+) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java index 0cf8162c3..2b531d4dd 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java @@ -11,8 +11,11 @@ package com.xdadan.erp.web.emis; +import java.math.BigDecimal; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; import com.xdadan.erp.common.utils.DateUtils; @@ -94,6 +97,40 @@ public class EmisSiteAccountController extends EmisBaseController return AjaxResult.success(emisSiteAccountService.selectEmisSiteAccountById(id)); } + /** + * 获取网点结算账户余额 + */ + @GetMapping(value = "/getSiteBalance") + public AjaxResult getSiteBalance() + { + EmisSiteAccount siteAccount = emisBaseService.getSiteAccountBySiteCode(getLoginUser().getUser().getOwnerSiteCode()); + Map balanceMap = new HashMap<>(); + if(siteAccount!=null) { + balanceMap.put("curMoney", siteAccount.getCurMoney()); + balanceMap.put("frozenMoney", siteAccount.getFrozenMoney()); + balanceMap.put("confirmMoney", siteAccount.getConfirmMoney()); + balanceMap.put("watchMoney", siteAccount.getWatchMoney()); + balanceMap.put("closeMoney", siteAccount.getCloseMoney()); + }else{ + balanceMap.put("curMoney", 0); + balanceMap.put("frozenMoney", 0); + balanceMap.put("confirmMoney", 0); + balanceMap.put("watchMoney", 0); + balanceMap.put("closeMoney",0); + } + + return AjaxResult.success("获取成功",balanceMap); + } + + + @GetMapping(value = "/{id}") + public AjaxResult getSiteBalance(@PathVariable("id") Long id) + { + return AjaxResult.success(emisSiteAccountService.selectEmisSiteAccountById(id)); + } + + + /** * 新增网点结算账户 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteAccountMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteAccountMapper.java index d8e8c9928..6a8cd0cc6 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteAccountMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteAccountMapper.java @@ -28,6 +28,15 @@ public interface EmisSiteAccountMapper extends BaseMapper */ public EmisSiteAccount selectEmisSiteAccountById(Long id); + + /** + * 根据站点代码获取站点结算账户 + * @param siteCode + * @return + */ + public EmisSiteAccount getAccountBySiteCode(String siteCode); + + /** * 查询列表 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 67a11f037..e71cb4eff 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -275,6 +275,16 @@ public class EmisBaseService { } + /** + * 获取网点结算账户信息 + * @param siteCode + * @return + */ + public EmisSiteAccount getSiteAccountBySiteCode(String siteCode){ + return emisSiteAccountMapper.getAccountBySiteCode(siteCode); + } + + /** * 获取跟踪信息 * @param scanRecord diff --git a/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml index cd666f976..dc10e3aa4 100644 --- a/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml @@ -119,6 +119,13 @@ + + +