From 84e3a2b126a0fc1ea870d98b1ab744d4bacfe427 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 5 Aug 2024 19:24:11 +0800 Subject: [PATCH] fix --- .../iformall/controller/market/WxFinancePrintController.java | 2 +- .../src/main/resources/db/migration/V202408000000001.sql | 2 +- .../com/iformall/service/impl/WxFinancePrintServiceImpl.java | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) 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 feda7ceee..b1700386d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java @@ -108,7 +108,7 @@ public class WxFinancePrintController extends BaseController { if (null == record.getTenantId()) { return new ResultData(Result.ERROR,"参数不对"); } - wxFinancePrintService.saveOrUpdate(record); + wxFinancePrintService.setTemplatesDel(record); return new ResultData(); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql index feaa34e87..064a7c12c 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql @@ -791,7 +791,7 @@ CREATE TABLE `wx_finance_print_template` ( `update_time` datetime DEFAULT NULL COMMENT '更新时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间', `name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '模板名称', - `is_del` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL, + `is_del` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0', `content` text COLLATE utf8mb4_unicode_ci COMMENT '内容', `type` int(1) NOT NULL COMMENT '类型', PRIMARY KEY (`id`) 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 dd64bf454..1f1bb6bd8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -65,7 +65,6 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { map.put("height", 500); map.put("pageWidth", 215); map.put("pageHeight", 140); - map.put("defaultValue", 0); record.setContent(JSON.toJSONString(map)); isGenarated = true; } @@ -77,7 +76,6 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { record.setUpdateTime(date); JSONObject o = record.getContentJson(); o.put("id", String.valueOf(record.getId())); - o.put("defaultValue", 0); o.put("title", record.getName()); o.put("type", record.getType()); record.setContent(JSON.toJSONString(o)); @@ -91,7 +89,6 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { if (null != record.getContentJson()) { JSONObject o = record.getContentJson(); o.put("id", String.valueOf(record.getId())); - o.put("defaultValue", 0); o.put("title", record.getName()); o.put("type", record.getType()); record.setContent(JSON.toJSONString(o));