igl 1 долоо хоног өмнө
parent
commit
34d38594f2

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

@@ -128,7 +128,7 @@ public interface OmsOrderClient {
      * 根据订单核销码获取订单详情
      */
     @GetMapping("/omsOrder/getOrderDetail")
-    OmsOrderDetailDTO getOrderDetail(@RequestParam("orderSn") Long orderSn,@RequestParam("merchantId") Long merchantId) ;
+    OmsOrderDetailDTO getOrderDetail(@RequestParam("orderSn") String orderSn,@RequestParam("merchantId") Long merchantId) ;
 
     /**
      * 订单支付回调

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

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

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

@@ -135,7 +135,7 @@ public interface OmsOrderService extends EnhanceService<OmsOrder>
     /**
      * 根据核销码获取订单详情
      */
-    OmsOrderDetailDTO getOraderDetail(Long orderSn,Long merchantId);
+    OmsOrderDetailDTO getOraderDetail(String orderSn,Long merchantId);
 
     /**
      * 下单回调接口

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

@@ -1096,7 +1096,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
     }
 
     @Override
-    public OmsOrderDetailDTO getOraderDetail(Long orderSn,Long merchantId) {
+    public OmsOrderDetailDTO getOraderDetail(String orderSn,Long merchantId) {
         OmsOrder omsOrder = this.lambdaQuery()
                 .eq(OmsOrder::getOrderSn,orderSn)
                 .eq(OmsOrder::getMerchantId,merchantId)