| @@ -223,8 +223,8 @@ public class WxFinanceController extends BaseController { | |||||
| if (null == record.getBills() || null == record.getPayWays()) { | if (null == record.getBills() || null == record.getPayWays()) { | ||||
| return new ResultData(Result.ERROR,"请选择账单和支付方式"); | return new ResultData(Result.ERROR,"请选择账单和支付方式"); | ||||
| } | } | ||||
| List<WxAllBill> list = wxFinanceService.createReceive(record,this.getUser()); | |||||
| return new ResultData(list); | |||||
| Map map = wxFinanceService.createReceive(record,this.getUser()); | |||||
| return new ResultData(map); | |||||
| } | } | ||||
| @ApiOperation("新增付款单") | @ApiOperation("新增付款单") | ||||
| @@ -237,8 +237,8 @@ public class WxFinanceController extends BaseController { | |||||
| if (null == record.getBills() || null == record.getPayWays()) { | if (null == record.getBills() || null == record.getPayWays()) { | ||||
| return new ResultData(Result.ERROR,"请选择账单和支付方式"); | return new ResultData(Result.ERROR,"请选择账单和支付方式"); | ||||
| } | } | ||||
| List<WxAllBill> list = wxFinanceService.createPay(record,this.getUser()); | |||||
| return new ResultData(list); | |||||
| Map map = wxFinanceService.createPay(record,this.getUser()); | |||||
| return new ResultData(map); | |||||
| } | } | ||||
| @GetMapping("receiveStatus") | @GetMapping("receiveStatus") | ||||
| @@ -133,11 +133,11 @@ public class WxFinancePrintController extends BaseController { | |||||
| @ApiOperation("预览") | @ApiOperation("预览") | ||||
| @PostMapping("viewTemplate") | @PostMapping("viewTemplate") | ||||
| @TenantIgnore | @TenantIgnore | ||||
| public ResultData viewTemplate(@RequestBody String tenantId,Long templateId,List<Long> 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(Result.ERROR,"参数不对"); | ||||
| } | } | ||||
| return new ResultData(wxFinancePrintService.parseTemplateData(tenantId,templateId,dataIds,null)); | |||||
| return new ResultData(wxFinancePrintService.parseTemplateData(record.getTenantId(),record.getId(),record.getDataIds(),null)); | |||||
| } | } | ||||
| @ApiOperation("") | @ApiOperation("") | ||||
| @@ -57,5 +57,7 @@ public class WxFinancePrintTemplate extends TenantEntity { | |||||
| private JSONObject contentJsonUpdate; | private JSONObject contentJsonUpdate; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List tempItems; | private List tempItems; | ||||
| @TableField(exist = false) | |||||
| List<Long> dataIds; | |||||
| } | } | ||||
| @@ -53,7 +53,20 @@ public class PrintCustomedTableDataHandler{ | |||||
| sb.append(">"); | sb.append(">"); | ||||
| //取什么属性 | //取什么属性 | ||||
| String fieldName = td.attr("fieldName"); | 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<fs.length; k++) { | |||||
| sb.append(o.get(fieldName)).append(sep); | |||||
| } | |||||
| } | |||||
| }else { | |||||
| sb.append(o.get(fieldName)); | |||||
| } | |||||
| } | |||||
| sb.append("</td>"); | sb.append("</td>"); | ||||
| } | } | ||||
| sb.append("</tr>"); | sb.append("</tr>"); | ||||
| @@ -30,8 +30,8 @@ public interface WxFinanceService { | |||||
| //收付款 | //收付款 | ||||
| PageInfo<WxFinanceReceiveVo> receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); | PageInfo<WxFinanceReceiveVo> receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); | ||||
| List<WxFinanceReceive> findReceiveList(WxFinanceReceive record); | List<WxFinanceReceive> findReceiveList(WxFinanceReceive record); | ||||
| List<WxAllBill> createReceive(WxFinanceReceive record,MallUserInfo user); | |||||
| List<WxAllBill> createPay(WxFinanceReceive record,MallUserInfo user); | |||||
| Map createReceive(WxFinanceReceive record,MallUserInfo user); | |||||
| Map createPay(WxFinanceReceive record,MallUserInfo user); | |||||
| WxFinanceReceive getReceiveById(TenantEntity tenantEntity,Long id); | WxFinanceReceive getReceiveById(TenantEntity tenantEntity,Long id); | ||||
| void invalidReceive(WxFinanceReceive record,MallUserInfo user,String remark); | void invalidReceive(WxFinanceReceive record,MallUserInfo user,String remark); | ||||
| void redSetoffReceive(WxFinanceReceive record,MallUserInfo user); | void redSetoffReceive(WxFinanceReceive record,MallUserInfo user); | ||||
| @@ -519,7 +519,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | ||||
| @Override | @Override | ||||
| public List<WxAllBill> 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.setMerchantId(record.getMerchantId()); | ||||
| addreceive.setRemark(record.getRemark()); | addreceive.setRemark(record.getRemark()); | ||||
| wxFinanceReceiveMapper.insert(addreceive); | 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) { | 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}) | @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | ||||
| @Override | @Override | ||||
| public List<WxAllBill> createPay(WxFinanceReceive record,MallUserInfo user) { | |||||
| public Map createPay(WxFinanceReceive record,MallUserInfo user) { | |||||
| //费用计算自动优先匹配时间最早的那个 | //费用计算自动优先匹配时间最早的那个 | ||||
| //单保存冲抵的时候,实收金额为0 | //单保存冲抵的时候,实收金额为0 | ||||
| BigDecimal payTotal = new BigDecimal(0); | BigDecimal payTotal = new BigDecimal(0); | ||||
| @@ -788,7 +792,11 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| addreceive.setMerchantId(record.getMerchantId()); | addreceive.setMerchantId(record.getMerchantId()); | ||||
| addreceive.setRemark(record.getRemark()); | addreceive.setRemark(record.getRemark()); | ||||
| wxFinanceReceiveMapper.insert(addreceive); | 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) { | public boolean createBillPay(FinanceReceiveCalcuteDTO calcuteDto,MallUserInfo user,WxFinanceReceive addreceive,WxAllBill be,WxMerchant merchant,WxBillPayWay payWay0) { | ||||