From 5997dc8acfa81a6c867c28810d1c3c9714efc46c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 29 三月 2025 14:55:42 +0800
Subject: [PATCH] fix: 登录
---
src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java | 218 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 196 insertions(+), 22 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..84d02ec 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,18 @@
@Autowired
private CodeService codeService;
+ @Autowired
+ private CodeDecorator codeDecorator;
+
+ @Autowired
+ private OrderItemCheckMapper orderItemCheckMapper;
+
+ @Autowired
+ private DeliveryOrderService deliveryOrderService;
+
+ @Autowired
+ private OrderItemSettlementMapper orderItemSettlementMapper;
+
public String createSales(OrderItemSalesCreateDTO dto){
Integer num = dto.getNum();
if(num == null || num == 0){
@@ -68,7 +84,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 +106,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 +135,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 +164,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 +193,76 @@
}
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));
+ dto.setStatusList(splitParam(dto.getStatus()));
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));
+ dto.setStatusList(splitParam(dto.getStatus()));
+
+ 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 +284,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,6 +297,10 @@
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) {
@@ -214,10 +308,30 @@
rr.setStationName(s.getName());
}
+ 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("status", Constants.ORDER_SALES_STATUS.AGREED.name())
+ );
+ BigDecimal preFee = new BigDecimal(0);
+ if(ls != null && ls.size() > 0){
+ for(OrderItemSales s : ls){
+ preFee = preFee.add(s.getTotalFee());
+ }
+ }
+ rr.setRefundTotalAmount(preFee.add(rr.getCheckTotalAmount()));
+
return rr;
}
- public OrderItem doAudit(OrderItemSalesAuditDTO dto, String status){
+ public OrderItem doAudit(OrderItemSalesAuditDTO dto, String status) throws Exception {
OrderItemSales sl = orderItemSalesMapper.selectById(dto.getId());
if(sl == null){
throw new ValidationException("售后单不存在");
@@ -232,28 +346,92 @@
}
BigDecimal feeSupplier = getAmount(dto.getFeeSupplier());
+ BigDecimal supplierTotal = getAmount(oi.getSupplierPrice()).multiply(new BigDecimal(sl.getNum()));//申请数量的供应商价格
+ log.info(">>>>>>feeSupplier: " + feeSupplier.doubleValue());
+ log.info(">>>>>>supplierTotal: " + supplierTotal.doubleValue());
+ log.info(">>>>>>sl.getNum(): " + sl.getNum());
+ //1.输入不能大于商品申请数量"供应商上架价格
+ if(feeSupplier.compareTo(supplierTotal) > 0){
+ throw new ValidationException("供应商扣款金额不能大于商品申请数量的供应商售价");
+ }
+
BigDecimal feePartner = getAmount(dto.getFeePartner());
+ //合伙人输入框限制:
+ //1.输入金额不能大于输入金额申请数量"加价
+ BigDecimal partnerTotal = getAmount(oi.getMarkupPartner()).multiply(new BigDecimal(sl.getNum()));//申请数量的合伙人加价
+ if(feePartner.compareTo(partnerTotal) > 0){
+ 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 totalFeeWithPacking = totalFee.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());
+ preFee = preFee.add(s.getTotalFee()).subtract(s.getFeePackingTransport());
+ preFeeSupplier = preFeeSupplier.add(s.getFeeSupplier());
+ preNum += s.getNum();
+ preFeePackingTransport = preFeePackingTransport.add(s.getFeePackingTransport());
}
}
+
+ preFeePackingTransport = preFeePackingTransport.add(feePackingTransport);
+ //打包运费限制不能超过订单的运费和打包费
+ Order o = orderMapper.selectById(oi.getOrderId());
+ BigDecimal packingTransport = getAmount(o.getPackingFee()).add(getAmount(o.getTransportFee()));
+ if(preFeePackingTransport.compareTo(packingTransport) > 0){
+ 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.compareTo(st) > 0){
+ 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.compareTo(supplierTotal) > 0){
+ throw new ValidationException("供应商总扣款金额不能大于商品购买数量的供应商售价");
+ }
+
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.compareTo(oi.getRealTotal()) > 0){
+ throw new ValidationException("退款总金额（包含质检退款）不能大于商品总价");
}
sl.setRemarks(dto.getRemarks());
@@ -263,15 +441,15 @@
sl.setFeePlatformPack(feePlatformPack);
sl.setFeePlatformCheck(feePlatformCheck);
sl.setFeePlatformTransport(feePlatformTransport);
- sl.setTotalFee(totalFee);
+ sl.setFeePackingTransport(feePackingTransport);
+ sl.setTotalFee(totalFeeWithPacking);
sl.setStatus(status);
sl.setAuditTime(LocalDateTime.now());
sl.update(SecurityUtils.getUserId());
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);
+ if(totalFeeWithPacking.doubleValue() > 0) {
+ String refundId = paymentV3Service.refundOrderSub(o, totalFeeWithPacking);
sl.setRefundId(refundId);
}
}
@@ -279,9 +457,5 @@
orderItemSalesMapper.updateById(sl);
return oi;
- }
-
- private BigDecimal getAmount(BigDecimal amount){
- return amount == null ? new BigDecimal(0) : amount;
}
}
--
Gitblit v1.9.3