1、修改已知bug

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/order/AppAdminTradeOrderController.java

@@ -2,17 +2,9 @@ package com.citu.module.menduner.system.controller.appadmin.order;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
-import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderCreateReqVO;
-import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderGetReqVO;
-import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderPageReqVO;
-import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderRespVO;
-import com.citu.module.menduner.system.convert.TradeOrderConvert;
-import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
-import com.citu.module.menduner.system.dal.dataobject.order.TradeOrderDO;
+import com.citu.module.menduner.system.controller.appadmin.order.vo.*;
 import com.citu.module.menduner.system.service.order.TradeOrderService;
-import com.citu.module.pay.api.order.dto.PayOrderRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;
@@ -49,8 +41,8 @@ public class AppAdminTradeOrderController {
     @GetMapping("/get/unpaid")
     @Operation(summary = "获取待支付的订单")
     @PreAuthenticated
-    public CommonResult<AppAdminTradeOrderRespVO> getOrderByUnpaid(@Valid AppAdminTradeOrderGetReqVO reqVO) {
-        AppAdminTradeOrderRespVO order = tradeOrderService.getOrderByUnpaid(reqVO);
+    public CommonResult<AppAdminTradeOrderGetRespVO> getOrderByUnpaid(@Valid AppAdminTradeOrderGetReqVO reqVO) {
+        AppAdminTradeOrderGetRespVO order = tradeOrderService.getOrderByUnpaid(reqVO);
         return success(order);
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/order/vo/AppAdminTradeOrderGetRespVO.java

@@ -0,0 +1,18 @@
+package com.citu.module.menduner.system.controller.appadmin.order.vo;
+
+import com.citu.module.menduner.system.dal.dataobject.order.TradeOrderDO;
+import com.citu.module.pay.api.order.dto.PayOrderBaseRespDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "招聘端 - 交易订单获取 Response VO")
+public class AppAdminTradeOrderGetRespVO {
+
+    @Schema(description = "业务订单")
+    private TradeOrderDO order;
+
+    @Schema(description = "支付订单")
+    private PayOrderBaseRespDTO payOrder;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/order/vo/AppAdminTradeOrderRespVO.java

@@ -1,18 +1,12 @@
 package com.citu.module.menduner.system.controller.appadmin.order.vo;
 
-import com.citu.module.menduner.system.dal.dataobject.order.TradeOrderDO;
-import com.citu.module.pay.api.order.dto.PayOrderBaseRespDTO;
+import com.citu.module.menduner.system.controller.base.order.TradeSimpleRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
 @Schema(description = "招聘端 - 交易订单分页 Response VO")
-public class AppAdminTradeOrderRespVO {
+public class AppAdminTradeOrderRespVO extends TradeSimpleRespVO {
 
-    @Schema(description = "业务订单")
-    private TradeOrderDO order;
-
-    @Schema(description = "支付订单")
-    private PayOrderBaseRespDTO payOrder;
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/job/JobAdvertisedMapper.java

@@ -18,6 +18,7 @@ import com.citu.module.menduner.system.controller.base.job.JobAdvertisedPageReqV
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
+import com.citu.module.menduner.system.enums.job.JobStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.time.LocalDateTime;
@@ -69,7 +70,7 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
         query.selectAll(EnterpriseDO.class);
         query.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, JobAdvertisedDO::getEnterpriseId);
 
-        query.eq(JobAdvertisedDO::getStatus, MendunerStatusEnum.ENABLE.getStatus());
+        query.eq(JobAdvertisedDO::getStatus, JobStatusEnum.ENABLE.getStatus());
         query.eqIfPresent(JobAdvertisedDO::getAreaId, reqVO.getAreaId());
         query.likeIfPresent(JobAdvertisedDO::getName, reqVO.getName());
         query.eqIfPresent(JobAdvertisedDO::getPositionId, reqVO.getPositionId());

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/order/TradeOrderMapper.java

@@ -8,6 +8,7 @@ import com.citu.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.citu.module.menduner.system.controller.app.order.vo.AppTradeOrderPageReqVO;
 import com.citu.module.menduner.system.controller.app.order.vo.AppTradeOrderRespVO;
 import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderPageReqVO;
+import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderGetRespVO;
 import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderRespVO;
 import com.citu.module.menduner.system.controller.base.order.TradeOrderPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.order.TradeOrderDO;
@@ -52,7 +53,7 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
      */
     default PageResult<AppTradeOrderRespVO> page(Long userId,AppTradeOrderPageReqVO reqVO) {
         MPJLambdaWrapperX<TradeOrderDO> query = new MPJLambdaWrapperX<>();
-        query.selectAll(TradeOrderDO.class);
+        query.selectAsClass(TradeOrderDO.class, AppTradeOrderRespVO.class);
         query.eq(TradeOrderDO::getUserId, userId);
         query.likeIfPresent(TradeOrderDO::getSpuName, reqVO.getSpuName())
                 .eqIfPresent(TradeOrderDO::getPayStatus, reqVO.getPayStatus())
@@ -68,7 +69,7 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
      */
     default PageResult<AppAdminTradeOrderRespVO> page(AppAdminTradeOrderPageReqVO reqVO) {
         MPJLambdaWrapperX<TradeOrderDO> query = new MPJLambdaWrapperX<>();
-        query.selectAll(TradeOrderDO.class);
+        query.selectAsClass(TradeOrderDO.class, AppAdminTradeOrderRespVO.class);
         query.eqIfPresent(TradeOrderDO::getUserId, reqVO.getUserId())
                 .eqIfPresent(TradeOrderDO::getType, reqVO.getType())
                 .eqIfPresent(TradeOrderDO::getTerminal, reqVO.getTerminal())

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/order/TradeOrderService.java

@@ -3,14 +3,10 @@ package com.citu.module.menduner.system.service.order;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.system.controller.app.order.vo.AppTradeOrderPageReqVO;
 import com.citu.module.menduner.system.controller.app.order.vo.AppTradeOrderRespVO;
-import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderCreateReqVO;
-import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderGetReqVO;
-import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderPageReqVO;
-import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderRespVO;
+import com.citu.module.menduner.system.controller.appadmin.order.vo.*;
 import com.citu.module.menduner.system.controller.base.order.TradeOrderCreateReqVO;
 import com.citu.module.menduner.system.controller.base.order.TradeOrderPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.order.TradeOrderDO;
-import com.citu.module.pay.api.order.dto.PayOrderRespDTO;
 
 /**
  * 订单 Service 接口
@@ -107,5 +103,5 @@ public interface TradeOrderService {
      * @param reqVO  参数
      * @return 订单
      */
-    AppAdminTradeOrderRespVO getOrderByUnpaid(AppAdminTradeOrderGetReqVO reqVO);
+    AppAdminTradeOrderGetRespVO getOrderByUnpaid(AppAdminTradeOrderGetReqVO reqVO);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/order/TradeOrderServiceImpl.java

@@ -6,10 +6,7 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.controller.app.order.vo.AppTradeOrderPageReqVO;
 import com.citu.module.menduner.system.controller.app.order.vo.AppTradeOrderRespVO;
-import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderCreateReqVO;
-import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderGetReqVO;
-import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderPageReqVO;
-import com.citu.module.menduner.system.controller.appadmin.order.vo.AppAdminTradeOrderRespVO;
+import com.citu.module.menduner.system.controller.appadmin.order.vo.*;
 import com.citu.module.menduner.system.controller.base.order.TradeOrderCreateReqVO;
 import com.citu.module.menduner.system.controller.base.order.TradeOrderPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.order.TradeOrderDO;
@@ -382,7 +379,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
     }
 
     @Override
-    public AppAdminTradeOrderRespVO getOrderByUnpaid(AppAdminTradeOrderGetReqVO reqVO) {
+    public AppAdminTradeOrderGetRespVO getOrderByUnpaid(AppAdminTradeOrderGetReqVO reqVO) {
 
         TradeOrderDO order = tradeOrderMapper.getOrderByUnpaid(LoginUserContext.getUserId(),
                 reqVO.getType(), reqVO.getSpuId());
@@ -390,7 +387,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             return null;
         }
         PayOrderBaseRespDTO respDTO = payOrderApi.getOrder2(order.getPayOrderId()).getCheckedData();
-        AppAdminTradeOrderRespVO respVO = new AppAdminTradeOrderRespVO();
+        AppAdminTradeOrderGetRespVO respVO = new AppAdminTradeOrderGetRespVO();
         respVO.setOrder(order);
         respVO.setPayOrder(respDTO);
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/util/ESQueryBuildUtils.java

@@ -2,7 +2,7 @@ package com.citu.module.menduner.system.util;
 
 import com.citu.framework.tenant.core.context.TenantContextHolder;
 import com.citu.module.menduner.system.controller.app.job.vo.AppJobAdvertisedSearchPageReqVO;
-import com.citu.module.menduner.system.enums.MendunerStatusEnum;
+import com.citu.module.menduner.system.enums.job.JobStatusEnum;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.RangeQueryBuilder;
@@ -111,7 +111,7 @@ public class ESQueryBuildUtils {
         boolQuery.filter(expireTimeQuery);
 
         // 状态
-        boolQuery.must(QueryBuilders.termQuery("status", MendunerStatusEnum.ENABLE.getStatus()));
+        boolQuery.must(QueryBuilders.termQuery("status", JobStatusEnum.ENABLE.getStatus()));
         boolQuery.must(QueryBuilders.termQuery("tenantId", TenantContextHolder.getTenantId()));