From b9cf4fd78b2b3b28f0f35e4675017dc9f90e8e42 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 5 Aug 2024 20:24:11 +0800 Subject: [PATCH] fix --- .../market/WxFinanceController.java | 2 +- .../market/WxFinancePrintController.java | 15 +++- .../service/WxFinancePrintService.java | 4 +- .../impl/WxFinancePrintServiceImpl.java | 79 ++++++++++++------- 4 files changed, 66 insertions(+), 34 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 726c14f08..82a31160b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -320,7 +320,7 @@ public class WxFinanceController extends BaseController { } @GetMapping("finishStatus") - public ResultData receiveSetoffStatus() { + public ResultData finishStatus() { List list = new ArrayList(); for (EnumFinanceFinishStatus t : EnumFinanceFinishStatus.values()) { Map m = new HashMap(); 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 b1700386d..e8c602e6b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java @@ -83,7 +83,18 @@ public class WxFinancePrintController extends BaseController { if (null == record.getTenantId()) { return new ResultData(Result.ERROR,"参数不对"); } - wxFinancePrintService.saveOrUpdate(record); + wxFinancePrintService.save(record); + return new ResultData(); + } + + @ApiOperation("费用区间列表") + @PostMapping("updateTemplates") + @TenantIgnore + public ResultData updateTemplates(@RequestBody WxFinancePrintTemplate record) { + if (null == record.getTenantId()) { + return new ResultData(Result.ERROR,"参数不对"); + } + wxFinancePrintService.update(record); return new ResultData(); } @@ -97,7 +108,7 @@ public class WxFinancePrintController extends BaseController { WxFinancePrintTemplate template = wxFinancePrintService.getTemplateById(record.getId()); template.setId(null); template.setName(template.getName()+"复制"); - wxFinancePrintService.saveOrUpdate(template); + wxFinancePrintService.copy(template); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java b/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java index 898cbc8a0..c19766f10 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java @@ -12,7 +12,9 @@ public interface WxFinancePrintService { List printDataList(WxFinancePrintData record); List printTemplateList(WxFinancePrintTemplate record); WxFinancePrintTemplate getTemplateById(Long id); - void saveOrUpdate(WxFinancePrintTemplate record); + void save(WxFinancePrintTemplate record); + void update(WxFinancePrintTemplate record); + void copy(WxFinancePrintTemplate record); void setTemplatesDel(WxFinancePrintTemplate record); List parseTemplateData(String tenantId,Integer type,List dataIds); } 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 10b3f7939..f12390655 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -57,45 +57,64 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { } @Override - public void saveOrUpdate(WxFinancePrintTemplate record) { + public void save(WxFinancePrintTemplate record) { + Date date = new Date(); + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + record.setCreateTime(date); + record.setUpdateTime(date); + record.setName(record.getTitle()); + Map map = new HashMap(); + map.put("width", 770); + map.put("height", 500); + map.put("pageWidth", 215); + map.put("pageHeight", 140); + map.put("tempItems", record.getTempItems()); + map.put("id", String.valueOf(record.getId())); + map.put("title", record.getName()); + map.put("type", record.getType()); + record.setContent(JSON.toJSONString(map)); + try { + wxFinancePrintTemplateMapper.insert(record); + } catch (Exception e) { + logger.error("保存模板失败,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); + } + } + + @Override + public void update(WxFinancePrintTemplate record) { + WxFinancePrintTemplate t = getTemplateById(record.getId()); Map map = new HashMap(); if (StringUtils.isBlank(record.getContent())) { map.put("width", 770); map.put("height", 500); map.put("pageWidth", 215); map.put("pageHeight", 140); + map.put("id", String.valueOf(t.getId())); + map.put("title", record.getName()); + map.put("type", t.getType()); + map.put("tempItems", record.getTempItems()); record.setContent(JSON.toJSONString(map)); } Date date = new Date(); - if (record.getId() == null) { - final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); - record.setCreateTime(date); - record.setUpdateTime(date); - record.setName(record.getTitle()); - JSONObject o = record.getContentJson(); - o.put("id", String.valueOf(record.getId())); - o.put("title", record.getName()); - o.put("type", record.getType()); - o.put("tempItems", record.getTempItems()); - record.setContent(JSON.toJSONString(o)); - try { - wxFinancePrintTemplateMapper.insert(record); - } catch (Exception e) { - logger.error("保存模板失败,e:" + e.getMessage()); - throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); - } - } else { - JSONObject o = record.getContentJson(); - o.put("id", String.valueOf(record.getId())); - o.put("title", record.getName()); - o.put("type", record.getType()); - o.put("tempItems", record.getTempItems()); - record.setContent(JSON.toJSONString(o)); - record.setName(record.getTitle()); - record.setUpdateTime(date); - wxFinancePrintTemplateMapper.updateById(record); - } + JSONObject o = record.getContentJson(); + o.put("title", record.getName()); + o.put("tempItems", record.getTempItems()); + record.setContent(JSON.toJSONString(o)); + record.setName(record.getTitle()); + record.setUpdateTime(date); + wxFinancePrintTemplateMapper.updateById(record); + } + + @Override + public void copy(WxFinancePrintTemplate record) { + WxFinancePrintTemplate t = getTemplateById(record.getId()); + final IdWorker idWorker = IdWorker.get(); + t.setId(idWorker.nextId()); + t.setCreateTime(new Date()); + t.setUpdateTime(new Date()); + wxFinancePrintTemplateMapper.insert(record); } @Override