From aa8652cc420f84bd3e543ebe611a563e852d4725 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期日, 08 九月 2024 16:26:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2
---
src/main/java/com/mzl/flower/service/BaseService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/BaseService.java b/src/main/java/com/mzl/flower/service/BaseService.java
index b796271..68883f6 100644
--- a/src/main/java/com/mzl/flower/service/BaseService.java
+++ b/src/main/java/com/mzl/flower/service/BaseService.java
@@ -235,7 +235,7 @@
break;
}
}
- fp = fp.add(b);
+ fp = fp.add(getAmount(b));
dto.setFirstFee(b);
}
@@ -294,7 +294,7 @@
break;
}
}
- fp = fp.add(b);
+ fp = fp.add(getAmount(b));
dto.setSecondFee(b);
FlowerMarkupSpCg fmpsc = null;
@@ -349,7 +349,7 @@
break;
}
}
- fp = fp.add(b);
+ fp = fp.add(getAmount(b));
dto.setPartnerFee(b);
}
@@ -387,7 +387,7 @@
break;
}
}
- fp = fp.add(b);
+ fp = fp.add(getAmount(b));
}
//二次加价
@@ -445,7 +445,7 @@
break;
}
}
- fp = fp.add(b);
+ fp = fp.add(getAmount(b));
return fp;
}
--
Gitblit v1.9.3