From 67c7dcedb4386899c92baf6dca055def0deebb94 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 15 Mar 2023 11:43:30 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8F=AF=E7=96=91=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/ykc/TransactionRecordsData.java | 5 +++++ .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 5 +++++ .../src/main/resources/mapper/pile/OrderBasicInfoMapper.xml | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/TransactionRecordsData.java b/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/TransactionRecordsData.java index 91b73660c..75906bf98 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/TransactionRecordsData.java +++ b/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/TransactionRecordsData.java @@ -7,6 +7,8 @@ import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.Date; + /** * 交易记录数据对象 * @@ -119,6 +121,8 @@ public class TransactionRecordsData { // 物理卡号 不足 8 位补 0 private String logicCard; + private Date createTime; + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) @@ -153,6 +157,7 @@ public class TransactionRecordsData { .append("transactionTime", transactionTime) .append("stopReasonMsg", stopReasonMsg) .append("logicCard", logicCard) + .append("createTime", createTime) .toString(); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 979ee3d4e..2ffc79b11 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -806,6 +806,11 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 谷时段用电量 orderDetail.setValleyUsedElectricity(new BigDecimal(data.getValleyUsedElectricity())); + if (data.getCreateTime() != null) { + orderBasicInfo.setCreateTime(data.getCreateTime()); + orderDetail.setCreateTime(data.getCreateTime()); + } + OrderTransactionDTO createOrderTransactionDTO = OrderTransactionDTO.builder() .orderBasicInfo(orderBasicInfo) .orderDetail(orderDetail) diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index df8eca15d..92f41dffd 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -539,7 +539,7 @@ peak_price, peak_used_electricity, peak_electricity_price, peak_service_price, peak_amount, flat_price, flat_used_electricity, flat_electricity_price, flat_service_price, flat_amount, valley_price, valley_used_electricity, valley_electricity_price, valley_service_price, valley_amount, - create_by,update_by) + create_by,update_by, createTime) values (#{item.id}, #{item.orderCode}, #{item.totalUsedElectricity}, #{item.totalOrderAmount}, #{item.totalElectricityAmount}, #{item.totalServiceAmount}, @@ -547,7 +547,7 @@ #{item.peakPrice}, #{item.peakUsedElectricity}, #{item.peakElectricityPrice}, #{item.peakServicePrice}, #{item.peakAmount}, #{item.flatPrice}, #{item.flatUsedElectricity}, #{item.flatElectricityPrice}, #{item.flatServicePrice}, #{item.flatAmount}, #{item.valleyPrice}, #{item.valleyUsedElectricity}, #{item.valleyElectricityPrice}, #{item.valleyServicePrice}, #{item.valleyAmount}, - #{item.createBy}, #{item.updateBy}) + #{item.createBy}, #{item.updateBy}, #{item.createTime,jdbcType=TIMESTAMP})