更新

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ExpenseFlowModel.java

@@ -3,7 +3,7 @@ package com.zhongshu.card.client.model.payment;
 import com.github.microservice.models.type.PaymentDeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.school.CardInfoModel;
-import com.zhongshu.card.client.type.OrderType;
+import com.github.microservice.types.OrderState;
 import com.zhongshu.card.client.type.RefundState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -23,7 +23,7 @@ public class ExpenseFlowModel extends SuperModel {
     //-----------------------------订单信息 start---------------------
 
     @Schema(description = "订单的总体状态")
-    private OrderType orderType;
+    private OrderState orderType;
 
     private String orderTypeStr;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ExpenseFlowSearch.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.payment;
 
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.type.OrderType;
+import com.github.microservice.types.OrderState;
 import com.zhongshu.card.client.type.RefundState;
 import com.zhongshu.card.client.type.StatisticType;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -24,7 +24,7 @@ public class ExpenseFlowSearch extends SuperSearch {
     private String userId;
 
     @Schema(description = "订单状态")
-    private List<OrderType> orderTypes;
+    private List<OrderState> orderTypes;
 
     @Schema(description = "所属项目Oid")
     private String projectOid;

FullCardClient/src/main/java/com/zhongshu/card/client/service/feign/ExpenseFlowFeignService.java

@@ -0,0 +1,23 @@
+package com.zhongshu.card.client.service.feign;
+
+import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.org.*;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+
+@FeignClient(name = "fullcardserver/expenseFlow/manager")
+public interface ExpenseFlowFeignService {
+
+    @Operation(summary = "查询订单信息", description = "查询订单信息")
+    @RequestMapping(value = "getDetailByPaymentNo", method = RequestMethod.GET)
+    ResultContent<OrganizationSimpleModel> getDetailByPaymentNo(
+            @Parameter(name = "paymentNo", description = "paymentNo", required = true)
+            @RequestParam(name = "paymentNo") String paymentNo);
+
+}

FullCardClient/src/main/java/com/zhongshu/card/client/service/payment/ExpenseFlowService.java

@@ -23,6 +23,8 @@ public interface ExpenseFlowService {
 
     ResultContent<ExpenseFlowModel> getDetail(String id);
 
+    ResultContent<ExpenseFlowModel> getDetailByPaymentNo(String paymentNo);
+
     // 商户的订单列表
     ResultContent<Page<ExpenseFlowModel>> pageBusMainOrder(ExpenseFlowSearch param, Pageable pageable);
 

FullCardClient/src/main/java/com/zhongshu/card/client/type/OrderType.java

@@ -1,49 +0,0 @@
-package com.zhongshu.card.client.type;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 订单的总体状态
- */
-public enum OrderType {
-
-    WAIT_PAYMENT("待付款"),
-
-    PARAM_ERROR("参数验证错误"),
-
-    HAVE_PAID("已支付"),
-
-    PAID_ERROR("支付失败"),
-
-    WAIT_USE("待使用"),
-
-    USED("已使用"),
-
-    APPLY_REFUND("申请退款"),
-
-    APPLY_REFUNDING("退款处理中"),
-
-    REFUSAL_REFUND("拒绝退款"),
-
-    UN_REFUND("取消退款"),
-
-    REFUNDED("已退款"),
-
-    AOUTO_REFUNDED("自动退款"),
-
-    CLOSE("关闭订单"),
-
-    APPLY_WITHDRAW("申请提现"),
-
-    PASS_WITHDRAW("提现通过"),
-
-    REFUSAL_WITHDRAW("拒绝提现");
-
-    @Getter
-    private String remark;
-
-    OrderType(String remark) {
-        this.remark = remark;
-    }
-}

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/feign/ExpenseFlowController.java

@@ -0,0 +1,37 @@
+package com.zhongshu.card.server.core.controller.feign;
+
+import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.org.*;
+import com.zhongshu.card.client.model.payment.ExpenseFlowModel;
+import com.zhongshu.card.client.service.org.OrganizationService;
+import com.zhongshu.card.client.service.org.UserAccountService;
+import com.zhongshu.card.client.service.payment.ExpenseFlowService;
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author TRX
+ * @date 2024/7/23
+ */
+@RestController
+@RequestMapping("expenseFlow")
+@Tag(name = "订单信息")
+@Hidden
+public class ExpenseFlowController {
+
+    @Autowired
+    ExpenseFlowService expenseFlowService;
+
+    @Operation(summary = "查询订单信息", description = "查询订单信息")
+    @RequestMapping(value = "manager/getDetailByPaymentNo", method = {RequestMethod.GET})
+    public ResultContent<ExpenseFlowModel> getDetailByPaymentNo(
+            @Parameter(name = "paymentNo", description = "paymentNo", required = false)
+            @RequestParam(name = "paymentNo") String paymentNo) {
+        return expenseFlowService.getDetailByPaymentNo(paymentNo);
+    }
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/ExpenseFlowDao.java

@@ -17,6 +17,8 @@ public interface ExpenseFlowDao extends MongoDao<ExpenseFlow>, ExpenseFlowDaoExt
 
     ExpenseFlow findTopById(String id);
 
+    ExpenseFlow findTopByPaymentNo(String paymentNo);
+
     ExpenseFlow findTopByOrderNoAndCardNoOrderByCreateTimeDesc(String orderNo, String cardNo);
 
     ExpenseFlow findTopByOrderNoOrderByCreateTimeDesc(String orderNo);

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -3,7 +3,7 @@ package com.zhongshu.card.server.core.domain.payment;
 import com.github.microservice.models.type.OrderFromType;
 import com.github.microservice.models.type.PaymentDeviceType;
 import com.github.microservice.models.type.PaymentType;
-import com.zhongshu.card.client.type.OrderType;
+import com.github.microservice.types.OrderState;
 import com.zhongshu.card.client.type.RefundState;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
@@ -41,7 +41,7 @@ public class ExpenseFlow extends SuperMain {
     private String token;
 
     @Schema(description = "订单的总体状态")
-    private OrderType orderType;
+    private OrderState orderType;
 
     @Schema(description = "消费的用户userId")
     private String userId;
@@ -155,7 +155,7 @@ public class ExpenseFlow extends SuperMain {
     public void setVerifyError(String error) {
         verifyParamIsSuccess = Boolean.FALSE;
         verifyParamMsg = error;
-        orderType = OrderType.PARAM_ERROR;
+        orderType = OrderState.PARAM_ERROR;
     }
 
     //------------------支付结果 start-------------------------

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -8,6 +8,7 @@ import com.github.microservice.models.hxz.*;
 import com.github.microservice.models.type.OrderFromType;
 import com.github.microservice.models.type.PaymentDeviceType;
 import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.OrderState;
 import com.zhongshu.card.client.model.operLogs.OperationLogsAddParam;
 import com.zhongshu.card.client.model.payment.*;
 import com.zhongshu.card.client.model.payment.statistic.BusinessMainStatisticModel;
@@ -148,7 +149,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         expenseFlow.setPaymentType(iotParam.getPaymentType());
         expenseFlow.setParam(iotParam);
         expenseFlow.setPaymentDeviceType(PaymentDeviceType.HxzConsumTransactions);
-        expenseFlow.setOrderType(OrderType.WAIT_PAYMENT);
+        expenseFlow.setOrderType(OrderState.WAIT_PAYMENT);
 
         // 验证参数、填充数据
         commonVerifyExpenseFlow(expenseFlow);
@@ -193,7 +194,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
             entity.setPaymentStatus(msg);
             entity.setIsPaySuccess(Boolean.TRUE);
             entity.setPayRemark(msg);
-            entity.setOrderType(OrderType.HAVE_PAID);
+            entity.setOrderType(OrderState.HAVE_PAID);
             logsAddParam.setMessageType(MessageType.Info);
             logsAddParam.setLevel(LogsLevel.Low);
             logsAddParam.setContent(msg);
@@ -205,7 +206,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
             entity.setPaymentStatus(msg);
             entity.setIsPaySuccess(Boolean.FALSE);
             entity.setPayRemark(msg);
-            entity.setOrderType(OrderType.PAID_ERROR);
+            entity.setOrderType(OrderState.PAID_ERROR);
             logsAddParam.setMessageType(MessageType.Warn);
             logsAddParam.setLevel(LogsLevel.Low);
             logsAddParam.setContent(msg);
@@ -683,6 +684,21 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         return ResultContent.buildSuccess(model);
     }
 
+    /**
+     * 根据订单号查询订单信息
+     *
+     * @param paymentNo
+     * @return
+     */
+    public ResultContent<ExpenseFlowModel> getDetailByPaymentNo(String paymentNo) {
+        ExpenseFlow entity = expenseFlowDao.findTopByPaymentNo(paymentNo);
+        if (ObjectUtils.isEmpty(entity)) {
+            return ResultContent.buildSuccess(String.format(ResultMessage.DATA_NOT_EXIST, paymentNo));
+        }
+        ExpenseFlowModel model = toModel(entity);
+        return ResultContent.buildSuccess(model);
+    }
+
     /**
      * 商家端用户退款
      *
@@ -694,7 +710,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         if (ObjectUtils.isEmpty(expenseFlow)) {
             return ResultContent.buildSuccess(String.format(ResultMessage.DATA_NOT_EXIST, param.getId()));
         }
-        if (expenseFlow.getOrderType() == OrderType.HAVE_PAID) {
+        if (expenseFlow.getOrderType() == OrderState.HAVE_PAID) {
             return ResultContent.buildFail(String.format("订单状态不是已支付状态，不能退款"));
         }
         // 调用支付中心退款
@@ -717,7 +733,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
             // 退款人
             expenseFlow.setRefundUserId(getCurrentUserId());
             expenseFlow.setRefundAMount(expenseFlow.getPayAmount());
-            expenseFlow.setOrderType(OrderType.REFUNDED);
+            expenseFlow.setOrderType(OrderState.REFUNDED);
             expenseFlow.setRefundState(RefundState.Refunded);
             expenseFlow.setRefuseRemark("退款成功");
             expenseFlowDao.save(expenseFlow);