From dd6915bd589844a7bf5494d3a8d5a5f39d74be72 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sat, 1 Mar 2025 14:39:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/controller/OrderPayController.java  | 12 ++++++++++--
 .../src/main/java/com/czg/resp/CzgRespCode.java      |  2 ++
 .../service/order/service/impl/PayServiceImpl.java   | 10 +++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java
index 87090a1a..efabf28b 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java
@@ -121,7 +121,7 @@ public class OrderPayController {
      * 获取店铺订单支付URL
      */
     @GetMapping("/shopPayApi/orderPayUrl")
-    public CzgResult<String> getOrderPayUrl(@RequestHeader Long shopId,@RequestParam(required = false) String extend,
+    public CzgResult<String> getOrderPayUrl(@RequestHeader Long shopId, @RequestParam(required = false) String extend,
                                             CheckOrderPay checkOrderPay) {
         AssertUtil.isNull(shopId, "店铺id不能为空");
         AssertUtil.isNull(checkOrderPay, "订单信息不能为空");
@@ -151,9 +151,17 @@ public class OrderPayController {
         return payService.js2PayOrder(ServletUtil.getClientIPByHeader(request), payParam);
     }
 
+    /**
+     * 获取订单状态
+     * unpaid-待支付;in-production 制作中;wait-out 待取餐;;done-订单完成;refunding-申请退单;refund-退单;part-refund 部分退单;cancelled-取消订单
+     */
+    @GetMapping("/queryOrderStatus")
+    public CzgResult<String> queryOrderStatus(Long orderId) {
+        return CzgResult.success(orderService.queryChain().select(OrderInfo::getStatus).eq(OrderInfo::getId, orderId).oneAs(String.class));
+    }
 
     @GetMapping("/queryOrderPay")
-    public CzgResult<Map<String, Object>> queryOrderPay(Long orderId){
+    public CzgResult<Map<String, Object>> queryOrderPay(Long orderId) {
         return payService.queryPayOrder(orderId);
     }
 }
diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/resp/CzgRespCode.java b/cash-common/cash-common-tools/src/main/java/com/czg/resp/CzgRespCode.java
index 1694cbd2..15f53af8 100644
--- a/cash-common/cash-common-tools/src/main/java/com/czg/resp/CzgRespCode.java
+++ b/cash-common/cash-common-tools/src/main/java/com/czg/resp/CzgRespCode.java
@@ -8,6 +8,8 @@ import lombok.Getter;
 @Getter
 public enum CzgRespCode {
     SUCCESS(200, "操作成功"),
+
+    WAIT_PAY(211, "等待用户付款"),
     FAILURE(500, "操作失败"),
     NOT_LOGIN(501, "登录失效"),
     SYSTEM_ERROR(555, "系统内部错误"),
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
index d875c455..b50ea37b 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
@@ -20,6 +20,7 @@ import com.czg.order.enums.PayEnums;
 import com.czg.order.service.OrderDetailService;
 import com.czg.order.service.OrderInfoService;
 import com.czg.order.service.OrderPaymentService;
+import com.czg.resp.CzgRespCode;
 import com.czg.resp.CzgResult;
 import com.czg.service.CzgPayService;
 import com.czg.service.RedisService;
@@ -718,11 +719,14 @@ public class PayServiceImpl implements PayService {
         Map<String, Object> map = new HashMap<>();
         switch (data) {
             case CzgMicroPayResp ignored -> {
-                if (!"TRADE_SUCCESS".equals(data.getState())) {
-                    result.setCode(500);
+                if ("TRADE_SUCCESS".equals(data.getState())) {
                     return result;
+                } else if ("TRADE_AWAIT".equals(data.getState())) {
+                    result.setCode(CzgRespCode.WAIT_PAY.getCode());
+                    result.setMsg("等待用户付款");
+                } else {
+                    result.setCode(CzgRespCode.FAILURE.getCode());
                 }
-                return result;
             }
             case CzgH5PayResp h5PayResp ->
                     map = JSONObject.parseObject(JSONObject.toJSONString(h5PayResp.getPayInfo()));