From e9beb9fdbcfc6563b00abf451e17712a1969edc2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 09:16:12 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 451 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 437 insertions(+), 14 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 89279c0..775ab8b 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
@@ -1,22 +1,38 @@
package com.ruoyi.shop.controller.management;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.*;
+import com.ruoyi.shop.domain.pojo.shop.BankBranchCode;
import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
+import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
+import com.ruoyi.system.api.service.RemoteUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.rmi.server.ServerCloneException;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author jqs34
@@ -29,6 +45,8 @@
@RestController
@RequestMapping("/mgt/shop")
public class MgtShopController {
+
+ Logger logger = LoggerFactory.getLogger(MgtShopController.class);
@Resource
private ShopService shopService;
@@ -45,26 +63,186 @@
@Resource
private ShopCertificateService shopCertificateService;
+ @Resource
+ private BankBranchCodeService bankBranchCodeService;
+ @Resource
+ private RemoteUserService sysUserService;
+
+
+
@RequestMapping(value = "/listMgtShopSimpleVo", method = RequestMethod.POST)
- @ApiOperation(value = "分页获取商户列表")
+ @ApiOperation(value = "获取简易商户列表")
public R<List<MgtShopListSimpleVo>> listMgtShopSimpleVo(@RequestBody MgtShopListDto mgtShopListDto) {
- List<MgtShopListSimpleVo> mgtShopListSimpleVoList = shopService.listMgtShopSimpleVo(mgtShopListDto);
+ // 获取当前登陆人的可视权限
+ SysUser sysUser = SecurityUtils.getSysUser();
+ // 店铺ids
+ List<Long> scope = new ArrayList<>();
+ if (sysUser!=null){
+ String dataScope = sysUser.getDataScope();
+ if (!sysUser.getUserName().equals("admin")){
+ if (org.springframework.util.StringUtils.hasLength(dataScope)){
+ switch (dataScope){
+ case "3":
+ // 本部门数据 查询当前登陆人属于哪个部门 查询这个部门下所有员工关联的所有店铺
+ // 根据用户id 查询同部门下所有员工id
+ List<Long> userIds = sysUserService.getUserIdsByDept(sysUser.getUserId()).getData();
+ // 店铺ids
+ List<Long> data = shopService.list(new QueryWrapper<Shop>()
+ .in("belong_user_id", userIds)
+ .eq("del_flag", 0))
+ .stream().map(Shop::getShopId).collect(Collectors.toList());
+ if (data.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data);
+ }
+
+ break;
+ case "5":
+ // 仅个人数据 查询当前登陆人关联店铺下的用户
+ List<Long> longs = new ArrayList<>();
+ longs.add(sysUser.getUserId());
+ // 获取店铺ids
+ List<Long> data1 = shopService.list(new QueryWrapper<Shop>()
+ .in("belong_user_id", longs)
+ .eq("del_flag", 0))
+ .stream().map(Shop::getShopId).collect(Collectors.toList());
+ if (data1.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data1);
+ }
+ break;
+ }
+ }
+ }
+ }
+ List<MgtShopListSimpleVo> mgtShopListSimpleVoList = shopService.listMgtShopSimpleVo(mgtShopListDto,scope);
return R.ok(mgtShopListSimpleVoList);
}
@RequestMapping(value = "/pageMgtShop", method = RequestMethod.POST)
@ApiOperation(value = "分页获取商户列表")
public R<Page<MgtShopPageVo>> pageMgtShop(@RequestBody MgtShopPageDto mgtShopPageDto) {
+ // 获取当前登陆人的可视权限
+ SysUser sysUser = SecurityUtils.getSysUser();
+ // 店铺ids
+ List<Long> scope = new ArrayList<>();
+ if (sysUser!=null){
+ String dataScope = sysUser.getDataScope();
+ if (!sysUser.getUserName().equals("admin")){
+ if (org.springframework.util.StringUtils.hasLength(dataScope)){
+ switch (dataScope){
+ case "3":
+ // 本部门数据 查询当前登陆人属于哪个部门 查询这个部门下所有员工关联的所有店铺
+ // 根据用户id 查询同部门下所有员工id
+ List<Long> userIds = sysUserService.getUserIdsByDept(sysUser.getUserId()).getData();
+ // 店铺ids
+ List<Long> data = shopService.list(new QueryWrapper<Shop>()
+ .in("belong_user_id", userIds)
+ .eq("del_flag", 0))
+ .stream().map(Shop::getShopId).collect(Collectors.toList());
+ if (data.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data);
+ }
+
+ break;
+ case "5":
+ // 仅个人数据 查询当前登陆人关联店铺下的用户
+ List<Long> longs = new ArrayList<>();
+ longs.add(sysUser.getUserId());
+ // 获取店铺ids
+ List<Long> data1 = shopService.list(new QueryWrapper<Shop>()
+ .in("belong_user_id", longs)
+ .eq("del_flag", 0))
+ .stream().map(Shop::getShopId).collect(Collectors.toList());
+ if (data1.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data1);
+ }
+ break;
+ }
+ }
+ }
+ }
+ if(null != mgtShopPageDto.getDeptId()){
+ R<List<SysUser>> r = sysUserService.getUsersByDeptId(mgtShopPageDto.getDeptId());
+ List<Long> collect = r.getData().stream().map(SysUser::getUserId).collect(Collectors.toList());
+ List<Shop> shops = shopService.getShopBySysUserIds(collect);
+ scope.addAll(shops.stream().map(Shop::getShopId).collect(Collectors.toList()));
+ }
+
Page<MgtShopPageVo> page = new Page<>();
page.setSize(mgtShopPageDto.getPageSize());
page.setCurrent(mgtShopPageDto.getPageNum());
- List<MgtShopPageVo> mgtShopPageVoList = shopService.pageMgtShop(page,mgtShopPageDto);
+ List<MgtShopPageVo> mgtShopPageVoList = shopService.pageMgtShop(page,mgtShopPageDto,scope);
return R.ok(page.setRecords(mgtShopPageVoList));
}
+ @RequestMapping(value = "/exportPageMgtShop", method = RequestMethod.POST)
+ @ApiOperation(value = "导出商户列表")
+ public void exportPageMgtShop(MgtShopPageDto mgtShopPageDto, HttpServletResponse response) {
+ Page<MgtShopPageVo> page = new Page<>();
+ if(mgtShopPageDto.getPageSize() > 5000){
+ page.setSize(5000);
+ page.setCurrent(1);
+ }else{
+ page.setSize(mgtShopPageDto.getPageSize());
+ page.setCurrent(mgtShopPageDto.getPageNum());
+ }
+ // 获取当前登陆人的可视权限
+ SysUser sysUser = SecurityUtils.getSysUser();
+ // 店铺ids
+ List<Long> scope = new ArrayList<>();
+ if (sysUser!=null){
+ String dataScope = sysUser.getDataScope();
+ if (!sysUser.getUserName().equals("admin")){
+ if (org.springframework.util.StringUtils.hasLength(dataScope)){
+ switch (dataScope){
+ case "3":
+ // 本部门数据 查询当前登陆人属于哪个部门 查询这个部门下所有员工关联的所有店铺
+ // 根据用户id 查询同部门下所有员工id
+ List<Long> userIds = sysUserService.getUserIdsByDept(sysUser.getUserId()).getData();
+ // 店铺ids
+ List<Long> data = shopService.list(new QueryWrapper<Shop>()
+ .in("belong_user_id", userIds)
+ .eq("del_flag", 1))
+ .stream().map(Shop::getShopId).collect(Collectors.toList());
+ scope.addAll(data);
+ break;
+ case "5":
+ // 仅个人数据 查询当前登陆人关联店铺下的用户
+ List<Long> longs = new ArrayList<>();
+ longs.add(sysUser.getUserId());
+ // 获取店铺ids
+ List<Long> data1 = shopService.list(new QueryWrapper<Shop>()
+ .in("belong_user_id", longs)
+ .eq("del_flag", 1))
+ .stream().map(Shop::getShopId).collect(Collectors.toList());
+ scope.addAll(data1);
+ break;
+ }
+ }
+ }
+ }
+ if(null != mgtShopPageDto.getDeptId()){
+ R<List<SysUser>> r = sysUserService.getUsersByDeptId(mgtShopPageDto.getDeptId());
+ List<Long> collect = r.getData().stream().map(SysUser::getUserId).collect(Collectors.toList());
+ List<Shop> shops = shopService.getShopBySysUserIds(collect);
+ scope.addAll(shops.stream().map(Shop::getShopId).collect(Collectors.toList()));
+ }
+ List<MgtShopPageVo> mgtShopPageVoList = shopService.pageMgtShop(page,mgtShopPageDto,scope);
+ ExcelUtil<MgtShopPageVo> util = new ExcelUtil<MgtShopPageVo>(MgtShopPageVo.class);
+ util.exportExcel(response, mgtShopPageVoList, "商户列表");
+ }
+
@RequestMapping(value = "/createMgtShop", method = RequestMethod.POST)
- @ApiOperation(value = "平台编辑商户")
- public R createMgtShop(@RequestBody MgtEditShopDto mgtEditShopDto) {
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "编辑商户")
+ @ApiOperation(value = "平台编辑商户【2.0】")
+ public R createMgtShop(@Validated @RequestBody MgtEditShopDto mgtEditShopDto) {
Long userId = SecurityUtils.getUserId();
mgtEditShopDto.setUserId(userId);
shopService.createShop(mgtEditShopDto);
@@ -72,7 +250,7 @@
}
@RequestMapping(value = "/getMgtShopInfo", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户详情")
+ @ApiOperation(value = "获取商户详情【2.0】")
public R<MgtShopInfoVo> getMgtShopInfo(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
MgtShopInfoVo mgtShopInfoVo = shopService.getMgtShopInfo(Long.valueOf(mgtBaseGetDto.getId()));
return R.ok(mgtShopInfoVo);
@@ -86,13 +264,23 @@
}
@RequestMapping(value = "/editMgtShopTag", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "修改商户标签")
@ApiOperation(value = "修改商户标签")
public R editMgtShopTag(@RequestBody MgtEditShopTagDto mgtEditShopTagDto) {
shopService.editShopTag(mgtEditShopTagDto);
return R.ok();
}
+ @RequestMapping(value = "/transferMgtShop", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "转移客户")
+ @ApiOperation(value = "转移客户")
+ public R transferMgtShop(@RequestBody MgtTransferShopDto mgtTransferShopDto) {
+ shopService.transferMgtShop(mgtTransferShopDto);
+ return R.ok();
+ }
+
@RequestMapping(value = "/terminateMgtCooperation", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "终止合作")
@ApiOperation(value = "终止合作")
public R terminateMgtCooperation(@RequestBody MgtTerminateCooperationDto mgtTerminateCooperationDto) {
Long userId = SecurityUtils.getUserId();
@@ -101,7 +289,18 @@
return R.ok();
}
+ @RequestMapping(value = "/frozenMgtShop", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "终止合作")
+ @ApiOperation(value = "冻结商户")
+ public R frozenMgtShop(@RequestBody MgtFrozenShopDto mgtFrozenShopDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtFrozenShopDto.setUserId(userId);
+ shopService.frozenMgtShop(mgtFrozenShopDto);
+ return R.ok();
+ }
+
@RequestMapping(value = "/changeMgtCooperationTime", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "修改合作时间")
@ApiOperation(value = "修改合作时间")
public R changeMgtCooperationTime(@RequestBody MgtChangeCoopDto mgtChangeCoopDto) {
Long userId = SecurityUtils.getUserId();
@@ -121,6 +320,7 @@
}
@RequestMapping(value = "/editMgtShopProportion", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "修改商户分成")
@ApiOperation(value = "修改商户分成")
public R editMgtShopProportion(@RequestBody MgtShopProportionEditDto mgtShopProportionEditDto) {
mgtShopProportionEditDto.setUserId(SecurityUtils.getUserId());
@@ -140,8 +340,27 @@
return R.ok(page.setRecords(mgtShopSuggestPageVoList));
}
+ @RequestMapping(value = "/exportPageMgtShopSuggest", method = RequestMethod.POST)
+ @ApiOperation(value = "导出商户建议列表")
+ public void exportPageMgtShopSuggest(MgtShopSuggestPageDto mgtShopSuggestPageDto, HttpServletResponse response) {
+ Long userId = SecurityUtils.getUserId();
+ mgtShopSuggestPageDto.setUserId(userId);
+ Page<MgtShopSuggestPageVo> page = new Page<>();
+ 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);
+ util.exportExcel(response, mgtShopSuggestPageVoList, "商户建议列表");
+ }
+
@RequestMapping(value = "/mgtReplayShopSuggest", method = RequestMethod.POST)
- @ApiOperation(value = "平台回复会员建议")
+ @Log(title = "商户建议管理", businessType = BusinessType.UPDATE,operContent = "回复商户建议")
+ @ApiOperation(value = "平台回复建议")
public R mgtReplayShopSuggest(@RequestBody MgtReplayShopSuggestDto mgtReplayShopSuggestDto) {
Long userId = SecurityUtils.getUserId();
mgtReplayShopSuggestDto.setUserId(userId);
@@ -157,7 +376,8 @@
}
@RequestMapping(value = "/mgtEditShopSuggestTag", method = RequestMethod.POST)
- @ApiOperation(value = "平台编辑会员建议标签")
+ @Log(title = "商户建议管理", businessType = BusinessType.UPDATE,operContent = "编辑商户建议标签")
+ @ApiOperation(value = "平台编辑商户建议标签")
public R mgtEditShopSuggestTag(@RequestBody MgtTagShopSuggestDto mgtTagShopSuggestDto) {
Long userId = SecurityUtils.getUserId();
mgtTagShopSuggestDto.setUserId(userId);
@@ -178,6 +398,7 @@
}
@RequestMapping(value = "/mgtAuditShopCertificate", method = RequestMethod.POST)
+ @Log(title = "商户证书管理", businessType = BusinessType.UPDATE,operContent = "审核商户证书")
@ApiOperation(value = "平台审核商户证书")
public R mgtAuditShopCertificate(@RequestBody MgtAuditShopCertificateDto mgtAuditShopCertificateDto) {
Long userId = SecurityUtils.getUserId();
@@ -202,16 +423,218 @@
Page<MgtShopAuthPageVo> page = new Page<>();
page.setSize(mgtShopAuthPageDto.getPageSize());
page.setCurrent(mgtShopAuthPageDto.getPageNum());
- List<MgtShopAuthPageVo> mgtShopAuthPageVoList = shopService.pageMgtShopAuth(page,mgtShopAuthPageDto);
+ // 获取当前登陆人的可视权限
+ SysUser sysUser = SecurityUtils.getSysUser();
+ // 店铺ids
+ List<Long> scope = new ArrayList<>();
+ if (sysUser!=null){
+ String dataScope = sysUser.getDataScope();
+ if (!sysUser.getUserName().equals("admin")){
+ if (org.springframework.util.StringUtils.hasLength(dataScope)){
+ switch (dataScope){
+ case "3":
+ // 本部门数据 查询当前登陆人属于哪个部门 查询这个部门下所有员工关联的所有店铺
+ // 根据用户id 查询同部门下所有员工id
+ List<Long> userIds = sysUserService.getUserIdsByDept(sysUser.getUserId()).getData();
+ // 店铺ids
+ List<Long> data = shopService.list(new QueryWrapper<Shop>()
+ .in("belong_user_id", userIds)
+ .eq("del_flag", 0))
+ .stream().map(Shop::getShopId).collect(Collectors.toList());
+ if (data.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data);
+ }
+
+ break;
+ case "5":
+ // 仅个人数据 查询当前登陆人关联店铺下的用户
+ List<Long> longs = new ArrayList<>();
+ longs.add(sysUser.getUserId());
+ // 获取店铺ids
+ List<Long> data1 = shopService.list(new QueryWrapper<Shop>()
+ .in("belong_user_id", longs)
+ .eq("del_flag", 0))
+ .stream().map(Shop::getShopId).collect(Collectors.toList());
+ if (data1.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data1);
+ }
+ break;
+ }
+ }
+ }
+ }
+ List<MgtShopAuthPageVo> mgtShopAuthPageVoList = shopService.pageMgtShopAuth(page,mgtShopAuthPageDto,scope);
return R.ok(page.setRecords(mgtShopAuthPageVoList));
}
@RequestMapping(value = "/mgtShopAuth", method = RequestMethod.POST)
+ @Log(title = "商户进件管理", businessType = BusinessType.UPDATE,operContent = "商户进件")
@ApiOperation(value = "平台商户进件")
- public R mgtShopAuth(@RequestBody MgtShopAuthDto mgtShopAuthDto) {
+ public R mgtShopAuth(@Validated @RequestBody MgtShopAuthDto mgtShopAuthDto) {
Long userId = SecurityUtils.getUserId();
mgtShopAuthDto.setUserId(userId);
shopService.mgtShopAuth(mgtShopAuthDto);
return R.ok();
}
+
+
+ @RequestMapping(value = "/getMgtShopAuth", method = RequestMethod.POST)
+ @ApiOperation(value = "获取商户进件信息")
+ public R<MgtShopAuthGetVo> getMgtShopAuth(@RequestBody MgtShopAuthGetDto mgtShopAuthGetDto) {
+ MgtShopAuthGetVo shopAuthGetVo = shopService.getMgtShopAuth(mgtShopAuthGetDto.getAuthId());
+ return R.ok(shopAuthGetVo);
+ }
+
+ @RequestMapping(value = "/getMgtShopAuthCode", method = RequestMethod.POST)
+ @ApiOperation(value = "获取商户进件验证信息")
+ public R<MgtShopAuthCodeVo> getMgtShopAuthCode(@RequestBody MgtShopAuthGetDto mgtShopAuthGetDto) {
+ MgtShopAuthCodeVo mgtShopAuthCodeVo = shopService.getMgtShopAuthCode(mgtShopAuthGetDto.getAuthId());
+ return R.ok(mgtShopAuthCodeVo);
+ }
+
+ @RequestMapping(value = "/mgtAddProfitSharingReceiver", method = RequestMethod.POST)
+ @Log(title = "商户进件管理", businessType = BusinessType.UPDATE,operContent = "商户添加分账方")
+ @ApiOperation(value = "平台商户添加分账方")
+ public R mgtAddProfitSharingReceiver(@RequestBody MgtShopAuthGetDto mgtShopAuthGetDto){
+ Long userId = SecurityUtils.getUserId();
+ mgtShopAuthGetDto.setUserId(userId);
+ shopService.addProfitSharingReceiver(mgtShopAuthGetDto);
+ return R.ok();
+ }
+
+
+ @RequestMapping(value = "/pageMgtShopHFTXAuth", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取商户进件列表（汇付天下）")
+ public R<Page<MgtShopHFTXAuthPageVo>> pageMgtShopHFTXAuth(@RequestBody MgtShopHFTXAuthPageDto mgtShopAuthPageDto) {
+ // 获取当前登陆人的可视权限
+ SysUser sysUser = SecurityUtils.getSysUser();
+ // 店铺ids
+ List<Long> scope = new ArrayList<>();
+ if (sysUser!=null){
+ String dataScope = sysUser.getDataScope();
+ if (!sysUser.getUserName().equals("admin")){
+ if (org.springframework.util.StringUtils.hasLength(dataScope)){
+ switch (dataScope){
+ case "3":
+ // 本部门数据 查询当前登陆人属于哪个部门 查询这个部门下所有员工关联的所有店铺
+ // 根据用户id 查询同部门下所有员工id
+ List<Long> userIds = sysUserService.getUserIdsByDept(sysUser.getUserId()).getData();
+ // 店铺ids
+ List<Long> data = shopService.list(new QueryWrapper<Shop>()
+ .in("belong_user_id", userIds)
+ .eq("del_flag", 0))
+ .stream().map(Shop::getShopId).collect(Collectors.toList());
+ if (data.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data);
+ }
+ break;
+ case "5":
+ // 仅个人数据 查询当前登陆人关联店铺下的用户
+ List<Long> longs = new ArrayList<>();
+ longs.add(sysUser.getUserId());
+ // 获取店铺ids
+ List<Long> data1 = shopService.list(new QueryWrapper<Shop>()
+ .in("belong_user_id", longs)
+ .eq("del_flag", 0))
+ .stream().map(Shop::getShopId).collect(Collectors.toList());
+ if (data1.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data1);
+ }
+ break;
+ }
+ }
+ }
+ }
+ Page<MgtShopHFTXAuthPageVo> page = new Page<>();
+ page.setSize(mgtShopAuthPageDto.getPageSize());
+ page.setCurrent(mgtShopAuthPageDto.getPageNum());
+ List<MgtShopHFTXAuthPageVo> mgtShopHFTXAuthPageVos = shopService.pageMgtShopHFTXAuth(page, mgtShopAuthPageDto,scope);
+ return R.ok(page.setRecords(mgtShopHFTXAuthPageVos));
+ }
+
+
+ @RequestMapping(value = "/mgtShopHFTXAuth", method = RequestMethod.POST)
+ @Log(title = "商户进件管理", businessType = BusinessType.UPDATE,operContent = "商户进件")
+ @ApiOperation(value = "平台商户进件（汇付天下）")
+ public R mgtShopHFTXAuth(@RequestBody MgtShopHFTXAuthDto mgtShopHFTXAuthDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtShopHFTXAuthDto.setUserId(userId);
+ shopService.mgtShopHFTXAuth(mgtShopHFTXAuthDto);
+ return R.ok();
+ }
+
+
+ @RequestMapping(value = "/merchantBasicdataNotify", method = RequestMethod.POST)
+ @Log(title = "商户进件回调通知（汇付天下）", businessType = BusinessType.UPDATE,operContent = "商户进件")
+ public void merchantBasicdataNotify(MerchantBasicDataNotifyDto dto, HttpServletResponse response){
+ R<String> r = shopService.merchantBasicdataNotify(dto);
+ if(r.getCode() == 200){
+ response.setStatus(200);
+ PrintWriter out = null;
+ try {
+ out = response.getWriter();
+ out.print("RECV_ORD_ID_" + r.getData());
+ out.flush();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }finally {
+ out.close();
+ }
+ }
+ }
+
+
+
+
+ @RequestMapping(value = "/getMgtShopHFTXAuthInfo", method = RequestMethod.POST)
+ @ApiOperation(value = "获取商户进件信息（汇付天下）")
+ public R<MgtShopHFTXAuthGetVo> getMgtShopHFTXAuthInfo(@Validated @RequestBody MgtShopHFTXAuthGetDto mgtShopHFTXAuthGetDto){
+ MgtShopHFTXAuthGetVo mgtShopHFTXAuthInfo = shopService.getMgtShopHFTXAuthInfo(mgtShopHFTXAuthGetDto.getShopId());
+ return R.ok(mgtShopHFTXAuthInfo);
+ }
+
+
+ @RequestMapping(value = "/setMgtShopShareRatio", method = RequestMethod.POST)
+ @ApiOperation(value = "设置分账比例（汇付天下）")
+ public R setMgtShopShareRatio(@Validated @RequestBody MgtShopShareRatioSetDto mgtShopShareRatioSetDto){
+ return shopService.setMgtShopShareRatio(mgtShopShareRatioSetDto);
+ }
+
+
+ @RequestMapping(value = "/getMerchantBasicDataSettlement", method = RequestMethod.POST)
+ @ApiOperation(value = "获取提现记录（汇付天下）")
+ public R<List<MerchantBasicdataSettlementVo>> getMerchantBasicDataSettlement(@Validated @RequestBody MerchantBasicdataSettlementDto mgtShopShareRatioSetDto){
+ return shopService.getMerchantBasicDataSettlement(mgtShopShareRatioSetDto);
+ }
+
+
+ @RequestMapping(value = "/getBankList", method = RequestMethod.POST)
+ @ApiOperation(value = "获取银行列表（汇付天下）")
+ public R<List<Map<String, String>>> getBankList(@Validated @RequestBody BankListGetDto dto){
+ List<Map<String, String>> bankList = bankBranchCodeService.getBankList(dto.getName());
+ return R.ok(bankList);
+ }
+
+
+ @RequestMapping(value = "/getBankBranchCode", method = RequestMethod.POST)
+ @ApiOperation(value = "获取银行分行列表（汇付天下）")
+ public R<List<Map<String, String>>> getBankBranchCode(@Validated @RequestBody BankBranchCodeGetDto dto){
+ List<Map<String, String>> bankBranchCode = bankBranchCodeService.getBankBranchCode(dto.getBankNumber());
+ return R.ok(bankBranchCode);
+ }
+
+ @RequestMapping(value = "/changeShopType", method = RequestMethod.GET)
+ @ApiOperation(value = "修改商户类型（转为经销商，转为加盟商）【2.0】")
+ public R<Void> changeShopType(@RequestParam Long shopId){
+ return shopService.changeShopType(shopId);
+ }
+
}
--
Gitblit v1.7.1