From 7f3d580ee5bfba50547a167d2d07ddf3a848679b Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 6 May 2019 15:22:35 +0800 Subject: [PATCH 01/13] =?UTF-8?q?[=E6=B6=88=E6=81=AF][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=82=AE=E4=BB=B6=E6=A8=A1=E6=9D=BF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201905061341__L_VAL_MSG_MODEL.sql | 4 + .../V201905061425__L_VAL_MSG_MODEL_DATA.sql | 78 ++++++++++++++++ ...201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql | 2 + .../com/iformall/domain/po/WxMsgModel.java | 54 +++++------ .../domain/po/WxMsgValidationcodeModel.java | 60 ++++++++----- .../msg/impl/SendEmailServiceImpl.java | 19 ++-- .../resources/mapper/WxMsgModelMapper.xml | 90 +++++++++---------- .../mapper/WxMsgValidationcodeModelMapper.xml | 44 ++++----- 8 files changed, 223 insertions(+), 128 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905061341__L_VAL_MSG_MODEL.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061341__L_VAL_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061341__L_VAL_MSG_MODEL.sql new file mode 100644 index 000000000..427b6e817 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905061341__L_VAL_MSG_MODEL.sql @@ -0,0 +1,4 @@ +alter table `wx_msg_validationcode_model` modify column content text; + +ALTER TABLE `wx_msg_validationcode_model` +ADD COLUMN `email_bg_img` varchar(300) DEFAULT NULL COMMENT '邮箱背景图片'; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql new file mode 100644 index 000000000..6d990f8ef --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql @@ -0,0 +1,78 @@ +INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10,'789', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '789', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '789', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '789', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '789', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '789', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'http://202.165.179.86:8081/images/WechatIMG5130.png'); + +INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1001', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1001', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1001', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1001', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1001', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1001', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'); + +INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1002', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1002', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1002', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1002', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1002', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1002', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'); + +INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1003', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1003', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1003', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1003', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1003', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1003', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'); + +INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1004', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1004', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1004', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1004', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1004', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1004', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'); + +INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1005', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1005', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1005', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1005', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1005', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1005', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'); + +INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1006', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1006', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1006', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1006', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1006', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1006', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'); + + +INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1007', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1007', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1007', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1007', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1007', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1007', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'); + + + + + + diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql new file mode 100644 index 000000000..b95b706f1 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql @@ -0,0 +1,2 @@ +delete from wx_msg_model where name in('欠缴账单通知','待缴账单通知','审批通过通知','待办通知','审批通知','驳回通知'); +alter table wx_msg_model drop column email_bg_img; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java index b05947103..4944b3a15 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java @@ -10,15 +10,15 @@ import java.util.List; @Table(name = "wx_msg_model") public class WxMsgModel implements Serializable { private static final long serialVersionUID = 1L; - + @Id - protected Long id; - - @Transient - protected List ids; - @Transient - protected String sortColumns; - + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + public Long getId() { return id; } @@ -26,20 +26,20 @@ public class WxMsgModel implements Serializable { public void setId(Long id) { this.id = id; } - + public String getSortColumns() { return sortColumns; } - + public List getIds() { return ids; } public void setIds(List ids) { this.ids = ids; } - - - + + + /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -61,15 +61,6 @@ public class WxMsgModel implements Serializable { @io.swagger.annotations.ApiModelProperty(value="modelid",name="modelId") private Integer modelId; - private String emailBgImg; - - public String getEmailBgImg() { - return emailBgImg; - } - - public void setEmailBgImg(String emailBgImg) { - this.emailBgImg = emailBgImg; - } public String getTenantId() { return tenantId; @@ -119,12 +110,12 @@ public class WxMsgModel implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC") - ,Content_ASC("`content` ASC"),Content_DESC("`content` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") + ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") + ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC") + ,Content_ASC("`content` ASC"),Content_DESC("`content` DESC") + ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") + ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") ,ModelId_ASC("`model_id` ASC"),ModelId_DESC("`model_id` DESC") ; @@ -143,7 +134,7 @@ public class WxMsgModel implements Serializable { return this.getValue(); } } - + public void setSortColumns(WxMsgModel.Field... fields) { if (fields == null || fields.length == 0) { @@ -161,9 +152,9 @@ public class WxMsgModel implements Serializable { } this.sortColumns = sb.toString(); - + } - + public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { @@ -181,3 +172,4 @@ public class WxMsgModel implements Serializable { } } } + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java index b9541ab06..fb1a7c863 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java @@ -11,15 +11,15 @@ import java.util.List; @Table(name = "wx_msg_validationcode_model") public class WxMsgValidationcodeModel implements Serializable { private static final long serialVersionUID = 1L; - + @Id - protected Long id; - - @Transient - protected List ids; - @Transient - protected String sortColumns; - + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + public Long getId() { return id; } @@ -29,16 +29,16 @@ public class WxMsgValidationcodeModel implements Serializable { public String getSortColumns() { return sortColumns; } - + public List getIds() { return ids; } public void setIds(List ids) { this.ids = ids; } - - - + + + /*名称**/ @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @@ -67,6 +67,17 @@ public class WxMsgValidationcodeModel implements Serializable { @io.swagger.annotations.ApiModelProperty(value="tenantid",name="tenantId") private String tenantId; + @io.swagger.annotations.ApiModelProperty(value="邮箱背景图片",name="emailBgImg") + private String emailBgImg; + + public String getEmailBgImg() { + return emailBgImg; + } + + public void setEmailBgImg(String emailBgImg) { + this.emailBgImg = emailBgImg; + } + public String getName() { return name; } @@ -127,15 +138,15 @@ public class WxMsgValidationcodeModel implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC") - ,Content_ASC("`content` ASC"),Content_DESC("`content` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,Minutes_ASC("`minutes` ASC"),Minutes_DESC("`minutes` DESC") - ,ModelId_ASC("`modelId` ASC"),ModelId_DESC("`modelId` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ; + ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") + ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC") + ,Content_ASC("`content` ASC"),Content_DESC("`content` DESC") + ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") + ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") + ,Minutes_ASC("`minutes` ASC"),Minutes_DESC("`minutes` DESC") + ,ModelId_ASC("`modelId` ASC"),ModelId_DESC("`modelId` DESC") + ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") + ; private String value; Field(String value){ this.value = value; @@ -151,7 +162,7 @@ public class WxMsgValidationcodeModel implements Serializable { return this.getValue(); } } - + public void setSortColumns(Field... fields) { if (fields == null || fields.length == 0) { @@ -167,9 +178,9 @@ public class WxMsgValidationcodeModel implements Serializable { sb.append(","); sb.append(fields[k].toString()); } - + } - + public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { @@ -187,3 +198,4 @@ public class WxMsgValidationcodeModel implements Serializable { } } } + diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java index fb4b5914a..6ab289173 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java @@ -1,10 +1,12 @@ package com.iformall.service.msg.impl; +import com.iformall.domain.po.WxMsgValidationcodeModel; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.MailMsg; -import com.iformall.domain.po.WxMsgModel; import com.iformall.mapper.WxMsgModelMapper; +import com.iformall.mapper.WxMsgValidationcodeModelMapper; import com.iformall.service.msg.MsgSendService; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,6 +19,7 @@ import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Service; import javax.mail.internet.MimeMessage; import java.io.File; +import java.util.List; import java.util.Map; /** @@ -30,25 +33,26 @@ public class SendEmailServiceImpl implements MsgSendService { @Autowired private JavaMailSender sender; - @Value("${spring.mail.username}") private String from; - @Autowired private WxMsgModelMapper wxMsgModelMapper; + @Autowired + private WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper; @Override public void send(BaseMsg baseMsg) throws Exception{ MailMsg mailMsg = (MailMsg)baseMsg; //根据模板替换动态内容 if(mailMsg.getModelId() != null){ - WxMsgModel msgModel = new WxMsgModel(); + WxMsgValidationcodeModel msgModel = new WxMsgValidationcodeModel(); msgModel.setTenantId(mailMsg.getTenantId()); - msgModel.setModelId(mailMsg.getModelId()); - WxMsgModel wxMsgModel = wxMsgModelMapper.findOneByModelId(msgModel); - if(wxMsgModel == null){ + msgModel.setType(mailMsg.getModelId()); + List modelList = wxMsgValidationcodeModelMapper.findList(msgModel); + if(CollectionUtils.isEmpty(modelList)){ throw new Exception("模板id:"+mailMsg.getModelId()+"不存在"); } + WxMsgValidationcodeModel wxMsgModel = modelList.get(0); String msg = wxMsgModel.getContent(); for (Map.Entry entry : mailMsg.getDynamicContentMap().entrySet()) { @@ -105,3 +109,4 @@ public class SendEmailServiceImpl implements MsgSendService { } } } + diff --git a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml index 0c6639c22..b86e3a5bd 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml @@ -10,64 +10,63 @@ - - + - `id`,`tenant_id`,`name`,`signature`,`content`,`createtime`,`status`,`model_id`,email_bg_img + `id`,`tenant_id`,`name`,`signature`,`content`,`createtime`,`status`,`model_id` - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id`=#{tenantId} - - - + where 1 = 1 + + + and `id` = #{id} + + + + + and `tenant_id`=#{tenantId} + + + - and `name` = #{name} - - - - - and `signature` = #{signature} - - - - - and `content` = #{content} - - - - - and `createtime` = #{createtime} - - - - - and `status` = #{status} - + and `name` = #{name} + + + + + and `signature` = #{signature} + + + + + and `content` = #{content} + + + + + and `createtime` = #{createtime} + + + + + and `status` = #{status} + and `model_id` = #{modelId} - and id in + and id in - #{idItem} + #{idItem} - + order by ${sortColumns} - + - - - - + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml index 4d5379181..c73e5a6a5 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml @@ -12,42 +12,44 @@ + + - + - `id`,`name`,`signature`,`content`,`createtime`,`status`,`minutes`,`model_id`,`type`,`tenant_id` + `id`,`name`,`signature`,`content`,`createtime`,`status`,`minutes`,`model_id`,`type`,`tenant_id`,email_bg_img - where 1 = 1 - and `id` = #{id} - and `name` = #{name} - and `signature` = #{signature} - and `content` = #{content} - and `createtime` = #{createtime} - and `status` = #{status} - and `minutes` = #{minutes} - and `model_id` = #{modelId} + where 1 = 1 + and `id` = #{id} + and `name` = #{name} + and `signature` = #{signature} + and `content` = #{content} + and `createtime` = #{createtime} + and `status` = #{status} + and `minutes` = #{minutes} + and `model_id` = #{modelId} and `type` = #{type} and `tenant_id` = #{tenantId} - and id in + and id in - #{idItem} + #{idItem} - + order by ${sortColumns} - + - - - - - - + + + + + + From 4e30b977fab7b41cbc3ff8d92bc36d494b3c4c52 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 6 May 2019 15:47:31 +0800 Subject: [PATCH 02/13] =?UTF-8?q?[=E6=B6=88=E6=81=AF][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=82=AE=E4=BB=B6=E6=A8=A1=E6=9D=BF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/enums/EnumMailMsgModel.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java b/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java index 3bfa720e1..d4788b732 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java @@ -5,12 +5,12 @@ package com.iformall.enums; * 短信模板 */ public enum EnumMailMsgModel { - MAIL_PASS_NODIFY(1, "审批通过通知"), - MAIL_BILL_WAIT_PAY(2, "待缴账单通知"), - MAIL_APPLY_NODIFY(3, "审批通知"), - MAIL_BILL_OWE(4, "欠缴账单通知"), - MAIL_ASSIGNEE_NODIFY(5, "代办通知"), - MAIL_REJECT_NODIFY(6, "驳回通知"), + MAIL_PASS_NODIFY(10, "审批通过通知"), + MAIL_BILL_WAIT_PAY(11, "待缴账单通知"), + MAIL_APPLY_NODIFY(12, "审批通知"), + MAIL_BILL_OWE(13, "欠缴账单通知"), + MAIL_ASSIGNEE_NODIFY(14, "代办通知"), + MAIL_REJECT_NODIFY(15, "驳回通知"), ; public static EnumMailMsgModel getEnum(Integer code) { From c57ad89c117ec156764ea950a66af355f9cef184 Mon Sep 17 00:00:00 2001 From: hanxueda Date: Mon, 6 May 2019 17:44:49 +0800 Subject: [PATCH 03/13] =?UTF-8?q?[=E4=BC=9A=E5=91=98][=E8=A7=84=E5=88=99]:?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BF=9E=E6=8E=A5wifi=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=88=90=E9=95=BF=E5=80=BC=E7=A7=AF=E5=88=86=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201905061616__MODIFY_SCORE_RULES.sql | 1 + .../main/java/com/iformall/domain/po/WxScoreRules.java | 2 -- .../src/main/java/com/iformall/enums/EnumScoreType.java | 2 +- .../iformall/service/impl/WxCreditHistoryServiceImpl.java | 8 -------- .../iformall/service/impl/WxScoreRulesServiceImpl.java | 8 -------- 5 files changed, 2 insertions(+), 19 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905061616__MODIFY_SCORE_RULES.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061616__MODIFY_SCORE_RULES.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061616__MODIFY_SCORE_RULES.sql new file mode 100644 index 000000000..aca7cc15c --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905061616__MODIFY_SCORE_RULES.sql @@ -0,0 +1 @@ +update wx_score_rules set rules = JSON_REMOVE(rules,'$[3]'); \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java index f389840d7..8bea2deef 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java @@ -43,7 +43,6 @@ public class WxScoreRules implements Serializable { " {\"businessId\":6,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}" + "]}," + "{\"id\":3,\"limit\":1,\"step\":1,\"score\":100,\"desc\":\"绑定车牌1个\"}," + - "{\"id\":4,\"limit\":0,\"step\":1,\"score\":10 ,\"desc\":\"连接WIFI1次\"}," + "{\"id\":5,\"limit\":1,\"step\":1,\"score\":100,\"desc\":\"授权个人信息\"}," + "{\"id\":6,\"limit\":1,\"step\":1,\"score\":100,\"desc\":\"授权手机号\"}," + "{\"id\":7,\"limit\":1,\"step\":1,\"score\":100,\"desc\":\"编辑个人信息\"}" + @@ -66,7 +65,6 @@ public class WxScoreRules implements Serializable { " {\"businessId\":6,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}" + "]}," + "{\"id\":3,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"绑定车牌1个\"}," + - "{\"id\":4,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"连接WIFI1次\"}," + "{\"id\":5,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"授权个人信息\"}," + "{\"id\":6,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"授权手机号\"}," + "{\"id\":7,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"编辑个人信息\"}" + diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java b/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java index 610660149..504b43abc 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java @@ -8,7 +8,7 @@ public enum EnumScoreType { LOGIN(1, "每日登录"), CONSUMPTION(2, "消费"), BIND_CAR(3, "绑车牌"), - WIFI_CONNECTION(4, "连接WIFI"), + //WIFI_CONNECTION(4, "连接WIFI"), WECHAT_PERSION(5, "微信用户昵称授权"), WECHAT_PHONE(6, "微信用户手机授权"), COMPLETE_INFO(7, "完善个人信息"), diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index f3dfb7098..4d09a34d8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -242,9 +242,6 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { if (record.getCreditType() == EnumScoreType.BIND_CAR.getCode()) { return bindCarAddCredit(record); } - if (record.getCreditType() == EnumScoreType.WIFI_CONNECTION.getCode()) { - return wifiAddCredit(); - } if (record.getCreditType() == EnumScoreType.WECHAT_PERSION.getCode()) { return personAddCredit(record); } @@ -296,11 +293,6 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return wxScoreRules.getRule(EnumScoreType.BIND_CAR, WxScoreRules.SCORE); } - private int wifiAddCredit() { - int addCreditNumber = 0; - return addCreditNumber; - } - private int personAddCredit(WxCreditHistory record) { // 1. 获取score rules WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index fc62cf0ec..66389363b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -353,11 +353,6 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { return addScoreNumber; } - private int wifiAddScore() { - int addScoreNumber = 0; - return addScoreNumber; - } - private int personAddScore(WxCUser user) { int addScoreNumber = 0; // 1. 获取score rules @@ -517,9 +512,6 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { WxCUserCar userCar = (WxCUserCar) param; return bindCarAddScore(userCar); } - case WIFI_CONNECTION:{ - return wifiAddScore(); - } case WECHAT_PERSION:{ WxCUser user = (WxCUser) param; return personAddScore(user); From acb16a130cd003db9ecbf188a99ce9d5b7df58c1 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 6 May 2019 18:32:35 +0800 Subject: [PATCH 04/13] =?UTF-8?q?[=E5=88=86=E8=B4=A6][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E5=8D=A1=E6=B6=88=E8=B4=B9=E6=97=B6,=E5=A6=82=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=85=8D=E7=BD=AE=E5=95=86=E6=88=B7=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?,=E6=8F=90=E7=A4=BA=E4=B8=8D=E6=94=AF=E6=8C=81=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/java/com/iformall/common/ErrorCode.java | 1 + .../iformall/service/impl/WxProfitSharingOrderServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index b332df272..f65cd7a79 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -235,6 +235,7 @@ public enum ErrorCode{ PROFIT_SHARING_RECEIVER_DEL_FAILED(12038, "分账账户删除失败"), PROFIT_SHARING_NUM_UP_LIMIT(12039, "分账次数超限"), PROFIT_SHARING_QUERY_UNKNOWN_TYPE(12040, "分账查询类型不支持"), + PROFIT_SHARING_UNSUPPORTED(12041, "支付方式不支持"), /** * 核销 */ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index 235c3726c..5b0e340cc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -262,7 +262,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode())) sharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode()); if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode())) - return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID); + return new ResultData(ErrorCode.PROFIT_SHARING_UNSUPPORTED); return finishSharingOrder(sharingOrderDto); } From 3aa8e7957efee27d820abe8b60f124faebfb5292 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 6 May 2019 18:53:39 +0800 Subject: [PATCH 05/13] =?UTF-8?q?[=E5=88=86=E8=B4=A6][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E5=8D=A1=E6=B6=88=E8=B4=B9=E6=97=B6,=E5=A6=82=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=85=8D=E7=BD=AE=E5=95=86=E6=88=B7=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?,=E6=8F=90=E7=A4=BA=E4=B8=8D=E6=94=AF=E6=8C=81=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 6 +++--- .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 2 +- .../service/impl/WxProfitSharingOrderServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index f65cd7a79..b8ec86e55 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -235,13 +235,13 @@ public enum ErrorCode{ PROFIT_SHARING_RECEIVER_DEL_FAILED(12038, "分账账户删除失败"), PROFIT_SHARING_NUM_UP_LIMIT(12039, "分账次数超限"), PROFIT_SHARING_QUERY_UNKNOWN_TYPE(12040, "分账查询类型不支持"), - PROFIT_SHARING_UNSUPPORTED(12041, "支付方式不支持"), + PROFIT_SHARING_RECEIVER_UNKNOWN(12041, "收款方账户异常"), /** * 核销 */ VERIFY_ERROR(12050, "核销异常"), MSG_REPEAT_SEND(12061, "短信重复发送"), - VERIFY_COUPON_ORDER_MERANT_IS_NULL(12062, "卡券核销商户无权限"), + VERIFY_COUPON_ORDER_MERCHANT_IS_NULL(12062, "卡券核销失败,请查看适用门店"), /** * 解单 @@ -260,7 +260,7 @@ public enum ErrorCode{ * 短信 * * */ - MSG_SERVER_NOT_FIND(12100,"您还未接入短信运营商,请联系平台管理员"), + MSG_SERVER_NOT_FIND(12100,"您还未接入短信运营商,请联系平台管理员"), MSG_TEMPLATE_REPEAT(12101,"您添加的短信模板已存在"), MSG_SIGNATURE_CONTENT_ERROR(12102,"短信签名或内容错误"), MSG_TEMPLATE_CREATE_ERROR(12103,"创建模板失败"), diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index dfc141a03..314517839 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -301,7 +301,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { List couponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); if (!couponMerchantList.stream().anyMatch(cm->cm.getMerchantId().equals(wxMerchantBUser.getMerchantId()))){ logger.error("券: coupon-" + wxCoupon.getId() + "核销: couponMerchantId-" + wxMerchantBUser.getMerchantId()); - throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERANT_IS_NULL); + throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index 5b0e340cc..f0e867280 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -262,7 +262,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode())) sharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode()); if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode())) - return new ResultData(ErrorCode.PROFIT_SHARING_UNSUPPORTED); + return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_UNKNOWN); return finishSharingOrder(sharingOrderDto); } From c87f8a57d1d65e561ace0ce5b4fa598e6f094437 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 7 May 2019 14:41:07 +0800 Subject: [PATCH 06/13] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=94=B6=E7=BC=B4=E7=8E=87=E7=99=BE=E5=88=86?= =?UTF-8?q?=E6=AF=94=E7=B2=BE=E5=BA=A6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxChartServiceImpl.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index f5c20e9c9..5b23bc128 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2317,11 +2317,11 @@ public class WxChartServiceImpl implements WxChartDataService { BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); BigDecimal pay = (BigDecimal) payinfo.get("pay"); if (receivepay.doubleValue() > 0) { - BigDecimal divide = pay.divide(receivepay, 2, BigDecimal.ROUND_HALF_UP); + BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_HALF_UP); double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); datamap.put("rentysje", receivepay); datamap.put("rentssje", pay); - datamap.put("rentzjsjl", zjcjl); + datamap.put("rentzjsjl", (double) Math.round(zjcjl * 100) / 100); } else { datamap.put("rentysje", 0); datamap.put("rentssje", 0); @@ -2339,11 +2339,11 @@ public class WxChartServiceImpl implements WxChartDataService { BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); BigDecimal pay = (BigDecimal) payinfo.get("pay"); if (receivepay.doubleValue() > 0) { - BigDecimal divide = pay.divide(receivepay, 2, BigDecimal.ROUND_HALF_UP); + BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_HALF_UP); double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); datamap.put("propertyysje", receivepay); datamap.put("propertyssje", pay); - datamap.put("propertyzjsjl", zjcjl); + datamap.put("propertyzjsjl", (double) Math.round(zjcjl * 100) / 100); } else { datamap.put("propertyysje", 0); datamap.put("propertyssje", 0); @@ -2361,11 +2361,11 @@ public class WxChartServiceImpl implements WxChartDataService { BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); BigDecimal pay = (BigDecimal) payinfo.get("pay"); if (receivepay.doubleValue() > 0) { - BigDecimal divide = pay.divide(receivepay, 2, BigDecimal.ROUND_HALF_UP); + BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_HALF_UP); double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); datamap.put("depositysje", receivepay); datamap.put("depositssje", pay); - datamap.put("depositzjsjl", zjcjl); + datamap.put("depositzjsjl", (double) Math.round(zjcjl * 100) / 100); } else { datamap.put("depositysje", 0); datamap.put("depositssje", 0); @@ -2383,11 +2383,11 @@ public class WxChartServiceImpl implements WxChartDataService { BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); BigDecimal pay = (BigDecimal) payinfo.get("pay"); if (receivepay.doubleValue() > 0) { - BigDecimal divide = pay.divide(receivepay, 2, BigDecimal.ROUND_HALF_UP); + BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_HALF_UP); double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); datamap.put("otherysje", receivepay); datamap.put("otherssje", pay); - datamap.put("otherzjsjl", zjcjl); + datamap.put("otherzjsjl", (double) Math.round(zjcjl * 100) / 100); } else { datamap.put("otherysje", 0); datamap.put("otherssje", 0); @@ -2465,10 +2465,14 @@ public class WxChartServiceImpl implements WxChartDataService { public static void main(String[] args) { BigDecimal receivepay = new BigDecimal(33); BigDecimal pay = new BigDecimal(11); - BigDecimal divide = pay.divide(receivepay, 2, BigDecimal.ROUND_UNNECESSARY); + BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_UP); System.out.println(divide); double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); System.out.println(zjcjl); + + double d = 114.336; + d = (double) Math.round(d * 100) / 100; + System.out.println(d); } /** From 6d281948eeda7a2c487853da46fb6b6a2b64019b Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 7 May 2019 14:41:49 +0800 Subject: [PATCH 07/13] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=94=B6=E7=BC=B4=E7=8E=87=E7=99=BE=E5=88=86?= =?UTF-8?q?=E6=AF=94=E7=B2=BE=E5=BA=A6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxChartServiceImpl.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 5b23bc128..44368f884 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2462,19 +2462,6 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } - public static void main(String[] args) { - BigDecimal receivepay = new BigDecimal(33); - BigDecimal pay = new BigDecimal(11); - BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_UP); - System.out.println(divide); - double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); - System.out.println(zjcjl); - - double d = 114.336; - d = (double) Math.round(d * 100) / 100; - System.out.println(d); - } - /** * 营销数据 * @param tenantId From 234140d5a34393ebe44ded9689a31b845449c588 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 7 May 2019 15:35:57 +0800 Subject: [PATCH 08/13] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=94=B6=E7=BC=B4=E7=8E=87=E7=99=BE=E5=88=86?= =?UTF-8?q?=E6=AF=94=E7=B2=BE=E5=BA=A6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxChartServiceImpl.java | 45 ++++++++++--------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 44368f884..46b51117f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2314,14 +2314,13 @@ public class WxChartServiceImpl implements WxChartDataService { params.put("enddate", DateUtils.date2String(endDate,"yyyy-MM-dd") + " 23:59:59"); Map payinfo = wxBillRentMapper.queryPayInfoTotal(params); if (payinfo != null) { - BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); - BigDecimal pay = (BigDecimal) payinfo.get("pay"); + Double receivepay = (Double) payinfo.get("receivepay"); + Double pay = (Double) payinfo.get("pay"); if (receivepay.doubleValue() > 0) { - BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_HALF_UP); - double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); + Double divide = pay/receivepay*100; datamap.put("rentysje", receivepay); datamap.put("rentssje", pay); - datamap.put("rentzjsjl", (double) Math.round(zjcjl * 100) / 100); + datamap.put("rentzjsjl", formatDouble(divide)); } else { datamap.put("rentysje", 0); datamap.put("rentssje", 0); @@ -2336,14 +2335,13 @@ public class WxChartServiceImpl implements WxChartDataService { //物业费收缴率 payinfo = wxBillPropertyMapper.queryPayInfoTotal(params); if (payinfo != null) { - BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); - BigDecimal pay = (BigDecimal) payinfo.get("pay"); + Double receivepay = (Double) payinfo.get("receivepay"); + Double pay = (Double) payinfo.get("pay"); if (receivepay.doubleValue() > 0) { - BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_HALF_UP); - double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); + Double divide = pay/receivepay*100; datamap.put("propertyysje", receivepay); datamap.put("propertyssje", pay); - datamap.put("propertyzjsjl", (double) Math.round(zjcjl * 100) / 100); + datamap.put("propertyzjsjl", formatDouble(divide)); } else { datamap.put("propertyysje", 0); datamap.put("propertyssje", 0); @@ -2358,14 +2356,13 @@ public class WxChartServiceImpl implements WxChartDataService { //押金收缴率 payinfo = wxBillDepositMapper.queryPayInfoAllTotal(params); if (payinfo != null) { - BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); - BigDecimal pay = (BigDecimal) payinfo.get("pay"); + Double receivepay = (Double) payinfo.get("receivepay"); + Double pay = (Double) payinfo.get("pay"); if (receivepay.doubleValue() > 0) { - BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_HALF_UP); - double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); + Double divide = pay/receivepay* 100; datamap.put("depositysje", receivepay); datamap.put("depositssje", pay); - datamap.put("depositzjsjl", (double) Math.round(zjcjl * 100) / 100); + datamap.put("depositzjsjl", formatDouble(divide)); } else { datamap.put("depositysje", 0); datamap.put("depositssje", 0); @@ -2380,14 +2377,13 @@ public class WxChartServiceImpl implements WxChartDataService { //其他费用收缴率 payinfo = wxBillOtherMapper.queryPayInfoTotal(params); if (payinfo != null) { - BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); - BigDecimal pay = (BigDecimal) payinfo.get("pay"); + Double receivepay = (Double) payinfo.get("receivepay"); + Double pay = (Double) payinfo.get("pay"); if (receivepay.doubleValue() > 0) { - BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_HALF_UP); - double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); + Double divide = pay/receivepay*100; datamap.put("otherysje", receivepay); datamap.put("otherssje", pay); - datamap.put("otherzjsjl", (double) Math.round(zjcjl * 100) / 100); + datamap.put("otherzjsjl",formatDouble(divide)); } else { datamap.put("otherysje", 0); datamap.put("otherssje", 0); @@ -2462,6 +2458,15 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } + public static double formatDouble(Double d){ + String s = d+""; + String lt = s.substring(s.indexOf("."),s.length()); + if(lt.length() >3){ + s = s.substring(0,s.indexOf(".")+3); + } + return Double.parseDouble(s); + } + /** * 营销数据 * @param tenantId From 9f426efc43fa9728c9e73bc7f8fa53e104934968 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 7 May 2019 17:39:29 +0800 Subject: [PATCH 09/13] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=99=BE=E5=88=86=E6=AF=94=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxChartServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 46b51117f..c25ff63be 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2314,8 +2314,8 @@ public class WxChartServiceImpl implements WxChartDataService { params.put("enddate", DateUtils.date2String(endDate,"yyyy-MM-dd") + " 23:59:59"); Map payinfo = wxBillRentMapper.queryPayInfoTotal(params); if (payinfo != null) { - Double receivepay = (Double) payinfo.get("receivepay"); - Double pay = (Double) payinfo.get("pay"); + Double receivepay = ((BigDecimal) payinfo.get("receivepay")).doubleValue(); + Double pay = ((BigDecimal) payinfo.get("pay")).doubleValue(); if (receivepay.doubleValue() > 0) { Double divide = pay/receivepay*100; datamap.put("rentysje", receivepay); @@ -2335,8 +2335,8 @@ public class WxChartServiceImpl implements WxChartDataService { //物业费收缴率 payinfo = wxBillPropertyMapper.queryPayInfoTotal(params); if (payinfo != null) { - Double receivepay = (Double) payinfo.get("receivepay"); - Double pay = (Double) payinfo.get("pay"); + Double receivepay = ((BigDecimal) payinfo.get("receivepay")).doubleValue(); + Double pay = ((BigDecimal) payinfo.get("pay")).doubleValue(); if (receivepay.doubleValue() > 0) { Double divide = pay/receivepay*100; datamap.put("propertyysje", receivepay); @@ -2356,8 +2356,8 @@ public class WxChartServiceImpl implements WxChartDataService { //押金收缴率 payinfo = wxBillDepositMapper.queryPayInfoAllTotal(params); if (payinfo != null) { - Double receivepay = (Double) payinfo.get("receivepay"); - Double pay = (Double) payinfo.get("pay"); + Double receivepay = ((BigDecimal) payinfo.get("receivepay")).doubleValue(); + Double pay = ((BigDecimal) payinfo.get("pay")).doubleValue(); if (receivepay.doubleValue() > 0) { Double divide = pay/receivepay* 100; datamap.put("depositysje", receivepay); @@ -2377,8 +2377,8 @@ public class WxChartServiceImpl implements WxChartDataService { //其他费用收缴率 payinfo = wxBillOtherMapper.queryPayInfoTotal(params); if (payinfo != null) { - Double receivepay = (Double) payinfo.get("receivepay"); - Double pay = (Double) payinfo.get("pay"); + Double receivepay = ((BigDecimal) payinfo.get("receivepay")).doubleValue(); + Double pay = ((BigDecimal) payinfo.get("pay")).doubleValue(); if (receivepay.doubleValue() > 0) { Double divide = pay/receivepay*100; datamap.put("otherysje", receivepay); From 4b60ccd249c09fb35c1c3a40b1a4a89486c0c258 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 8 May 2019 15:43:19 +0800 Subject: [PATCH 10/13] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E6=B5=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxChartServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index c25ff63be..b5bc04784 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -614,6 +614,7 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } + /** * 车流 - 近一周新增会员数 * @param tenantId @@ -638,8 +639,9 @@ public class WxChartServiceImpl implements WxChartDataService { List timeList = new ArrayList<>(); List valList = new ArrayList<>(); for (String date : days) { - Object o = weekCarCollect.get(date); - timeList.add(date.substring(5, date.length()).replace("-", "/")); + String newdate = date.substring(5, date.length()).replace("-", "/"); + Object o = weekCarCollect.get(newdate); + timeList.add(newdate); if (o == null) { valList.add(0L); } else { From 89718b7371919c5b5913979e39a2aa44096a58a7 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 9 May 2019 19:23:51 +0800 Subject: [PATCH 11/13] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=B8=8D=E6=A3=80=E6=9F=A5=E8=A1=A5=E8=B4=B4=E7=9A=84=E5=90=88?= =?UTF-8?q?=E6=B3=95=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxCouponServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 0c9ed530c..ea23e33bc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -249,9 +249,6 @@ public class WxCouponServiceImpl implements WxCouponService { // TODO 微信转账到银行卡 } - } else if ((subsidyType == null && subsidyNum != null) - || (subsidyType != null && subsidyNum == null)){ - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } record.setId(idWorker.nextId()); From dfa3f1c72e646bf44031d6b75ced5affa7595bc1 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 14 May 2019 15:46:33 +0800 Subject: [PATCH 12/13] =?UTF-8?q?[=E5=AF=BC=E5=87=BAexcel][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E5=AF=BC=E5=87=BAexcel=E6=A0=BC=E5=BC=8F=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E4=B8=BAxlsx,=E4=B8=8E=E5=AF=BC=E5=85=A5=E4=B8=80?= =?UTF-8?q?=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCUserBasicInfoController.java | 2 +- .../src/main/java/com/iformall/service/ExcelService.java | 5 +++-- .../com/iformall/service/impl/WxBillAllServiceImpl.java | 4 ++-- .../iformall/service/impl/WxCUserBasicInfoServiceImpl.java | 6 +++--- .../com/iformall/service/impl/WxCardSpendServiceImpl.java | 2 +- .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 2 +- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 2 +- .../iformall/service/impl/WxMerchantSubsidyServiceImpl.java | 2 +- .../java/com/iformall/service/impl/WxShopServiceImpl.java | 4 ++-- 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java index 9d9d8f8ef..6326b1d07 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java @@ -335,7 +335,7 @@ public class WxCUserBasicInfoController extends BaseController { if (!targetFile.exists()) { targetFile.mkdirs(); } - String fileName = "1.xls"; + String fileName = "1.xlsx"; int dot = mFile.getOriginalFilename().lastIndexOf('.'); fileName = fileName + mFile.getOriginalFilename().substring(dot, mFile.getOriginalFilename().length()); diff --git a/mallinkService/src/main/java/com/iformall/service/ExcelService.java b/mallinkService/src/main/java/com/iformall/service/ExcelService.java index 21563014c..91ed1a198 100644 --- a/mallinkService/src/main/java/com/iformall/service/ExcelService.java +++ b/mallinkService/src/main/java/com/iformall/service/ExcelService.java @@ -33,12 +33,13 @@ public class ExcelService { { ExportParams exportParams = new ExportParams(title, sheetName); exportParams.setCreateHeadRows(isCreateHeader); + exportParams.setType(ExcelType.XSSF); defaultExport(list, pojoClass, fileName, response, exportParams); } public static void exportExcel(List list, String title, String sheetName, Class pojoClass,String fileName, HttpServletResponse response) { - defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName)); + defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName, ExcelType.XSSF)); } public static void exportExcel(List> list, String fileName, HttpServletResponse response) @@ -56,7 +57,7 @@ public class ExcelService { private static void defaultExport(List> list, String fileName, HttpServletResponse response) { - Workbook workbook = ExcelExportUtil.exportExcel(list, ExcelType.HSSF); + Workbook workbook = ExcelExportUtil.exportExcel(list, ExcelType.XSSF); if (workbook != null); downLoadExcel(fileName, response, workbook); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 019848b75..db4e6472f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -247,7 +247,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { list.add(map); } - excelService.exportExcel(list, "账单数据.xls", response); + excelService.exportExcel(list, "账单数据.xlsx", response); } private int updateBillOtherDeposit(Map bill) { @@ -788,6 +788,6 @@ public class WxBillAllServiceImpl implements WxBillAllService { list.add(oweMerchantVo); } String name = "欠缴商户列表"; - excelService.exportExcel(list,null, name, OweMerchantVo.class,name+".xls",response); + excelService.exportExcel(list,null, name, OweMerchantVo.class,name+".xlsx",response); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index e839d0da9..0ca091318 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -500,7 +500,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { String tagNames = StringUtils.join(ids.stream().map(id->tagMap.get(id)).collect(Collectors.toList()),"/"); u.setTagNames(tagNames); }); - excelService.exportExcel(list,null,"会员信息",WxCUserBasicInfoVo.class,"会员信息数据.xls",response); + excelService.exportExcel(list,null,"会员信息",WxCUserBasicInfoVo.class,"会员信息数据.xlsx",response); } public void exportTemplate(HttpServletRequest request, HttpServletResponse response, String tenantId) { @@ -575,7 +575,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { list.add(u2); list.add(u3); - excelService.exportExcel(list,null,"会员信息模板",WxCUserBasicInfoVo.class,"会员信息模板.xls",response); + excelService.exportExcel(list,null,"会员信息模板",WxCUserBasicInfoVo.class,"会员信息模板.xlsx",response); } @@ -826,7 +826,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { public void exportCarPayData(WxCarPayRecord record, HttpServletRequest request, HttpServletResponse response) { List list = wxCarPayRecordMapper.findCarPayList(record); String sheetName = (record.getIsPay()!=null && 1==record.getIsPay())?"线上缴费车辆列表":"进出车辆列表"; - excelService.exportExcel(list,null,sheetName,WxCarPayRecord.class,sheetName+".xls",response); + excelService.exportExcel(list,null,sheetName,WxCarPayRecord.class,sheetName+".xlsx",response); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 201d2a479..2dbd977b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -499,7 +499,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { @Override public void exportData(WxCardSpendVo wxCardSpendVo, HttpServletRequest request, HttpServletResponse response) { List list = wxCardSpendMapper.findCardSpendVoList(wxCardSpendVo); - excelService.exportExcel(list,null,"消费记录",WxCardSpendVo.class,"消费记录.xls",response); + excelService.exportExcel(list,null,"消费记录",WxCardSpendVo.class,"消费记录.xlsx",response); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 314517839..efe35eb30 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -271,7 +271,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { wxMall = wxMallMapper.findList(wxMall).get(0); String filename = wxMall.getName() + DateUtils.getSystemTime("yyyyMMDDHHmmss"); List list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder); - excelService.exportExcel(list, null, filename, WxCouponOrderBVo.class, filename + ".xls", response); + excelService.exportExcel(list, null, filename, WxCouponOrderBVo.class, filename + ".xlsx", response); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 8a94dd000..53184a939 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -609,6 +609,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { } }); - excelService.exportExcel(list,null,"商户信息",WxMerchant.class,"商户信息数据.xls",response); + excelService.exportExcel(list,null,"商户信息",WxMerchant.class,"商户信息数据.xlsx",response); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java index 89a172fee..b7bd35a61 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -82,7 +82,7 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { @Override public void exportData(WxMerchantSubsidy wxMerchantSubsidy, HttpServletRequest request, HttpServletResponse response) { List list = wxMerchantSubsidyMapper.findVoList(wxMerchantSubsidy); - excelService.exportExcel(list,null,"补贴记录",WxMerchantSubsidyVo.class,"补贴记录.xls",response); + excelService.exportExcel(list,null,"补贴记录",WxMerchantSubsidyVo.class,"补贴记录.xlsx",response); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 4c6c0569f..208ae7f40 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -163,7 +163,7 @@ public class WxShopServiceImpl implements WxShopService { public void exportShop(WxShop wxShop, HttpServletRequest request, HttpServletResponse response) { List list = wxShopMapper.findListWithMerchantMap(wxShop); String name = EnumRentShopType.SHOP.getCode().equals(wxShop.getType())?"店铺列表":"多经点位列表"; - excelService.exportExcel(list,null, name, WxShopVo.class,name+".xls",response); + excelService.exportExcel(list,null, name, WxShopVo.class,name+".xlsx",response); } @Override @@ -186,6 +186,6 @@ public class WxShopServiceImpl implements WxShopService { notRentShopVoList.add(notRentShopVo); } String name = "未出租商铺列表"; - excelService.exportExcel(notRentShopVoList,null, name, WxNotRentShopVo.class,name+".xls",response); + excelService.exportExcel(notRentShopVoList,null, name, WxNotRentShopVo.class,name+".xlsx",response); } } From d5575cffbcea3e25511c27ea810a1d83a274b884 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 14 May 2019 18:10:59 +0800 Subject: [PATCH 13/13] =?UTF-8?q?[=E5=AF=BC=E5=87=BAexcel][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E8=B4=A6=E5=8D=95=E5=AF=BC=E5=87=BA=E8=A6=81?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9Asheet=EF=BC=8Ceasypoi=E6=9C=89bug?= =?UTF-8?q?=EF=BC=8C=E6=81=A2=E5=A4=8Dxls=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/service/ExcelService.java | 2 +- .../java/com/iformall/service/impl/WxBillAllServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/ExcelService.java b/mallinkService/src/main/java/com/iformall/service/ExcelService.java index 91ed1a198..3d6314d8b 100644 --- a/mallinkService/src/main/java/com/iformall/service/ExcelService.java +++ b/mallinkService/src/main/java/com/iformall/service/ExcelService.java @@ -57,7 +57,7 @@ public class ExcelService { private static void defaultExport(List> list, String fileName, HttpServletResponse response) { - Workbook workbook = ExcelExportUtil.exportExcel(list, ExcelType.XSSF); + Workbook workbook = ExcelExportUtil.exportExcel(list, ExcelType.HSSF); if (workbook != null); downLoadExcel(fileName, response, workbook); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index db4e6472f..8ef82a1ab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -247,7 +247,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { list.add(map); } - excelService.exportExcel(list, "账单数据.xlsx", response); + excelService.exportExcel(list, "账单数据.xls", response); } private int updateBillOtherDeposit(Map bill) {