Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期

src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java

@@ -1,5 +1,6 @@
 package com.example.demo.serviceImpl;
 
+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.Gold;
@@ -78,6 +79,15 @@ public class AuditServiceImpl implements AuditService {
             update.setCurrentFreeDecember(order.getFreeDecember()); //当前十二月免费金币
             update.setCurrentTaskGold(order.getTaskGold()); //当前任务金币
             auditMapper.updateUserGold(update);
+            //erp增加充值数据
+            if(update.getJwcode().equals(94226013)){
+                GoldTistV2.addCoinNew(order.getJwcode().toString(), 64, //充值永久金币
+                        (double) (order.getPermanentGold() ) /100,
+                        order.getRemark(),0, order.getPayPlatform(), "金币充值");
+                GoldTistV2.addCoinNew(order.getJwcode().toString(), 63, //充值免费
+                        (double) (order.getFreeDecember()+order.getFreeJune() ) /100,
+                        order.getRemark(),0, order.getPayPlatform(), "金币充值");
+            }
         }else if (order.getType()==2) {  //退款
             //更新用户余额
             User update = new User();
@@ -86,8 +96,19 @@ public class AuditServiceImpl implements AuditService {
             update.setCurrentFreeJune(order.getFreeJune()); //当前六月免费金币
             update.setCurrentFreeDecember(order.getFreeDecember()); //当前十二月免费金币
             update.setCurrentTaskGold(order.getTaskGold()); //当前任务金币
-
             auditMapper.updateUserGold(update);
+            //erp增加退款数据
+            if(update.getJwcode().equals(94226013)){
+                GoldTistV2.addCoinNew(order.getJwcode().toString(), 56, //退款永久金币
+                        (double) (order.getPermanentGold() ) /100,
+                        order.getRemark(),0, order.getPayPlatform(), "退款商品"+order.getGoodsName());
+                GoldTistV2.addCoinNew(order.getJwcode().toString(), 55, //退款免费
+                        (double) (order.getFreeDecember()+order.getFreeJune() ) /100,
+                        order.getRemark(),0, order.getPayPlatform(), "退款商品"+order.getGoodsName());
+                GoldTistV2.addCoinNew(order.getJwcode().toString(), 57, //退款任务
+                        (double) (order.getTaskGold() ) /100,
+                        order.getRemark(),0, order.getPayPlatform(), "退款商品"+order.getGoodsName());
+            }
 
         }
         return true;