From 8d985addf862255f4328df7479a640bb4d7e8539 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: Wed, 5 Jun 2024 16:29:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF=E4=BB=98bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CardValueOrdersServiceImpl.java          | 8 +++++++-
 .../fuint/business/tag/controller/OilTagController.java   | 6 +++++-
 .../src/main/java/com/fuint/business/tag/vo/OilTagVO.java | 1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

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 9f5e8046d..33a660fd7 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
@@ -11,6 +11,8 @@ 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;
+import com.fuint.business.storeInformation.entity.LJStore;
+import com.fuint.business.storeInformation.service.ILJStoreService;
 import com.fuint.business.userManager.entity.UserBalance;
 import com.fuint.business.userManager.service.UserBalanceService;
 import com.fuint.common.dto.AccountInfo;
@@ -36,6 +38,9 @@ public class CardValueOrdersServiceImpl extends ServiceImpl<CardValueOrdersMappe
 
     @Resource
     private AllOrderInfoService allOrderInfoService;
+
+    @Resource
+    private ILJStoreService iljStoreService;
     /**
      * 根据订单编号返回订单信息
      * @param orderNo
@@ -96,7 +101,8 @@ public class CardValueOrdersServiceImpl extends ServiceImpl<CardValueOrdersMappe
         if (ObjectUtil.isNotEmpty(oneByOrderNo)){
             oneByOrderNo.setPayMoney(oneByOrderNo.getGoodsMoney());
             if ("paid".equals(status)){
-                UserBalance userBalance = userBalanceService.selectUserBalanceByStorId(oneByOrderNo.getUserId(),oneByOrderNo.getStoreId());
+                LJStore ljStore = iljStoreService.selectStoreByStoreId(oneByOrderNo.getStoreId());
+                UserBalance userBalance = userBalanceService.selectUserBalance(oneByOrderNo.getUserId(),ljStore.getChainStoreId());
                 Double cardBalance = 0.0;
                 cardBalance = userBalance.getCardBalance() + oneByOrderNo.getPayMoney();
                 userBalance.setCardBalance(cardBalance);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/controller/OilTagController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/controller/OilTagController.java
index 4bea84883..0de398696 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/controller/OilTagController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/controller/OilTagController.java
@@ -86,12 +86,16 @@ public class OilTagController extends BaseController {
             LambdaQueryWrapper<TagCodeRecord> queryWrapper1 = new LambdaQueryWrapper<>();
             queryWrapper1.eq(TagCodeRecord::getOilTagId,oilTagId);
             TagCodeRecord one = tagCodeRecordService.getOne(queryWrapper1);
+
             OilTagVO oilTagVO = new OilTagVO();
             BeanUtils.copyProperties(record,oilTagVO);
             if (ObjectUtils.isNotEmpty(one)){
                 oilTagVO.setStoreName(one.getStoreName());
+                if (ObjectUtils.isNotEmpty(one.getStaffName())){
+                    oilTagVO.setMtStatus("1");
+                    oilTagVO.setStaffName(one.getStaffName());
+                }
             }
-
             oilTagVOArrayList.add(oilTagVO);
         }
         page1.setRecords(oilTagVOArrayList);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/vo/OilTagVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/vo/OilTagVO.java
index 7ca2ff7e2..82ef5b375 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/vo/OilTagVO.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/vo/OilTagVO.java
@@ -9,4 +9,5 @@ import java.io.Serializable;
 public class OilTagVO extends OilTag implements Serializable {
     //店铺名字
     private String storeName;
+    private String staffName;
 }