From ead994fd895de18d82ba35ac7f7891704cb93cad Mon Sep 17 00:00:00 2001 From: donqi Date: Mon, 17 Oct 2022 23:22:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=8F=91=E8=B5=B7=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=9B=E8=AE=A2=E5=8D=95=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderMasterController.java | 1 + .../java/com/ghy/web/pojo/vo/OrderListResponse.java | 2 ++ .../com/ghy/order/domain/AfterServiceRecord.java | 12 ++++++++++++ .../service/impl/AfterServiceRecordServiceImpl.java | 2 ++ .../mapper/order/AfterServiceRecordMapper.xml | 4 +++- 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 45931059..79d0239a 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -183,6 +183,7 @@ public class OrderMasterController extends BaseController { orderListResponse.setTotalMoney(financialMaster.getTotalMoney()); orderListResponse.setPayMoney(totalPayMoney); orderListResponse.setChangeMoney(totalChangeMoney); + orderListResponse.setPaidMoney(totalPayMoney.subtract(totalChangeMoney)); orderListResponse.setWorkerName(worker == null ? "" : worker.getName()); orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone()); orderListResponse.setCustomerName(customerAddress.getName()); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java index 77ca92b0..200fc5d7 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java @@ -63,6 +63,8 @@ public class OrderListResponse { private BigDecimal payMoney; + private BigDecimal paidMoney; + private BigDecimal changeMoney; private BigDecimal discountMoney; diff --git a/ghy-order/src/main/java/com/ghy/order/domain/AfterServiceRecord.java b/ghy-order/src/main/java/com/ghy/order/domain/AfterServiceRecord.java index 080a6705..b95245b2 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/AfterServiceRecord.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/AfterServiceRecord.java @@ -1,6 +1,7 @@ package com.ghy.order.domain; import java.math.BigDecimal; +import java.util.Date; import java.util.List; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -64,6 +65,8 @@ public class AfterServiceRecord extends BaseEntity @Excel(name = "最终原路返还的金额") private BigDecimal originalRefund; + private Date refundApplyTime; + private boolean excludeAfterServiceFinished; private List imgsList; @@ -193,6 +196,14 @@ public class AfterServiceRecord extends BaseEntity this.excludeAfterServiceFinished = excludeAfterServiceFinished; } + public Date getRefundApplyTime() { + return refundApplyTime; + } + + public void setRefundApplyTime(Date refundApplyTime) { + this.refundApplyTime = refundApplyTime; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -207,6 +218,7 @@ public class AfterServiceRecord extends BaseEntity .append("refund", getRefund()) .append("agreedRefund", getAgreedRefund()) .append("originalRefund", getOriginalRefund()) + .append("refundApplyTime", getRefundApplyTime()) .append("customerFinalCheck", getCustomerFinalCheck()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java index 6ab451fd..cd7ccbdc 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.ghy.order.service.impl; import java.math.BigDecimal; +import java.util.Date; import java.util.List; import com.alibaba.fastjson.JSONObject; @@ -164,6 +165,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService financialMasterService.updateFinancialMaster(financialMaster); financialDetailService.updateFinancialDetail(financialDetail); param.setOriginalRefund(refundMoney); + param.setRefundApplyTime(new Date()); } else if (AdapayStatusEnum.failed.code.equals(response.getString("status"))) { if("reverse_amt_over".equals(response.getString("error_code"))){ throw new BaseException("退款金额大于最后一次支付,请撤销改金额再发起"); diff --git a/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml b/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml index 383ecb15..3d374687 100644 --- a/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml @@ -22,10 +22,11 @@ + - select id, customer_reason_type, customer_reason, order_detail_id, oper_type, worker_feedback_result, worker_feedback_reason_type, worker_feedback_reason, refund, agreed_refund, original_refund, customer_final_check, create_by, create_time, update_by, update_time, remark from after_service_record + select id, customer_reason_type, customer_reason, order_detail_id, oper_type, worker_feedback_result, worker_feedback_reason_type, worker_feedback_reason, refund, agreed_refund, original_refund, customer_final_check, create_by, create_time, update_by, update_time, remark, refund_apply_time from after_service_record