jiangqs
2023-09-04 f79a327bd4e5d1511ac3b738530b0f5c63772aec
seata  同步 支付调整
4个文件已修改
36 ■■■■ 已修改文件
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/StaffController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/test/java/com/ruoyi/system/systemTest.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
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();
    }
}
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);
    }
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();
    }
}