From 5f59d8426e3c7a82ae4483a5871273fe34b51a6e Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 26 Oct 2021 18:50:54 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=2041393=2041379=20=E6=A0=87=E5=8D=8F?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=88=A0=E9=99=A4=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/util/AuthenticationUtils.java | 20 ++++++++- .../controller/PayMeetingController.java | 45 ++++++++++--------- .../StandardsMeetingController.java | 27 +++++++++++ .../service/impl/PayMeetingServiceImpl.java | 10 ----- 4 files changed, 69 insertions(+), 33 deletions(-) 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/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index c0426799..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查询 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/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 778bd0e3..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);