Merge remote-tracking branch 'refs/remotes/origin/合并分支使用' into milestone-20260401-现金管理四期

# Conflicts:
#	src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java
#	src/main/java/com/example/demo/service/cash/CashCollectionService.java
#	src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java

src/main/java/com/example/demo/Export/ExportServiceImpl.java

@@ -145,7 +145,7 @@ public class ExportServiceImpl implements ExportService {
         } else if (dto instanceof FundDTO fundDTO){
             fundDTO.setAccount(Integer.valueOf(account));
             fundDTO.setUrl("");
-            fundDTO.setFileName(generateFileName("资金明细", adminName, lang));
+            fundDTO.setFileName(generateFileName("资金流水明细", adminName, lang));
             fundDTO.setDataNum(0);
         } else if(dto instanceof UserWalletRecordDTO userWalletRecordDTO){
             userWalletRecordDTO.setAccount(Integer.valueOf(account));
@@ -434,7 +434,7 @@ public class ExportServiceImpl implements ExportService {
 
     @Override
     public Result addExportPerformance(PerformanceDTO dto) {
-        return addExport(dto, "业绩明细", "performance:queue:export_queue", "performanceDTO", dto.getLang());
+        return addExport(dto, "业绩归属明细", "performance:queue:export_queue", "performanceDTO", dto.getLang());
     }
 
     @Override

src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java

@@ -313,7 +313,10 @@ public class MysqlServiceImpl implements MysqlService {
         data.operation_platform = rs.getString("operation_platform");
         data.goods_name = rs.getString("goods_name");
         data.uid = rs.getString("id");
-        data.linkId = rs.getString("uid");
+        // 👇👇👇 新增：去掉 linkId 首尾空格 👇👇👇
+        String rawLinkId = rs.getString("uid");
+        data.linkId = (rawLinkId != null) ? rawLinkId.trim() : null;
+        // 👆👆👆 新增结束 👆👆👆
 
         // 预生成订单号（避免在循环中重复生成）
         String timestampPart = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
@@ -920,6 +923,7 @@ public class MysqlServiceImpl implements MysqlService {
             case 7 -> 4; // 其他 → 西南钱包
             case 10 -> 8;
             case 15 -> 3;
+            case 16 -> 6;
             default -> 1;
         };
     }

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

@@ -369,17 +369,17 @@ public class CashCollectionController {
             String market = null;
             Integer pageNum = null;
             Integer pageSize = null;
+            String sortField = null;
+            String sortOrder = null;
+            Integer sortWalletId = null;
 
             if (params.containsKey("jwcode")) {
                 Object jwcodeObj = params.get("jwcode");
-                if (jwcodeObj != null) {
-                    String jwcodeStr = jwcodeObj.toString();
-                    if (!jwcodeStr.isEmpty()) {
-                        try {
-                            jwcode = ((Number) jwcodeObj).intValue();
-                        } catch (Exception e) {
-                            // 如果转换失败，保持为 null
-                        }
+                if (jwcodeObj != null && !jwcodeObj.toString().isEmpty()) {
+                    try {
+                        jwcode = ((Number) jwcodeObj).intValue();
+                    } catch (Exception e) {
+                        // 如果转换失败，保持为 null
                     }
                 }
             }
@@ -413,6 +413,31 @@ public class CashCollectionController {
                 }
             }
 
+            if (params.containsKey("sortField")) {
+                Object sortFieldObj = params.get("sortField");
+                if (sortFieldObj != null && !sortFieldObj.toString().isEmpty()) {
+                    sortField = sortFieldObj.toString();
+                }
+            }
+
+            if (params.containsKey("sortOrder")) {
+                Object sortOrderObj = params.get("sortOrder");
+                if (sortOrderObj != null && !sortOrderObj.toString().isEmpty()) {
+                    sortOrder = sortOrderObj.toString();
+                }
+            }
+
+            if (params.containsKey("sortWalletId")) {
+                Object sortWalletIdObj = params.get("sortWalletId");
+                if (sortWalletIdObj != null) {
+                    try {
+                        sortWalletId = ((Number) sortWalletIdObj).intValue();
+                    } catch (Exception e) {
+                        // 如果转换失败，保持为 null
+                    }
+                }
+            }
+
             if (pageNum == null) {
                 pageNum = 1;
             }
@@ -420,7 +445,7 @@ public class CashCollectionController {
                 pageSize = 10;
             }
 
-            PageInfo<UserWalletVO> result = cashCollectionService.selectUserWallets(jwcode, market, pageNum, pageSize);
+            PageInfo<UserWalletVO> result = cashCollectionService.selectUserWallets(jwcode, market, pageNum, pageSize, sortField, sortOrder, sortWalletId);
 
             // 对返回结果进行多语言转换
             if (result != null && result.getList() != null) {
@@ -667,6 +692,13 @@ public class CashCollectionController {
                         cashRecord.getPaymentCurrencyOrig(), languageCode);
                 cashRecord.setPaymentCurrencyOrig(chinesePaymentCurrencyOrig);
             }
+
+            // 转换数量单位
+            if (cashRecord.getNumUnit() != null && !cashRecord.getNumUnit().isEmpty()) {
+                String chineseNumUnit = translationService.findChineseSimplifiedByTranslation(
+                        cashRecord.getNumUnit(), languageCode);
+                cashRecord.setNumUnit(chineseNumUnit);
+            }
         }
     }
 

src/main/java/com/example/demo/domain/vo/cash/UserWalletVO.java

@@ -26,4 +26,11 @@ public class UserWalletVO {
     private BigDecimal currentPermanentGold; // 当前永久金币数量
 
     private List<WalletItem> walletList;    // 钱包列表（仅用于查询结果）
+
+    @ExcelIgnore
+    private String sortField; // 排序字段
+    @ExcelIgnore
+    private String sortOrder; // 排序顺序
+    @ExcelIgnore
+    private Integer sortWalletId; // 用于排序的钱包 ID（指定按哪个钱包排序）
 }

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

@@ -117,10 +117,17 @@ public interface CashCollectionMapper {
 
     // 查询符合条件的精网号列表（用于分页，每个精网号算一条记录）
     List<Integer> selectDistinctJwcodes(@Param("jwcode") Integer jwcode,
-                                        @Param("market") String market);
+                                        @Param("market") String market,
+                                        @Param("sortField") String sortField,
+                                        @Param("sortOrder") String sortOrder,
+                                        @Param("sortWalletId") Integer sortWalletId);
 
     // 根据精网号列表查询用户的所有钱包信息
     List<UserWalletVO> selectUserWalletsByJwcodes(@Param("jwcodeList") List<Integer> jwcodeList,
+                                                  @Param("market") String market,
+                                                  @Param("sortField") String sortField,
+                                                  @Param("sortOrder") String sortOrder,
+                                                  @Param("sortWalletId") Integer sortWalletId);
                                                   @Param("market") String market);
     // 添加流水--其他收入
     void addExFund(@Param("addFundsDTO") CashCollection addFundsDTO);

src/main/java/com/example/demo/service/cash/CashCollectionService.java

@@ -56,4 +56,5 @@ public interface CashCollectionService {
     PageInfo<UserWalletVO> selectUserWallets(Integer jwcode, String market, Integer pageNum, Integer pageSize);
     // 添加流水--其他收入
     String addExFund(CashCollection addFundsDTO);
+    PageInfo<UserWalletVO> selectUserWallets(Integer jwcode, String market, Integer pageNum, Integer pageSize, String sortField, String sortOrder, Integer sortWalletId);
 }

src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java

@@ -142,7 +142,7 @@ public class RedServiceImpl implements RedService {
             return "{\"success\":false,\"msg\":\"网络异常\"}";
         }
     }
-     @Override
+    @Override
     public  String sendConsumeJwcode(Integer jwcode, List<String> redIds,String orderId) {
         try {
             String body = JSON.toJSONString(java.util.Map.of("jwcode", jwcode,"coupon_ids",redIds,"order_id",orderId));

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

@@ -625,10 +625,10 @@ public class CashCollectionServiceImpl implements CashCollectionService {
 
     // 根据精网号和地区查询用户的所有钱包 ID 和金币数量（包含用户名和地区）（分页）
     @Override
-    public PageInfo<UserWalletVO> selectUserWallets(Integer jwcode, String market, Integer pageNum, Integer pageSize) {
+    public PageInfo<UserWalletVO> selectUserWallets(Integer jwcode, String market, Integer pageNum, Integer pageSize, String sortField, String sortOrder, Integer sortWalletId) {
         // 第一步：先查询符合条件的精网号列表（分页）
         PageHelper.startPage(pageNum, pageSize);
-        List<Integer> jwcodeList = cashCollectionMapper.selectDistinctJwcodes(jwcode, market);
+        List<Integer> jwcodeList = cashCollectionMapper.selectDistinctJwcodes(jwcode, market, sortField, sortOrder, sortWalletId);
         PageInfo<Integer> jwcodePageInfo = new PageInfo<>(jwcodeList);
 
         // 如果没有符合条件的记录，直接返回空结果
@@ -643,7 +643,7 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         }
 
         // 第二步：根据精网号列表查询用户的钱包信息（不分页，返回这些精网号的所有钱包）
-        List<UserWalletVO> allWallets = cashCollectionMapper.selectUserWalletsByJwcodes(jwcodeList, market);
+        List<UserWalletVO> allWallets = cashCollectionMapper.selectUserWalletsByJwcodes(jwcodeList, market, sortField, sortOrder, sortWalletId);
 
         // 第三步：将钱包信息按精网号分组组装
         Map<Integer, UserWalletVO> userWalletMap = new LinkedHashMap<>();
@@ -683,6 +683,7 @@ public class CashCollectionServiceImpl implements CashCollectionService {
 
         return resultPageInfo;
     }
+
     //新增流水--其他收入
     @Override
     public String addExFund(CashCollection addFundsDTO) {

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

@@ -199,36 +199,7 @@ public class CashRefundServiceImpl implements RefundService {
                 throw new Exception("请选择所属地区");
             }
             if(cashRecordRefund.getWalletId() != null) {
-                String payType = cashRecordRefund.getPayType();
-                Integer wallet = null;
-                if (payType == null || payType.trim().isEmpty()) {
-                    throw new SystemException("未穿输支付方式");
-                }
-                if (payType.equals("Stripe") || payType.equals("PaymentAsia")) {
-                    wallet = 2;
-                }
-                if (payType.equals("FirstData") || payType.equals("Grabpay") || payType.equals("Nets") || payType.equals("PayPal") || payType.equals("IOS")) {
-                    wallet = 5;
-                }
-                if (payType.equals("Stripe2")) {
-                    wallet = 3;
-                }
-                if (payType.equals("Ipay88")) {
-                    wallet = 4;
-                }
-                if (payType.equals("E-Transfer")) {
-                    wallet = 6;
-                }
-                if (payType.equals("paysolution")) {
-                    wallet = 8;
-                }
-                String payType1 = languageTranslationUtil.translate("银行转账", lang);
-                String payType2 = languageTranslationUtil.translate("现金", lang);
-                String payType3 = languageTranslationUtil.translate("支票", lang);
-                String payType4 = languageTranslationUtil.translate("刷卡", lang);
-                if (payType.equals(payType1) || payType.equals(payType2) || payType.equals(payType3) || payType.equals(payType4)) {
-                    wallet = cashRecordRefund.getWalletId();
-                }
+                Integer wallet = cashRecordRefund.getWalletId();
                 UserRegionWallet userRegionWallet = walletMapper.selectWallet(cashRecordRefund.getJwcode(), wallet);
                 User user = userMapper.selectUserByJwcode(cashRecordRefund.getJwcode());
                 if (user.getCurrentFreeJune().add(user.getCurrentFreeDecember()).compareTo(BigDecimal.valueOf(cashRecordRefund.getPartRefundFree())) < 0) {
@@ -505,6 +476,13 @@ public class CashRefundServiceImpl implements RefundService {
             user.setCurrentPermanentGold(BigDecimal.valueOf(-userGoldRecord.getPermanentGold())); //当前永久金币
             user.setCurrentFreeJune(BigDecimal.valueOf(-userGoldRecord.getFreeJune())); //当前六月免费金币
             user.setCurrentFreeDecember(BigDecimal.valueOf(-userGoldRecord.getFreeDecember())); //当前十二月免费金币
+            User usergold = userMapper.selectUserByJwcode(userGoldRecord.getJwcode());
+            if(usergold.getCurrentFreeJune().add(user.getCurrentFreeJune()).compareTo(BigDecimal.ZERO)<0){
+                throw new RuntimeException("当前六月免费金币不足");
+            }
+            if (usergold.getCurrentFreeDecember().add(user.getCurrentFreeDecember()).compareTo(BigDecimal.ZERO)<0){
+                throw new RuntimeException("当前十二月免费金币不足");
+            }
             auditMapper.updateUserGold(user);
 
 // 钱包更新 - 按原始充值流水 wallet_id 优先级顺序原路退回（1-10，越小优先级越高）

src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java

@@ -544,6 +544,9 @@ public class ExportExcelServiceImpl implements ExportExcelService {
                 String market = null;
                 Integer pageNum = userWalletDTONode.path("page").asInt(1);
                 Integer pageSize = userWalletDTONode.path("pageSize").asInt(20);
+                String sortField = null;
+                String sortOrder = null;
+                Integer sortWalletId = null;
 
                 JsonNode jwcodeNode = userWalletDTONode.path("jwcode");
                 if (!jwcodeNode.isMissingNode() && !jwcodeNode.isNull()) {
@@ -566,6 +569,37 @@ public class ExportExcelServiceImpl implements ExportExcelService {
                     }
                 }
 
+                // 获取排序字段
+                JsonNode sortFieldNode = userWalletDTONode.path("sortField");
+                if (!sortFieldNode.isMissingNode() && !sortFieldNode.isNull()) {
+                    String sortFieldStr = sortFieldNode.asText();
+                    if (!sortFieldStr.isEmpty()) {
+                        sortField = sortFieldStr.trim();
+                    }
+                }
+
+                // 获取排序顺序
+                JsonNode sortOrderNode = userWalletDTONode.path("sortOrder");
+                if (!sortOrderNode.isMissingNode() && !sortOrderNode.isNull()) {
+                    String sortOrderStr = sortOrderNode.asText();
+                    if (!sortOrderStr.isEmpty()) {
+                        sortOrder = sortOrderStr.trim();
+                    }
+                }
+
+                // 获取用于排序的钱包 ID
+                JsonNode sortWalletIdNode = userWalletDTONode.path("sortWalletId");
+                if (!sortWalletIdNode.isMissingNode() && !sortWalletIdNode.isNull()) {
+                    String sortWalletIdStr = sortWalletIdNode.asText();
+                    if (!sortWalletIdStr.isEmpty()) {
+                        try {
+                            sortWalletId = Integer.parseInt(sortWalletIdStr.trim());
+                        } catch (NumberFormatException e) {
+                            log.warn("排序钱包 ID 格式错误：{}", sortWalletIdStr);
+                        }
+                    }
+                }
+
                 // 从请求数据中获取语言设置
                 String lang = "zh_CN";
                 JsonNode langNode = rootNode.path("lang");
@@ -574,7 +608,7 @@ public class ExportExcelServiceImpl implements ExportExcelService {
                 }
 
                 // 调用查询接口
-                PageInfo<UserWalletVO> result = cashCollectionService.selectUserWallets(jwcode, market, pageNum, pageSize);
+                PageInfo<UserWalletVO> result = cashCollectionService.selectUserWallets(jwcode, market, pageNum, pageSize, sortField, sortOrder, sortWalletId);
 
                 // 翻译处理
                 List<UserWalletVO> flatList = new ArrayList<>();

src/main/java/com/example/demo/serviceImpl/coin/GoldDetailServiceImpl.java

@@ -212,32 +212,6 @@ public class GoldDetailServiceImpl implements GoldDetailService {
         return Result.success();
     }
 
-    /**
-     * 将类型数字转换为中文描述
-     */
-    private String convertTypeToString(Integer type) {
-        if (type == null) return "";
-        switch (type) {
-            case 0: return "充值";
-            case 1: return "消耗";
-            case 2: return "退款";
-            default: return "其他";
-        }
-    }
-
-    /**
-     * 填充金币明细数据的类型描述
-     */
-    private void fillTypeDescriptions(List<GoldDetail> goldDetails) {
-        if (goldDetails != null && !goldDetails.isEmpty()) {
-            for (GoldDetail detail : goldDetails) {
-                if (detail.getType() != null) {
-                    detail.setTypeDesc(convertTypeToString(detail.getType()));
-                }
-            }
-        }
-    }
-
     //更新用户消费次数
     @Override
     public Result updateConsumeNum() {

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -487,7 +487,18 @@
             </if>
             AND wr.wallet_id IS NOT NULL
         </where>
-        ORDER BY u.jwcode
+        <choose>
+            <when test="sortField != null and sortField != '' and sortOrder != null and sortOrder != '' and sortWalletId != null">
+                ORDER BY (
+                SELECT COALESCE(wr2.current_permanent_gold, 0)
+                FROM user_region_wallet wr2
+                WHERE wr2.jwcode = u.jwcode AND wr2.wallet_id = #{sortWalletId}
+                ) ${sortOrder}, u.jwcode
+            </when>
+            <otherwise>
+                ORDER BY u.jwcode
+            </otherwise>
+        </choose>
     </select>
 
     <!-- 根据精网号列表查询用户的所有钱包信息 -->
@@ -514,7 +525,18 @@
             </if>
             AND wr.wallet_id IS NOT NULL
         </where>
-        ORDER BY u.jwcode, wr.wallet_id
+        <choose>
+            <when test="sortField != null and sortField != '' and sortOrder != null and sortOrder != '' and sortWalletId != null">
+                ORDER BY (
+                SELECT COALESCE(wr2.current_permanent_gold, 0)
+                FROM user_region_wallet wr2
+                WHERE wr2.jwcode = u.jwcode AND wr2.wallet_id = #{sortWalletId}
+                ) ${sortOrder}, u.jwcode, wr.wallet_id
+            </when>
+            <otherwise>
+                ORDER BY u.jwcode, wr.wallet_id
+            </otherwise>
+        </choose>
     </select>
 
     <!--根据OrderCode订单号更新收款订单-->