1、修改已知bug

citu-module-pay/citu-module-pay-api/src/main/java/com/citu/module/pay/api/order/PayOrderApi.java

@@ -1,6 +1,7 @@
 package com.citu.module.pay.api.order;
 
 import com.citu.framework.common.pojo.CommonResult;
+import com.citu.module.pay.api.order.dto.PayOrderBaseRespDTO;
 import com.citu.module.pay.api.order.dto.PayOrderCreateReqDTO;
 import com.citu.module.pay.api.order.dto.PayOrderRespDTO;
 import com.citu.module.pay.enums.ApiConstants;
@@ -30,6 +31,12 @@ public interface PayOrderApi {
     @PermitAll
     CommonResult<PayOrderRespDTO> getOrder(@RequestParam("id") Long id);
 
+    @GetMapping(PREFIX + "/get2")
+    @Operation(summary = "获得支付单")
+    @Parameter(name = "id", description = "支付单编号", example = "1", required = true)
+    @PermitAll
+    CommonResult<PayOrderBaseRespDTO> getOrder2(@RequestParam("id") Long id);
+
     @PutMapping(PREFIX + "/update-price")
     @Operation(summary = "更新支付订单价格")
     @Parameters({

citu-module-pay/citu-module-pay-api/src/main/java/com/citu/module/pay/api/order/dto/PayOrderBaseRespDTO.java

@@ -0,0 +1,96 @@
+package com.citu.module.pay.api.order.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * 支付订单 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ *
+ * @author aquan
+ */
+@Data
+public class PayOrderBaseRespDTO {
+
+    @Schema(description = "支付订单编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long id;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+    @Schema(description = "应用编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @NotNull(message = "应用编号不能为空")
+    private Long appId;
+
+    @Schema(description = "渠道编号", example = "2048")
+    private Long channelId;
+
+    @Schema(description = "渠道编码", example = "wx_app")
+    private String channelCode;
+
+    @Schema(description = "商户订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "888")
+    @NotNull(message = "商户订单编号不能为空")
+    private String merchantOrderId;
+
+    @Schema(description = "商品标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "土豆")
+    @NotNull(message = "商品标题不能为空")
+    private String subject;
+
+    @Schema(description = "商品描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是土豆")
+    @NotNull(message = "商品描述不能为空")
+    private String body;
+
+    @Schema(description = "异步通知地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "http://127.0.0.1:48080/pay/notify")
+    @NotNull(message = "异步通知地址不能为空")
+    private String notifyUrl;
+
+    @Schema(description = "支付金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    @NotNull(message = "支付金额，单位：分不能为空")
+    private Long price;
+
+    @Schema(description = "渠道手续费，单位：百分比", example = "10")
+    private Double channelFeeRate;
+
+    @Schema(description = "渠道手续金额，单位：分", example = "100")
+    private Integer channelFeePrice;
+
+    @Schema(description = "支付状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "支付状态不能为空")
+    private Integer status;
+
+    @Schema(description = "用户 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "127.0.0.1")
+    @NotNull(message = "用户 IP不能为空")
+    private String userIp;
+
+    @Schema(description = "订单失效时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "订单失效时间不能为空")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime expireTime;
+
+    @Schema(description = "订单支付成功时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime successTime;
+
+    @Schema(description = "支付成功的订单拓展单编号", example = "50")
+    private Long extensionId;
+
+    @Schema(description = "支付订单号", example = "2048888")
+    private String no;
+
+    @Schema(description = "退款总金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    @NotNull(message = "退款总金额，单位：分不能为空")
+    private Long refundPrice;
+
+    @Schema(description = "渠道用户编号", example = "2048")
+    private String channelUserId;
+
+    @Schema(description = "渠道订单号", example = "4096")
+    private String channelOrderNo;
+
+}

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/api/order/PayOrderApiImpl.java

@@ -1,6 +1,7 @@
 package com.citu.module.pay.api.order;
 
 import com.citu.framework.common.pojo.CommonResult;
+import com.citu.module.pay.api.order.dto.PayOrderBaseRespDTO;
 import com.citu.module.pay.api.order.dto.PayOrderCreateReqDTO;
 import com.citu.module.pay.api.order.dto.PayOrderRespDTO;
 import com.citu.module.pay.convert.order.PayOrderConvert;
@@ -31,6 +32,11 @@ public class PayOrderApiImpl implements PayOrderApi {
         return success(PayOrderConvert.INSTANCE.convert2(order));
     }
 
+    @Override
+    public CommonResult<PayOrderBaseRespDTO> getOrder2(Long id) {
+        return success(PayOrderConvert.INSTANCE.convert3(payOrderService.getOrder(id)));
+    }
+
     @Override
     public CommonResult<Boolean> updatePayOrderPrice(Long id, Integer payPrice) {
         payOrderService.updatePayOrderPrice(id, payPrice);

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/convert/order/PayOrderConvert.java

@@ -4,6 +4,7 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.collection.CollectionUtils;
 import com.citu.framework.common.util.collection.MapUtils;
 import com.citu.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
+import com.citu.module.pay.api.order.dto.PayOrderBaseRespDTO;
 import com.citu.module.pay.api.order.dto.PayOrderCreateReqDTO;
 import com.citu.module.pay.api.order.dto.PayOrderRespDTO;
 import com.citu.module.pay.controller.admin.order.vo.*;
@@ -32,6 +33,8 @@ public interface PayOrderConvert {
 
     PayOrderRespDTO convert2(PayOrderDO order);
 
+    PayOrderBaseRespDTO convert3(PayOrderDO order);
+
     default PayOrderDetailsRespVO convert(PayOrderDO order, PayOrderExtensionDO orderExtension, PayAppDO app) {
         PayOrderDetailsRespVO respVO = convertDetail(order);
         respVO.setExtension(convert(orderExtension));

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

@@ -1,19 +1,18 @@
 package com.citu.module.menduner.system.controller.appadmin.order.vo;
 
-import com.citu.module.menduner.system.controller.base.order.TradeSimpleRespVO;
 import com.citu.module.menduner.system.dal.dataobject.order.TradeOrderDO;
-import com.citu.module.pay.api.order.dto.PayOrderRespDTO;
+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 AppAdminTradeOrderRespVO  {
+public class AppAdminTradeOrderRespVO {
 
     @Schema(description = "业务订单")
     private TradeOrderDO order;
 
     @Schema(description = "支付订单")
-    private PayOrderRespDTO payOrder;
+    private PayOrderBaseRespDTO payOrder;
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/order/TradeOrderCreateReqVO.java

@@ -11,7 +11,6 @@ import java.math.BigDecimal;
 
 @Schema(description = "管理后台 - 交易订单创建 Request VO")
 @Data
-@Builder
 public class TradeOrderCreateReqVO {
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImpl.java

@@ -313,12 +313,12 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
             // 新增
             job.setUserId(loginUser.getId());
             job.setEnterpriseId(enterpriseId);
-            job.setStatus(JobStatusEnum.ENABLE.getStatus());
+            job.setStatus(JobStatusEnum.WAIT_ENABLE.getStatus());
             job.setTop(false);
             if (!job.getHire()) {
                 job.setHirePoint(0);
                 job.setHirePrice(BigDecimal.ZERO);
-                job.setStatus(JobStatusEnum.WAIT_ENABLE.getStatus());
+                job.setStatus(JobStatusEnum.ENABLE.getStatus());
             }
             // 后置处理
             jobOperateAfter(enterpriseId, loginUser.getId(), job, ESOperateEnum.ADD);

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

@@ -20,6 +20,7 @@ import com.citu.module.menduner.system.enums.order.TradeOrderStatusEnum;
 import com.citu.module.menduner.system.enums.order.TradeOrderTypeEnum;
 import com.citu.module.menduner.system.mq.producer.OrderProducer;
 import com.citu.module.pay.api.order.PayOrderApi;
+import com.citu.module.pay.api.order.dto.PayOrderBaseRespDTO;
 import com.citu.module.pay.api.order.dto.PayOrderCreateReqDTO;
 import com.citu.module.pay.api.order.dto.PayOrderRespDTO;
 import com.citu.module.pay.api.refund.PayRefundApi;
@@ -371,15 +372,13 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         Long userId = LoginUserContext.getUserId();
         // 获取待支付的订单
         TradeOrderTypeEnum type = TradeOrderTypeEnum.getByType(reqVO.getType());
-        TradeOrderCreateReqVO createReqVO =
-                TradeOrderCreateReqVO.builder()
-                        .userId(userId)
-                        .type(reqVO.getType())
-                        .spuId(reqVO.getSpuId())
-                        .spuName(type.getName() + ": " + reqVO.getSpuName())
-                        .price(reqVO.getPrice())
-                        .build();
-        return createOrder(createReqVO);
+        TradeOrderCreateReqVO dto = new TradeOrderCreateReqVO();
+        dto.setUserId(userId);
+        dto.setType(reqVO.getType());
+        dto.setSpuId(reqVO.getSpuId());
+        dto.setSpuName(type.getName() + ": " + reqVO.getSpuName());
+        dto.setPrice(reqVO.getPrice());
+        return createOrder(dto);
     }
 
     @Override
@@ -390,7 +389,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         if (null == order) {
             return null;
         }
-        PayOrderRespDTO respDTO = payOrderApi.getOrder(order.getPayOrderId()).getCheckedData();
+        PayOrderBaseRespDTO respDTO = payOrderApi.getOrder2(order.getPayOrderId()).getCheckedData();
         AppAdminTradeOrderRespVO respVO = new AppAdminTradeOrderRespVO();
         respVO.setOrder(order);
         respVO.setPayOrder(respDTO);