From 70bb3b4d636c1f0e9429706a2d38651b7f539048 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sun, 20 Oct 2024 22:26:58 +0800 Subject: [PATCH] fix --- .../market/WxFinanceController.java | 38 ++++----- .../db/migration/V202410000000001.sql | 1 + .../iformall/domain/po/WxFinanceFinish.java | 81 ++++++++++++++++++- .../service/impl/WxFinanceServiceImpl.java | 29 ++++++- .../mapper/WxFinanceFinishMapper.xml | 12 +-- 5 files changed, 133 insertions(+), 28 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V202410000000001.sql 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 dd74eb535..015e20d2b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -601,7 +601,7 @@ public class WxFinanceController extends BaseController { return new ResultData(list); } - @ApiOperation("结账列表") + @ApiOperation("交款列表") @GetMapping("finishList") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @@ -614,7 +614,7 @@ public class WxFinanceController extends BaseController { return new ResultData(page); } - @ApiOperation("结账") + @ApiOperation("新增交款") @PostMapping("saveFinish") public ResultData saveFinish(@RequestBody WxFinanceFinish record) { record.updateTenantInfo(getTenantInfo()); @@ -622,22 +622,6 @@ public class WxFinanceController extends BaseController { return new ResultData(); } - @ApiOperation("结账列表") - @GetMapping("finishReceiveList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), - }) - public ResultData finishList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { - if (null == record.getFinishId()) { - return new ResultData(Result.ERROR,"finishId参数不能为空"); - } - record.updateTenantInfo(getTenantInfo()); - record.setSortColumns("status asc,create_time asc"); - PageInfo page = wxFinanceService.receiveVoListAsPage(record, pageNum, pageSize); - return new ResultData(page); - } - @ApiOperation("批次结账统计合计") @GetMapping("finishReceiveSum") public ResultData finishReceiveSum(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { @@ -671,6 +655,24 @@ public class WxFinanceController extends BaseController { return new ResultData(page); } + @ApiOperation("交款收付款单列表") + @GetMapping("finishReceiveList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + public ResultData finishList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { + if (null == record.getFinishId()) { + return new ResultData(Result.ERROR,"finishId参数不能为空"); + } + record.updateTenantInfo(getTenantInfo()); + record.setSortColumns("status asc,create_time asc"); + PageInfo page = wxFinanceService.receiveVoListAsPage(record, pageNum, pageSize); + return new ResultData(page); + } + + + @ApiOperation("结账") @PostMapping("receiveFinish") public ResultData receiveFinish(@RequestBody WxFinanceFinish record) { diff --git a/mallinkAdmin/src/main/resources/db/migration/V202410000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202410000000001.sql new file mode 100644 index 000000000..2edd16302 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V202410000000001.sql @@ -0,0 +1 @@ +ALTER TABLE wx_finance_finish DROP COLUMN NAME; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java index 055fea4d4..d4f6317f7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java @@ -64,14 +64,87 @@ public class WxFinanceFinish extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "remark", name = "remark") private String backRemark; - @io.swagger.annotations.ApiModelProperty(value = "startDate", name = "startDate") + @io.swagger.annotations.ApiModelProperty(value = "交款开始日期", name = "startDate") private Date startDate; - @io.swagger.annotations.ApiModelProperty(value = "endDate", name = "endDate") + @io.swagger.annotations.ApiModelProperty(value = "交款结束日期", name = "endDate") private Date endDate; - @io.swagger.annotations.ApiModelProperty(value = "name", name = "name") - private String name; + @io.swagger.annotations.ApiModelProperty(value = "审核时间", name = "auditTime") + private Date auditTime; + + @io.swagger.annotations.ApiModelProperty(value="审核人",name="auditBy") + private Long auditBy; + + @io.swagger.annotations.ApiModelProperty(value="审核人姓名",name="auditByName") + private String auditByName; + + @io.swagger.annotations.ApiModelProperty(value="楼栋",name="buildings") + private String buildings; + @TableField(exist = false) + private List buildindIds; + public List getBuildindIds() { + if (StringUtils.isNotBlank(buildings)) { + List bids = new ArrayList(); + String[] bs = buildings.split(","); + if (null != bs && bs.length > 0 ) { + for (int i = 0 ; i < bs.length ; i ++) { + String _bs = bs[i]; + if (StringUtils.isNotBlank(_bs)) { + bids.add(Long.parseLong(_bs)); + } + } + } + buildindIds = bids; + return buildindIds; + } + return null; + } + + + @io.swagger.annotations.ApiModelProperty(value="科目",name="fees") + private String fees; + @TableField(exist = false) + private List feesIds; + public List getFeesIds() { + if (StringUtils.isNotBlank(fees)) { + List bids = new ArrayList(); + String[] bs = fees.split(","); + if (null != bs && bs.length > 0 ) { + for (int i = 0 ; i < bs.length ; i ++) { + String _bs = bs[i]; + if (StringUtils.isNotBlank(_bs)) { + bids.add(Long.parseLong(_bs)); + } + } + } + feesIds = bids; + return feesIds; + } + return null; + } + + @io.swagger.annotations.ApiModelProperty(value="支付方式",name="payways") + private String payways; + @TableField(exist = false) + private List paywaysIds; + public List getPaywaysIds() { + if (StringUtils.isNotBlank(payways)) { + List bids = new ArrayList(); + String[] bs = payways.split(","); + if (null != bs && bs.length > 0 ) { + for (int i = 0 ; i < bs.length ; i ++) { + String _bs = bs[i]; + if (StringUtils.isNotBlank(_bs)) { + bids.add(Long.parseLong(_bs)); + } + } + } + paywaysIds = bids; + return paywaysIds; + } + return null; + } @TableField(exist = false) private List receiveIds; 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 0ca0d4817..6a9f00135 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -1476,7 +1476,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Override public void redSetoffReceive(WxFinanceReceive record, MallUserInfo user) { - invalidReceive(record, user , true); + //invalidReceive(record, user , true); copyRedSetOffReceive(record); } @@ -1496,6 +1496,8 @@ public class WxFinanceServiceImpl implements WxFinanceService { } record.setStatus(EnumFinanceReceiveStatus.RED_SETOFF.getCode()); record.setParentId(oldRecordId); + record.setCreateTime(new Date()); + record.setUpdateTime(new Date()); wxFinanceReceiveMapper.insert(record); WxFinanceReceiveBill rbq = new WxFinanceReceiveBill(); @@ -1514,9 +1516,34 @@ public class WxFinanceServiceImpl implements WxFinanceService { rb.setPay("-"+rb.getPay()); } rb.setReceiveId(record.getId()); + rb.setCreateTime(new Date()); + rb.setUpdateTime(new Date()); wxFinanceReceiveBillMapper.insert(rb); } } + + //复制支付方式 + WxFinanceReceivePayway rpq = new WxFinanceReceivePayway(); + rpq.updateTenantInfo(record); + rpq.setReceiveId(record.getId()); + rpq.setUpdateTime(new Date()); + List plist = wxFinanceReceivePaywayMapper.findList(rpq); + if (null != plist ) { + for (int i = 0 ; i < plist.size() ; i++ ) { + WxFinanceReceivePayway rb = plist.get(i); + rb.setId(idWorker.nextId()); + if (StringUtils.isNotBlank(rb.getReceive())) { + rb.setReceive("-"+rb.getReceive()); + } + if (StringUtils.isNotBlank(rb.getPay())) { + rb.setPay("-"+rb.getPay()); + } + rb.setReceiveId(record.getId()); + rb.setCreateTime(new Date()); + rb.setUpdateTime(new Date()); + wxFinanceReceivePaywayMapper.insert(rb); + } + } } @Override diff --git a/mallinkService/src/main/resources/mapper/WxFinanceFinishMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceFinishMapper.xml index dc7511681..fc7500059 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceFinishMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceFinishMapper.xml @@ -16,12 +16,17 @@ - + + + + + + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`create_by`,`create_by_name`,`update_by`,`update_by_name`, - `status`,`remark`,`back_remark`,`start_date`,`end_date`,`name` + `status`,`remark`,`back_remark`,`start_date`,`end_date`,`audit_time`,`audit_by`,`audit_by_name`,`buildings,`fees`,`payways` @@ -34,9 +39,6 @@ and `parent_tenant_id` = #{parentTenantId} and `status` = #{status} - - and `name` like concat('%', #{name},'%') - and id in