From e15121030e0510229a38c65582eb9c4c3543cc2b Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 30 八月 2024 11:00:00 +0800
Subject: [PATCH] add:GROWTH_SOURCE,GROWTH_TYPE字典
---
src/main/java/com/mzl/flower/service/BaseService.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 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 ac580a1..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,26 @@
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);
+
+ if(p == null){
+ throw new ValidationException("商户不存在");
+ }
+
+ return p;
+ }
+
public Partner getCurrentPartner(){
String userId = SecurityUtils.getUserId();
Partner p = partnerMapper.selectOne(new QueryWrapper<Partner>()
--
Gitblit v1.9.3