From ad9b71f4021e6e19c78fe868a04c372f10dc2ee9 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Wed, 7 Jan 2026 10:38:33 +0800
Subject: [PATCH] =?UTF-8?q?1.7=20=E7=BA=A2=E5=8C=85=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/service/Temporary/RedService.java     | 1 -
 .../java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java  | 5 +++--
 .../java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java     | 2 --
 .../java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java   | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/example/demo/service/Temporary/RedService.java b/src/main/java/com/example/demo/service/Temporary/RedService.java
index 2b166cf..75a70de 100644
--- a/src/main/java/com/example/demo/service/Temporary/RedService.java
+++ b/src/main/java/com/example/demo/service/Temporary/RedService.java
@@ -23,7 +23,6 @@ public interface RedService {
     String sendJwcode(Integer jwcode,String orderId);
 
     BigDecimal selectRedSum(Integer jwcode);
-    String sendConsumeJwcode(Integer jwcode, List<String> redIds );
 
     List<RedList> selectRedList(Integer jwcode);
 
diff --git a/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java
index a9b9127..ee46334 100644
--- a/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.example.demo.Util.BaseDES3;
 import com.example.demo.Util.BusinessException;
 import com.example.demo.Util.GoldTistV2;
+import com.example.demo.Util.SimpleIdGenerator;
 import com.example.demo.config.RedTimeRuleConfig;
 import com.example.demo.domain.entity.User;
 import com.example.demo.domain.entity.UserGoldRecord;
@@ -384,7 +385,7 @@ public class RedServiceImpl implements RedService {
             // if(consumeUser.getJwcode().equals(94226013)){
             String result = GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65,
                     (double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) / 100,
-                    userGoldRecord.getRemark(), 0, consumeUser.getAdminName(), userGoldRecord.getGoodsName());
+                    SimpleIdGenerator.generateId(),userGoldRecord.getRemark(), 0, consumeUser.getAdminName(), userGoldRecord.getGoodsName());
 //        System.out.println("9"+result+"9");
             result = result.replaceAll("[\r\n]", "");
 
@@ -392,7 +393,7 @@ public class RedServiceImpl implements RedService {
             if (!result.equals("2")) {
                 result = GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65,
                         (double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) / 100,
-                        userGoldRecord.getRemark(), 0, consumeUser.getAdminName(), userGoldRecord.getGoodsName());
+                        SimpleIdGenerator.generateId(),userGoldRecord.getRemark(), 0, consumeUser.getAdminName(), userGoldRecord.getGoodsName());
                 //返回状态１加成功２减成功其他失败 -5 金币不足 -6 类型错误 -7签名错误
                 if (!result.equals("2")) {
                     String errorMsg = "减金币失败，数据未进erp，返回状态：" + result;
diff --git a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java
index 9c0a76d..0b1d58a 100644
--- a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java
@@ -208,8 +208,6 @@ public class AuditServiceImpl implements AuditService {
                     if (order.getTaskGold()!=0){
                     GoldTistV2.addCoinNew(order.getJwcode().toString(), 59, //退款任务+永久金币-充值
                         (double) (order.getTaskGold()+order.getPermanentGold() ) /100,SimpleIdGenerator.generateId(),
-                        order.getRemark(),(double) order.getPermanentGold() / 100, auditName, "退款金币充值");
-                        (double) (order.getTaskGold()+order.getPermanentGold() ) /100,
                         order.getRemark(),(double) order.getPermanentGold() / 100, auditName, "退款金币充值");}
 
                     //额外扣金币抵扣红包
diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java
index de612c1..80f3046 100644
--- a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java
@@ -168,7 +168,6 @@ public class ConsumeServiceImpl implements ConsumeService {
         // if(consumeUser.getJwcode().equals(94226013)){
         String result = GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65,
                 (double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) / 100,
-                userGoldRecord.getRemark(), 0, consumeUser.getAdminName(), userGoldRecord.getGoodsName());
                 userGoldRecord.getLinkId(), userGoldRecord.getRemark(),0, consumeUser.getAdminName(), userGoldRecord.getGoodsName());
 //        System.out.println("9"+result+"9");
         result = result.replaceAll("[\r\n]", "");