mall + pay：简化 pay 的复杂度

1. 移除 merchant 表设计
2. 移除 app 和 channel 的导出

yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceTest.java

@@ -1,26 +1,19 @@
-package cn.iocoder.yudao.module.pay.service.merchant;
+package cn.iocoder.yudao.module.pay.service.app;
 
 import cn.hutool.core.util.RandomUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.pay.controller.admin.merchant.vo.app.PayAppCreateReqVO;
-import cn.iocoder.yudao.module.pay.controller.admin.merchant.vo.app.PayAppExportReqVO;
-import cn.iocoder.yudao.module.pay.controller.admin.merchant.vo.app.PayAppPageReqVO;
-import cn.iocoder.yudao.module.pay.controller.admin.merchant.vo.app.PayAppUpdateReqVO;
-import cn.iocoder.yudao.module.pay.dal.dataobject.merchant.PayAppDO;
-import cn.iocoder.yudao.module.pay.dal.dataobject.merchant.PayMerchantDO;
-import cn.iocoder.yudao.module.pay.dal.mysql.merchant.PayAppMapper;
-import cn.iocoder.yudao.module.pay.dal.mysql.merchant.PayMerchantMapper;
+import cn.iocoder.yudao.module.pay.controller.admin.app.vo.PayAppCreateReqVO;
+import cn.iocoder.yudao.module.pay.controller.admin.app.vo.PayAppPageReqVO;
+import cn.iocoder.yudao.module.pay.controller.admin.app.vo.PayAppUpdateReqVO;
+import cn.iocoder.yudao.module.pay.dal.dataobject.app.PayAppDO;
+import cn.iocoder.yudao.module.pay.dal.mysql.app.PayAppMapper;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
@@ -40,9 +33,6 @@ public class PayAppServiceTest extends BaseDbUnitTest {
     @Resource
     private PayAppMapper appMapper;
 
-    @MockBean(name = "payMerchantMapper")
-    private PayMerchantMapper payMerchantMapper;
-
     @Test
     public void testCreateApp_success() {
         // 准备参数
@@ -112,9 +102,6 @@ public class PayAppServiceTest extends BaseDbUnitTest {
 
     @Test
     public void testGetAppPage() {
-        Long merchantId = 1L;
-        Long mismatchMerchantId = 2L;
-
         // mock 数据
         PayAppDO dbApp = randomPojo(PayAppDO.class, o -> { // 等会查询到
             o.setName("灿灿姐的杂货铺");
@@ -122,24 +109,9 @@ public class PayAppServiceTest extends BaseDbUnitTest {
             o.setRemark("敏敏姐的小卖铺");
             o.setPayNotifyUrl("https://www.hc.com");
             o.setRefundNotifyUrl("https://www.xm.com");
-            o.setMerchantId(merchantId);
             o.setCreateTime(buildTime(2021,11,20));
         });
 
-        // mock 数据
-        PayMerchantDO dbMerchant = randomPojo(PayMerchantDO.class, o -> { // 等会查询到
-            o.setId(merchantId);
-            o.setNo("M1008611");
-            o.setName("灿哥的杂货铺");
-            o.setShortName("灿灿子");
-            o.setStatus(CommonStatusEnum.ENABLE.getStatus());
-            o.setRemark("灿哥的杂货铺");
-            o.setCreateTime(buildTime(2021,11,3));
-        });
-
-        Mockito.when(payMerchantMapper.getMerchantListByName(dbMerchant.getName()))
-                .thenReturn(Collections.singletonList(dbMerchant));
-
         appMapper.insert(dbApp);
         // 测试 name 不匹配
         appMapper.insert(cloneIgnoreId(dbApp, o -> o.setName("敏敏姐的杂货铺")));
@@ -151,8 +123,6 @@ public class PayAppServiceTest extends BaseDbUnitTest {
         appMapper.insert(cloneIgnoreId(dbApp, o -> o.setPayNotifyUrl("xm.com")));
         // 测试 refundNotifyUrl 不匹配
         appMapper.insert(cloneIgnoreId(dbApp, o -> o.setRefundNotifyUrl("hc.com")));
-        // 测试 merchantId 不匹配
-        appMapper.insert(cloneIgnoreId(dbApp, o -> o.setMerchantId(mismatchMerchantId)));
         // 测试 createTime 不匹配
         appMapper.insert(cloneIgnoreId(dbApp, o -> o.setCreateTime(buildTime(2021,12,21))));
         // 准备参数
@@ -162,7 +132,6 @@ public class PayAppServiceTest extends BaseDbUnitTest {
         reqVO.setRemark("敏敏姐的小卖铺");
         reqVO.setPayNotifyUrl("https://www.hc.com");
         reqVO.setRefundNotifyUrl("https://www.xm.com");
-        reqVO.setMerchantName(dbMerchant.getName());
         reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021,11,19),buildTime(2021,11,21)}));
 
         // 调用
@@ -173,66 +142,4 @@ public class PayAppServiceTest extends BaseDbUnitTest {
         assertPojoEquals(dbApp, pageResult.getList().get(0));
     }
 
-    @Test // TODO 请修改 null 为需要的值
-    public void testGetAppList() {
-        Long merchantId = 1L;
-        Long mismatchMerchantId = 2L;
-
-        // mock 数据
-        PayAppDO dbApp = randomPojo(PayAppDO.class, o -> { // 等会查询到
-            o.setName("灿灿姐的杂货铺");
-            o.setStatus(CommonStatusEnum.ENABLE.getStatus());
-            o.setRemark("敏敏姐的小卖铺");
-            o.setPayNotifyUrl("https://www.hc.com");
-            o.setRefundNotifyUrl("https://www.xm.com");
-            o.setMerchantId(merchantId);
-            o.setCreateTime(buildTime(2021,11,20));
-        });
-
-        // mock 数据
-        PayMerchantDO dbMerchant = randomPojo(PayMerchantDO.class, o -> { // 等会查询到
-            o.setId(merchantId);
-            o.setNo("M1008611");
-            o.setName("灿哥的杂货铺");
-            o.setShortName("灿灿子");
-            o.setStatus(CommonStatusEnum.ENABLE.getStatus());
-            o.setRemark("灿哥的杂货铺");
-            o.setCreateTime(buildTime(2021,11,3));
-        });
-
-        Mockito.when(payMerchantMapper.getMerchantListByName(dbMerchant.getName()))
-                .thenReturn(Collections.singletonList(dbMerchant));
-
-        appMapper.insert(dbApp);
-        // 测试 name 不匹配
-        appMapper.insert(cloneIgnoreId(dbApp, o -> o.setName("敏敏姐的杂货铺")));
-        // 测试 status 不匹配
-        appMapper.insert(cloneIgnoreId(dbApp, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
-        // 测试 remark 不匹配
-        appMapper.insert(cloneIgnoreId(dbApp, o -> o.setRemark("灿灿姐的小卖部")));
-        // 测试 payNotifyUrl 不匹配
-        appMapper.insert(cloneIgnoreId(dbApp, o -> o.setPayNotifyUrl("xm.com")));
-        // 测试 refundNotifyUrl 不匹配
-        appMapper.insert(cloneIgnoreId(dbApp, o -> o.setRefundNotifyUrl("hc.com")));
-        // 测试 merchantId 不匹配
-        appMapper.insert(cloneIgnoreId(dbApp, o -> o.setMerchantId(mismatchMerchantId)));
-        // 测试 createTime 不匹配
-        appMapper.insert(cloneIgnoreId(dbApp, o -> o.setCreateTime(buildTime(2021,12,21))));
-        // 准备参数
-        PayAppExportReqVO reqVO = new PayAppExportReqVO();
-        reqVO.setName("灿灿姐的杂货铺");
-        reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
-        reqVO.setRemark("敏敏姐的小卖铺");
-        reqVO.setPayNotifyUrl("https://www.hc.com");
-        reqVO.setRefundNotifyUrl("https://www.xm.com");
-        reqVO.setMerchantName(dbMerchant.getName());
-        reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021,11,19),buildTime(2021,11,21)}));
-
-        // 调用
-        List<PayAppDO> list = appService.getAppList(reqVO);
-        // 断言
-        assertEquals(1, list.size());
-        assertPojoEquals(dbApp, list.get(0));
-    }
-
 }

yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.pay.service.merchant;
+package cn.iocoder.yudao.module.pay.service.channel;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -7,12 +7,11 @@ import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientCon
 import cn.iocoder.yudao.framework.pay.core.client.impl.weixin.WxPayClientConfig;
 import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.pay.controller.admin.merchant.vo.channel.PayChannelCreateReqVO;
-import cn.iocoder.yudao.module.pay.controller.admin.merchant.vo.channel.PayChannelExportReqVO;
-import cn.iocoder.yudao.module.pay.controller.admin.merchant.vo.channel.PayChannelPageReqVO;
-import cn.iocoder.yudao.module.pay.controller.admin.merchant.vo.channel.PayChannelUpdateReqVO;
-import cn.iocoder.yudao.module.pay.dal.dataobject.merchant.PayChannelDO;
-import cn.iocoder.yudao.module.pay.dal.mysql.merchant.PayChannelMapper;
+import cn.iocoder.yudao.module.pay.controller.admin.channel.vo.PayChannelCreateReqVO;
+import cn.iocoder.yudao.module.pay.controller.admin.channel.vo.PayChannelPageReqVO;
+import cn.iocoder.yudao.module.pay.controller.admin.channel.vo.PayChannelUpdateReqVO;
+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.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -21,7 +20,6 @@ import org.springframework.context.annotation.Import;
 import javax.annotation.Resource;
 import javax.validation.Validator;
 import java.time.LocalDateTime;
-import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
@@ -211,7 +209,6 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
             o.setStatus(CommonStatusEnum.ENABLE.getStatus());
             o.setRemark("灿灿子的支付渠道");
             o.setFeeRate(0.03);
-            o.setMerchantId(1L);
             o.setAppId(1L);
             o.setConfig(payClientConfig);
             o.setCreateTime(buildTime(2021,11,20));
@@ -239,11 +236,6 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
             o.setConfig(payClientConfig);
             o.setFeeRate(1.23);
         }));
-        // 测试 merchantId 不匹配
-        channelMapper.insert(cloneIgnoreId(dbChannel, o -> {
-            o.setConfig(payClientConfig);
-            o.setMerchantId(2L);
-        }));
         // 测试 appId 不匹配
         channelMapper.insert(cloneIgnoreId(dbChannel, o -> {
             o.setConfig(payClientConfig);
@@ -260,7 +252,6 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
         reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
         reqVO.setRemark("灿灿子的支付渠道");
         reqVO.setFeeRate(0.03);
-        reqVO.setMerchantId(1L);
         reqVO.setAppId(1L);
         reqVO.setConfig(JSON.toJSONString(payClientConfig));
         reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021,11,19),buildTime(2021,11,21)}));
@@ -275,77 +266,6 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
 
     }
 
-    @Test
-    public void testGetChannelList() {
-        // mock 数据
-        AlipayPayClientConfig payClientConfig = getCertificateConfig();
-        PayChannelDO dbChannel = randomPojo(PayChannelDO.class, o -> { // 等会查询到
-            o.setCode(PayChannelEnum.ALIPAY_APP.getCode());
-            o.setStatus(CommonStatusEnum.ENABLE.getStatus());
-            o.setRemark("灿灿子的支付渠道");
-            o.setFeeRate(0.03);
-            o.setMerchantId(1L);
-            o.setAppId(1L);
-            o.setConfig(payClientConfig);
-            o.setCreateTime(buildTime(2021,11,20));
-        });
-        channelMapper.insert(dbChannel);
-        // 执行拷贝的时候会出现异常，所以在插入后要重置为null 后续在写入新的
-        dbChannel.setConfig(null);
-        // 测试 code 不匹配
-        channelMapper.insert(cloneIgnoreId(dbChannel, o -> {
-            o.setConfig(payClientConfig);
-            o.setCode(PayChannelEnum.WX_PUB.getCode());
-        }));
-        // 测试 status 不匹配
-        channelMapper.insert(cloneIgnoreId(dbChannel, o -> {
-            o.setConfig(payClientConfig);
-            o.setStatus(CommonStatusEnum.DISABLE.getStatus());
-        }));
-        // 测试 remark 不匹配
-        channelMapper.insert(cloneIgnoreId(dbChannel, o ->{
-            o.setConfig(payClientConfig);
-            o.setRemark("敏敏子的渠道");
-        }));
-        // 测试 feeRate 不匹配
-        channelMapper.insert(cloneIgnoreId(dbChannel, o -> {
-            o.setConfig(payClientConfig);
-            o.setFeeRate(1.23);
-        }));
-        // 测试 merchantId 不匹配
-        channelMapper.insert(cloneIgnoreId(dbChannel, o -> {
-            o.setConfig(payClientConfig);
-            o.setMerchantId(2L);
-        }));
-        // 测试 appId 不匹配
-        channelMapper.insert(cloneIgnoreId(dbChannel, o -> {
-            o.setConfig(payClientConfig);
-            o.setAppId(2L);
-        }));
-        // 测试 createTime 不匹配
-        channelMapper.insert(cloneIgnoreId(dbChannel, o -> {
-            o.setConfig(payClientConfig);
-            o.setCreateTime(buildTime(2021, 10, 20));
-        }));
-        // 准备参数
-        PayChannelExportReqVO reqVO = new PayChannelExportReqVO();
-        reqVO.setCode(PayChannelEnum.ALIPAY_APP.getCode());
-        reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
-        reqVO.setRemark("灿灿子的支付渠道");
-        reqVO.setFeeRate(0.03);
-        reqVO.setMerchantId(1L);
-        reqVO.setAppId(1L);
-        reqVO.setConfig(JSON.toJSONString(payClientConfig));
-        reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021,11,19),buildTime(2021,11,21)}));
-
-        // 调用
-        List<PayChannelDO> list = channelService.getChannelList(reqVO);
-        // 断言
-        assertEquals(1, list.size());
-        assertPojoEquals(dbChannel, list.get(0), "config");
-        assertPojoEquals(payClientConfig, list.get(0).getConfig());
-    }
-
     public WxPayClientConfig getV2Config() {
         return new WxPayClientConfig()
                 .setAppId("APP00001")

yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/merchant/PayMerchantServiceTest.java

@@ -1,191 +0,0 @@
-package cn.iocoder.yudao.module.pay.service.merchant;
-
-import cn.hutool.core.util.RandomUtil;
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.pay.controller.admin.merchant.vo.merchant.PayMerchantCreateReqVO;
-import cn.iocoder.yudao.module.pay.controller.admin.merchant.vo.merchant.PayMerchantExportReqVO;
-import cn.iocoder.yudao.module.pay.controller.admin.merchant.vo.merchant.PayMerchantPageReqVO;
-import cn.iocoder.yudao.module.pay.controller.admin.merchant.vo.merchant.PayMerchantUpdateReqVO;
-import cn.iocoder.yudao.module.pay.dal.dataobject.merchant.PayMerchantDO;
-import cn.iocoder.yudao.module.pay.dal.mysql.merchant.PayMerchantMapper;
-import org.junit.jupiter.api.Test;
-import org.springframework.context.annotation.Import;
-
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
-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.randomLongId;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
-import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.PAY_MERCHANT_NOT_EXISTS;
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
-* {@link PayMerchantServiceImpl} 的单元测试类
-*
-* @author aquan
-*/
-@Import(PayMerchantServiceImpl.class)
-public class PayMerchantServiceTest extends BaseDbUnitTest {
-
-    @Resource
-    private PayMerchantServiceImpl merchantService;
-
-    @Resource
-    private PayMerchantMapper merchantMapper;
-
-    @Test
-    public void testCreateMerchant_success() {
-        // 准备参数
-        PayMerchantCreateReqVO reqVO = randomPojo(PayMerchantCreateReqVO.class,o ->
-            o.setStatus(RandomUtil.randomEle(CommonStatusEnum.values()).getStatus()));
-
-        // 调用
-        Long merchantId = merchantService.createMerchant(reqVO);
-        // 断言
-        assertNotNull(merchantId);
-        // 校验记录的属性是否正确
-        PayMerchantDO merchant = merchantMapper.selectById(merchantId);
-        assertPojoEquals(reqVO, merchant);
-    }
-
-    @Test
-    public void testUpdateMerchant_success() {
-        // mock 数据
-        PayMerchantDO dbMerchant = randomPojo(PayMerchantDO.class, o ->
-            o.setStatus(CommonStatusEnum.ENABLE.getStatus()));
-        merchantMapper.insert(dbMerchant);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        PayMerchantUpdateReqVO reqVO = randomPojo(PayMerchantUpdateReqVO.class, o -> {
-            o.setId(dbMerchant.getId()); // 设置更新的 ID
-            o.setStatus(CommonStatusEnum.DISABLE.getStatus());
-        });
-
-        // 调用
-        merchantService.updateMerchant(reqVO);
-        // 校验是否更新正确
-        PayMerchantDO merchant = merchantMapper.selectById(reqVO.getId()); // 获取最新的
-        assertPojoEquals(reqVO, merchant);
-    }
-
-    @Test
-    public void testUpdateMerchant_notExists() {
-        // 准备参数
-        PayMerchantUpdateReqVO reqVO = randomPojo(PayMerchantUpdateReqVO.class);
-
-        // 调用, 并断言异常
-        assertServiceException(() -> merchantService.updateMerchant(reqVO), PAY_MERCHANT_NOT_EXISTS);
-    }
-
-    @Test
-    public void testDeleteMerchant_success() {
-        // mock 数据
-        PayMerchantDO dbMerchant = randomPojo(PayMerchantDO.class,
-                o-> o.setStatus(CommonStatusEnum.ENABLE.getStatus()));
-        merchantMapper.insert(dbMerchant);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        Long id = dbMerchant.getId();
-
-        // 调用
-        merchantService.deleteMerchant(id);
-       // 校验数据不存在了
-       assertNull(merchantMapper.selectById(id));
-    }
-
-    @Test
-    public void testDeleteMerchant_notExists() {
-        // 准备参数
-        Long id = randomLongId();
-
-        // 调用, 并断言异常
-        assertServiceException(() -> merchantService.deleteMerchant(id), PAY_MERCHANT_NOT_EXISTS);
-    }
-
-    @Test
-    public void testGetMerchantPage() {
-       // mock 数据
-       PayMerchantDO dbMerchant = randomPojo(PayMerchantDO.class, o -> { // 等会查询到
-           o.setNo("M1008611");
-           o.setName("灿哥的杂货铺");
-           o.setShortName("灿灿子");
-           o.setStatus(CommonStatusEnum.ENABLE.getStatus());
-           o.setRemark("灿哥的杂货铺");
-           o.setCreateTime(buildTime(2021,11,3));
-       });
-       merchantMapper.insert(dbMerchant);
-       // 测试 no 不匹配
-       merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setNo("M200000")));
-       // 测试 name 不匹配
-       merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setName("斌哥的杂货铺")));
-       // 测试 shortName 不匹配
-       merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setShortName("斌斌子")));
-       // 测试 status 不匹配
-       merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
-       // 测试 remark 不匹配
-       merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setRemark("斌哥的杂货铺")));
-       // 测试 createTime 不匹配
-       merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setCreateTime(buildTime(2022,12,4))));
-       // 准备参数
-       PayMerchantPageReqVO reqVO = new PayMerchantPageReqVO();
-       reqVO.setNo("M1008611");
-       reqVO.setName("灿哥的杂货铺");
-       reqVO.setShortName("灿灿子");
-       reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
-       reqVO.setRemark("灿哥的杂货铺");
-       reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021,11,2),buildTime(2021,11,4)}));
-
-       // 调用
-       PageResult<PayMerchantDO> pageResult = merchantService.getMerchantPage(reqVO);
-       // 断言
-       assertEquals(1, pageResult.getTotal());
-       assertEquals(1, pageResult.getList().size());
-       assertPojoEquals(dbMerchant, pageResult.getList().get(0));
-    }
-
-    @Test
-    public void testGetMerchantList() {
-       // mock 数据
-       PayMerchantDO dbMerchant = randomPojo(PayMerchantDO.class, o -> { // 等会查询到
-           o.setNo("M1008611");
-           o.setName("灿哥的杂货铺");
-           o.setShortName("灿灿子");
-           o.setStatus(CommonStatusEnum.ENABLE.getStatus());
-           o.setRemark("灿哥的杂货铺");
-           o.setCreateTime(buildTime(2021,11,3));
-       });
-        merchantMapper.insert(dbMerchant);
-        // 测试 no 不匹配
-        merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setNo("M200000")));
-        // 测试 name 不匹配
-        merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setName("斌哥的杂货铺")));
-        // 测试 shortName 不匹配
-        merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setShortName("斌斌子")));
-        // 测试 status 不匹配
-        merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
-        // 测试 remark 不匹配
-        merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setRemark("斌哥的杂货铺")));
-        // 测试 createTime 不匹配
-        merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setCreateTime(buildTime(2022,12,4))));
-       // 准备参数
-       PayMerchantExportReqVO reqVO = new PayMerchantExportReqVO();
-       reqVO.setNo("M1008611");
-       reqVO.setName("灿哥的杂货铺");
-       reqVO.setShortName("灿灿子");
-       reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
-       reqVO.setRemark("灿哥的杂货铺");
-       reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021,11,2),buildTime(2021,11,4)}));
-
-       // 调用
-       List<PayMerchantDO> list = merchantService.getMerchantList(reqVO);
-       // 断言
-       assertEquals(1, list.size());
-       assertPojoEquals(dbMerchant, list.get(0));
-    }
-
-}

yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java

@@ -14,8 +14,8 @@ import cn.iocoder.yudao.module.pay.dal.mysql.order.PayOrderMapper;
 import cn.iocoder.yudao.module.pay.enums.order.PayOrderNotifyStatusEnum;
 import cn.iocoder.yudao.module.pay.enums.order.PayOrderStatusEnum;
 import cn.iocoder.yudao.module.pay.enums.refund.PayRefundTypeEnum;
-import cn.iocoder.yudao.module.pay.service.merchant.PayAppService;
-import cn.iocoder.yudao.module.pay.service.merchant.PayChannelService;
+import cn.iocoder.yudao.module.pay.service.app.PayAppService;
+import cn.iocoder.yudao.module.pay.service.channel.PayChannelService;
 import cn.iocoder.yudao.module.pay.service.notify.PayNotifyService;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -67,7 +67,6 @@ public class PayOrderServiceTest extends BaseDbUnitTest {
 
         // mock 数据
         PayOrderDO dbOrder = randomPojo(PayOrderDO.class, o -> { // 等会查询到
-            o.setMerchantId(1L);
             o.setAppId(1L);
             o.setChannelId(1L);
             o.setChannelCode(PayChannelEnum.WX_PUB.getCode());
@@ -94,8 +93,6 @@ public class PayOrderServiceTest extends BaseDbUnitTest {
             o.setUpdateTime(LocalDateTime.of(2018, 1, 1, 10, 10, 15));
         });
         orderMapper.insert(dbOrder);
-        // 测试 merchantId 不匹配
-        orderMapper.insert(cloneIgnoreId(dbOrder, o -> o.setMerchantId(2L)));
         // 测试 appId 不匹配
         orderMapper.insert(cloneIgnoreId(dbOrder, o -> o.setAppId(2L)));
         // 测试 channelId 不匹配
@@ -115,7 +112,6 @@ public class PayOrderServiceTest extends BaseDbUnitTest {
                 1))));
         // 准备参数
         PayOrderPageReqVO reqVO = new PayOrderPageReqVO();
-        reqVO.setMerchantId(1L);
         reqVO.setAppId(1L);
         reqVO.setChannelId(1L);
         reqVO.setChannelCode(PayChannelEnum.WX_PUB.getCode());
@@ -139,7 +135,6 @@ public class PayOrderServiceTest extends BaseDbUnitTest {
         String merchantOrderId = generateNo();
         String channelOrderId = generateNo();
         PayOrderDO dbOrder = randomPojo(PayOrderDO.class, o -> { // 等会查询到
-            o.setMerchantId(1L);
             o.setAppId(1L);
             o.setChannelId(1L);
             o.setChannelCode(PayChannelEnum.WX_PUB.getCode());
@@ -167,8 +162,6 @@ public class PayOrderServiceTest extends BaseDbUnitTest {
 
         });
         orderMapper.insert(dbOrder);
-        // 测试 merchantId 不匹配
-        orderMapper.insert(cloneIgnoreId(dbOrder, o -> o.setMerchantId(2L)));
         // 测试 appId 不匹配
         orderMapper.insert(cloneIgnoreId(dbOrder, o -> o.setAppId(2L)));
         // 测试 channelId 不匹配
@@ -188,7 +181,6 @@ public class PayOrderServiceTest extends BaseDbUnitTest {
                 1))));
         // 准备参数
         PayOrderExportReqVO reqVO = new PayOrderExportReqVO();
-        reqVO.setMerchantId(1L);
         reqVO.setAppId(1L);
         reqVO.setChannelId(1L);
         reqVO.setChannelCode(PayChannelEnum.WX_PUB.getCode());

yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceTest.java

@@ -12,8 +12,8 @@ import cn.iocoder.yudao.module.pay.dal.mysql.refund.PayRefundMapper;
 import cn.iocoder.yudao.module.pay.enums.order.PayOrderNotifyStatusEnum;
 import cn.iocoder.yudao.module.pay.enums.refund.PayRefundStatusEnum;
 import cn.iocoder.yudao.module.pay.enums.refund.PayRefundTypeEnum;
-import cn.iocoder.yudao.module.pay.service.merchant.PayAppService;
-import cn.iocoder.yudao.module.pay.service.merchant.PayChannelService;
+import cn.iocoder.yudao.module.pay.service.app.PayAppService;
+import cn.iocoder.yudao.module.pay.service.channel.PayChannelService;
 import cn.iocoder.yudao.module.pay.service.notify.PayNotifyService;
 import cn.iocoder.yudao.module.pay.service.order.PayOrderExtensionService;
 import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
@@ -58,7 +58,6 @@ public class PayRefundServiceTest extends BaseDbUnitTest {
     public void testGetRefundPage() {
         // mock 数据
         PayRefundDO dbRefund = randomPojo(PayRefundDO.class, o -> { // 等会查询到
-            o.setMerchantId(1L);
             o.setAppId(1L);
             o.setChannelId(1L);
             o.setChannelCode(PayChannelEnum.WX_PUB.getCode());
@@ -86,8 +85,6 @@ public class PayRefundServiceTest extends BaseDbUnitTest {
             o.setUpdateTime(LocalDateTime.of(2021, 1, 1, 10, 10, 35));
         });
         refundMapper.insert(dbRefund);
-        // 测试 merchantId 不匹配
-        refundMapper.insert(cloneIgnoreId(dbRefund, o -> o.setMerchantId(2L)));
         // 测试 appId 不匹配
         refundMapper.insert(cloneIgnoreId(dbRefund, o -> o.setAppId(2L)));
         // 测试 channelCode 不匹配
@@ -106,7 +103,6 @@ public class PayRefundServiceTest extends BaseDbUnitTest {
                 o.setCreateTime(LocalDateTime.of(2022, 1, 1, 10, 10, 10))));
         // 准备参数
         PayRefundPageReqVO reqVO = new PayRefundPageReqVO();
-        reqVO.setMerchantId(1L);
         reqVO.setAppId(1L);
         reqVO.setChannelCode(PayChannelEnum.WX_PUB.getCode());
         reqVO.setMerchantRefundNo("MRF0000001");
@@ -127,7 +123,6 @@ public class PayRefundServiceTest extends BaseDbUnitTest {
     public void testGetRefundList() {
         // mock 数据
         PayRefundDO dbRefund = randomPojo(PayRefundDO.class, o -> { // 等会查询到
-            o.setMerchantId(1L);
             o.setAppId(1L);
             o.setChannelId(1L);
             o.setChannelCode(PayChannelEnum.WX_PUB.getCode());
@@ -155,8 +150,6 @@ public class PayRefundServiceTest extends BaseDbUnitTest {
             o.setUpdateTime(LocalDateTime.of(2021, 1, 1, 10, 10, 35));
         });
         refundMapper.insert(dbRefund);
-        // 测试 merchantId 不匹配
-        refundMapper.insert(cloneIgnoreId(dbRefund, o -> o.setMerchantId(2L)));
         // 测试 appId 不匹配
         refundMapper.insert(cloneIgnoreId(dbRefund, o -> o.setAppId(2L)));
         // 测试 channelCode 不匹配
@@ -176,7 +169,6 @@ public class PayRefundServiceTest extends BaseDbUnitTest {
 
         // 准备参数
         PayRefundExportReqVO reqVO = new PayRefundExportReqVO();
-        reqVO.setMerchantId(1L);
         reqVO.setAppId(1L);
         reqVO.setChannelCode(PayChannelEnum.WX_PUB.getCode());
         reqVO.setMerchantRefundNo("MRF0000001");