diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java index e7ef8bbd..d0ac3e59 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java @@ -96,8 +96,9 @@ public class AuthenticationUtils { public static void checkResult(String response) { JSONObject jsonObject = JSONObject.parseObject(response); String code = jsonObject.getString("code"); + String message = jsonObject.getString("message"); if (!"200".equals(code)){ - throw new JeroBootException("数据同步失败!"); + throw new JeroBootException("数据同步失败!"+message); } } @@ -136,4 +137,21 @@ public class AuthenticationUtils { String post = HttpUtil.post(urlBuilder.toString(), paramMap); checkResult(post); } + + /** + * 调用会员系统get接口 + * @param methodName + */ + public static void get(String methodName, HashMap paramMap) { + Map stringStringMap = encryptByRsaPriKey(); + paramMap.put("pushToken", stringStringMap.get("token")); + paramMap.put("publicKey", stringStringMap.get("publicKey")); + //拼接url路径 + StringBuilder urlBuilder = new StringBuilder(AuthenticationUtils.URL); + urlBuilder.append(methodName); + urlBuilder.append("?"); + paramMap.forEach((k,v) -> urlBuilder.append(k).append("=").append(v).append("&")); + String get = HttpUtil.get(urlBuilder.toString()); + checkResult(get); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index 1132f415..931c7d32 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -77,12 +77,14 @@ public class SendMessageServiceImpl implements SendMessageService { if(!Objects.isNull(map)) { // 替换企业端系统url与小程序名称 // todo 替换系统地址,小程序名称 - if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode()) + if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode()) + ||Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode()) - || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())){ + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG13.getCode())){ map.put("systemAddress",env.getProperty("message.systemUrl")); map.put("wxName",env.getProperty("message.wxName")); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java index e5234433..18afad05 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; @@ -331,7 +332,7 @@ public class CommitteeMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO); + payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG13,"C_OPEN_TYPE13"); return Result.OK(); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 790c0d03..9c464a52 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -246,29 +246,30 @@ public class PayMeetingController extends JeroController delete(@RequestParam(name = "id") String id) { - payMeetingService.deleteById(id); - return Result.OK("删除成功!"); - } + ///** + // * 通过id删除 + //@RequiresPermissions("meeting:delete") + //@AutoLog(value = "会议管理-通过id删除") + //@ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除") + //@GetMapping(value = "/delete") + //public Result delete(@RequestParam(name = "id") String id) { + // payMeetingService.deleteById(id); + // return Result.OK("删除成功!"); + //}*/ - /** - * 批量删除 - */ - @RequiresPermissions("meeting:batchDel") - @AutoLog(value = "会议管理-批量删除") - @ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除") - @GetMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name = "ids") String ids) { - this.payMeetingService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } + + + ///** + // * 批量删除 + // */ + //@RequiresPermissions("meeting:batchDel") + //@AutoLog(value = "会议管理-批量删除") + //@ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除") + //@GetMapping(value = "/deleteBatch") + //public Result deleteBatch(@RequestParam(name = "ids") String ids) { + // this.payMeetingService.deleteByIds(Arrays.asList(ids.split(","))); + // return Result.OK("批量删除成功!"); + //} /** * 通过id查询 @@ -426,18 +427,6 @@ public class PayMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO); - return Result.OK(); - } - @ApiOperation(value = "生成base64") @GetMapping(value = "/createBase64") @ApiImplicitParam(name = "contact", value = "内容", required = true, paramType = "query") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java index c53b140e..a1720918 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java @@ -45,6 +45,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -145,8 +146,21 @@ public class StandardsMeetingController extends JeroController delete(@RequestParam(name = "id") String id) { extracted(id); + payMeetingService.deleteById(id); + HashMap paramMap = new HashMap<>(); + paramMap.put("id",id); + AuthenticationUtils.get("/stablecrosstraining/stableCrossTraining/deleteIncome",paramMap); + return Result.OK("删除成功!"); + } + + /** + * 会员系统删除会议 + */ + @GetMapping(value = "/deleteStandard") + public Result deleteStandard(@RequestParam(name = "id") String id) { payMeetingService.deleteById(id); return Result.OK("删除成功!"); } @@ -158,12 +172,25 @@ public class StandardsMeetingController extends JeroController deleteBatch(@RequestParam(name = "ids") String ids) { List idList = Arrays.asList(ids.split(",")); for (String id : idList) { extracted(id); } this.payMeetingService.deleteByIds(idList); + HashMap paramMap = new HashMap<>(); + paramMap.put("ids",ids); + AuthenticationUtils.get("/stablecrosstraining/stableCrossTraining/deleteBatchIncome",paramMap); + return Result.OK("批量删除成功!"); + } + + /** + * 会员系统删除会议 + */ + @GetMapping(value = "/deleteBatchStandard") + public Result deleteBatchStandard(@RequestParam(name = "ids") String ids) { + this.payMeetingService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java index d04c169d..e59941c0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; @@ -332,7 +333,7 @@ public class WorkGroupMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO); + payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG1,"C_OPEN_TYPE1"); return Result.OK(); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index 6f2abb5c..9b05b720 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java @@ -3,6 +3,7 @@ package com.jero.meeting.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.enums.CompanyMessageEnums; import com.jero.meeting.entity.PayMeeting; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.meeting.vo.PayMeetingVO; @@ -61,9 +62,8 @@ public interface IPayMeetingService extends IService { * @param publishReminderVO * @author lijiarao * @date 2021/9/27 - * @return void */ - void publishReminder(PublishReminderVO publishReminderVO); + void publishReminder(PublishReminderVO publishReminderVO, CompanyMessageEnums companyMessageEnums, String busType); IPage pageListContract(Page page, QueryWrapper queryWrapper, String now); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index bca796ec..f0c68529 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -385,10 +385,6 @@ public class PayMeetingServiceImpl extends ServiceImpl 0) { throw new JeroBootException("该会议有参会人无法删除"); } - PayMeeting payMeeting = getById(id); - if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { - stableCrossTrainingService.delete(id); - } removeById(id); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayMeetingHotelContacts::getMeetingId, id); @@ -411,12 +407,6 @@ public class PayMeetingServiceImpl extends ServiceImpl 0) { throw new JeroBootException(meetingList + "会议下有参会人,无法删除"); } - for (String id : ids) { - PayMeeting payMeeting = getById(id); - if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { - stableCrossTrainingService.delete(id); - } - } removeByIds(ids); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(PayMeetingHotelContacts::getMeetingId, ids); @@ -441,7 +431,7 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingIds = publishReminderVO.getMeetingIds(); List subitemIds = publishReminderVO.getSubitemIds(); Integer projectType = publishReminderVO.getProjectType(); @@ -532,9 +522,9 @@ public class PayMeetingServiceImpl extends ServiceImpl1.3.4 1.6.1 7.4.0 - 9.0.48 + 9.0.54