From e2ab3e6f3f65dee4cf4f51d8ee735738c1315af7 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期五, 30 八月 2024 08:59:58 +0800
Subject: [PATCH] Merge branch 'master' into master-v2
---
src/main/java/com/mzl/flower/service/BaseService.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/BaseService.java b/src/main/java/com/mzl/flower/service/BaseService.java
index acd2725..bd1d2cb 100644
--- a/src/main/java/com/mzl/flower/service/BaseService.java
+++ b/src/main/java/com/mzl/flower/service/BaseService.java
@@ -113,10 +113,10 @@
}
if (platformSalesMap != null) {
- BigDecimal feePlatform = s.getFeePlatform();
- BigDecimal feePlatformPack = s.getFeePlatformPack();
- BigDecimal feePlatformCheck = s.getFeePlatformCheck();
- BigDecimal feePlatformTransport = s.getFeePlatformTransport();
+ BigDecimal feePlatform = getAmount(s.getFeePlatform());
+ BigDecimal feePlatformPack = getAmount(s.getFeePlatformPack());
+ BigDecimal feePlatformCheck = getAmount(s.getFeePlatformCheck());
+ BigDecimal feePlatformTransport = getAmount(s.getFeePlatformTransport());
BigDecimal b = platformSalesMap.get(orderItemId);
if (b == null) {
@@ -125,6 +125,10 @@
b = b.add(feePlatform).add(feePlatformPack).add(feePlatformCheck).add(feePlatformTransport);
platformSalesMap.put(orderItemId, b);
}
+ }
+
+ protected BigDecimal getAmount(BigDecimal amount){
+ return amount == null ? new BigDecimal(0) : amount;
}
protected void prepareSalesAmount(OrderSalesItem s
@@ -459,6 +463,16 @@
return p;
}
+ protected Customer getCustomerByUserId(String userId){
+ Customer p = customerMapper.selectOne(new QueryWrapper<Customer>()
+ .eq("user_id", userId));
+ if(p == null){
+ throw new ValidationException("客户不存在");
+ }
+
+ return p;
+ }
+
protected Customer getCustomer(Long id){
Customer p = customerMapper.selectById(id);
--
Gitblit v1.9.3