根据核销码查询订单

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/OmsOrderClient.java

@@ -124,4 +124,10 @@ public interface OmsOrderClient {
      */
     @PostMapping("/omsOrder/orderVerification")
     void orderVerification(@RequestParam("orderId") Long orderId, @RequestParam("merchantId") Long merchantId);
+
+    /**
+     * 根据订单核销码获取订单详情
+     */
+    @GetMapping("/omsOrder/getOrderDetail")
+    OmsOrderDetailDTO getOrderDetail(@RequestParam("orderSn") Long orderSn,@RequestParam("merchantId") Long merchantId) ;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/controller/OmsOrderController.java

@@ -156,4 +156,12 @@ public class OmsOrderController {
     public void orderVerification(@RequestParam("orderId") Long orderId, @RequestParam("merchantId") Long merchantId) {
         omsOrderService.orderVerification(orderId, merchantId);
     }
+
+    /**
+     * 根据订单核销码获取订单详情
+     */
+    @GetMapping("/omsOrder/getOrderDetail")
+    public OmsOrderDetailDTO getOrderDetail(@RequestParam("orderSn") Long orderSn,@RequestParam("merchantId") Long merchantId) {
+        return omsOrderService.getOraderDetail(orderSn,merchantId);
+    }
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/OmsOrderService.java

@@ -126,4 +126,10 @@ public interface OmsOrderService extends IService<OmsOrder>
      * @return
      */
     MerchantTeamDTO queryTeamOrder(Long merchantId);
+
+
+    /**
+     * 根据核销码获取订单详情
+     */
+    OmsOrderDetailDTO getOraderDetail(Long orderSn,Long merchantId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -932,4 +932,22 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
             e.getStackTrace();
         }
     }
+
+    @Override
+    public OmsOrderDetailDTO getOraderDetail(Long orderSn,Long merchantId) {
+        OmsOrder omsOrder = this.lambdaQuery()
+                .eq(OmsOrder::getOrderSn,orderSn)
+                .eq(OmsOrder::getMerchantId,merchantId)
+                .one();
+        if (null == omsOrder){
+            return null;
+        }
+        List<OmsOrderItemDTO> orderItemList = omsOrderItemService.getOrderItemByOrderId(omsOrder.getId());
+        OmsOrderDetailDTO orderDetail = new OmsOrderDetailDTO();
+        BeanUtils.copyProperties(omsOrder, orderDetail);
+        orderDetail.setOrderItemList(orderItemList);
+        MerchantDTO merchant = this.merchantService.getMerchantById(omsOrder.getMerchantId());
+        orderDetail.setMerchantInfo(merchant);
+        return orderDetail;
+    }
 }