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("绑定微信成功"); 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..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 @@ -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 @@ -632,9 +661,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl