Merge remote-tracking branch 'origin/milestone-20260113-现金管理0109' into milestone-20260113-现金管理0109

src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java

@@ -42,4 +42,6 @@ public interface CashRefundMapper {
     List<FundsDTO> selectfunds(FundsDTO fundsDTO);
 
     List<FundsDTO> selectRefundCount(List<Integer> needQueryIds);
+
+    void updategold(String orderCode);
 }

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

@@ -358,6 +358,10 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
                         cashRecordDone.getGoodsName().contains(languageTranslationUtil.translate("金币充值", lang)))) {
             UserGoldRecord userGoldRecord = new UserGoldRecord();
             userGoldRecord.setOrderCode(cashRecordDone.getOrderCode());
+            String orderCode = cashRecordDone.getOrderCode();
+            if (orderCode != null && orderCode.length() > 2 && orderCode.startsWith("TK")) {
+                orderCode = orderCode.substring(2);
+            }
             userGoldRecord.setType((byte) 2);
             userGoldRecord.setIsRefund((byte) 1);
             userGoldRecord.setRefundType("金币退款");
@@ -382,7 +386,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
                 userGoldRecord.setFreeJune(cashRecordDone.getFreeGold());
                 userGoldRecord.setFreeDecember(0);
             }
-            userGoldRecord.setGoodsName(cashRecordDone.getGoodsName());
+            userGoldRecord.setGoodsName("金币充值");
             userGoldRecord.setPayPlatform("金币系统");
             userGoldRecord.setRemark(cashRecordDone.getRemark());
             userGoldRecord.setAdminId(cashRecordDone.getAdminId());
@@ -392,6 +396,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
             userGoldRecord.setUpdateTime(new Date());
             String auditName = auditMapper.getName(cashRecordDone.getAuditId());
                 refundMapper.add(userGoldRecord);
+                cashRefundMapper.updategold(orderCode);
                 User user = new User();
                 user.setJwcode(userGoldRecord.getJwcode());
             user.setCurrentPermanentGold(BigDecimal.valueOf(-userGoldRecord.getPermanentGold())); //当前永久金币

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -138,7 +138,11 @@
         </set>
         where id = #{auditId}
     </update>
-
+    <update id="updategold">
+        update user_gold_record
+        set is_refund = 1
+        where order_code = #{orderCode}
+    </update>
 
     <select id="select" resultType="com.example.demo.domain.vo.cash.CashRecordDTO">
                 select