From 8fb0f54ce422774c99372d5159e3e224f27b7b70 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 7 Mar 2024 11:01:35 +0800
Subject: [PATCH] bug

---
 .../activeDiscount/controller/ActiveDiscountController.java | 2 +-
 .../service/impl/ActiveDiscountServiceImpl.java             | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/controller/ActiveDiscountController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/controller/ActiveDiscountController.java
index a2e2daf06..16e285588 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/controller/ActiveDiscountController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/controller/ActiveDiscountController.java
@@ -108,7 +108,7 @@ public class ActiveDiscountController extends BaseController {
      * @return
      */
     @DeleteMapping("delById/{ids}")
-    public ResponseObject delete(@PathVariable Long ids) {
+    public ResponseObject delete(@PathVariable Integer ids) {
         return getSuccessResult(this.activeDiscountService.removeById(ids));
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/service/impl/ActiveDiscountServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/service/impl/ActiveDiscountServiceImpl.java
index a809da7cd..0124f67d1 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/service/impl/ActiveDiscountServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/service/impl/ActiveDiscountServiceImpl.java
@@ -22,7 +22,9 @@ import com.fuint.business.petrolStationManagement.entity.OilName;
 import com.fuint.business.petrolStationManagement.service.OilNameService;
 import com.fuint.business.store.service.StoreService;
 import com.fuint.business.userManager.service.LJUserGradeService;
+import com.fuint.common.service.AccountService;
 import com.fuint.common.util.TokenUtil;
+import com.fuint.repository.model.TAccount;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +58,8 @@ public class ActiveDiscountServiceImpl extends ServiceImpl<ActiveDiscountMapper,
     private OilNameService oilNameService;
     @Resource
     private ActiveDiscountMapper activeDiscountMapper;
+    @Resource
+    private AccountService accountService;
     /**
      * 新增数据
      * @param activeDiscountDTO
@@ -161,6 +165,8 @@ public class ActiveDiscountServiceImpl extends ServiceImpl<ActiveDiscountMapper,
                 activeDiscountVO.setDieselUserLevel(str.split(","));
             }
             activeDiscountVO.setActiveDiscountChildList(activeDiscountChildList);
+            TAccount accountInfoById = accountService.getAccountInfoById(Integer.parseInt(s.getCreateBy()));
+            if (ObjectUtil.isNotEmpty(accountInfoById)) activeDiscountVO.setCreateBy(accountInfoById.getRealName());
             return activeDiscountVO;
         }).collect(Collectors.toList());
         page1.setRecords(activeConsumptionVOList);