From c97706c3cc213b7db3d381e8a0435ff0ef9a04d6 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 04 九月 2023 18:53:40 +0800
Subject: [PATCH] seata 同步 支付调整
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
index 48b2420..735cd40 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
@@ -71,13 +71,16 @@
@ApiOperation(value = "导出商户列表")
public void exportPageMgtShop(MgtShopPageDto mgtShopPageDto, HttpServletResponse response) {
Page<MgtShopPageVo> page = new Page<>();
- if(page.getSize()>5000){
+ if(mgtShopPageDto.getPageSize() > 5000){
page.setSize(5000);
page.setCurrent(1);
+ }else{
+ page.setSize(mgtShopPageDto.getPageSize());
+ page.setCurrent(mgtShopPageDto.getPageNum());
}
List<MgtShopPageVo> mgtShopPageVoList = shopService.pageMgtShop(page,mgtShopPageDto);
ExcelUtil<MgtShopPageVo> util = new ExcelUtil<MgtShopPageVo>(MgtShopPageVo.class);
- util.exportExcel(response, mgtShopPageVoList, "用户订单列表");
+ util.exportExcel(response, mgtShopPageVoList, "商户列表");
}
@RequestMapping(value = "/createMgtShop", method = RequestMethod.POST)
@@ -187,9 +190,12 @@
Long userId = SecurityUtils.getUserId();
mgtShopSuggestPageDto.setUserId(userId);
Page<MgtShopSuggestPageVo> page = new Page<>();
- if(page.getSize()>5000){
+ if(mgtShopSuggestPageDto.getPageSize() > 5000){
page.setSize(5000);
page.setCurrent(1);
+ }else{
+ page.setSize(mgtShopSuggestPageDto.getPageSize());
+ page.setCurrent(mgtShopSuggestPageDto.getPageNum());
}
List<MgtShopSuggestPageVo> mgtShopSuggestPageVoList = shopSuggestService.pageMgtShopSuggest(page,mgtShopSuggestPageDto);
ExcelUtil<MgtShopSuggestPageVo> util = new ExcelUtil<MgtShopSuggestPageVo>(MgtShopSuggestPageVo.class);
@@ -268,7 +274,7 @@
@RequestMapping(value = "/mgtShopAuth", method = RequestMethod.POST)
@Log(title = "商户进件管理", businessType = BusinessType.UPDATE,operContent = "商户进件")
@ApiOperation(value = "平台商户进件")
- public R mgtShopAuth(@Validated @RequestBody MgtShopAuthDto mgtShopAuthDto) throws Exception {
+ public R mgtShopAuth(@Validated @RequestBody MgtShopAuthDto mgtShopAuthDto) {
Long userId = SecurityUtils.getUserId();
mgtShopAuthDto.setUserId(userId);
shopService.mgtShopAuth(mgtShopAuthDto);
@@ -289,5 +295,13 @@
return R.ok(mgtShopAuthCodeVo);
}
-
+ @RequestMapping(value = "/mgtShopAuth", method = RequestMethod.POST)
+ @Log(title = "商户进件管理", businessType = BusinessType.UPDATE,operContent = "商户进件")
+ @ApiOperation(value = "平台商户进件")
+ public R mgtShopAuth(@RequestBody MgtShopAuthGetDto mgtShopAuthGetDto){
+ Long userId = SecurityUtils.getUserId();
+ mgtShopAuthGetDto.setUserId(userId);
+ shopService.addProfitSharingReceiver(mgtShopAuthGetDto);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1