query order

book-dao/src/main/java/com/book/dao/VO/OrderVo.java

@@ -0,0 +1,15 @@
+package com.book.dao.VO;
+
+import lombok.Data;
+
+/**
+ * created in 2021/9/4
+ * Project: book-store
+ *
+ * @author win7
+ */
+@Data
+public class OrderVo {
+ private String orderId;
+ private String status;
+}

book-server/src/main/java/com/book/server/controller/WxPayController.java

@@ -1,5 +1,6 @@
 package com.book.server.controller;
 
+import com.book.dao.VO.OrderVo;
 import com.book.dao.VO.WxPayInfo;
 import com.book.dao.VO.WxPayRequest;
 import com.book.server.common.entity.Result;
@@ -67,4 +68,9 @@ public class WxPayController extends BaseController {
         return wxPayService.chargePage(userId, code,page);
     }
 
+    @GetMapping("/query")
+    public Result<OrderVo> queryOrder(@RequestParam("orderId") String orderId){
+        return  Result.success(wxPayService.queryOrder(orderId));
+    }
+
 }

book-server/src/main/java/com/book/server/service/WxPayService.java

@@ -1,5 +1,6 @@
 package com.book.server.service;
 
+import com.book.dao.VO.OrderVo;
 import com.book.dao.VO.WxPayInfo;
 import com.book.dao.VO.WxPayRequest;
 import com.book.server.common.entity.Result;
@@ -23,4 +24,7 @@ public interface WxPayService {
 
 
     String chargePage(String userId, String code,String page);
+
+    OrderVo queryOrder(String orderId);
+
 }

book-server/src/main/java/com/book/server/service/impl/WxPayServiceImpl.java

@@ -1,9 +1,6 @@
 package com.book.server.service.impl;
 
-import com.book.dao.VO.PalmpayResponse;
-import com.book.dao.VO.SnsapiBase;
-import com.book.dao.VO.WxPayInfo;
-import com.book.dao.VO.WxPayRequest;
+import com.book.dao.VO.*;
 import com.book.dao.cps.entity.Goods;
 import com.book.dao.cps.mapper.*;
 import com.book.dao.cps.pojo.*;
@@ -149,7 +146,7 @@ public class WxPayServiceImpl implements WxPayService {
         WxPayInfo wxPayInfo = new WxPayInfo();
         wxPayInfo.setUserId(userByUserId.getId() + "");
         wxPayInfo.setOrderId(order.getOutTradeNo());
-        if (StringUtils.isNotEmpty(wxpay.getAppid()) && StringUtils.isNotEmpty(wxPayRequest.getOpenid())){
+        if (StringUtils.isNotEmpty(wxpay.getAppid()) && StringUtils.isNotEmpty(wxPayRequest.getOpenid())) {
             map.put("subAppid", wxpay.getAppid());
             map.put("openid", wxPayRequest.getOpenid());
 
@@ -170,19 +167,14 @@ public class WxPayServiceImpl implements WxPayService {
             Map<String, Object> map1 = JsonUtils.getMap(pay_info);
             wxPayInfo.setPayInfo(map1);
 
-        }else {
+        } else {
             wxPayInfo.setUrl(PALMPAY_URL + "?" + form);
         }
 
 
-
-
-
-
         ordersMapper.insert(order);
 
 
-
         return wxPayInfo;
     }
 
@@ -234,7 +226,7 @@ public class WxPayServiceImpl implements WxPayService {
     }
 
     @Override
-    public String chargePage(String userId, String code,String page) {
+    public String chargePage(String userId, String code, String page) {
         User userByUserId = userService.getUserByUserId(Long.parseLong(userId));
         Integer channelId = userByUserId.getChannelId();
         AdminConfig adminConfig = adminConfigMapper.selectByPrimaryKey(channelId);
@@ -262,17 +254,29 @@ public class WxPayServiceImpl implements WxPayService {
             String openid = object.getOpenid();
             Integer ophostId = adminConfig.getOphostId();
             Ophost ophost = ophostMapper.selectByPrimaryKey(ophostId);
-            String url = Const.URL_PAY_CENTER.replace("{appid}",appid)
-                    .replace("{host}",ophost.getHost())
-                    .replace("{page}",page)
-                    .replace("userId",userId)
-                    .replace("{openid}",openid);
+            String url = Const.URL_PAY_CENTER.replace("{appid}", appid)
+                    .replace("{host}", ophost.getHost())
+                    .replace("{page}", page)
+                    .replace("userId", userId)
+                    .replace("{openid}", openid);
             return "redirect:" + url;
         }
 
 
     }
 
+    @Override
+    public OrderVo queryOrder(String orderId) {
+        Orders order = ordersMapper.selectByOutTradeNo(orderId);
+        if (order == null) {
+            return null;
+        }
+        OrderVo orderVo = new OrderVo();
+        orderVo.setOrderId(orderId);
+        orderVo.setStatus(order.getState().toString());
+        return orderVo;
+    }
+
 
     //排序，校验
     private boolean signCheck(Map<String, String> src, String sectKey) {