From 5324586116fa2bcce9eeca0e577517b43d68825e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Tue, 4 Jun 2024 15:44:41 +0800
Subject: [PATCH] =?UTF-8?q?pos=E6=94=AF=E4=BB=98bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CardValueOrdersController.java              | 6 ++++++
 .../cardValueOrders/service/CardValueOrdersService.java    | 2 ++
 .../service/impl/CardValueOrdersServiceImpl.java           | 7 +++++++
 .../fuint/business/order/service/AllOrderInfoService.java  | 2 ++
 .../order/service/impl/AllOrderInfoServiceImpl.java        | 5 +++++
 5 files changed, 22 insertions(+)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/controller/CardValueOrdersController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/controller/CardValueOrdersController.java
index ce420a5dd..75020d71c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/controller/CardValueOrdersController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/controller/CardValueOrdersController.java
@@ -120,5 +120,11 @@ public class CardValueOrdersController extends BaseController {
         String orderNo = map.get("orderNo");
         cardValueOrdersService.getOneByOrderNo(orderNo);
     }
+
+    @PostMapping("getOneByOrderNos")
+    public ResponseObject getOneByOrderNos(@RequestBody Map<String,String> map){
+        String orderNo = map.get("orderNo");
+        return getSuccessResult(cardValueOrdersService.getOneByOrderNos(orderNo));
+    }
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java
index 14a91b5d4..e26b52e3c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders;
+import com.fuint.business.order.entity.AllOrderInfo;
 
 /**
  * 储值卡订单表(CardValueOrders)表服务接口
@@ -19,6 +20,7 @@ public interface CardValueOrdersService extends IService<CardValueOrders> {
      * @return
      */
     CardValueOrders getOneByOrderNo(String orderNo);
+    AllOrderInfo getOneByOrderNos(String orderNo);
     /**
      * 根据用户id分页查询储值卡订单信息
      * @param page
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java
index 802aa5330..06a5dc9c5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders;
 import com.fuint.business.marketingActivity.cardValueOrders.mapper.CardValueOrdersMapper;
 import com.fuint.business.marketingActivity.cardValueOrders.service.CardValueOrdersService;
+import com.fuint.business.order.entity.AllOrderInfo;
 import com.fuint.business.order.mapper.AllOrderInfoMapper;
 import com.fuint.business.order.service.AllOrderInfoService;
 import com.fuint.business.order.vo.AllOrderInfoVo;
@@ -45,6 +46,12 @@ public class CardValueOrdersServiceImpl extends ServiceImpl<CardValueOrdersMappe
 
         return cardValueOrdersMapper.getOneByOrderNo(orderNo);
     }
+
+    @Override
+    public AllOrderInfo getOneByOrderNos(String orderNo) {
+        return allOrderInfoService.getOneByOrderNos(orderNo);
+    }
+
     @Override
     public IPage<CardValueOrders> selectCardValueOrders(Page page, CardValueOrders order) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
index fd65af3b1..db12e5f4c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
@@ -94,4 +94,6 @@ public interface AllOrderInfoService {
     AllOrderInfoVo getOperatingDataPos(AllOrderInfoDto allOrderInfo);
 
     AllOrderInfoVo getOneByOrderNo(String orderNo);
+
+    AllOrderInfo getOneByOrderNos(String orderNo);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
index 8c14dcccc..3a6cdaa2e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
@@ -961,6 +961,11 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
         return allOrderInfoMapper.getOneByOrderNo(orderNo);
     }
 
+    @Override
+    public AllOrderInfo getOneByOrderNos(String orderNo) {
+        return allOrderInfoMapper.getOneByOrderNo(orderNo);
+    }
+
 
     private long dayCount(String beginTimeStr, String endTimeStr ) {
         // 将字符串表示的时间转换成 LocalDate 对象