sumit

zhongzheng-system/src/main/java/com/zhongzheng/modules/middleground/record/bo/ExamApplySubscribeRequstBo.java

@@ -28,6 +28,9 @@ public class ExamApplySubscribeRequstBo implements Serializable {
     @ApiModelProperty("专业名称")
     private String majorName;
 
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+
     @ApiModelProperty("考试日期")
     private Long applyTime;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/middleground/record/domain/CdExamSubscribe.java

@@ -76,4 +76,7 @@ public class CdExamSubscribe implements Serializable {
     /** 预约类型：1新考 2补考 */
     private Integer examType;
 
+    @TableField(exist = false)
+    private Long orderGoodsId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/middleground/record/service/impl/CdExamRoomServiceImpl.java

@@ -322,6 +322,7 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
             subscribe.setDataFrom(userSubscribe.getDataFrom());
             subscribe.setTenantId(userSubscribe.getTenantId());
             subscribe.setType(userSubscribe.getType());
+            subscribe.setOrderGoodsId(userSubscribe.getOrderGoodsId());
             if (CollectionUtils.isNotEmpty(bo.getSeatNumberMap())){
                 String number = bo.getSeatNumberMap().get(userSubscribeId);
                 subscribe.setSeatNumber(number);
@@ -373,11 +374,12 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
                         requstBo.setApplyStartTime(examRoom.getExamStartTime());
                         requstBo.setApplyEndTime(examRoom.getExamEndTime());
                         requstBo.setMajorName(item.getExamMajor());
-                        String param = JSONObject.toJSONString(bo);
+                        requstBo.setOrderGoodsId(item.getOrderGoodsId());
+                        String param = JSONObject.toJSONString(requstBo);
                         Map<String, String> headersMap = new HashMap<>();
-                        headersMap.put("TenantId", ServletUtils.getRequest().getHeader("TenantId"));
+                        headersMap.put("TenantId", getNewTenant(item.getTenantId(),1).getNewId().toString());
                         try {
-                            HttpUtils.sendPostJsonHeaderAsync(EXAM_SUBSCRIBE_PATH, param,headersMap);
+                            HttpUtils.sendPostHeader(EXAM_SUBSCRIBE_PATH, param,headersMap);
                         }catch (Exception e){
                             //预约错误记录日志
                             CdExamErrorLog log = new CdExamErrorLog();
@@ -451,6 +453,7 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
                 throw new CustomException(String.format("【%s】学员预约的考试场次距开考少于7个工作日，不能取消预约！",userSubscribe.getUserName()));
             }
             subscribe.setSubscribeStatus(0);//取消预约
+            subscribe.setOrderGoodsId(userSubscribe.getOrderGoodsId());
             subscribeList.add(subscribe);
         });
         cdExamSubscribeService.updateBatchById(subscribeList);
@@ -483,11 +486,12 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
                         requstBo.setApplyStartTime(examRoom.getExamStartTime());
                         requstBo.setApplyEndTime(examRoom.getExamEndTime());
                         requstBo.setMajorName(item.getExamMajor());
-                        String param = JSONObject.toJSONString(bo);
+                        requstBo.setOrderGoodsId(item.getOrderGoodsId());
+                        String param = JSONObject.toJSONString(requstBo);
                         Map<String, String> headersMap = new HashMap<>();
-                        headersMap.put("TenantId", ServletUtils.getRequest().getHeader("TenantId"));
+                        headersMap.put("TenantId", getNewTenant(item.getTenantId(),1).getNewId().toString());
                         try {
-                            HttpUtils.sendPostJsonHeaderAsync(EXAM_SUBSCRIBE_CANCEL_PATH, param,headersMap);
+                            HttpUtils.sendPostHeader(EXAM_SUBSCRIBE_CANCEL_PATH, param,headersMap);
                         }catch (Exception e){
                             //预约错误记录日志
                             CdExamErrorLog log = new CdExamErrorLog();
@@ -711,15 +715,8 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
      * @return java.lang.Long
      */
     private DataTenant getNewTenant(Long tenantId,Integer dataFrom){
-        LambdaQueryWrapper<DataTenant> queryWrapper = new LambdaQueryWrapper<>();
-        if (dataFrom == 1){
-            //新系统
-            queryWrapper.eq(DataTenant::getNewId,tenantId);
-        }else {
-            //旧系统
-            queryWrapper.eq(DataTenant::getOldId,tenantId);
-        }
-        DataTenant tenant = dataTenantService.getOne(queryWrapper);
+        DataTenant tenant = dataTenantService
+                .getOne(new LambdaQueryWrapper<DataTenant>().eq(DataTenant::getTenantId, tenantId));
         if (ObjectUtils.isNull(tenant)){
             throw new CustomException("机构信息不匹配，请检查！");
         }