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 7da74d9cf..c05c6273b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java @@ -51,12 +51,16 @@ public class WxFinancePrintController extends BaseController { @GetMapping("types") public ResultData types() { List list = new ArrayList(); - for (EnumFinancePrintDataType t : EnumFinancePrintDataType.values()) { - Map m = new HashMap(); - m.put("id", t.getCode()); - m.put("name", t.getMessage()); - list.add(m); - } + Map m = new HashMap(); + m.put("id", EnumFinancePrintDataType.FINANCE_RECEIVE.getCode()); + m.put("name", EnumFinancePrintDataType.FINANCE_RECEIVE.getMessage()); + list.add(m); +// for (EnumFinancePrintDataType t : EnumFinancePrintDataType.values()) { +// Map m = new HashMap(); +// m.put("id", t.getCode()); +// m.put("name", t.getMessage()); +// list.add(m); +// } return new ResultData(list); } @@ -140,6 +144,17 @@ public class WxFinancePrintController extends BaseController { return new ResultData(wxFinancePrintService.parseTemplateData(record.getTenantId(),record.getId(),record.getDataIds(),null)); } + @ApiOperation("确认打印") + @PostMapping("confirmPrint") + @TenantIgnore + public ResultData confirmPrint(@RequestBody WxFinancePrintTemplate record) { + if (StringUtils.isBlank(record.getTenantId())||null == record.getDataId()) { + return new ResultData(Result.ERROR,"参数不对"); + } + wxFinancePrintService.confirmPrint(record); + return new ResultData(); + } + @ApiOperation("") @GetMapping("needUpdate") @TenantIgnore 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 63ff9e873..4f354f0cc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java @@ -58,6 +58,8 @@ public class WxFinancePrintTemplate extends TenantEntity { @TableField(exist = false) private List tempItems; @TableField(exist = false) - List dataIds; + private List dataIds; + @TableField(exist = false) + private Long dataId; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveMapper.java index 5d592294c..62a5debd0 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveMapper.java @@ -28,6 +28,6 @@ public interface WxFinanceReceiveMapper extends CommonMapper getReceivePayWaySum(WxFinanceReceive record); - + void updatePrint(WxFinanceReceive record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java b/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java index 19e2eb1f7..a5b4a2d05 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java @@ -17,4 +17,5 @@ public interface WxFinancePrintService { void copy(WxFinancePrintTemplate record); void setTemplatesDel(WxFinancePrintTemplate record); List parseTemplateData(String tenantId,Long templateId,List dataIds,Object entity); + void confirmPrint(WxFinancePrintTemplate record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index be615a6d2..092175cdc 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -37,6 +37,7 @@ public interface WxFinanceService { void invalidReceive(WxFinanceReceive record,MallUserInfo user,String remark); void redSetoffReceive(WxFinanceReceive record,MallUserInfo user); List getReceiveBillIds(WxFinanceReceiveBill record); + void updateReceivePrint(WxFinanceReceive record); //预收款 List calcuetSetOff(FinanceSetOffDTO dto,MallUserInfo user); FinanceBillSetoffSum getBillSetoffSum(WxFinanceReceive record); 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 cc49f0fe9..a52ed032b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -379,5 +379,19 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { return null; } + @Override + public void confirmPrint(WxFinancePrintTemplate record) { + if (record.getType().intValue() == EnumFinancePrintDataType.FINANCE_RECEIVE.getCode()) { + WxFinanceReceive receive = wxFinanceService.getReceiveById(record, record.getDataId()); + if (null != receive) { + wxFinanceService.updateReceivePrint(receive); + } + }else if (record.getType().intValue() == EnumFinancePrintDataType.BILL.getCode()) { + + }else if(record.getType().intValue() == EnumFinancePrintDataType.RENT_OWE.getCode()) { + + } + } + } 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 fb05e87a8..b23fba48a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -1052,6 +1052,11 @@ public class WxFinanceServiceImpl implements WxFinanceService { return wxFinanceReceiveBillMapper.findBillIdList(record); } + @Override + public void updateReceivePrint(WxFinanceReceive record) { + wxFinanceReceiveMapper.updatePrint(record); + } + @Override public void redSetoffReceive(WxFinanceReceive record, MallUserInfo user) { invalidReceive(record, user , true); diff --git a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml index 49c7903ec..c902a3ca4 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml @@ -138,6 +138,10 @@ update wx_finance_receive set is_finish = 1 + + + update wx_finance_receive set is_print = 1 where id = #{id} and tenant_id = #{tenantId} +