10.23 返还永久免费金币

src/main/java/com/example/demo/controller/cash/CashRefundController.java

@@ -77,7 +77,7 @@ public class CashRefundController {
         } else {
             // 普通用户：必须校验权限
             if (requestedMarkets == null || requestedMarkets.isEmpty()) {
-                page.getCashRecordDone().setMarkets(requestedMarkets);
+                page.getCashRecordDone().setMarkets(markets);
             }
             if (!markets.containsAll(requestedMarkets)) {
                 return Result.error("无权限！请求的市场不在授权范围内。");

src/main/java/com/example/demo/controller/coin/GoldDetailController.java

@@ -91,7 +91,7 @@ public class GoldDetailController {
         } else {
             // 普通用户：必须校验权限
             if (requestedMarkets == null || requestedMarkets.isEmpty()) {
-                page.getGoldDetail().setMarkets(requestedMarkets);
+                page.getGoldDetail().setMarkets(markets);
             }
             if (!markets.containsAll(requestedMarkets)) {
                 return Result.error("无权限！请求的市场不在授权范围内。");
@@ -134,7 +134,7 @@ public class GoldDetailController {
         } else {
             // 普通用户：必须校验权限
             if (requestedMarkets == null || requestedMarkets.isEmpty()) {
-                page.getGoldDetail().setMarkets(requestedMarkets);
+                page.getGoldDetail().setMarkets(markets);
             }
             if (!markets.containsAll(requestedMarkets)) {
                 return Result.error("无权限！请求的市场不在授权范围内。");
@@ -171,7 +171,7 @@ public class GoldDetailController {
         } else {
             // 普通用户：必须校验权限
             if (requestedMarkets == null || requestedMarkets.isEmpty()) {
-                 user.setMarkets(null);
+                 user.setMarkets(markets);
             }
             if (!markets.containsAll(requestedMarkets)) {
                 return Result.error("无权限！请求的市场不在授权范围内。");
@@ -215,7 +215,7 @@ public class GoldDetailController {
         } else {
             // 普通用户：必须校验权限
             if (requestedMarkets == null || requestedMarkets.isEmpty()) {
-                page.getUser().setMarkets(null);
+                page.getUser().setMarkets(markets);
             }
             if (!markets.containsAll(requestedMarkets)) {
                 return Result.error("无权限！请求的市场不在授权范围内。");

src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java

@@ -1,6 +1,7 @@
 package com.example.demo.serviceImpl.cash;
 
 import com.example.demo.Util.GoldTistV2;
+import com.example.demo.domain.entity.User;
 import com.example.demo.domain.entity.UserGoldRecord;
 import com.example.demo.domain.vo.cash.CashRecordDone;
 import com.example.demo.domain.vo.coin.Result;
@@ -14,6 +15,7 @@ import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.UUID;
@@ -171,7 +173,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
             if (cashRecordDone1.getId()!=null||cashRecordDone1.getOrderCode()!= null){
             cashRefundMapper.updateStatus(cashRecordDone1);
         }}
-        if (cashRecordDone.getGoodsName() != null &&
+        if (cashRecordDone.getGoodsName() != null &&cashRecordDone.getStatus() ==40 &&
                 (cashRecordDone.getGoodsName().equals("金币充值") ||
                         cashRecordDone.getGoodsName().contains("金币充值"))) {
             UserGoldRecord userGoldRecord = new UserGoldRecord();
@@ -200,7 +202,12 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
             userGoldRecord.setAuditStatus(1);
             String auditName = auditMapper.getName(cashRecordDone.getAuditId());
                 refundMapper.add(userGoldRecord);
-
+                User user = new User();
+                user.setJwcode(userGoldRecord.getJwcode());
+            user.setCurrentPermanentGold(BigDecimal.valueOf(userGoldRecord.getPermanentGold())); //当前永久金币
+            user.setCurrentFreeJune(BigDecimal.valueOf(userGoldRecord.getFreeJune())); //当前六月免费金币
+            user.setCurrentFreeDecember(BigDecimal.valueOf(userGoldRecord.getFreeDecember())); //当前十二月免费金币
+            auditMapper.updateUserGold(user);
                 GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 58, //退款免费+永久金币-充值
                         (double) (userGoldRecord.getFreeDecember()+userGoldRecord.getFreeJune()+userGoldRecord.getPermanentGold() ) /100,
                         userGoldRecord.getRemark(),(double) userGoldRecord.getPermanentGold() / 100, auditName, "退款金币充值");}

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -188,6 +188,8 @@
         a2.head_finance,
         cr.refund_currency,
         cr.refund_amount,
+        cr.permanent_gold,
+        cr.free_gold,
         m.name as marketName
         from cash_record cr
         left join admin a1 on submitter_id = a1.id
@@ -252,7 +254,7 @@
             and cr.refund_channels = #{refundChannels}
         </if>
             <if test="sTime != null and eTime != null">
-                and cr.`pay_time` BETWEEN #{sTime} AND #{eTime}
+                and cr.`refund_time` BETWEEN #{sTime} AND #{eTime}
             </if>
         </where>
         <choose>