From f42c9aea81ecff7d89ac113d202f4af6764c4e2a Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Nov 2021 17:38:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?add=20=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=20=E9=9D=9E=E6=88=90=E5=91=98=E6=8A=A5=E5=90=8D=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=B8=8D=E9=80=9A=E8=BF=87=E5=8F=91=E6=B6=88=E6=81=AF?= =?UTF-8?q?=EF=BC=9A=E6=82=A8=E7=9A=84=E5=8F=82=E4=BC=9A=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=B7=B2=E8=A2=AB=E6=8B=92=E7=BB=9D=EF=BC=8C=E6=AD=A4=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E4=B8=8D=E5=8F=AF=E6=8A=A5=E5=90=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayMeetingSituationServiceImpl.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index fcbd6430..4d89c4e5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -78,6 +78,8 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.transaction.annotation.Transactional; +import static org.apache.shiro.web.filter.mgt.DefaultFilter.user; + /** * @Description: 会议报名信息 * @Author: jero-boot @@ -508,6 +510,33 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl map = new HashMap<>(); + //map.put("meetingName", payMeeting.getMeetingName()); + sendMessageDTO.setFromUser(loginUser.getUsername()); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG16.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("C_OPEN_TYPE16"); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("id", id); + //jsonObject.put("meetingName", payMeeting.getMeetingName()); + //jsonObject.put("meetingType", MeetingCommon.INTERNATIONAL_MEETING_INT); + sendMessageDTO.setBusId(jsonObject.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); + } } @Override From 778a16a811b693d3f2d5f91ec370df12b71aaaf2 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Nov 2021 17:41:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix=20bug=2041911=20=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E7=AD=BE=E5=88=B0--=E7=BC=B4=E8=B4=B9=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E4=B8=BA=E6=B1=87=E6=AC=BE=E7=9A=84=E4=B8=8D=E7=AE=A1=E4=B8=8A?= =?UTF-8?q?=E6=B2=A1=E4=B8=8A=E4=BC=A0=E9=83=BD=E5=8F=AF=E7=AD=BE=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 4d89c4e5..75216c11 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -661,9 +661,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Tue, 2 Nov 2021 17:45:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=20bug=2041911=20=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E7=AD=BE=E5=88=B0--=E7=BC=B4=E8=B4=B9=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E4=B8=BA=E6=B1=87=E6=AC=BE=E7=9A=84=E4=B8=8D=E7=AE=A1=E4=B8=8A?= =?UTF-8?q?=E6=B2=A1=E4=B8=8A=E4=BC=A0=E9=83=BD=E5=8F=AF=E7=AD=BE=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 75216c11..cb64cfcd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -697,12 +697,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Tue, 2 Nov 2021 17:55:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=20=E7=99=BB=E5=BD=95=E5=B0=B1=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=BE=AE=E4=BF=A1=EF=BC=8C=E5=B9=B6=E8=A7=A3=E7=BB=91?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/controller/CompanyLoginController.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java index cbdcf77d..44edd106 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java @@ -259,14 +259,15 @@ public class CompanyLoginController { LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.eq(PayContactsManagement::getOpenId, PasswordUtil.encrypt(openId)); PayContactsManagement contactsManagement1 = payContactsManagementService.getOne(queryWrapper1); - //没有绑定过就绑定 - if (contactsManagement1 == null){ - contactsManagement.setOpenId(PasswordUtil.encrypt(openId)); + //绑定过就解绑重新绑定 + if (contactsManagement1 != null){ + contactsManagement1.setOpenId(null); payContactsManagementService.updateById(contactsManagement); - //绑定过就判断是否是当前用户,如果不是就报错 - }else if (!Objects.equals(contactsManagement1.getPhone(),contactsManagement.getPhone())){ - throw new JeroBootException("微信已经绑定过其他账号"); } + //绑定微信 + contactsManagement.setOpenId(PasswordUtil.encrypt(openId)); + payContactsManagementService.updateById(contactsManagement); + baseCommonService.addLog("手机号: " + PasswordUtil.decrypt(contactsManagement.getPhone()) + ",绑定微信成功！", CommonConstant.LOG_TYPE_2, CommonConstant.OPERATE_TYPE_3, loginUser); //update-end--Author:wangshuai Date:20200714 for：登录日志没有记录人员 return Result.OK("绑定微信成功");