diff --git a/maintain-admin/lib/screw-core-1.0.5.jar b/maintain-admin/lib/screw-core-1.0.5.jar new file mode 100644 index 0000000000000000000000000000000000000000..c81e6c0374b2907cb034b8a817451ae00955e3d2 Binary files /dev/null and b/maintain-admin/lib/screw-core-1.0.5.jar differ diff --git a/maintain-admin/pom.xml b/maintain-admin/pom.xml index fa7dc03d04314834a4aba7b1ffbc8cac22b68342..fcd4920c13d1a3069b389cda5ae4af19b7521976 100644 --- a/maintain-admin/pom.xml +++ b/maintain-admin/pom.xml @@ -109,6 +109,24 @@ + + + + + cn.smallbun.screw + screw-core + 1.0.5 + system + ${project.basedir}/lib/screw-core-1.0.5.jar + + + + com.zaxxer + HikariCP + 3.4.5 + + + diff --git a/maintain-admin/src/main/java/com/maintain/web/controller/business/ExportMysql.java b/maintain-admin/src/main/java/com/maintain/web/controller/business/ExportMysql.java new file mode 100644 index 0000000000000000000000000000000000000000..018741b48e48921f674da75ba94f33b03d4fe019 --- /dev/null +++ b/maintain-admin/src/main/java/com/maintain/web/controller/business/ExportMysql.java @@ -0,0 +1,86 @@ +package com.maintain.web.controller.business; + +import cn.smallbun.screw.core.Configuration; +import cn.smallbun.screw.core.engine.EngineConfig; +import cn.smallbun.screw.core.engine.EngineFileType; +import cn.smallbun.screw.core.engine.EngineTemplateType; +import cn.smallbun.screw.core.execute.DocumentationExecute; +import cn.smallbun.screw.core.process.ProcessConfig; +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; + +import java.util.ArrayList; + +/** + * 数据库说明书 + */ +public class ExportMysql { + + public static void main(String[] args) { + //数据源 + HikariConfig hikariConfig = new HikariConfig(); + hikariConfig.setDriverClassName("com.mysql.cj.jdbc.Driver"); + hikariConfig.setJdbcUrl("jdbc:mysql://rm-hp3340490n5mw72tcto.mysql.huhehaote.rds.aliyuncs.com:3306/tianmaiweixiu_db?currentSchema=single"); + hikariConfig.setUsername("tianmaiweixiu"); + hikariConfig.setPassword("7HTx9s@2wcbTQ@r1"); + //设置可以获取tables remarks信息 + hikariConfig.setMinimumIdle(2); + hikariConfig.setMaximumPoolSize(5); + HikariDataSource dataSource = new HikariDataSource(hikariConfig); + //生成配置 + EngineConfig engineConfig = EngineConfig.builder() + //生成文件路径 + .fileOutputDir("C:\\Users\\admin\\Desktop") + //打开目录 + .openOutputDir(true) + //文件类型 + .fileType(EngineFileType.WORD) + //生成模板实现 + .produceType(EngineTemplateType.freemarker) + //自定义文件名称 + .fileName("维修管理系统数据库说明书").build(); + + //忽略表 + ArrayList ignoreTableName = new ArrayList<>(); +// ignoreTableName.add("sys_config"); +// ignoreTableName.add("sys_user"); + //忽略表前缀 + ArrayList ignorePrefix = new ArrayList<>(); +// ignorePrefix.add("test_"); + //忽略表后缀 + ArrayList ignoreSuffix = new ArrayList<>(); +// ignoreSuffix.add("_test"); + ProcessConfig processConfig = ProcessConfig.builder() + //指定生成逻辑、当存在指定表、指定表前缀、指定表后缀时,将生成指定表,其余表不生成、并跳过忽略表配置 + //根据名称指定表生成 + .designatedTableName(new ArrayList<>()) + //根据表前缀生成 + .designatedTablePrefix(new ArrayList<>()) + //根据表后缀生成 + .designatedTableSuffix(new ArrayList<>()) + //忽略表名 + .ignoreTableName(ignoreTableName) + //忽略表前缀 + .ignoreTablePrefix(ignorePrefix) + //忽略表后缀 + .ignoreTableSuffix(ignoreSuffix).build(); + //配置 + Configuration config = Configuration.builder() + //版本 + .version("1.0.0") + //描述 + .description("数据库设计文档生成") + //数据源 + .dataSource(dataSource) + //生成配置 + .engineConfig(engineConfig) + //生成配置 + .produceConfig(processConfig) + .build(); + //执行生成 + new DocumentationExecute(config).execute(); + } + + + +} diff --git a/maintain-admin/src/main/resources/application-prod.yml b/maintain-admin/src/main/resources/application-prod.yml index 565a9afb804eba392152113b165f48d9ca38d69c..0e18334ad04b27d651cccd72a980445cbc70275a 100644 --- a/maintain-admin/src/main/resources/application-prod.yml +++ b/maintain-admin/src/main/resources/application-prod.yml @@ -187,6 +187,6 @@ pay: appid: 8a81c1bd96cf23aa0199cc0a8dcb187c appkey: 02c4bc73faaf46c89e0c620345a11aec url: https://api-mop.chinaums.com/v6/poslink/transaction/pay - merchantCode: 123456789111115 + merchantCode: 898440300005398 deviceType: 11 payMode: CODE_SCAN diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpSettlementMaintainServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpSettlementMaintainServiceImpl.java index a4b77894fa959c7c5236cd772a87a12be8ec913b..c6e218910209255dfb4f28725a3ad0481a12fe47 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpSettlementMaintainServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpSettlementMaintainServiceImpl.java @@ -253,6 +253,9 @@ public class ErpSettlementMaintainServiceImpl implements IErpSettlementMaintainS // 生成一个时间戳单号 String orderNo = String.valueOf(System.currentTimeMillis()); int money = maintain.getPracticalMoney().movePointRight(2).intValue(); + if (money == 0) { + throw new ServiceException("结算单金额为0,无需支付!"); + } PayResponse response = yinLianPayApi.pay(orderNo, money, bo.getPaymentAccount(), sysDept.getTerminalCode()); if (!response.getErrCode().equals("00")) { throw new ServiceException("结算单支付失败:"+ response.getErrInfo());