From a21c0b965f85c62bcb9dea9f34dcde5f6d28e1f6 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期三, 18 九月 2024 17:27:49 +0800
Subject: [PATCH] 结算备注新增账号名称
---
src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java | 3 +++
src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java | 25 +++++++++++++------------
src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml | 2 +-
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
index e878c48..84df139 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
@@ -78,4 +78,7 @@
@ApiModelProperty(value = "下单时间")
private LocalDateTime orderTime;
+
+ @ApiModelProperty(value = "收货时间")
+ private LocalDateTime receiveTime;
}
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java b/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
index 02cb428..7fe5f0c 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
@@ -130,19 +130,21 @@
}
String type = settlement.getType();
+ String name = "";
+ if(Constants.SETTLEMENT_TYPE.supplier.name().equals(type)){
+ Supplier s = supplierMapper.selectOne(new QueryWrapper<Supplier>()
+ .eq("user_id", settlement.getUserId()));
+ name = "供应商" + s.getName();
+ } else {
+ Partner p = partnerMapper.selectOne(new QueryWrapper<Partner>()
+ .eq("user_id", settlement.getUserId()));
+ name = "合伙人" + p.getName();
+ }
+
UserWechat wechat = wechatMapper.selectOne(new QueryWrapper<UserWechat>()
.eq("user_id", settlement.getUserId()));
if(wechat == null){
- String msg;
- if(Constants.SETTLEMENT_TYPE.supplier.name().equals(type)){
- Supplier s = supplierMapper.selectOne(new QueryWrapper<Supplier>()
- .eq("user_id", settlement.getUserId()));
- msg = "供应商" + s.getName() + "未绑定账号无法结算";
- } else {
- Partner p = partnerMapper.selectOne(new QueryWrapper<Partner>()
- .eq("user_id", settlement.getUserId()));
- msg = "合伙人" + p.getName() + "未绑定账号无法结算";
- }
+ String msg = name + "未绑定账号无法结算";
log.error(msg);
throw new ValidationException(msg);
}
@@ -151,8 +153,7 @@
LocalDateTime now = LocalDateTime.now();
String day = format(now, "yyyy-MM-dd");
- String remarks = Constants.SETTLEMENT_TYPE.supplier.name().equals(type)
- ? "供应商账单结算" : "合伙人账单结算";
+ String remarks = name + "账单结算";
String appId = Constants.SETTLEMENT_TYPE.supplier.name().equals(type)
? PyamentV3Configurer.supplier_app_id : PyamentV3Configurer.partner_app_id;
diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index 024312f..832228f 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -45,7 +45,7 @@
SELECT ois.order_item_id, oi.flower_name, oi.flower_level, oi.num, oi.supplier_price price , s.`status`
, ois.check_num, ois.check_fee, ois.replace_num, ois.replace_fee, ois.lack_num, ois.lack_fee_supplier lackFee
, ois.station_fee, ois.sales_fee_supplier salesFee, ois.service_fee_rate, ois.service_fee
- , ois.income_supplier income, o.status_backend, o.create_time orderTime
+ , ois.income_supplier income, o.status_backend, o.create_time orderTime, o.receive_time
, (select count(1) from t_order_item_sales sa where sa.order_item_id = oi.id) salesNum
FROM t_delivery_order_item doi
join t_delivery_order q on q.id = doi.delivery_id
--
Gitblit v1.9.3