fix bug 41393 41379 标协会议删除同步

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<String, Object> paramMap) {
+        Map<String, String> 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);
+    }
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java

@@ -246,29 +246,30 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
         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("删除成功!");
-    }
+    ///**
+    // * 通过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查询

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<PayMeeting, IPayM
     @AutoLog(value = "会议管理-通过id删除")
     @ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
     @GetMapping(value = "/delete")
+    @Transactional
     public Result<?> delete(@RequestParam(name = "id") String id) {
         extracted(id);
+        payMeetingService.deleteById(id);
+        HashMap<String, Object> 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<PayMeeting, IPayM
     @AutoLog(value = "会议管理-批量删除")
     @ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
     @GetMapping(value = "/deleteBatch")
+    @Transactional
     public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
         List<String> idList = Arrays.asList(ids.split(","));
         for (String id : idList) {
             extracted(id);
         }
         this.payMeetingService.deleteByIds(idList);
+        HashMap<String, Object> 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("批量删除成功!");
     }
 

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java

@@ -385,10 +385,6 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         if (integer > 0) {
             throw new JeroBootException("该会议有参会人无法删除");
         }
-        PayMeeting payMeeting = getById(id);
-        if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
-            stableCrossTrainingService.delete(id);
-        }
         removeById(id);
         LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(PayMeetingHotelContacts::getMeetingId, id);
@@ -411,12 +407,6 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         if (meetingList.size() > 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<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(PayMeetingHotelContacts::getMeetingId, ids);