From 00debcc01858e0a2a98cdc84f5f088ca9a632547 Mon Sep 17 00:00:00 2001
From: hly <2783385703@qq.com>
Date: Sat, 23 Aug 2025 17:52:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/applet/contoller/ApiAppletAmountController.java  | 1 +
 .../main/java/com/ruoyi/model/domain/AppletOrderDateFrequency.java  | 2 +-
 .../model/service/impl/AppletOrderDateFrequencyServiceImpl.java     | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java
index 570135b..58d3989 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java
@@ -42,6 +42,7 @@ public class ApiAppletAmountController {
                 .orderByDesc(AppletAmountLog::getCreateTime)
                 .eq(AppletAmountLog::getUserId, appletAmountLog.getUserId())
                 .eq(appletAmountLog.getType() != null, AppletAmountLog::getType, appletAmountLog.getType())
+                .eq(appletAmountLog.getMoneyType() != null, AppletAmountLog::getMoneyType, appletAmountLog.getMoneyType())
                 .list();
         return AjaxResult.success("金额流水信息列表数据", amountLogList);
     }
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderDateFrequency.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderDateFrequency.java
index 48f1a23..b740f83 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderDateFrequency.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderDateFrequency.java
@@ -70,7 +70,7 @@ public class AppletOrderDateFrequency {
     private Long userId;
 
     /** 完成状态 */
-    @Excel(name = "完成状态")
+    @Excel(name = "完成状态 0草稿 1待完成 1已完成")
     private String status;
 
     /** 完成时间 */
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java
index 1926e49..bbf1cdc 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java
@@ -432,21 +432,21 @@ public class AppletOrderDateFrequencyServiceImpl extends ServiceImpl<AppletOrder
 
                     if (petPaymentHh != null && estimated_platform_revenue != null){
                         BigDecimal multiply = omsOrder.getPayAmount().multiply(new BigDecimal(estimated_platform_revenue.getParamValueText()))
-                                .multiply(new BigDecimal(petPaymentHh.getParamValueNum()));
+                                .multiply(petPaymentHh.getParamValueNo());
 
                         log.info("合伙人分销 合伙人等级：{} 平台预计收益比例：{} 分销金额：{}", petPaymentHh, estimated_platform_revenue.getParamValueText(), multiply);
 
                         AppletAmountLog multiplyLog = new AppletAmountLog();
                         multiplyLog.setUserId(users.getUserId());
                         multiplyLog.setTitle("合伙人佣金");
-                        multiplyLog.setAmount(appletOrderItem.getOrderGivePrice());
+                        multiplyLog.setAmount(multiply);
                         multiplyLog.setType(0); //收入
                         multiplyLog.setState(1); //到账
                         multiplyLog.setCreateTime(LocalDateTime.now());
                         multiplyLog.setMoneyType(0);//钱包类型
                         multiplyLog.setFormId(member.getId());//来源用户
                         multiplyLog.setOrderId(omsOrder.getId());//来源订单
-                        appletAmountLogService.insertAppletAmountLog(moneyLog);
+                        appletAmountLogService.insertAppletAmountLog(multiplyLog);
 
                         users.setMoney(users.getMoney().add(multiply));
                         appUsersService.updateById(users);