代码调整

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/security/SpringWebSecurityConfiguration.java

@@ -52,16 +52,16 @@ class SpringWebSecurityConfiguration extends WebSecurityConfigurerAdapter {
                 .cors()
                 .and()
                 .authorizeRequests()
-                .antMatchers("/error/**", "/unifiedpay/**").permitAll()
+                .antMatchers("/error/**", "/unifiedpay/**", "/api/store/wxlogin", "/wxpay/**").permitAll()
                 .anyRequest().authenticated()
                 .and()
                 .exceptionHandling()
                 .authenticationEntryPoint(null)
                 .accessDeniedHandler(null);
     }
-
-    @Override
-    public void configure(WebSecurity web) throws Exception {
-        web.ignoring().antMatchers("/api/store/wxlogin", "/wxpay/**");
-    }
+//
+//    @Override
+//    public void configure(WebSecurity web) throws Exception {
+//
+//    }
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/controller/OrderApiController.java

@@ -4,10 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.xingxi.api.common.BaseApiController;
-import com.xingxi.api.model.OrderCreateRequest;
-import com.xingxi.api.model.OrderCreateResponse;
-import com.xingxi.api.model.OrderQueryRequest;
-import com.xingxi.api.model.OrderQueryResponse;
+import com.xingxi.api.model.*;
 import com.xingxi.api.service.OrderServiceI;
 import com.xingxi.business.Order.domain.Order;
 import com.xingxi.business.Order.service.IOrderService;
@@ -20,10 +17,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StreamUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -59,6 +53,12 @@ public class OrderApiController extends BaseApiController {
         return orderServiceI.create(getUserContext(), request);
     }
 
+
+    @GetMapping("/detail")
+    public OrderDetailResponse detail(OrderDetailRequest request){
+        return orderServiceI.get(getUserContext(), request);
+    }
+
     // 微信支付支付通知接口
     @PostMapping("/wxpay/callback")
     public void callback(HttpServletRequest request, HttpServletResponse response) {

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/data/domain/OrderDTO.java

@@ -77,7 +77,6 @@ public class OrderDTO {
     // 删除标志（0代表存在 2代表删除）
     private String delFlag;
 
-
     /**
      * 创建者
      */

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/data/mapper/WxApiOrderMapper.java

@@ -1,6 +1,7 @@
 package com.xingxi.api.data.mapper;
 
 import com.xingxi.business.Order.domain.Order;
+import com.xingxi.business.Order.mapper.OrderDetailMapper;
 import com.xingxi.business.Order.mapper.OrderMapper;
 import com.xingxi.business.PaymentInfo.domain.PaymentInfo;
 import com.xingxi.business.PaymentInfo.mapper.PaymentInfoMapper;
@@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
-public interface WxApiOrderMapper extends OrderMapper {
+public interface WxApiOrderMapper extends OrderMapper, OrderDetailMapper {
 
     Order lockOrderByPrescId(@Param("orderId") Long orderId);
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/OrderDetailRequest.java

@@ -0,0 +1,12 @@
+package com.xingxi.api.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class OrderDetailRequest  {
+
+
+    private Long orderId;
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/OrderDetailResponse.java

@@ -0,0 +1,10 @@
+package com.xingxi.api.model;
+
+import com.xingxi.api.data.domain.OrderDTO;
+import lombok.Value;
+
+@Value
+public class OrderDetailResponse {
+
+    OrderDTO orderDTO;
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/OrderServiceI.java

@@ -1,10 +1,7 @@
 package com.xingxi.api.service;
 
 import com.xingxi.api.common.UserContext;
-import com.xingxi.api.model.OrderCreateRequest;
-import com.xingxi.api.model.OrderCreateResponse;
-import com.xingxi.api.model.OrderQueryRequest;
-import com.xingxi.api.model.OrderQueryResponse;
+import com.xingxi.api.model.*;
 import com.xingxi.business.Order.domain.Order;
 import com.xingxi.business.PaymentInfo.domain.PaymentInfo;
 import org.apache.ibatis.annotations.Param;
@@ -15,6 +12,8 @@ public interface OrderServiceI {
 
     OrderCreateResponse create(UserContext userContext, OrderCreateRequest request);
 
+    OrderDetailResponse get(UserContext userContext, OrderDetailRequest request);
+
     PaymentInfo selectPaymentInfoByOutTradeNo(String outTradeNo);
 
     Order lockOrderByPrescId(Long orderId);

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/OrderApiServiceImpl.java

@@ -54,6 +54,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
@@ -301,6 +302,37 @@ class OrderApiServiceImpl implements OrderServiceI {
     }
 
     @Override
+    public OrderDetailResponse get(UserContext userContext, OrderDetailRequest request) {
+        Long orderId = request.getOrderId();
+        return new OrderDetailResponse(
+                getOrderDTOByOrderId(orderId)
+        );
+    }
+    private OrderDTO getOrderDTOByOrderId(Long orderId){
+        OrderDTO rtn = new OrderDTO();
+        Order order = wxApiOrderMapper.selectOrderByOrderId(orderId);
+
+        BeanUtils.copyProperties(order,rtn);
+
+        List<OrderDetailDTO> detailDTOList = new ArrayList<>();
+
+        OrderDetail condOrderDetail = new OrderDetail();
+        condOrderDetail.setOrderId(orderId);
+
+        List<OrderDetail> orderDetailList = wxApiOrderMapper.selectOrderDetailList(condOrderDetail);
+
+        for (OrderDetail orderDetail : orderDetailList) {
+            OrderDetailDTO dto = new OrderDetailDTO();
+            BeanUtils.copyProperties(orderDetail,dto);
+            detailDTOList.add(dto);
+        }
+
+        rtn.setOrderDetailDTOS(detailDTOList);
+
+        return rtn;
+    }
+
+    @Override
     public PaymentInfo selectPaymentInfoByOutTradeNo(String outTradeNo) {
         return wxApiPaymentInfoMapper.selectPaymentInfoByOutTradeNo(outTradeNo);
     }