From 540b80dd4c3b3fdecc56e12792b485cc111b5530 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 九月 2024 14:03:38 +0800
Subject: [PATCH] 1.新增筛选：已加价/未加价2.新增“售价”字段，售价=底价+加价
---
src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpService.java | 11 +++++++++++
src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java | 3 +++
src/main/java/com/mzl/flower/dto/response/flower/FlowerMarkupSpListDTO.java | 3 +++
src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml | 20 ++++++++++++++++++++
4 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java
index 0a3c057..dab0c25 100644
--- a/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java
@@ -20,4 +20,7 @@
@ApiModelProperty(value = "合伙人ID")
private Long partnerId;
+ @ApiModelProperty(value = "是否加价")
+ private String isFee;
+
}
diff --git a/src/main/java/com/mzl/flower/dto/response/flower/FlowerMarkupSpListDTO.java b/src/main/java/com/mzl/flower/dto/response/flower/FlowerMarkupSpListDTO.java
index 7d98948..94115be 100644
--- a/src/main/java/com/mzl/flower/dto/response/flower/FlowerMarkupSpListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/flower/FlowerMarkupSpListDTO.java
@@ -67,4 +67,7 @@
@ApiModelProperty(value = "重量")
private Double weight;
+
+ @ApiModelProperty(value = "售价")
+ private BigDecimal sellPrice;
}
diff --git a/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpService.java b/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpService.java
index 89b410b..e6d1697 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpService.java
@@ -15,6 +15,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.List;
@Slf4j
@@ -77,6 +78,11 @@
if(ll != null && ll.size() > 0){
for(FlowerMarkupSpListDTO ss : ll){
ss.setPrice(getFinalPriceForPartner(dto.getPartnerId(), ss.getCategory(), ss.getFlowerId(), ss.getPrice(), ss.getLevel()));
+ BigDecimal fee = ss.getFee();
+ if (fee == null) {
+ fee = BigDecimal.ZERO;
+ }
+ ss.setSellPrice(ss.getPrice().add(fee));
}
}
@@ -90,6 +96,11 @@
if(ll != null && ll.size() > 0){
for(FlowerMarkupSpListDTO ss : ll){
ss.setPrice(getFinalPriceForPartner(dto.getPartnerId(), ss.getCategory(), ss.getFlowerId(), ss.getPrice(), ss.getLevel()));
+ BigDecimal fee = ss.getFee();
+ if (fee == null) {
+ fee = BigDecimal.ZERO;
+ }
+ ss.setSellPrice(ss.getPrice().add(fee));
}
}
diff --git a/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml b/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
index 60a976a..e16fb0b 100644
--- a/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
@@ -33,6 +33,16 @@
)
)
</if>
+ <if test="condition.isFee != null">
+ <choose>
+ <when test="condition.isFee == 'markup'">
+ AND sp.fee > 0
+ </when>
+ <otherwise>
+ AND (sp.fee is null or sp.fee = 0)
+ </otherwise>
+ </choose>
+ </if>
ORDER BY f.id
</select>
@@ -68,6 +78,16 @@
)
)
</if>
+ <if test="condition.isFee != null">
+ <choose>
+ <when test="condition.isFee == 'markup'">
+ AND sp.fee > 0
+ </when>
+ <otherwise>
+ AND (sp.fee is null or sp.fee = 0)
+ </otherwise>
+ </choose>
+ </if>
ORDER BY f.id
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3