From e73d51df2fc2fc369c02eff3571a76f75b98a8ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:14:08 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 ef5b163..3e1edc4 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
@@ -50,7 +50,7 @@
private OrderItemMapper orderItemMapper;
@Autowired
- private UserPaymentV3Service paymentV3Service;
+ private UserPaymentSybService paymentSybService;
@Autowired
private SequenceNo sequenceNo;
@@ -197,6 +197,7 @@
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);
@@ -209,6 +210,7 @@
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);
@@ -246,6 +248,7 @@
objs[a++] = d.getStatusStr();
objs[a++] = format(d.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
objs[a++] = d.getRemarks();
+
dataList.add(objs);
@@ -328,7 +331,7 @@
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("售后单不存在");
@@ -446,7 +449,7 @@
if(Constants.ORDER_SALES_STATUS.AGREED.name().equals(sl.getStatus())){
if(totalFeeWithPacking.doubleValue() > 0) {
- String refundId = paymentV3Service.refundOrderSub(o, totalFeeWithPacking);
+ String refundId = paymentSybService.refundOrderSub(o, totalFeeWithPacking);
sl.setRefundId(refundId);
}
}
--
Gitblit v1.9.3