From 36bc1495bd6b2599f53858694656da3f7ac591af 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: Fri, 15 Mar 2024 15:40:37 +0800
Subject: [PATCH] bug

---
 .../impl/CardFuelRecordServiceImpl.java       |  2 +-
 .../cardValue/dto/CardValueRecordDTO.java     |  2 ++
 .../impl/CardValueRecordServiceImpl.java      | 30 +++++++++++++++++--
 3 files changed, 30 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 bb1246ad4..e9d1120da 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
@@ -636,7 +636,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
         oilBalanceChange.setChangeType("1");
         oilBalanceChange.setFromType("囤油卡充值");
         oilBalanceChange.setOilBalance(cardFuleOrders.getIncomeLitres());
-        oilBalanceChange.setType(cardFuleOrders.getType());
+        oilBalanceChange.setType(cardFuleOrders.getType()+" "+cardFuleOrders.getOilName());
         oilBalanceChange.setOrderNo(cardFuleOrders.getOrderNo());
         oilBalanceChange.setOilType(cardFuleOrders.getOilType());
         oilBalanceChangeService.save(oilBalanceChange);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java
index e7bec6a83..8a7f1d902 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java
@@ -1,5 +1,6 @@
 package com.fuint.business.marketingActivity.cardValue.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
 import lombok.Data;
 
@@ -27,6 +28,7 @@ public class CardValueRecordDTO extends CardValueRecord {
     private String paymentType;
     private String payStatus;
     private String types;
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date expireTime;
 
 //    /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
index ae1b0d9ad..727dc14d0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
@@ -132,6 +132,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
     private ILJStoreService storeService;
     @Resource
     private MtUserGradeChildService userGradeChildService;
+    @Resource
+    private GrowthValueChangeService growthValueChangeService;
 
     /**
      * 储值卡充值（新增）
@@ -482,12 +484,9 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
     @Resource
     CardValueChildService cardValueChildService;
     @Resource
-
     CardValueChildMapper cardValueChildMapper;
 
 
-    @Resource
-    GrowthValueChangeService growthValueChangeService;
     /**
      * 查询支付状态 修改相关关联表
      * @param id
@@ -987,7 +986,32 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
 
 
 
+        //成长值记录
+        GrowthValueChange growthValueChange = new GrowthValueChange();
+        growthValueChange.setUserId(cardValueOrders.getMtUserId());
+        growthValueChange.setChainStoreId(cardValueOrders.getChainStoreId());
+        growthValueChange.setStoreId(cardValueOrders.getStoreId());
+        growthValueChange.setChangeType("1");
+        growthValueChange.setFromType("储值卡充值");
+        growthValueChange.setGrowthValue(cardValueOrders.getGrowthValue());
+        if (ObjectUtils.isNotEmpty(userBalance) && ObjectUtils.isNotEmpty(userBalance.getGrowthValue())){
+            growthValueChange.setAfterTheChange(userBalance.getGrowthValue() + cardValueOrders.getGrowthValue());
+        }
+        growthValueChange.setOrderNo(cardValueOrders.getOrderNo());
+        growthValueChangeService.insertGrowthValueChange(growthValueChange);
 
+        //积分表变动
+        if (ObjectUtils.isNotEmpty(userBalance) && ObjectUtils.isNotEmpty(userBalance.getPoints()) && ObjectUtils.isNotEmpty(cardValueOrders.getPoints())) {
+            IntegralDetail integralDetail = new IntegralDetail();
+            integralDetail.setStoreId(cardValueRecord.getStoreId());
+            integralDetail.setChainStoreId(cardValueRecord.getChainStoreId());
+            integralDetail.setCreateBy(cardValueRecord.getMtStaffId().toString());
+            integralDetail.setPointsChange(Double.valueOf(cardValueOrders.getPoints()));
+            integralDetail.setCurrentPoints(userBalance.getPoints() + cardValueOrders.getPoints());
+            integralDetail.setChangeType("1");
+            integralDetail.setChangeReason("储值卡充值");
+            integralDetailService.insert2(integralDetail);
+        }
         //生成充值记录
         cardValueRecord.setMtUserId(cardValueOrders.getMtUserId());
         cardValueRecord.setName(cardValueOrders.getName());