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 467c3d049..726c14f08 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -312,14 +312,6 @@ public class WxFinanceController extends BaseController { return new ResultData(page); } - @ApiOperation("过账") - @PostMapping("receiveFinish") - public ResultData receiveFinish(@RequestBody WxFinanceReceive record) { - record.updateTenantInfo(getTenantInfo()); - wxFinanceService.finishReceive(record, getUser()); - return new ResultData(); - } - @ApiOperation("打印项项目需要获取的租户号") @GetMapping("templateCurrentTenant") @TenantIgnore @@ -352,4 +344,12 @@ public class WxFinanceController extends BaseController { return new ResultData(page); } + @ApiOperation("过账") + @PostMapping("receiveFinish") + public ResultData receiveFinish(@RequestBody WxFinanceReceive record) { + record.updateTenantInfo(getTenantInfo()); + wxFinanceService.finishReceive(record, getUser()); + return new ResultData(); + } + } 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 a02c47f2e..2d4af1464 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import java.util.Date; +import java.util.List; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -27,6 +28,8 @@ public class WxFinancePrintTemplate extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="name",name="name") private String name; + @TableField(exist = false) + private String title; @io.swagger.annotations.ApiModelProperty(value="createTime",name="createTime") private Date createTime; @@ -50,5 +53,7 @@ public class WxFinancePrintTemplate extends TenantEntity { } return null; } + @TableField(exist = false) + private List tempItems; } 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 1f1bb6bd8..10b3f7939 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -58,15 +58,13 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { @Override public void saveOrUpdate(WxFinancePrintTemplate record) { - boolean isGenarated = false; + Map map = new HashMap(); if (StringUtils.isBlank(record.getContent())) { - Map map = new HashMap(); map.put("width", 770); map.put("height", 500); map.put("pageWidth", 215); map.put("pageHeight", 140); record.setContent(JSON.toJSONString(map)); - isGenarated = true; } Date date = new Date(); if (record.getId() == null) { @@ -74,10 +72,12 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { 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); @@ -86,13 +86,13 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } } else { - if (null != record.getContentJson()) { - JSONObject o = record.getContentJson(); - o.put("id", String.valueOf(record.getId())); - o.put("title", record.getName()); - o.put("type", record.getType()); - record.setContent(JSON.toJSONString(o)); - } + 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); }