From dbf20d66d4a723725d7ae5b049105a8f3996b010 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 14 Jul 2026 16:06:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=B9=B3=E5=8F=B0=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E6=8A=BD=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/api/vo/order/HardOrderCsVo.java      |   6 ++++++
 .../order/HardOrderTotalController.java       |   9 +++++++++
 .../impl/order/HardOrderTotalServiceImpl.java |  19 ++++++++++++++++++
 .../main/resources/file/商户交易金额汇总.xlsx | Bin 10052 -> 10168 bytes
 .../api/entity/mch/MchManageEntity.java       |   6 ++++++
 .../resources/mapper/mch/MchManageMapper.xml  |   1 +
 6 files changed, 41 insertions(+)

diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderCsVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderCsVo.java
index 5802e4793..423b24842 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderCsVo.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderCsVo.java
@@ -61,6 +61,12 @@ public class HardOrderCsVo implements BaseMchInterface, BaseHardInterface {
     @Schema(description = "日期")
     private String day;
 
+    @Schema(description = "平台抽成比例")
+    private Double mchPlatformRanke;
+
+    @Schema(description = "平台抽成(元)")
+    private BigDecimal mchPlatformRankePrice;
+
     /**
      * 导出相关
      */
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java
index 0fe1d8eec..6a5975bae 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java
@@ -376,6 +376,8 @@ public class HardOrderTotalController {
                 // 总盈利
                 BigDecimal totalProfitPrice = BigDecimal.ZERO;
                 BigDecimal totalProfitCount = BigDecimal.ZERO;
+                // 总抽成
+                BigDecimal mchPlatformRankeTotalPrice = BigDecimal.ZERO;
                 Long lineNumber = 1L;
                 for (HardOrderCsVo v : list) {
                     v.setLineNumber(lineNumber);
@@ -407,6 +409,11 @@ public class HardOrderTotalController {
                     if (ObjectUtil.isNotEmpty(v.getTotalProfitCount())) {
                         totalProfitCount = totalProfitCount.add(v.getTotalProfitCount());
                     }
+                    // 平台抽成
+                    if (ObjectUtil.isNotEmpty(v.getMchPlatformRankePrice())) {
+                        mchPlatformRankeTotalPrice = mchPlatformRankeTotalPrice.add(v.getMchPlatformRankePrice());
+                        v.setMchPlatformRankePrice(v.getMchPlatformRankePrice().divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP));
+                    }
                 }
                 // 总消费
                 map.put("computeTotalPayPrice", totalPayPrice.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString());
@@ -417,6 +424,8 @@ public class HardOrderTotalController {
                 // 总盈利
                 map.put("computeTotalProfitPrice", totalProfitPrice.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString());
                 map.put("computeTotalProfitCount", totalProfitCount.toString());
+                // 总抽成
+                map.put("mchPlatformRankeTotalPrice", mchPlatformRankeTotalPrice.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString());
             }
             excelWriter.fill(map, writeSheet);
             excelWriter.fill(list, fillConfig, writeSheet);
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java
index 921b071ea..d5edfb18d 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java
@@ -224,6 +224,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
                 List<MchManageVo> mchList = getMchListByIds(mchIds);
                 if (ObjectUtil.isNotEmpty(mchList)) {
                     WalletDataUtil.convertMchList(totalList, CollectionUtils.convertMap(mchList, MchManageVo::getId));
+                    computeMchPlatformRanke(totalList, mchList);
                 }
             }
             // 商户部门
@@ -323,6 +324,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
                 List<MchManageVo> mchList = getMchListByIds(mchIds);
                 if (ObjectUtil.isNotEmpty(mchList)) {
                     WalletDataUtil.convertMchList(totalList, CollectionUtils.convertMap(mchList, MchManageVo::getId));
+                    computeMchPlatformRanke(totalList, mchList);
                 }
             }
             // 商户部门
@@ -971,6 +973,23 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
         return listMap;
     }
 
+    private void computeMchPlatformRanke(List<HardOrderCsVo> totalList, List<MchManageVo> mchList) {
+        // 平台抽成计算
+        for (HardOrderCsVo item : totalList) {
+            MchManageVo targetMch = mchList.stream().filter(v -> ObjectUtil.equals(v.getId(), item.getMerchantId())).findFirst().orElse(null);
+            if (ObjectUtil.isEmpty(targetMch)) continue;
+            Double mchPlatformRanke = targetMch.getPlatformRanke();
+            if (ObjectUtil.isNotEmpty(mchPlatformRanke) && ObjectUtil.isNotEmpty(item.getTotalProfitPrice())) {
+                BigDecimal mchPlatformRankePrice = BigDecimal.valueOf(mchPlatformRanke).divide(BigDecimal.valueOf(100)).multiply(item.getTotalProfitPrice()).setScale(2, RoundingMode.HALF_UP);
+                item.setMchPlatformRankePrice(mchPlatformRankePrice);
+                item.setMchPlatformRanke(mchPlatformRanke);
+            }
+            if (ObjectUtil.isEmpty(mchPlatformRanke)) {
+                item.setMchPlatformRanke((double) 0);
+            }
+        }
+    }
+
     private List<MchManageVo> getMchListByIds(List<Long> mchIds) {
         return RemoteBatchQueryUtil.queryByIds(mchIds, ids -> remoteMchService.getByIds(ids).getData());
     }
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/商户交易金额汇总.xlsx b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/商户交易金额汇总.xlsx
index 41c27a79e952b44adcd1b6029e9f031dd280421a..af0f926a0b7e7a619ef0c3fa4307b8d66399f452 100644
GIT binary patch
delta 5225
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
Y0-~W&|Ks!j(Q=Vw9NgHctbf7(0_xYig8%>k

delta 5121
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

diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchManageEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchManageEntity.java
index d18f5feb5..723f236f9 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchManageEntity.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchManageEntity.java
@@ -159,6 +159,12 @@ public class MchManageEntity extends Model<MchManageEntity> {
     @Schema(description = "分店数量")
     private Long mchCount;
 
+    /**
+     * 平台抽成
+     */
+    @Schema(description = "平台抽成")
+    private Double platformRanke;
+
     /**
      * 创建人
      */
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml
index 61d63a7a8..56f4396a9 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml
@@ -49,6 +49,7 @@
                a.discounts_price,
                a.cooperation_status,
                a.mch_count,
+               a.platform_ranke,
                a.create_by,
                a.create_time,
                a.update_by,