From 11c95afd1e44bcd3d70dbcf77e790596ec80a53e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 24 九月 2024 18:54:59 +0800
Subject: [PATCH] fix: 剔除加价限制条件
---
src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java | 153 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 137 insertions(+), 16 deletions(-)
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 b32176b..fe2bdb3 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mzl.flower.base.interceptor.CodeDecorator;
import com.mzl.flower.component.SequenceNo;
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.config.security.SecurityUtils;
@@ -17,6 +18,7 @@
import com.mzl.flower.mapper.supplier.StationMapper;
import com.mzl.flower.service.BaseService;
import com.mzl.flower.service.system.CodeService;
+import com.mzl.flower.utils.ExcelExportUtil;
import com.mzl.flower.utils.UUIDGenerator;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -24,7 +26,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
@@ -57,6 +61,15 @@
@Autowired
private CodeService codeService;
+ @Autowired
+ private CodeDecorator codeDecorator;
+
+ @Autowired
+ private OrderItemCheckMapper orderItemCheckMapper;
+
+ @Autowired
+ private DeliveryOrderService deliveryOrderService;
+
public String createSales(OrderItemSalesCreateDTO dto){
Integer num = dto.getNum();
if(num == null || num == 0){
@@ -68,7 +81,16 @@
throw new ValidationException("订单商品不存在");
}
- if(num > oi.getNum()){
+ OrderItemCheck c = orderItemCheckMapper.selectOne(new QueryWrapper<OrderItemCheck>()
+ .eq("order_item_id", oi.getId())
+ .eq("type", Constants.CHECK_TYPE.lack.name())
+ .eq("audit_status", Constants.CHECK_AUDIT_STATUS.AGREED.name())
+ );
+ int totalNum = oi.getNum();
+ if(c != null){//需要减去缺货的数量
+ totalNum -= c.getNum();
+ }
+ if(num > totalNum){
throw new ValidationException("申请数量不能超过总数");
}
@@ -81,7 +103,9 @@
String userId = SecurityUtils.getUserId();
int count = orderItemSalesMapper.selectCount(new QueryWrapper<OrderItemSales>()
- .eq("order_item_id", oi.getId()));
+ .eq("order_item_id", oi.getId())
+ .eq("status", Constants.ORDER_SALES_STATUS.AGREED.name())
+ );
if(count >= 2){
throw new ValidationException("售后申请超过限额");
}
@@ -108,6 +132,7 @@
s.setReason(dto.getReason());
s.setStatus(Constants.ORDER_SALES_STATUS.PENDING.name());
s.create(userId);
+ s.setSalesType(dto.getSalesType());
orderItemSalesMapper.insert(s);
return s.getId();
@@ -136,10 +161,10 @@
}
public List<OrderStatusCountDTO> getSalesStatusCount(OrderItemSalesQueryDTO dto) {
- dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr()));
- dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr()));
- dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr()));
- dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr()));
+ dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr(), true));
+ dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr(), false));
+ dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr(), true));
+ dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr(), false));
List<CodeValueDTO> ls = codeService.searchValue("ORDER_SALES_STATUS");
List<OrderStatusCountDTO> ll = orderItemSalesMapper.getSalesStatusCount(dto);
@@ -165,15 +190,73 @@
}
public Page<OrderItemSalesNewListDTO> selectSalesList(Page page, OrderItemSalesQueryDTO dto){
- dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr()));
- dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr()));
- dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr()));
- dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr()));
+ dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr(), true));
+ dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr(), false));
+ dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr(), true));
+ dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr(), false));
List<OrderItemSalesNewListDTO> ls = orderItemSalesMapper.selectItemSalesList(page, dto);
page.setRecords(ls);
return page;
+ }
+
+ public void exportSalesList(HttpServletResponse response, OrderItemSalesQueryDTO dto){
+ dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr(), true));
+ dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr(), false));
+ dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr(), true));
+ dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr(), false));
+
+ List<OrderItemSalesNewListDTO> ls = orderItemSalesMapper.selectItemSalesList(null, dto);
+ codeDecorator.decorate(ls);
+
+ String[] rowsName = new String[]{"序号", "集货站", "商品名称", "商品单位", "商品颜色", "商品等级"
+ , "商品分类", "收货人", "收货人手机号码", "收货地址", "商品数量", "供应商名称", "商品售价"
+ , "总金额", "订单号", "售后单号", "标题", "申请数量", "理由", "实际退款", "审核结果"
+ , "申请时间", "平台回复"};
+ List<Object[]> dataList = new ArrayList<>();
+
+ int sn = 1;
+ for (OrderItemSalesNewListDTO d : ls) {
+ Object[] objs = new Object[rowsName.length];
+ int a = 0;
+ objs[a++] = sn;
+ objs[a++] = d.getStationName();
+ objs[a++] = d.getFlowerName();
+ objs[a++] = d.getFlowerUnit();
+ objs[a++] = d.getFlowerColor();
+ objs[a++] = d.getFlowerLevelStr();
+ objs[a++] = d.getFlowerCategory();
+ objs[a++] = d.getCustomer();
+ objs[a++] = d.getCustomerTel();
+ objs[a++] = d.getCustomerProvince() + d.getCustomerCity() + d.getCustomerRegion() + d.getCustomerAddress();
+ objs[a++] = d.getFlowerNum();
+ objs[a++] = d.getSupplierName();
+ objs[a++] = d.getPrice();
+ objs[a++] = d.getTotal();
+ objs[a++] = d.getOrderNo();
+ objs[a++] = d.getSalesNo();
+ objs[a++] = d.getTitle();
+ objs[a++] = d.getNum();
+ objs[a++] = d.getReason();
+ objs[a++] = d.getTotalFee();
+ objs[a++] = d.getStatusStr();
+ objs[a++] = format(d.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+ objs[a++] = d.getRemarks();
+
+ dataList.add(objs);
+
+ sn++;
+ }
+
+ ExcelExportUtil excelExportUtil = new ExcelExportUtil("售后申请列表", rowsName, dataList, response);
+ try {
+ response.addHeader("filename", URLEncoder.encode("售后申请列表.xls", "UTF-8"));
+ response.addHeader("Access-Control-Expose-Headers", "filename");
+ excelExportUtil.export();
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
}
public OrderItemSalesNewDTO getSalesInfo(String id){
@@ -195,6 +278,7 @@
rr.setCustomerCity(o.getCustomerCity());
rr.setCustomerRegion(o.getCustomerRegion());
rr.setCustomerAddress(o.getCustomerAddress());
+ rr.setOrderTime(o.getCreateTime());
OrderItem oi = orderItemMapper.selectById(sl.getOrderItemId());
rr.setFlowerName(oi.getFlowerName());
@@ -207,12 +291,37 @@
rr.setSupplierName(oi.getSupplierName());
rr.setPrice(oi.getPrice());
rr.setTotal(oi.getTotal());
+ rr.setSupplierPrice(oi.getSupplierPrice());
+ rr.setMarkupPartner(oi.getMarkupPartner());
+ rr.setRealPrice(oi.getRealPrice());
+ rr.setRealTotal(oi.getRealTotal());
Long stationId = oi.getStationId();
if(stationId != null) {
Station s = stationMapper.selectById(oi.getStationId());
rr.setStationName(s.getName());
}
+
+ List<OrderItemCheck> cLs = orderItemCheckMapper.selectList(new QueryWrapper<OrderItemCheck>()
+ .eq("order_item_id", oi.getId())
+ .eq("audit_status", Constants.CHECK_AUDIT_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();
+ }
+ }
+ }
+ rr.setReduceNum(reduceNum);
+ rr.setReduceAmount(reduceAmount);
+ rr.setReplaceNum(replaceNum);
return rr;
}
@@ -232,6 +341,11 @@
}
BigDecimal feeSupplier = getAmount(dto.getFeeSupplier());
+ BigDecimal supplierTotal = oi.getSupplierPrice().multiply(new BigDecimal(sl.getNum()));
+ if(feeSupplier.doubleValue() > supplierTotal.doubleValue()){
+ throw new ValidationException("供应商扣款金额不能大于商品申请数量的供应商售价");
+ }
+
BigDecimal feePartner = getAmount(dto.getFeePartner());
BigDecimal feePlatform = getAmount(dto.getFeePlatform());
BigDecimal feePlatformPack = getAmount(dto.getFeePlatformPack());
@@ -240,6 +354,11 @@
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("退款金额不能大于商品申请数量的售价");
+ }
List<OrderItemSales> ls = orderItemSalesMapper.selectList(new QueryWrapper<OrderItemSales>()
.eq("order_item_id", oi.getId())
@@ -252,8 +371,14 @@
}
}
preFee = preFee.add(totalFee);
- if(preFee.doubleValue() > oi.getTotal().doubleValue()){
- throw new ValidationException("退款金额不能大于商品总价");
+ 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("退款总金额（包含质检退款）不能大于商品总价");
}
sl.setRemarks(dto.getRemarks());
@@ -279,9 +404,5 @@
orderItemSalesMapper.updateById(sl);
return oi;
- }
-
- private BigDecimal getAmount(BigDecimal amount){
- return amount == null ? new BigDecimal(0) : amount;
}
}
--
Gitblit v1.9.3