From 2a431ace3a7b7dcdd313bb2fa0eff5bb727946f8 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 24 八月 2023 14:38:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java
index 0dd3049..59e3d19 100644
--- a/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java
@@ -90,6 +90,7 @@
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
UpdateWrapper<CompanyOpen> wrapper = new UpdateWrapper<>();
wrapper.lambda().eq(CompanyOpen::getCompanyId,companyOpen.getCompanyId())
+ .set(CompanyOpen::getUserNum,companyOpen.getUserNum())
.set(CompanyOpen::getValidDate,companyOpen.getValidDate())
.set(CompanyOpen::getOepnType,companyOpen.getOepnType());
companyOpenMapper.update(null,wrapper);
@@ -97,6 +98,7 @@
company.setId(companyOpen.getCompanyId());
company.setOepnValidDate(companyOpen.getValidDate());
company.setOepnType(companyOpen.getOepnType());
+ company.setOpenUserNum(companyOpen.getUserNum());
companyMapper.updateById(company);
Company company1 = companyMapper.selectById(companyOpen.getCompanyId());
@@ -109,7 +111,8 @@
companyLog.setRemark("鏈夋晥鏈熶粠"+format.format(cyResult.getOepnValidDate())+"鏃ヨ皟鏁磋嚦"+format.format(companyOpen.getValidDate()));
companyLog.setCompanyId(company.getId());
companyLog.setUpdateType(Constants.CompanyUpdateType.UPDATE_VAIL_DATE.getKey());
- companyLog.setDetail("鏈夋晥鏈熶粠"+format.format(cyResult.getOepnValidDate())+"鏃ヨ皟鏁磋嚦"+format.format(companyOpen.getValidDate()));
+ companyLog.setDetail("鏈夋晥鏈熶粠"+format.format(cyResult.getOepnValidDate())+"鏃ヨ皟鏁磋嚦"+format.format(companyOpen.getValidDate())+"\n"+
+ "鐢ㄦ埛寮�閫氫汉鏁颁粠"+format.format(cyResult.getOpenUserNum())+"璋冩暣鑷�"+format.format(companyOpen.getUserNum()));
companyLogService.create(companyLog);
initRedisCache(company1);
--
Gitblit v1.9.3