mirror of
https://gitee.com/hhyykk/ipms-sjy.git
synced 2025-08-11 16:51:53 +08:00
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts: # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java # yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java # yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java # yudao-server/src/main/resources/application-local.yaml
This commit is contained in:
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.pay.service.channel;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
|
||||
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
|
||||
import cn.iocoder.yudao.framework.pay.core.client.PayClient;
|
||||
import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
|
||||
import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig;
|
||||
import cn.iocoder.yudao.framework.pay.core.client.impl.weixin.WxPayClientConfig;
|
||||
@@ -12,30 +13,26 @@ import cn.iocoder.yudao.module.pay.controller.admin.channel.vo.PayChannelUpdateR
|
||||
import cn.iocoder.yudao.module.pay.dal.dataobject.channel.PayChannelDO;
|
||||
import cn.iocoder.yudao.module.pay.dal.mysql.channel.PayChannelMapper;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
import org.springframework.context.annotation.Import;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.Validator;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.addTime;
|
||||
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
|
||||
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
|
||||
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
|
||||
import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.*;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
@Import({PayChannelServiceImpl.class})
|
||||
public class PayChannelServiceTest extends BaseDbUnitTest {
|
||||
|
||||
private static final String ALIPAY_SERVER_URL = "https://openapi.alipay.com/gateway.do";
|
||||
|
||||
@Resource
|
||||
private PayChannelServiceImpl channelService;
|
||||
|
||||
@@ -47,45 +44,6 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
|
||||
@MockBean
|
||||
private Validator validator;
|
||||
|
||||
@BeforeEach
|
||||
public void setUp() {
|
||||
channelService.setChannelCache(null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testInitLocalCache() {
|
||||
// mock 数据
|
||||
PayChannelDO dbChannel = randomPojo(PayChannelDO.class,
|
||||
o -> o.setConfig(randomWxPayClientConfig()));
|
||||
channelMapper.insert(dbChannel);// @Sql: 先插入出一条存在的数据
|
||||
|
||||
// 调用
|
||||
channelService.initLocalCache();
|
||||
// 校验缓存
|
||||
assertEquals(1, channelService.getChannelCache().size());
|
||||
assertEquals(dbChannel, channelService.getChannelCache().get(0));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRefreshLocalCache() {
|
||||
// mock 数据 01
|
||||
PayChannelDO dbChannel = randomPojo(PayChannelDO.class,
|
||||
o -> o.setConfig(randomWxPayClientConfig()).setUpdateTime(addTime(Duration.ofMinutes(-2))));
|
||||
channelMapper.insert(dbChannel);// @Sql: 先插入出一条存在的数据
|
||||
channelService.initLocalCache();
|
||||
// mock 数据 02
|
||||
PayChannelDO dbChannel02 = randomPojo(PayChannelDO.class,
|
||||
o -> o.setConfig(randomWxPayClientConfig()));
|
||||
channelMapper.insert(dbChannel02);// @Sql: 先插入出一条存在的数据
|
||||
|
||||
// 调用
|
||||
channelService.refreshLocalCache();
|
||||
// 校验缓存
|
||||
assertEquals(2, channelService.getChannelCache().size());
|
||||
assertEquals(dbChannel, channelService.getChannelCache().get(0));
|
||||
assertEquals(dbChannel02, channelService.getChannelCache().get(1));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCreateChannel_success() {
|
||||
// 准备参数
|
||||
@@ -103,8 +61,7 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
|
||||
assertPojoEquals(reqVO, channel, "config");
|
||||
assertPojoEquals(config, channel.getConfig());
|
||||
// 校验缓存
|
||||
assertEquals(1, channelService.getChannelCache().size());
|
||||
assertEquals(channel, channelService.getChannelCache().get(0));
|
||||
assertNull(channelService.getClientCache().getIfPresent(channelId));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -146,8 +103,7 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
|
||||
assertPojoEquals(reqVO, channel, "config");
|
||||
assertPojoEquals(config, channel.getConfig());
|
||||
// 校验缓存
|
||||
assertEquals(1, channelService.getChannelCache().size());
|
||||
assertEquals(channel, channelService.getChannelCache().get(0));
|
||||
assertNull(channelService.getClientCache().getIfPresent(channel.getId()));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -179,7 +135,7 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
|
||||
// 校验数据不存在了
|
||||
assertNull(channelMapper.selectById(id));
|
||||
// 校验缓存
|
||||
assertEquals(0, channelService.getChannelCache().size());
|
||||
assertNull(channelService.getClientCache().getIfPresent(id));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -344,6 +300,28 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
|
||||
assertPojoEquals(channel, dbChannel03);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetPayClient() {
|
||||
// mock 数据
|
||||
PayChannelDO channel = randomPojo(PayChannelDO.class, o -> {
|
||||
o.setCode(PayChannelEnum.ALIPAY_APP.getCode());
|
||||
o.setConfig(randomAlipayPayClientConfig());
|
||||
});
|
||||
channelMapper.insert(channel);
|
||||
// mock 参数
|
||||
Long id = channel.getId();
|
||||
// mock 方法
|
||||
PayClient mockClient = mock(PayClient.class);
|
||||
when(payClientFactory.getPayClient(eq(id))).thenReturn(mockClient);
|
||||
|
||||
// 调用
|
||||
PayClient client = channelService.getPayClient(id);
|
||||
// 断言
|
||||
assertSame(client, mockClient);
|
||||
verify(payClientFactory).createOrUpdatePayClient(eq(id), eq(channel.getCode()),
|
||||
eq(channel.getConfig()));
|
||||
}
|
||||
|
||||
public WxPayClientConfig randomWxPayClientConfig() {
|
||||
return new WxPayClientConfig()
|
||||
.setAppId(randomString())
|
||||
|
Reference in New Issue
Block a user