Commit cb006ddf2bec1a9f406d70017c929696477dd5e4
1 parent
37522911
DateUtils.buildLocalDateTime ==> LocalDateTime.of
Showing
6 changed files
with
37 additions
and
53 deletions
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
| ... | ... | @@ -5,6 +5,7 @@ import cn.hutool.core.date.LocalDateTimeUtil; |
| 5 | 5 | |
| 6 | 6 | import java.time.Duration; |
| 7 | 7 | import java.time.Instant; |
| 8 | +import java.time.LocalDate; | |
| 8 | 9 | import java.time.LocalDateTime; |
| 9 | 10 | import java.time.ZoneId; |
| 10 | 11 | import java.time.ZonedDateTime; |
| ... | ... | @@ -77,7 +78,7 @@ public class DateUtils { |
| 77 | 78 | } |
| 78 | 79 | |
| 79 | 80 | public static LocalDateTime buildLocalDateTime(int year, int mouth, int day) { |
| 80 | - return buildLocalDateTime(year, mouth, day, 0, 0, 0); | |
| 81 | + return LocalDateTime.of(year, mouth, day, 0, 0, 0); | |
| 81 | 82 | } |
| 82 | 83 | |
| 83 | 84 | /** |
| ... | ... | @@ -104,19 +105,6 @@ public class DateUtils { |
| 104 | 105 | return calendar.getTime(); |
| 105 | 106 | } |
| 106 | 107 | |
| 107 | - public static LocalDateTime buildLocalDateTime(int year, int mouth, int day, | |
| 108 | - int hour, int minute, int second) { | |
| 109 | - Calendar calendar = Calendar.getInstance(); | |
| 110 | - calendar.set(Calendar.YEAR, year); | |
| 111 | - calendar.set(Calendar.MONTH, mouth - 1); | |
| 112 | - calendar.set(Calendar.DAY_OF_MONTH, day); | |
| 113 | - calendar.set(Calendar.HOUR_OF_DAY, hour); | |
| 114 | - calendar.set(Calendar.MINUTE, minute); | |
| 115 | - calendar.set(Calendar.SECOND, second); | |
| 116 | - calendar.set(Calendar.MILLISECOND, 0); // 一般情况下,都是 0 毫秒 | |
| 117 | - return dateToLocalDateTime(calendar.getTime()); | |
| 118 | - } | |
| 119 | - | |
| 120 | 108 | public static Date max(Date a, Date b) { |
| 121 | 109 | if (a == null) { |
| 122 | 110 | return b; | ... | ... |
yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java
| ... | ... | @@ -11,7 +11,6 @@ import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO; |
| 11 | 11 | import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum; |
| 12 | 12 | import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; |
| 13 | 13 | import cn.iocoder.yudao.framework.common.util.collection.MapUtils; |
| 14 | -import cn.iocoder.yudao.framework.common.util.date.DateUtils; | |
| 15 | 14 | import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; |
| 16 | 15 | import com.aliyuncs.AcsRequest; |
| 17 | 16 | import com.aliyuncs.IAcsClient; |
| ... | ... | @@ -27,6 +26,7 @@ import org.mockito.ArgumentMatcher; |
| 27 | 26 | import org.mockito.InjectMocks; |
| 28 | 27 | import org.mockito.Mock; |
| 29 | 28 | |
| 29 | +import java.time.LocalDateTime; | |
| 30 | 30 | import java.util.List; |
| 31 | 31 | import java.util.function.Function; |
| 32 | 32 | |
| ... | ... | @@ -125,7 +125,7 @@ public class AliyunSmsClientTest extends BaseMockitoUnitTest { |
| 125 | 125 | assertEquals("DELIVERED", statuses.get(0).getErrorCode()); |
| 126 | 126 | assertEquals("用户接收成功", statuses.get(0).getErrorMsg()); |
| 127 | 127 | assertEquals("13900000001", statuses.get(0).getMobile()); |
| 128 | - assertEquals(DateUtils.buildLocalDateTime(2017, 2, 2, 22, 23, 24), statuses.get(0).getReceiveTime()); | |
| 128 | + assertEquals(LocalDateTime.of(2017, 2, 2, 22, 23, 24), statuses.get(0).getReceiveTime()); | |
| 129 | 129 | assertEquals("12345", statuses.get(0).getSerialNo()); |
| 130 | 130 | assertEquals(67890L, statuses.get(0).getLogId()); |
| 131 | 131 | } |
| ... | ... | @@ -181,7 +181,7 @@ public class AliyunSmsClientTest extends BaseMockitoUnitTest { |
| 181 | 181 | when(client.getAcsResponse(any(AcsRequest.class))).thenThrow(ex); |
| 182 | 182 | |
| 183 | 183 | // 调用,并断言异常 |
| 184 | - SmsCommonResult<?> result = smsClient.invoke(request,null); | |
| 184 | + SmsCommonResult<?> result = smsClient.invoke(request, null); | |
| 185 | 185 | // 断言 |
| 186 | 186 | assertEquals(ex.getErrCode(), result.getApiCode()); |
| 187 | 187 | assertEquals(ex.getErrMsg(), result.getApiMsg()); | ... | ... |
yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsClientTest.java
| ... | ... | @@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.common.core.KeyValue; |
| 6 | 6 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; |
| 7 | 7 | import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; |
| 8 | 8 | import cn.iocoder.yudao.framework.common.util.collection.MapUtils; |
| 9 | -import cn.iocoder.yudao.framework.common.util.date.DateUtils; | |
| 10 | 9 | import cn.iocoder.yudao.framework.common.util.json.JsonUtils; |
| 11 | 10 | import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; |
| 12 | 11 | import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO; |
| ... | ... | @@ -25,6 +24,7 @@ import org.junit.jupiter.api.Test; |
| 25 | 24 | import org.mockito.InjectMocks; |
| 26 | 25 | import org.mockito.Mock; |
| 27 | 26 | |
| 27 | +import java.time.LocalDateTime; | |
| 28 | 28 | import java.util.ArrayList; |
| 29 | 29 | import java.util.List; |
| 30 | 30 | |
| ... | ... | @@ -146,7 +146,7 @@ public class TencentSmsClientTest extends BaseMockitoUnitTest { |
| 146 | 146 | assertEquals("DELIVRD", statuses.get(0).getErrorCode()); |
| 147 | 147 | assertEquals("用户短信送达成功", statuses.get(0).getErrorMsg()); |
| 148 | 148 | assertEquals("13900000001", statuses.get(0).getMobile()); |
| 149 | - assertEquals(DateUtils.buildLocalDateTime(2015, 10, 17, 8, 3, 4), statuses.get(0).getReceiveTime()); | |
| 149 | + assertEquals(LocalDateTime.of(2015, 10, 17, 8, 3, 4), statuses.get(0).getReceiveTime()); | |
| 150 | 150 | assertEquals("12345", statuses.get(0).getSerialNo()); |
| 151 | 151 | assertEquals(67890L, statuses.get(0).getLogId()); |
| 152 | 152 | } | ... | ... |
yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java
| ... | ... | @@ -10,7 +10,6 @@ import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO; |
| 10 | 10 | import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO; |
| 11 | 11 | import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum; |
| 12 | 12 | import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; |
| 13 | -import cn.iocoder.yudao.framework.common.util.date.DateUtils; | |
| 14 | 13 | import com.google.common.collect.Lists; |
| 15 | 14 | import com.yunpian.sdk.YunpianClient; |
| 16 | 15 | import com.yunpian.sdk.api.SmsApi; |
| ... | ... | @@ -23,6 +22,7 @@ import org.junit.jupiter.api.Test; |
| 23 | 22 | import org.mockito.InjectMocks; |
| 24 | 23 | import org.mockito.Mock; |
| 25 | 24 | |
| 25 | +import java.time.LocalDateTime; | |
| 26 | 26 | import java.util.HashMap; |
| 27 | 27 | import java.util.List; |
| 28 | 28 | import java.util.Map; |
| ... | ... | @@ -115,7 +115,7 @@ public class YunpianSmsClientTest extends BaseMockitoUnitTest { |
| 115 | 115 | assertEquals("", statuses.get(0).getErrorCode()); |
| 116 | 116 | assertNull(statuses.get(0).getErrorMsg()); |
| 117 | 117 | assertEquals("15205201314", statuses.get(0).getMobile()); |
| 118 | - assertEquals(DateUtils.buildLocalDateTime(2014, 3, 17, 22, 55, 21), statuses.get(0).getReceiveTime()); | |
| 118 | + assertEquals(LocalDateTime.of(2014, 3, 17, 22, 55, 21), statuses.get(0).getReceiveTime()); | |
| 119 | 119 | assertEquals("9527", statuses.get(0).getSerialNo()); |
| 120 | 120 | assertEquals(1024L, statuses.get(0).getLogId()); |
| 121 | 121 | } | ... | ... |
yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java
| ... | ... | @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.pay.service.order; |
| 3 | 3 | import cn.hutool.core.date.DateUtil; |
| 4 | 4 | import cn.hutool.core.util.RandomUtil; |
| 5 | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | -import cn.iocoder.yudao.framework.common.util.date.DateUtils; | |
| 7 | 6 | import cn.iocoder.yudao.framework.pay.config.PayProperties; |
| 8 | 7 | import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory; |
| 9 | 8 | import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; |
| ... | ... | @@ -26,7 +25,6 @@ import javax.annotation.Resource; |
| 26 | 25 | import java.time.LocalDateTime; |
| 27 | 26 | import java.util.List; |
| 28 | 27 | |
| 29 | -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime; | |
| 30 | 28 | import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; |
| 31 | 29 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 32 | 30 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; |
| ... | ... | @@ -83,17 +81,17 @@ public class PayOrderServiceTest extends BaseDbUnitTest { |
| 83 | 81 | o.setChannelFeeAmount(1L); |
| 84 | 82 | o.setStatus(PayOrderStatusEnum.SUCCESS.getStatus()); |
| 85 | 83 | o.setUserIp("127.0.0.1"); |
| 86 | - o.setCreateTime(DateUtils.buildLocalDateTime(2018, 1, 1, 10, 1, 0)); | |
| 87 | - o.setExpireTime(DateUtils.buildLocalDateTime(2018, 1, 1, 10, 30, 0)); | |
| 88 | - o.setSuccessTime(DateUtils.buildLocalDateTime(2018, 1, 1, 10, 10, 2)); | |
| 89 | - o.setNotifyTime(DateUtils.buildLocalDateTime(2018, 1, 1, 10, 10, 15)); | |
| 84 | + o.setCreateTime(LocalDateTime.of(2018, 1, 1, 10, 1, 0)); | |
| 85 | + o.setExpireTime(LocalDateTime.of(2018, 1, 1, 10, 30, 0)); | |
| 86 | + o.setSuccessTime(LocalDateTime.of(2018, 1, 1, 10, 10, 2)); | |
| 87 | + o.setNotifyTime(LocalDateTime.of(2018, 1, 1, 10, 10, 15)); | |
| 90 | 88 | o.setSuccessExtensionId(1L); |
| 91 | 89 | o.setRefundStatus(PayRefundTypeEnum.NO.getStatus()); |
| 92 | 90 | o.setRefundTimes(0); |
| 93 | 91 | o.setRefundAmount(0L); |
| 94 | 92 | o.setChannelUserId("1008611"); |
| 95 | 93 | o.setChannelOrderNo(channelOrderId); |
| 96 | - o.setUpdateTime(DateUtils.buildLocalDateTime(2018, 1, 1, 10, 10, 15)); | |
| 94 | + o.setUpdateTime(LocalDateTime.of(2018, 1, 1, 10, 10, 15)); | |
| 97 | 95 | }); |
| 98 | 96 | orderMapper.insert(dbOrder); |
| 99 | 97 | // 测试 merchantId 不匹配 |
| ... | ... | @@ -113,7 +111,7 @@ public class PayOrderServiceTest extends BaseDbUnitTest { |
| 113 | 111 | // 测试 refundStatus 不匹配 |
| 114 | 112 | orderMapper.insert(cloneIgnoreId(dbOrder, o -> o.setRefundStatus(PayRefundTypeEnum.ALL.getStatus()))); |
| 115 | 113 | // 测试 createTime 不匹配 |
| 116 | - orderMapper.insert(cloneIgnoreId(dbOrder, o -> o.setCreateTime(DateUtils.buildLocalDateTime(2019, 1, 1, 10, 10, | |
| 114 | + orderMapper.insert(cloneIgnoreId(dbOrder, o -> o.setCreateTime(LocalDateTime.of(2019, 1, 1, 10, 10, | |
| 117 | 115 | 1)))); |
| 118 | 116 | // 准备参数 |
| 119 | 117 | PayOrderPageReqVO reqVO = new PayOrderPageReqVO(); |
| ... | ... | @@ -125,7 +123,7 @@ public class PayOrderServiceTest extends BaseDbUnitTest { |
| 125 | 123 | reqVO.setNotifyStatus(PayOrderNotifyStatusEnum.SUCCESS.getStatus()); |
| 126 | 124 | reqVO.setStatus(PayOrderStatusEnum.SUCCESS.getStatus()); |
| 127 | 125 | reqVO.setRefundStatus(PayRefundTypeEnum.NO.getStatus()); |
| 128 | - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2018, 1, 1, 10, 1, 0),buildLocalDateTime(2018, 1, 1, 10, 1, 0)})); | |
| 126 | + reqVO.setCreateTime((new LocalDateTime[]{LocalDateTime.of(2018, 1, 1, 10, 1, 0), LocalDateTime.of(2018, 1, 1, 10, 1, 0)})); | |
| 129 | 127 | // 调用 |
| 130 | 128 | PageResult<PayOrderDO> pageResult = orderService.getOrderPage(reqVO); |
| 131 | 129 | // 断言 |
| ... | ... | @@ -155,17 +153,17 @@ public class PayOrderServiceTest extends BaseDbUnitTest { |
| 155 | 153 | o.setChannelFeeAmount(1L); |
| 156 | 154 | o.setStatus(PayOrderStatusEnum.SUCCESS.getStatus()); |
| 157 | 155 | o.setUserIp("127.0.0.1"); |
| 158 | - o.setCreateTime(DateUtils.buildLocalDateTime(2018, 1, 1, 10, 1, 0)); | |
| 159 | - o.setExpireTime(DateUtils.buildLocalDateTime(2018, 1, 1, 10, 30, 0)); | |
| 160 | - o.setSuccessTime(DateUtils.buildLocalDateTime(2018, 1, 1, 10, 10, 2)); | |
| 161 | - o.setNotifyTime(DateUtils.buildLocalDateTime(2018, 1, 1, 10, 10, 15)); | |
| 156 | + o.setCreateTime(LocalDateTime.of(2018, 1, 1, 10, 1, 0)); | |
| 157 | + o.setExpireTime(LocalDateTime.of(2018, 1, 1, 10, 30, 0)); | |
| 158 | + o.setSuccessTime(LocalDateTime.of(2018, 1, 1, 10, 10, 2)); | |
| 159 | + o.setNotifyTime(LocalDateTime.of(2018, 1, 1, 10, 10, 15)); | |
| 162 | 160 | o.setSuccessExtensionId(1L); |
| 163 | 161 | o.setRefundStatus(PayRefundTypeEnum.NO.getStatus()); |
| 164 | 162 | o.setRefundTimes(0); |
| 165 | 163 | o.setRefundAmount(0L); |
| 166 | 164 | o.setChannelUserId("1008611"); |
| 167 | 165 | o.setChannelOrderNo(channelOrderId); |
| 168 | - o.setUpdateTime(DateUtils.buildLocalDateTime(2018, 1, 1, 10, 10, 15)); | |
| 166 | + o.setUpdateTime(LocalDateTime.of(2018, 1, 1, 10, 10, 15)); | |
| 169 | 167 | |
| 170 | 168 | }); |
| 171 | 169 | orderMapper.insert(dbOrder); |
| ... | ... | @@ -186,7 +184,7 @@ public class PayOrderServiceTest extends BaseDbUnitTest { |
| 186 | 184 | // 测试 refundStatus 不匹配 |
| 187 | 185 | orderMapper.insert(cloneIgnoreId(dbOrder, o -> o.setRefundStatus(PayRefundTypeEnum.ALL.getStatus()))); |
| 188 | 186 | // 测试 createTime 不匹配 |
| 189 | - orderMapper.insert(cloneIgnoreId(dbOrder, o -> o.setCreateTime(DateUtils.buildLocalDateTime(2019, 1, 1, 10, 10, | |
| 187 | + orderMapper.insert(cloneIgnoreId(dbOrder, o -> o.setCreateTime(LocalDateTime.of(2019, 1, 1, 10, 10, | |
| 190 | 188 | 1)))); |
| 191 | 189 | // 准备参数 |
| 192 | 190 | PayOrderExportReqVO reqVO = new PayOrderExportReqVO(); |
| ... | ... | @@ -198,7 +196,7 @@ public class PayOrderServiceTest extends BaseDbUnitTest { |
| 198 | 196 | reqVO.setNotifyStatus(PayOrderNotifyStatusEnum.SUCCESS.getStatus()); |
| 199 | 197 | reqVO.setStatus(PayOrderStatusEnum.SUCCESS.getStatus()); |
| 200 | 198 | reqVO.setRefundStatus(PayRefundTypeEnum.NO.getStatus()); |
| 201 | - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2018, 1, 1, 10, 1, 0),buildLocalDateTime(2018, 1, 1, 10, 1, 0)})); | |
| 199 | + reqVO.setCreateTime((new LocalDateTime[]{LocalDateTime.of(2018, 1, 1, 10, 1, 0), LocalDateTime.of(2018, 1, 1, 10, 1, 0)})); | |
| 202 | 200 | |
| 203 | 201 | // 调用 |
| 204 | 202 | List<PayOrderDO> list = orderService.getOrderList(reqVO); | ... | ... |
yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceTest.java
| 1 | 1 | package cn.iocoder.yudao.module.pay.service.refund; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.yudao.framework.common.util.date.DateUtils; | |
| 5 | 4 | import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory; |
| 6 | 5 | import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; |
| 7 | 6 | import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; |
| ... | ... | @@ -25,7 +24,6 @@ import javax.annotation.Resource; |
| 25 | 24 | import java.time.LocalDateTime; |
| 26 | 25 | import java.util.List; |
| 27 | 26 | |
| 28 | -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime; | |
| 29 | 27 | import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; |
| 30 | 28 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 31 | 29 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; |
| ... | ... | @@ -78,11 +76,11 @@ public class PayRefundServiceTest extends BaseDbUnitTest { |
| 78 | 76 | o.setChannelErrorCode(""); |
| 79 | 77 | o.setChannelErrorMsg(""); |
| 80 | 78 | o.setChannelExtras(""); |
| 81 | - o.setExpireTime(DateUtils.buildLocalDateTime(2021, 1, 1, 10, 10, 30)); | |
| 82 | - o.setSuccessTime(DateUtils.buildLocalDateTime(2021, 1, 1, 10, 10, 15)); | |
| 83 | - o.setNotifyTime(DateUtils.buildLocalDateTime(2021, 1, 1, 10, 10, 20)); | |
| 84 | - o.setCreateTime(DateUtils.buildLocalDateTime(2021, 1, 1, 10, 10, 10)); | |
| 85 | - o.setUpdateTime(DateUtils.buildLocalDateTime(2021, 1, 1, 10, 10, 35)); | |
| 79 | + o.setExpireTime(LocalDateTime.of(2021, 1, 1, 10, 10, 30)); | |
| 80 | + o.setSuccessTime(LocalDateTime.of(2021, 1, 1, 10, 10, 15)); | |
| 81 | + o.setNotifyTime(LocalDateTime.of(2021, 1, 1, 10, 10, 20)); | |
| 82 | + o.setCreateTime(LocalDateTime.of(2021, 1, 1, 10, 10, 10)); | |
| 83 | + o.setUpdateTime(LocalDateTime.of(2021, 1, 1, 10, 10, 35)); | |
| 86 | 84 | }); |
| 87 | 85 | refundMapper.insert(dbRefund); |
| 88 | 86 | // 测试 merchantId 不匹配 |
| ... | ... | @@ -102,7 +100,7 @@ public class PayRefundServiceTest extends BaseDbUnitTest { |
| 102 | 100 | refundMapper.insert(cloneIgnoreId(dbRefund, o -> o.setType(PayRefundTypeEnum.ALL.getStatus()))); |
| 103 | 101 | // 测试 createTime 不匹配 |
| 104 | 102 | refundMapper.insert(cloneIgnoreId(dbRefund, o -> |
| 105 | - o.setCreateTime(DateUtils.buildLocalDateTime(2022, 1, 1, 10, 10, 10)))); | |
| 103 | + o.setCreateTime(LocalDateTime.of(2022, 1, 1, 10, 10, 10)))); | |
| 106 | 104 | // 准备参数 |
| 107 | 105 | PayRefundPageReqVO reqVO = new PayRefundPageReqVO(); |
| 108 | 106 | reqVO.setMerchantId(1L); |
| ... | ... | @@ -112,7 +110,7 @@ public class PayRefundServiceTest extends BaseDbUnitTest { |
| 112 | 110 | reqVO.setNotifyStatus(PayOrderNotifyStatusEnum.SUCCESS.getStatus()); |
| 113 | 111 | reqVO.setStatus(PayRefundStatusEnum.SUCCESS.getStatus()); |
| 114 | 112 | reqVO.setType(PayRefundTypeEnum.SOME.getStatus()); |
| 115 | - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 1, 1, 10, 10, 10),buildLocalDateTime(2021, 1, 1, 10, 10, 12)})); | |
| 113 | + reqVO.setCreateTime((new LocalDateTime[]{LocalDateTime.of(2021, 1, 1, 10, 10, 10), LocalDateTime.of(2021, 1, 1, 10, 10, 12)})); | |
| 116 | 114 | |
| 117 | 115 | // 调用 |
| 118 | 116 | PageResult<PayRefundDO> pageResult = refundService.getRefundPage(reqVO); |
| ... | ... | @@ -147,11 +145,11 @@ public class PayRefundServiceTest extends BaseDbUnitTest { |
| 147 | 145 | o.setChannelErrorCode(""); |
| 148 | 146 | o.setChannelErrorMsg(""); |
| 149 | 147 | o.setChannelExtras(""); |
| 150 | - o.setExpireTime(DateUtils.buildLocalDateTime(2021, 1, 1, 10, 10, 30)); | |
| 151 | - o.setSuccessTime(DateUtils.buildLocalDateTime(2021, 1, 1, 10, 10, 15)); | |
| 152 | - o.setNotifyTime(DateUtils.buildLocalDateTime(2021, 1, 1, 10, 10, 20)); | |
| 153 | - o.setCreateTime(DateUtils.buildLocalDateTime(2021, 1, 1, 10, 10, 10)); | |
| 154 | - o.setUpdateTime(DateUtils.buildLocalDateTime(2021, 1, 1, 10, 10, 35)); | |
| 148 | + o.setExpireTime(LocalDateTime.of(2021, 1, 1, 10, 10, 30)); | |
| 149 | + o.setSuccessTime(LocalDateTime.of(2021, 1, 1, 10, 10, 15)); | |
| 150 | + o.setNotifyTime(LocalDateTime.of(2021, 1, 1, 10, 10, 20)); | |
| 151 | + o.setCreateTime(LocalDateTime.of(2021, 1, 1, 10, 10, 10)); | |
| 152 | + o.setUpdateTime(LocalDateTime.of(2021, 1, 1, 10, 10, 35)); | |
| 155 | 153 | }); |
| 156 | 154 | refundMapper.insert(dbRefund); |
| 157 | 155 | // 测试 merchantId 不匹配 |
| ... | ... | @@ -171,7 +169,7 @@ public class PayRefundServiceTest extends BaseDbUnitTest { |
| 171 | 169 | refundMapper.insert(cloneIgnoreId(dbRefund, o -> o.setType(PayRefundTypeEnum.ALL.getStatus()))); |
| 172 | 170 | // 测试 createTime 不匹配 |
| 173 | 171 | refundMapper.insert(cloneIgnoreId(dbRefund, o -> |
| 174 | - o.setCreateTime(DateUtils.buildLocalDateTime(2022, 1, 1, 10, 10, 10)))); | |
| 172 | + o.setCreateTime(LocalDateTime.of(2022, 1, 1, 10, 10, 10)))); | |
| 175 | 173 | |
| 176 | 174 | // 准备参数 |
| 177 | 175 | PayRefundExportReqVO reqVO = new PayRefundExportReqVO(); |
| ... | ... | @@ -182,7 +180,7 @@ public class PayRefundServiceTest extends BaseDbUnitTest { |
| 182 | 180 | reqVO.setNotifyStatus(PayOrderNotifyStatusEnum.SUCCESS.getStatus()); |
| 183 | 181 | reqVO.setStatus(PayRefundStatusEnum.SUCCESS.getStatus()); |
| 184 | 182 | reqVO.setType(PayRefundTypeEnum.SOME.getStatus()); |
| 185 | - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 1, 1, 10, 10, 10),buildLocalDateTime(2021, 1, 1, 10, 10, 12)})); | |
| 183 | + reqVO.setCreateTime((new LocalDateTime[]{LocalDateTime.of(2021, 1, 1, 10, 10, 10), LocalDateTime.of(2021, 1, 1, 10, 10, 12)})); | |
| 186 | 184 | |
| 187 | 185 | // 调用 |
| 188 | 186 | List<PayRefundDO> list = refundService.getRefundList(reqVO); | ... | ... |