From 71df91b54a33b8a7739ff962eb381a7f4d2cbda2 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 16:32:09 +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

---
 .../service/impl/CardFuelRecordServiceImpl.java       | 11 +++++++++++
 .../controller/CardValueOrdersController.java         |  8 ++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
index 78fa5bba3..3e442ec69 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
@@ -32,6 +32,8 @@ import com.fuint.business.marketingActivity.cardFuleOrders.service.CardFuleOrder
 import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
 import com.fuint.business.marketingActivity.cardValue.mapper.CardValueRecordMapper;
 import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService;
+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.member.entity.LJStaff;
 import com.fuint.business.member.service.ILJStaffService;
@@ -53,6 +55,7 @@ import com.fuint.business.userManager.vo.LJUserVo;
 import com.fuint.common.util.RedisLock;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -269,6 +272,12 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
         if ("CASH".equals(cardFuelRecordDTO.getPaymentType())) {
             AllOrderInfo allOrderInfo = getAllOrderInfo(cardFuelRecordDTO);
             allOrderInfoService.insertAllOrderInfo(allOrderInfo);
+            CardValueOrders cardValueOrders = new CardValueOrders();
+            BeanUtils.copyProperties(allOrderInfo, cardValueOrders);
+            cardValueOrders.setPayAmount(allOrderInfo.getPayMoney());
+            cardValueOrders.setDiscount(allOrderInfo.getDiscountAmount());
+            cardValueOrders.setAmount(allOrderInfo.getPayMoney());
+            cardValueOrdersMapper.insert(cardValueOrders);
             cardValueOrdersService.updateBalances(orderNo,"paid");
         }
 
@@ -317,6 +326,8 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
         return cardFuelRecordDTO;
     }
 
+    @Resource
+    private CardValueOrdersMapper cardValueOrdersMapper;
 
     private static AllOrderInfo getAllOrderInfo(CardFuelRecordDTO cardFuelRecordDTO) {
         AllOrderInfo allOrderInfo = new AllOrderInfo();
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 75020d71c..60cbd3230 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
@@ -116,15 +116,15 @@ public class CardValueOrdersController extends BaseController {
 
 
     @PostMapping("getOneByOrderNo")
-    public void getOneByOrderNo(@RequestBody Map<String,String> map){
+    public ResponseObject getOneByOrderNo(@RequestBody Map<String,String> map){
         String orderNo = map.get("orderNo");
-        cardValueOrdersService.getOneByOrderNo(orderNo);
+        return getSuccessResult(cardValueOrdersService.getOneByOrderNo(orderNo));
     }
 
-    @PostMapping("getOneByOrderNos")
+    /*@PostMapping("getOneByOrderNos")
     public ResponseObject getOneByOrderNos(@RequestBody Map<String,String> map){
         String orderNo = map.get("orderNo");
         return getSuccessResult(cardValueOrdersService.getOneByOrderNos(orderNo));
-    }
+    }*/
 }