From 276db2b3109580974bf55d294f6080dff7665749 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 9 Aug 2024 20:04:12 +0800 Subject: [PATCH] fix --- .../controller/market/WxFinanceController.java | 8 ++++---- .../market/WxFinancePrintController.java | 6 +++--- .../domain/po/WxFinancePrintTemplate.java | 2 ++ .../data/PrintCustomedTableDataHandler.java | 15 ++++++++++++++- .../com/iformall/service/WxFinanceService.java | 4 ++-- .../service/impl/WxFinanceServiceImpl.java | 16 ++++++++++++---- 6 files changed, 37 insertions(+), 14 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 29ea3fb8a..21819fea8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -223,8 +223,8 @@ public class WxFinanceController extends BaseController { if (null == record.getBills() || null == record.getPayWays()) { return new ResultData(Result.ERROR,"请选择账单和支付方式"); } - List list = wxFinanceService.createReceive(record,this.getUser()); - return new ResultData(list); + Map map = wxFinanceService.createReceive(record,this.getUser()); + return new ResultData(map); } @ApiOperation("新增付款单") @@ -237,8 +237,8 @@ public class WxFinanceController extends BaseController { if (null == record.getBills() || null == record.getPayWays()) { return new ResultData(Result.ERROR,"请选择账单和支付方式"); } - List list = wxFinanceService.createPay(record,this.getUser()); - return new ResultData(list); + Map map = wxFinanceService.createPay(record,this.getUser()); + return new ResultData(map); } @GetMapping("receiveStatus") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java index 50719e911..7da74d9cf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java @@ -133,11 +133,11 @@ public class WxFinancePrintController extends BaseController { @ApiOperation("预览") @PostMapping("viewTemplate") @TenantIgnore - public ResultData viewTemplate(@RequestBody String tenantId,Long templateId,List dataIds) { - if (StringUtils.isBlank(tenantId)||null == dataIds || dataIds.size() <= 0 || null == templateId) { + public ResultData viewTemplate(@RequestBody WxFinancePrintTemplate record) { + if (StringUtils.isBlank(record.getTenantId())||null == record.getDataIds() || record.getDataIds().size() <= 0 || null == record.getId()) { return new ResultData(Result.ERROR,"参数不对"); } - return new ResultData(wxFinancePrintService.parseTemplateData(tenantId,templateId,dataIds,null)); + return new ResultData(wxFinancePrintService.parseTemplateData(record.getTenantId(),record.getId(),record.getDataIds(),null)); } @ApiOperation("") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java index a5ac59413..63ff9e873 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java @@ -57,5 +57,7 @@ public class WxFinancePrintTemplate extends TenantEntity { private JSONObject contentJsonUpdate; @TableField(exist = false) private List tempItems; + @TableField(exist = false) + List dataIds; } diff --git a/mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java index 8385dc4d1..b8fc87d89 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java @@ -53,7 +53,20 @@ public class PrintCustomedTableDataHandler{ sb.append(">"); //取什么属性 String fieldName = td.attr("fieldName"); - sb.append(o.get(fieldName)); + if (StringUtils.isNotBlank(fieldName)) { + if (fieldName.contains(",")) { + String sep = td.attr("sep"); + String[] fs = fieldName.split(","); + if (null != fs) { + for (int k = 0 ; k"); } sb.append(""); diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index 6237c6125..b7c372d12 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -30,8 +30,8 @@ public interface WxFinanceService { //收付款 PageInfo receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); List findReceiveList(WxFinanceReceive record); - List createReceive(WxFinanceReceive record,MallUserInfo user); - List createPay(WxFinanceReceive record,MallUserInfo user); + Map createReceive(WxFinanceReceive record,MallUserInfo user); + Map createPay(WxFinanceReceive record,MallUserInfo user); WxFinanceReceive getReceiveById(TenantEntity tenantEntity,Long id); void invalidReceive(WxFinanceReceive record,MallUserInfo user,String remark); void redSetoffReceive(WxFinanceReceive record,MallUserInfo user); 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 59c93128d..d8e3d1ee9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -519,7 +519,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Override - public List createReceive(WxFinanceReceive record,MallUserInfo user) { + public Map createReceive(WxFinanceReceive record,MallUserInfo user) { //冲抵信息根据页面返回的账单抵扣信息直接保存入库 //费用计算自动优先匹配时间最早的那个 @@ -591,7 +591,11 @@ public class WxFinanceServiceImpl implements WxFinanceService { addreceive.setMerchantId(record.getMerchantId()); addreceive.setRemark(record.getRemark()); wxFinanceReceiveMapper.insert(addreceive); - return bills; + + Map retMap = new HashMap(); + retMap.put("addreceive", addreceive); + retMap.put("billlist", bills); + return retMap; } public boolean createBillReceive(FinanceReceiveCalcuteDTO calcuteDto,MallUserInfo user,WxFinanceReceive addreceive,WxAllBill be,WxMerchant merchant,WxBillPayWay payWay0) { @@ -727,7 +731,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Override - public List createPay(WxFinanceReceive record,MallUserInfo user) { + public Map createPay(WxFinanceReceive record,MallUserInfo user) { //费用计算自动优先匹配时间最早的那个 //单保存冲抵的时候,实收金额为0 BigDecimal payTotal = new BigDecimal(0); @@ -788,7 +792,11 @@ public class WxFinanceServiceImpl implements WxFinanceService { addreceive.setMerchantId(record.getMerchantId()); addreceive.setRemark(record.getRemark()); wxFinanceReceiveMapper.insert(addreceive); - return bills; + + Map retMap = new HashMap(); + retMap.put("addreceive", addreceive); + retMap.put("billlist", bills); + return retMap; } public boolean createBillPay(FinanceReceiveCalcuteDTO calcuteDto,MallUserInfo user,WxFinanceReceive addreceive,WxAllBill be,WxMerchant merchant,WxBillPayWay payWay0) {