From 6a86398832bfd9d19235422d6c4752283e2fa373 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期二, 24 九月 2024 22:56:51 +0800
Subject: [PATCH] 售后验证
---
src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java | 12 ++++
src/main/java/com/mzl/flower/service/BaseService.java | 4 +
src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesAuditDTO.java | 3 +
src/main/java/com/mzl/flower/entity/payment/OrderItemSales.java | 3 +
src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java | 99 ++++++++++++++++++++++++---------
src/main/表设计.xlsx | 0
src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java | 4 +
7 files changed, 96 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesAuditDTO.java b/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesAuditDTO.java
index ca04cc7..c979aa1 100644
--- a/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesAuditDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesAuditDTO.java
@@ -30,6 +30,9 @@
@ApiModelProperty(value = "物流扣款")
private BigDecimal feePlatformTransport;
+ @ApiModelProperty(value = "打包运费")
+ private BigDecimal feePackingTransport;
+
@ApiModelProperty(value = "平台回复")
private String remarks;
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java
index a91666f..8662ab6 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java
@@ -34,6 +34,9 @@
@ApiModelProperty(value = "物流扣款")
private BigDecimal feePlatformTransport;
+ @ApiModelProperty(value = "打包运费")
+ private BigDecimal feePackingTransport;
+
@ApiModelProperty(value = "下单时间")
private LocalDateTime orderTime;
@@ -46,4 +49,13 @@
@ApiModelProperty(value = "补货数量")
private Integer replaceNum;
+ @ApiModelProperty(value = "缺货数量")
+ private Integer lackNum;
+
+ @ApiModelProperty(value = "质检总扣款")
+ private BigDecimal checkTotalAmount;
+
+ @ApiModelProperty(value = "已退总金额")
+ private BigDecimal refundTotalAmount;
+
}
diff --git a/src/main/java/com/mzl/flower/entity/payment/OrderItemSales.java b/src/main/java/com/mzl/flower/entity/payment/OrderItemSales.java
index 62d2cd4..552626b 100644
--- a/src/main/java/com/mzl/flower/entity/payment/OrderItemSales.java
+++ b/src/main/java/com/mzl/flower/entity/payment/OrderItemSales.java
@@ -54,6 +54,9 @@
@TableField("fee_platform_transport")
private BigDecimal feePlatformTransport;//物流扣款
+ @TableField("fee_packing_transport")
+ private BigDecimal feePackingTransport;//打包运费
+
@TableField("total_fee")
private BigDecimal totalFee;//退款总额
diff --git a/src/main/java/com/mzl/flower/service/BaseService.java b/src/main/java/com/mzl/flower/service/BaseService.java
index c5c2d7e..ecfcb6a 100644
--- a/src/main/java/com/mzl/flower/service/BaseService.java
+++ b/src/main/java/com/mzl/flower/service/BaseService.java
@@ -143,12 +143,14 @@
BigDecimal feePlatformPack = getAmount(s.getFeePlatformPack());
BigDecimal feePlatformCheck = getAmount(s.getFeePlatformCheck());
BigDecimal feePlatformTransport = getAmount(s.getFeePlatformTransport());
+ BigDecimal feePackingTransport = getAmount(s.getFeePackingTransport());
BigDecimal b = platformSalesMap.get(orderItemId);
if (b == null) {
b = new BigDecimal(0);
}
- b = b.add(feePlatform).add(feePlatformPack).add(feePlatformCheck).add(feePlatformTransport);
+ b = b.add(feePlatform).add(feePlatformPack).add(feePlatformCheck)
+ .add(feePlatformTransport).add(feePackingTransport);
platformSalesMap.put(orderItemId, b);
}
}
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
index fe2bdb3..4fb68da 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
@@ -70,6 +70,9 @@
@Autowired
private DeliveryOrderService deliveryOrderService;
+ @Autowired
+ private OrderItemSettlementMapper orderItemSettlementMapper;
+
public String createSales(OrderItemSalesCreateDTO dto){
Integer num = dto.getNum();
if(num == null || num == 0){
@@ -302,26 +305,25 @@
rr.setStationName(s.getName());
}
- List<OrderItemCheck> cLs = orderItemCheckMapper.selectList(new QueryWrapper<OrderItemCheck>()
+ OrderItemSettlement ois = orderItemSettlementMapper.selectOne(new QueryWrapper<OrderItemSettlement>()
+ .eq("order_item_id", sl.getOrderItemId()));
+ rr.setReduceNum(ois.getCheckNum());
+ rr.setReduceAmount(ois.getCheckFee());
+ rr.setReplaceNum(ois.getReplaceNum());
+ rr.setLackNum(ois.getLackNum());
+ rr.setCheckTotalAmount(getAmount(oi.getDeductAmount()));
+
+ List<OrderItemSales> ls = orderItemSalesMapper.selectList(new QueryWrapper<OrderItemSales>()
.eq("order_item_id", oi.getId())
- .eq("audit_status", Constants.CHECK_AUDIT_STATUS.AGREED.name())
+ .eq("status", Constants.ORDER_SALES_STATUS.AGREED.name())
);
- int reduceNum = 0;
- BigDecimal reduceAmount = new BigDecimal(0);
- int replaceNum = 0;
- if(cLs != null && cLs.size() > 0){
- for(OrderItemCheck c : cLs){
- if(Constants.CHECK_TYPE.reduce.name().equals(c.getType())){
- reduceNum += c.getNum();
- reduceAmount = reduceAmount.add(c.getDeductAmount());
- } else if(Constants.CHECK_TYPE.replace.name().equals(c.getType())){
- replaceNum += c.getNum();
- }
+ BigDecimal preFee = new BigDecimal(0);
+ if(ls != null && ls.size() > 0){
+ for(OrderItemSales s : ls){
+ preFee = preFee.add(s.getTotalFee());
}
}
- rr.setReduceNum(reduceNum);
- rr.setReduceAmount(reduceAmount);
- rr.setReplaceNum(replaceNum);
+ rr.setRefundTotalAmount(preFee.add(rr.getCheckTotalAmount()));
return rr;
}
@@ -341,42 +343,85 @@
}
BigDecimal feeSupplier = getAmount(dto.getFeeSupplier());
- BigDecimal supplierTotal = oi.getSupplierPrice().multiply(new BigDecimal(sl.getNum()));
+ BigDecimal supplierTotal = oi.getSupplierPrice().multiply(new BigDecimal(sl.getNum()));//申请数量的供应商价格
+ //1.输入不能大于商品申请数量"供应商上架价格
if(feeSupplier.doubleValue() > supplierTotal.doubleValue()){
throw new ValidationException("供应商扣款金额不能大于商品申请数量的供应商售价");
}
BigDecimal feePartner = getAmount(dto.getFeePartner());
+ //合伙人输入框限制:
+ //1.输入金额不能大于输入金额申请数量"加价
+ BigDecimal partnerTotal = oi.getMarkupPartner().multiply(new BigDecimal(sl.getNum()));//申请数量的合伙人加价
+ if(feePartner.doubleValue() > partnerTotal.doubleValue()){
+ throw new ValidationException("合伙人扣款金额不能大于商品申请数量的合伙人加价");
+ }
+
BigDecimal feePlatform = getAmount(dto.getFeePlatform());
BigDecimal feePlatformPack = getAmount(dto.getFeePlatformPack());
BigDecimal feePlatformCheck = getAmount(dto.getFeePlatformCheck());
BigDecimal feePlatformTransport = getAmount(dto.getFeePlatformTransport());
+ BigDecimal feePackingTransport = getAmount(dto.getFeePackingTransport());
BigDecimal totalFee = feeSupplier.add(feePartner).add(feePlatform).add(feePlatformPack)
- .add(feePlatformCheck).add(feePlatformTransport);
-
- BigDecimal st = oi.getRealPrice().multiply(new BigDecimal(sl.getNum()));//申请售后的花的金额，使用券后的单价
- if(totalFee.doubleValue() > st.doubleValue()){
- throw new ValidationException("退款金额不能大于商品申请数量的售价");
- }
+ .add(feePlatformCheck).add(feePlatformTransport).add(feePackingTransport);
List<OrderItemSales> ls = orderItemSalesMapper.selectList(new QueryWrapper<OrderItemSales>()
.eq("order_item_id", oi.getId())
.eq("status", Constants.ORDER_SALES_STATUS.AGREED.name())
);
BigDecimal preFee = new BigDecimal(0);
+ BigDecimal preFeeSupplier = new BigDecimal(0);
+ BigDecimal preFeePackingTransport = new BigDecimal(0);
+ int preNum = 0;
if(ls != null && ls.size() > 0){
for(OrderItemSales s : ls){
preFee = preFee.add(s.getTotalFee());
+ preFeeSupplier = preFeeSupplier.add(s.getFeeSupplier());
+ preNum += s.getNum();
+ preFeePackingTransport = preFeePackingTransport.add(s.getFeePackingTransport());
}
}
- preFee = preFee.add(totalFee);
- if(preFee.doubleValue() > oi.getRealTotal().doubleValue()){//使用券后的总价
- throw new ValidationException("退款总金额不能大于商品总价");
+
+ preFeePackingTransport = preFeePackingTransport.add(feePackingTransport);
+ //打包运费限制不能超过订单的运费和打包费
+ Order o = orderMapper.selectById(oi.getOrderId());
+ BigDecimal packingTransport = getAmount(o.getPackingFee()).add(getAmount(o.getTransportFee()));
+ if(preFeePackingTransport.doubleValue() > packingTransport.doubleValue()){
+ throw new ValidationException("打包运费不能超过订单的运费和打包费");
}
+
+ OrderItemSettlement ois = orderItemSettlementMapper.selectOne(new QueryWrapper<OrderItemSettlement>()
+ .eq("order_item_id", sl.getOrderItemId()));
+ int usedNum = ois.getLackNum() + preNum;//缺货的数量和上一次售后的数量
+ int leftNum = oi.getNum() - usedNum;//剩下的数量
+ BigDecimal st = oi.getRealPrice().multiply(new BigDecimal(sl.getNum()));//申请售后的花的金额，使用券后的单价
+ if(sl.getNum() == leftNum){//剩下的所有的商品都售后时用减法计算
+ st = oi.getRealTotal().subtract(oi.getRealPrice().multiply(new BigDecimal(usedNum)));
+ }
+ if(totalFee.doubleValue() > st.doubleValue()){
+ throw new ValidationException("退款金额不能大于商品申请数量的售价");
+ }
+
+ supplierTotal = oi.getSupplierPrice().multiply(new BigDecimal(oi.getNum()));//购买总数的供应商价格
+ preFeeSupplier = preFeeSupplier.add(feeSupplier);
+
+ preFeeSupplier = preFeeSupplier.add(ois.getCheckFee())
+ .add(ois.getLackFeeSupplier())
+ .add(ois.getReplaceFee());
+ //2.不能大于商品购买数量"花材底价-质检总扣款-第一次售后全额扣供应商的全额
+ if(preFeeSupplier.doubleValue() > supplierTotal.doubleValue()){
+ throw new ValidationException("供应商总扣款金额不能大于商品购买数量的供应商售价");
+ }
+
+ preFee = preFee.add(totalFee);
+ /*if(preFee.doubleValue() > oi.getRealTotal().doubleValue()){//使用券后的总价
+ throw new ValidationException("退款总金额不能大于商品总价");
+ }*/
BigDecimal deduct = deliveryOrderService.calculateOrderItemDeduct(sl.getOrderItemId());//质检已扣款金额
preFee = preFee.add(deduct);
+ //券后总金额-未申请售后的数量(商品购买数量-申请数量)券后单价
if(preFee.doubleValue() > oi.getRealTotal().doubleValue()){
throw new ValidationException("退款总金额（包含质检退款）不能大于商品总价");
}
@@ -388,6 +433,7 @@
sl.setFeePlatformPack(feePlatformPack);
sl.setFeePlatformCheck(feePlatformCheck);
sl.setFeePlatformTransport(feePlatformTransport);
+ sl.setFeePackingTransport(feePackingTransport);
sl.setTotalFee(totalFee);
sl.setStatus(status);
sl.setAuditTime(LocalDateTime.now());
@@ -395,7 +441,6 @@
if(Constants.ORDER_SALES_STATUS.AGREED.name().equals(sl.getStatus())){
if(totalFee.doubleValue() > 0) {
- Order o = orderMapper.selectById(sl.getOrderId());
String refundId = paymentV3Service.refundOrderSub(o, totalFee);
sl.setRefundId(refundId);
}
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java b/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
index 6de9160..96f93ad 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
@@ -173,8 +173,10 @@
BigDecimal feePlatformPack = s.getFeePlatformPack();
BigDecimal feePlatformCheck = s.getFeePlatformCheck();
BigDecimal feePlatformTransport = s.getFeePlatformTransport();
+ BigDecimal feePackingTransport = s.getFeePackingTransport();
salesFeePlatform = salesFeePlatform.add(feePlatform)
- .add(feePlatformPack).add(feePlatformCheck).add(feePlatformTransport);
+ .add(feePlatformPack).add(feePlatformCheck)
+ .add(feePlatformTransport).add(feePackingTransport);
salesFeeSupplier = salesFeeSupplier.add(feeSupplier);
salesFeePartner = salesFeePartner.add(feePartner);
}
diff --git "a/src/main/\350\241\250\350\256\276\350\256\241.xlsx" "b/src/main/\350\241\250\350\256\276\350\256\241.xlsx"
index 3c4cf99..304a84e 100644
--- "a/src/main/\350\241\250\350\256\276\350\256\241.xlsx"
+++ "b/src/main/\350\241\250\350\256\276\350\256\241.xlsx"
Binary files differ
--
Gitblit v1.9.3