Merge remote-tracking branch 'origin/hph' into dev

src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java

@@ -154,4 +154,11 @@ public class OrderController {
                                  @RequestParam("pageSize") int pageSize){
         return orderService.getOutNumber(shopId,page,pageSize);
     }
+
+
+
+    @GetMapping("getOrderById")
+    public Result getOrderById(@RequestParam("orderId") Integer orderId){
+            return orderService.getOrder(orderId);
+    }
 }

src/main/java/com/chaozhanggui/system/cashierservice/interceptor/WebAppConfigurer.java

@@ -1,7 +1,6 @@
 package com.chaozhanggui.system.cashierservice.interceptor;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -24,6 +23,7 @@ public class WebAppConfigurer implements WebMvcConfigurer {
                 .excludePathPatterns("/order/scanSendMessage")
                 .excludePathPatterns("/order/getsendMessage")
                 .excludePathPatterns("/qrcode/getscanCode")
-                .excludePathPatterns("/order/sendMessage");
+                .excludePathPatterns("/order/sendMessage")
+                .excludePathPatterns("/order/getOrderById");
     }
 }

src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java

@@ -1064,6 +1064,13 @@ public class OrderService {
     }
 
 
+
+
+    public Result getOrder(Integer orderId){
+      return Result.success(CodeEnum.SUCCESS, tbOrderInfoMapper.selectByPrimaryKey(orderId)) ;
+    }
+
+
     @Autowired
     TbUserInfoMapper tbUserInfoMapper;
 
@@ -1154,6 +1161,9 @@ public class OrderService {
 
 
 
+
+
+
     @Autowired
     TbOrderOutNumberMapper tbOrderOutNumberMapper;
     public Result scanSendMessage(String outNumber,String shopId){