LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/branch20211008' into branch20211008

Browse Source
This commit is contained in:
梁琦涛
2021-11-02 18:00:25 +08:00
parent 2684f82bd9 9a37bd771f
commit b2e958044d
2 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java
+7 -6
View File
@@ -259,14 +259,15 @@ public class CompanyLoginController {
LambdaQueryWrapper<PayContactsManagement> 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("绑定微信成功");
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+33 -5
View File
@@ -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<PayMeetingSituat
payMeetingSituation.setRegisterCheckResult(checkResult);
saveOrUpdate(payMeetingSituation);
//如果驳回就发送消息给参会人
if (registerCheckResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_2)) {
String companyContactId = payMeetingSituation.getCompanyContactId();
PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if (!StringUtils.isBlank(contactsManagement.getEmail())) {
sendMessageDTO.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail()));
}
if (!StringUtils.isBlank(contactsManagement.getPhone())) {
sendMessageDTO.setToUser(PasswordUtil.decrypt(contactsManagement.getPhone()));
sendMessageDTO.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone()));
}
String directorId = payMeeting.getDirectorId();
LoginUser loginUser = iSysBaseApi.getUserById(directorId);
HashMap<String, String> 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<PayMeetingSituat
if (checkIn.equals(PayProjectCommon.YES)) {
throw new JeroBootException("已经签到，请勿重复签到");
}
//如果是汇款并且缴费凭证为空
//如果是线上缴费并且缴费凭证为空
Integer payMode = meetingSituation.getPayMode();
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
&& StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
throw new JeroBootException("请上传缴费凭证后再签到");
}
@@ -668,12 +697,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
signInPageVO.setCheckFile(meetingSituation.getCheckFile());
//如果是汇款并且缴费凭证为空
Integer payMode = meetingSituation.getPayMode();
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
&& StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
signInPageVO.setCanCheckIn(0);
}
//如果是线上缴费并且审核不通过的
else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
}else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
&& !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
signInPageVO.setCanCheckIn(0);
}else {