From dd2915d711650ec0daf9956dd49133a9180834e6 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 4 Sep 2024 21:21:52 +0800 Subject: [PATCH] fix --- .../java/com/iformall/config/ShiroConfig.java | 2 +- .../controller/base/BaseController.java | 22 +++++++++---------- .../iformall/domain/vo/WxMerchantBillVo.java | 10 +++++++++ .../impl/PrintMerchantSettleDataHandler.java | 10 +++++++++ .../impl/WxFinancePrintServiceImpl.java | 3 +++ .../service/impl/WxFinanceServiceImpl.java | 2 +- 6 files changed, 36 insertions(+), 13 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 3463ea458..ab71e3397 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -163,7 +163,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/logout", "authc"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); -// filterChainDefinitionMap.put("/**", "anon"); + filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index fa0b4e34a..247597318 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -52,13 +52,13 @@ public class BaseController { }); } public MallUserInfo getUser(){ - MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); -// MallUserInfo user = new MallUserInfo(); -// user.setId(321127266275430400L); -// user.setName("alitest"); -// user.setTenantId("789"); -// user.setParentTenantId(null); -// user.setIsAdmin(1); +// MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); + MallUserInfo user = new MallUserInfo(); + user.setId(321127266275430400L); + user.setName("alitest"); + user.setTenantId("789"); + user.setParentTenantId(null); + user.setIsAdmin(1); return user; } @@ -80,10 +80,10 @@ public class BaseController { */ public TenantEntity getTenantInfo(){ Session session = SecurityUtils.getSubject().getSession(); - String tenantId = (String)session.getAttribute(UserSession.tenantId); - String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); -// String tenantId = "789"; -// String parentTenantId = null; +// String tenantId = (String)session.getAttribute(UserSession.tenantId); +// String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); + String tenantId = "789"; + String parentTenantId = null; TenantEntity tenantEntity = new TenantEntity(); tenantEntity.setTenantId(tenantId); tenantEntity.setParentTenantId(parentTenantId); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java index 6c387bf3b..da6249ecf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java @@ -88,5 +88,15 @@ public class WxMerchantBillVo implements Serializable { @TableField(exist = false) private Date currentTime; + @TableField(exist = false) + private Date starttime; + @TableField(exist = false) + private Date endtime; + @TableField(exist = false) + private Date mallBankAccountName; + @TableField(exist = false) + private Date mallBankName; + @TableField(exist = false) + private Date mallBankAccount; } diff --git a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java index 90757771a..6b06f1e3e 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java @@ -45,6 +45,16 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{ return receive.getMerchantName(); }else if (name.equals("rentArea")) { return receive.getRentArea(); + }else if (name.equals("starttime")) { + return DateUtils.date2String(receive.getStarttime(),DateUtils.DATE_PATTERN); + }else if (name.equals("endtime")) { + return DateUtils.date2String(receive.getEndtime(),DateUtils.DATE_PATTERN); + }else if (name.equals("mallBankAccount")) { + return receive.getMallBankAccount(); + }else if (name.equals("mallBankAccountName")) { + return receive.getMallBankAccountName(); + }else if (name.equals("mallBankName")) { + return receive.getMallBankName(); }else if (name.equals("merchantId")) { if (null != merchantMap) { WxMerchant m = merchantMap.get(receive.getMerchantId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java index e3bfb9420..6110dc4d1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -314,6 +314,9 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { }else { bq.setShopNumber(""); } + + + //打哪些科目 List feesId = dataIds; List voList = new ArrayList(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 2867777e3..90a45006c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -328,7 +328,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { //查询出账单可以抵扣的科目预收项 WxAllBill abq = new WxAllBill(); abq.updateTenantInfo(dto); - abq.setEnergyFeesIds(setOffFeesIds); + abq.setFeesStandarsId(dto.getFeesId()); abq.setBillType(EnumBillAllType.ADVANCE.getCode()); abq.setAdvanceHasMoney(EnumYesOrNo.YES.getCode()); abq.setSortColumns(SortField.Createtime_ASC);