| @@ -163,7 +163,7 @@ public class ShiroConfig { | |||||
| filterChainDefinitionMap.put("/logout", "authc"); | filterChainDefinitionMap.put("/logout", "authc"); | ||||
| filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); | filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); | ||||
| // filterChainDefinitionMap.put("/**", "anon"); | |||||
| filterChainDefinitionMap.put("/**", "anon"); | |||||
| shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); | shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); | ||||
| @@ -52,13 +52,13 @@ public class BaseController { | |||||
| }); | }); | ||||
| } | } | ||||
| public MallUserInfo getUser(){ | 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; | return user; | ||||
| } | } | ||||
| @@ -80,10 +80,10 @@ public class BaseController { | |||||
| */ | */ | ||||
| public TenantEntity getTenantInfo(){ | public TenantEntity getTenantInfo(){ | ||||
| Session session = SecurityUtils.getSubject().getSession(); | 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 tenantEntity = new TenantEntity(); | ||||
| tenantEntity.setTenantId(tenantId); | tenantEntity.setTenantId(tenantId); | ||||
| tenantEntity.setParentTenantId(parentTenantId); | tenantEntity.setParentTenantId(parentTenantId); | ||||
| @@ -88,5 +88,15 @@ public class WxMerchantBillVo implements Serializable { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Date currentTime; | 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; | |||||
| } | } | ||||
| @@ -45,6 +45,16 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{ | |||||
| return receive.getMerchantName(); | return receive.getMerchantName(); | ||||
| }else if (name.equals("rentArea")) { | }else if (name.equals("rentArea")) { | ||||
| return receive.getRentArea(); | 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")) { | }else if (name.equals("merchantId")) { | ||||
| if (null != merchantMap) { | if (null != merchantMap) { | ||||
| WxMerchant m = merchantMap.get(receive.getMerchantId()); | WxMerchant m = merchantMap.get(receive.getMerchantId()); | ||||
| @@ -314,6 +314,9 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||||
| }else { | }else { | ||||
| bq.setShopNumber(""); | bq.setShopNumber(""); | ||||
| } | } | ||||
| //打哪些科目 | //打哪些科目 | ||||
| List<Long> feesId = dataIds; | List<Long> feesId = dataIds; | ||||
| List<PrintVo> voList = new ArrayList<PrintVo>(); | List<PrintVo> voList = new ArrayList<PrintVo>(); | ||||
| @@ -328,7 +328,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| //查询出账单可以抵扣的科目预收项 | //查询出账单可以抵扣的科目预收项 | ||||
| WxAllBill abq = new WxAllBill(); | WxAllBill abq = new WxAllBill(); | ||||
| abq.updateTenantInfo(dto); | abq.updateTenantInfo(dto); | ||||
| abq.setEnergyFeesIds(setOffFeesIds); | |||||
| abq.setFeesStandarsId(dto.getFeesId()); | |||||
| abq.setBillType(EnumBillAllType.ADVANCE.getCode()); | abq.setBillType(EnumBillAllType.ADVANCE.getCode()); | ||||
| abq.setAdvanceHasMoney(EnumYesOrNo.YES.getCode()); | abq.setAdvanceHasMoney(EnumYesOrNo.YES.getCode()); | ||||
| abq.setSortColumns(SortField.Createtime_ASC); | abq.setSortColumns(SortField.Createtime_ASC); | ||||