代码规范性调整

src/main/java/com/qtzl/alterSales/dao/entity/second/AflServerFeeRefund.java

@@ -4,10 +4,10 @@ package com.qtzl.alterSales.dao.entity.second;
 import cn.com.taiji.common.entity.StringUUIDEntity;
 
 import javax.persistence.Column;
-import javax.persistence.Converter;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.util.Date;
+import java.util.Objects;
 
 @Entity
 @Table(name = "AFL_SERVER_FEE_REFUND")
@@ -31,6 +31,19 @@ public class AflServerFeeRefund extends StringUUIDEntity {
     private String remarks;
     private Date insertTime;
 
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        AflServerFeeRefund that = (AflServerFeeRefund) o;
+        return Objects.equals(refundDate, that.refundDate) && Objects.equals(transactionId, that.transactionId) && Objects.equals(outTradeNo, that.outTradeNo) && Objects.equals(payDate, that.payDate) && Objects.equals(outRefundNo, that.outRefundNo) && Objects.equals(refundId, that.refundId) && Objects.equals(subMchId, that.subMchId) && Objects.equals(refundTime, that.refundTime) && Objects.equals(plateNum, that.plateNum) && Objects.equals(refundFee, that.refundFee) && Objects.equals(payeeName, that.payeeName) && Objects.equals(payeeOpeningBank, that.payeeOpeningBank) && Objects.equals(paymentAccount, that.paymentAccount) && Objects.equals(paymentBank, that.paymentBank) && Objects.equals(etcCardNo, that.etcCardNo) && Objects.equals(remarks, that.remarks) && Objects.equals(insertTime, that.insertTime);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), refundDate, transactionId, outTradeNo, payDate, outRefundNo, refundId, subMchId, refundTime, plateNum, refundFee, payeeName, payeeOpeningBank, paymentAccount, paymentBank, etcCardNo, remarks, insertTime);
+    }
+
     @Column(name = "REFUND_DATE")
     public String getRefundDate() {
         return refundDate;

src/main/java/com/qtzl/alterSales/dao/excelVO/enums/ReportExportDataEnum.java

@@ -1,6 +1,5 @@
 package com.qtzl.alterSales.dao.excelVO.enums;
 
-import com.qtzl.alterSales.dao.excelVO.request.ReportDateRangeRequest;
 import com.qtzl.alterSales.dao.excelVO.request.ReportServiceFee50Request;
 
 public enum ReportExportDataEnum {

src/main/java/com/qtzl/alterSales/manager/constants/DateFormatConstants.java

@@ -0,0 +1,8 @@
+package com.qtzl.alterSales.manager.constants;
+
+public class DateFormatConstants {
+    // 定义一个公共静态最终常量来表示日期格式
+    public static final String DATE_FORMAT_YYYY_MM_DD = "yyyy-MM-dd";
+
+    private DateFormatConstants() {}
+}

src/main/java/com/qtzl/alterSales/manager/service/AflServerFeeRefundServiceImpl.java

@@ -7,6 +7,7 @@ import com.qtzl.alterSales.dao.excelVO.head.incomeCost.ExcelHeadIncomeCostRefund
 import com.qtzl.alterSales.dao.excelVO.request.ReportDateRangeRequest;
 import com.qtzl.alterSales.dao.excelVO.request.ReportServiceFee50Request;
 import com.qtzl.alterSales.dao.repo.jpa.second.AflServerFeeRefundRepo;
+import com.qtzl.alterSales.manager.constants.DateFormatConstants;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -31,7 +32,7 @@ public class AflServerFeeRefundServiceImpl implements AflServerFeeRefundService{
     @Resource
     private AflServerFeeRefundRepo aflServerFeeRefundRepo;
 
-    private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+    private final SimpleDateFormat sdf = new SimpleDateFormat(DateFormatConstants.DATE_FORMAT_YYYY_MM_DD);
 
     @Override
     public Page<AflServerFeeRefund> findAll(ReportServiceFee50Request reportServiceFee50Request, Pageable pageable) {

src/test/java/ReportExcelTest.java

@@ -1,37 +0,0 @@
-import com.qtzl.alterSales.UserApplication;
-import com.qtzl.alterSales.dao.repo.jpa.primary.FssPaccountPayRepo;
-import com.qtzl.alterSales.dao.repo.jpa.second.*;
-import com.qtzl.alterSales.dao.repo.jpa.second.refund.RefundStatsRepo;
-import com.qtzl.alterSales.manager.service.*;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = UserApplication.class)
-public class ReportExcelTest {
-
-    private static final Logger log = LoggerFactory.getLogger(ReportExcelTest.class);
-    @Resource
-    private AflMchStatisticsRepo aflMchStatisticsRepo;
-    @Resource
-    private FssPaccountPayRepo fssPaccountPayRepo;
-    @Resource
-    private AflPaccountRefundCountRepo aflPaccountRefundCountRepo;
-    @Resource
-    private RefundStatsRepo refundStatsRepo;
-    @Resource
-    private AflOrderInfoRepo aflOrderInfoRepo;
-
-    @Resource
-    private AflReportFromServiceFeeDataService aflReportFromServiceFeeDataService;
-
-    @Resource
-    private AflServerFeeRefundRepo aflServerFeeRefundRepo;
-
-
-}