winter пре 1 година
родитељ
комит
84e3a2b126
3 измењених фајлова са 2 додато и 5 уклоњено
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java
  2. +1
    -1
      mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql
  3. +0
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java Прегледај датотеку

@@ -108,7 +108,7 @@ public class WxFinancePrintController extends BaseController {
if (null == record.getTenantId()) { if (null == record.getTenantId()) {
return new ResultData(Result.ERROR,"参数不对"); return new ResultData(Result.ERROR,"参数不对");
} }
wxFinancePrintService.saveOrUpdate(record);
wxFinancePrintService.setTemplatesDel(record);
return new ResultData(); return new ResultData();
} }


+ 1
- 1
mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql Прегледај датотеку

@@ -791,7 +791,7 @@ CREATE TABLE `wx_finance_print_template` (
`update_time` datetime DEFAULT NULL COMMENT '更新时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
`name` varchar(100) COLLATE utf8mb4_unicode_ci 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 '内容', `content` text COLLATE utf8mb4_unicode_ci COMMENT '内容',
`type` int(1) NOT NULL COMMENT '类型', `type` int(1) NOT NULL COMMENT '类型',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)


+ 0
- 3
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("height", 500);
map.put("pageWidth", 215); map.put("pageWidth", 215);
map.put("pageHeight", 140); map.put("pageHeight", 140);
map.put("defaultValue", 0);
record.setContent(JSON.toJSONString(map)); record.setContent(JSON.toJSONString(map));
isGenarated = true; isGenarated = true;
} }
@@ -77,7 +76,6 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
record.setUpdateTime(date); record.setUpdateTime(date);
JSONObject o = record.getContentJson(); JSONObject o = record.getContentJson();
o.put("id", String.valueOf(record.getId())); o.put("id", String.valueOf(record.getId()));
o.put("defaultValue", 0);
o.put("title", record.getName()); o.put("title", record.getName());
o.put("type", record.getType()); o.put("type", record.getType());
record.setContent(JSON.toJSONString(o)); record.setContent(JSON.toJSONString(o));
@@ -91,7 +89,6 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
if (null != record.getContentJson()) { if (null != record.getContentJson()) {
JSONObject o = record.getContentJson(); JSONObject o = record.getContentJson();
o.put("id", String.valueOf(record.getId())); o.put("id", String.valueOf(record.getId()));
o.put("defaultValue", 0);
o.put("title", record.getName()); o.put("title", record.getName());
o.put("type", record.getType()); o.put("type", record.getType());
record.setContent(JSON.toJSONString(o)); record.setContent(JSON.toJSONString(o));


Loading…
Откажи
Сачувај