From f79a327bd4e5d1511ac3b738530b0f5c63772aec Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 04 九月 2023 19:34:35 +0800
Subject: [PATCH] seata 同步 支付调整
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 8 ++++----
ruoyi-modules/ruoyi-system/src/test/java/com/ruoyi/system/systemTest.java | 7 -------
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/StaffController.java | 12 ------------
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java | 9 ---------
4 files changed, 4 insertions(+), 32 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 735cd40..001e8a6 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
@@ -295,10 +295,10 @@
return R.ok(mgtShopAuthCodeVo);
}
- @RequestMapping(value = "/mgtShopAuth", method = RequestMethod.POST)
- @Log(title = "商户进件管理", businessType = BusinessType.UPDATE,operContent = "商户进件")
- @ApiOperation(value = "平台商户进件")
- public R mgtShopAuth(@RequestBody MgtShopAuthGetDto mgtShopAuthGetDto){
+ @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);
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/StaffController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/StaffController.java
index 4d0a8c3..fd3d20e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/StaffController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/StaffController.java
@@ -57,16 +57,4 @@
return R.ok();
}
-
- @PostMapping("/updateDept")
- public R updateDept(){
- sysWxCpService.updateDept();
- return R.ok();
- }
-
- @PostMapping("/sendMessage")
- public R sendMessage(){
- sysWxCpService.sendMessage();
- return R.ok();
- }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java
index a0ec401..b7b4b70 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java
@@ -15,12 +15,10 @@
import com.ruoyi.system.mapper.sys.SysDeptMapper;
import com.ruoyi.system.mapper.sys.SysDeptMenuMapper;
import com.ruoyi.system.mapper.sys.SysRoleMapper;
-import com.ruoyi.system.service.staff.SysWxCpService;
import com.ruoyi.system.service.sys.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -42,9 +40,6 @@
@Autowired
private SysDeptMenuMapper deptMenuMapper;
-
- @Resource
- private SysWxCpService sysWxCpService;
/**
* 查询部门管理数据
@@ -343,10 +338,6 @@
@Override
public int deleteDeptById(Long deptId)
{
- SysDept sysDept = this.selectDeptById(deptId);
- if(sysDept.getWxDeptId()!=null){
- sysWxCpService.deleteWxCpDept(sysDept.getWxDeptId());
- }
return deptMapper.deleteDeptById(deptId);
}
diff --git a/ruoyi-modules/ruoyi-system/src/test/java/com/ruoyi/system/systemTest.java b/ruoyi-modules/ruoyi-system/src/test/java/com/ruoyi/system/systemTest.java
index 903c071..3c0ecdf 100644
--- a/ruoyi-modules/ruoyi-system/src/test/java/com/ruoyi/system/systemTest.java
+++ b/ruoyi-modules/ruoyi-system/src/test/java/com/ruoyi/system/systemTest.java
@@ -2,8 +2,6 @@
import com.ruoyi.system.service.staff.SysWxCpService;
-import me.chanjar.weixin.common.error.WxErrorException;
-import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -24,9 +22,4 @@
@Resource
private SysWxCpService sysWxCpService;
- @Test
- public void main() throws WxErrorException {
- sysWxCpService.sendMessage();
- sysWxCpService.updateDept();
- }
}
--
Gitblit v1.7.1