新增机构管理相关接口

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/CommonController.java

@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -226,17 +227,17 @@ public class CommonController {
         List<Roleuser> ur = iRoleuserMapper.selectList(new QueryWrapper<Roleuser>().eq("managerid", systemmanager.getAutoid()));
         if (CollectionUtils.isNotEmpty(ur)) {
             boolean isYYFlag = false;
-            for (Roleuser role: ur){
-                if (role.getRoleid().equals(2L)){
+            for (Roleuser role : ur) {
+                if (role.getRoleid().equals(2L)) {
                     isYYFlag = true;
                     break;
                 }
             }
-            if (isYYFlag){
+            if (isYYFlag) {
                 param.setYyareauserid(systemmanager.getAreauserid());
             }
         }
-        return iCommonService.queryGoodsSelect(param,request);
+        return iCommonService.queryGoodsSelect(param, request);
     }
 
     @ApiOperation("获取市场下拉列表")
@@ -355,17 +356,17 @@ public class CommonController {
         return iCommonService.queryOrganSelect(vo, request);
     }
 
-    @RequestMapping(method = RequestMethod.GET, value ="queryOrganSelectPAndC")
+    @RequestMapping(method = RequestMethod.GET, value = "queryOrganSelectPAndC")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    public AjaxResult<OrganSelectResult> queryOrganSelectPAndC(OrganSelectParam vo,  HttpServletRequest request) {
+    public AjaxResult<OrganSelectResult> queryOrganSelectPAndC(OrganSelectParam vo, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         vo.setUsertype(null);
-        List<OrganSelectResult> list = (List<OrganSelectResult>) this.queryOrganSelectP( vo, request);
+        List<OrganSelectResult> list = (List<OrganSelectResult>) this.queryOrganSelectP(vo, request);
         List<Useraccount> uaList = iUseraccountMapper.selectList(new QueryWrapper<Useraccount>()
                 .eq("accountstatus", 4)
                 .eq("hasauth", 1)
-                .eq(StringUtils.isNotBlank(vo.getUsertype()),"usertype",vo.getUsertype())
-                .eq(SysConstants.SYS_TYPE_CLIENT.equals(systemmanager.getReletype()),"memberuserid", systemmanager.getAreauserid()));
+                .eq(StringUtils.isNotBlank(vo.getUsertype()), "usertype", vo.getUsertype())
+                .eq(SysConstants.SYS_TYPE_CLIENT.equals(systemmanager.getReletype()), "memberuserid", systemmanager.getAreauserid()));
         list.addAll(uaList.stream().filter(x -> StringUtils.isBlank(vo.getSearchcode()) ||
                 (StringUtils.isNotBlank(vo.getSearchcode()) && x.getAccountname().contains(vo.getSearchcode()) || x.getUserid().toString().contains(vo.getSearchcode()))).map(x -> {
             OrganSelectResult organSelectVo = new OrganSelectResult();
@@ -373,30 +374,42 @@ public class CommonController {
             organSelectVo.setAccountname(x.getAccountname());
             organSelectVo.setMemberuserid(x.getMemberuserid());
             organSelectVo.setParentuserid(x.getParentuserid());
-            organSelectVo.setUsertype(x.getUsertype()+"");
+            organSelectVo.setUsertype(x.getUsertype() + "");
             return organSelectVo;
         }).collect(Collectors.toList()));
         list = list.stream().limit(10).collect(Collectors.toList());
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), list);
     }
 
-    @RequestMapping(method = RequestMethod.GET, value ="queryAccountId")
+    @RequestMapping(method = RequestMethod.GET, value = "queryAccountId")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @ApiOperation("获取资金账户信息")
-    public AjaxResult<Taaccount> queryAccountId(Long userid,  HttpServletRequest request) {
+    public AjaxResult<Taaccount> queryAccountId(Long userid, HttpServletRequest request) {
         return iCommonService.queryAccountId(userid, request);
     }
 
-    @RequestMapping(method = RequestMethod.GET, value ="queryMobileByUserId")
+    @RequestMapping(method = RequestMethod.GET, value = "queryMobileByUserId")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @ApiOperation("获取手机号")
-    public AjaxResult queryMobileByUserId(Long userid,  HttpServletRequest request) {
+    public AjaxResult queryMobileByUserId(Long userid, HttpServletRequest request) {
         return iCommonService.queryMobileByUserId(userid, request);
     }
 
-    @RequestMapping(method = RequestMethod.GET, value ="queryTAAccountList")
+    @RequestMapping(method = RequestMethod.GET, value = "queryTAAccountList")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     public AjaxResult<TaAccountQueryResult> queryTAAccountList(TaAccountReportParam param, HttpServletRequest request) {
         return iCommonService.queryTAAccountList(param, request);
     }
+
+    @RequestMapping("/common/queryOrganSelectRole")
+    @ApiOperation("按角色加载机构")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    public AjaxResult<OrganSelectResult> queryOrganSelectRole(OrganSelectParam vo, HttpServletRequest request) {
+        if (StringUtils.isNotBlank(vo.getSubarealevelpath())) {
+            Useraccount userAccount = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>()
+                    .eq("userid",Long.valueOf(vo.getSubarealevelpath().replace(",", ""))));
+            vo.setSubarealevelpath(userAccount.getSubarealevelpath());
+        }
+        return iCommonService.queryOrganSelect(vo, request);
+    }
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/OrganController.java

@@ -6,6 +6,7 @@ import com.muchinfo.mtp3century.service.ISystemmanagerService;
 import com.muchinfo.mtp3century.service.ITaaccountService;
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.entity.Accountriskconfig;
 import com.muchinfo.mtp3pojos.entity.Systemmanager;
 import com.muchinfo.mtp3pojos.vo.SystemRoleVo;
 import com.muchinfo.mtp3pojos.vo.investor.InvestorTaAccountUpdateParam;
@@ -198,4 +199,60 @@ public class OrganController {
     private AjaxResult roleadd(@RequestBody OrganRoleModifyParam vo, HttpServletRequest request) {
         return iOrganService.roleadd(vo, request);
     }
+
+    @ApiOperation("会员机构管理-->机构管理-->商品限制设置-->获取列表")
+    @RequestMapping(method = RequestMethod.GET, value = "/querymembergoodslimit")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<MemberGoodsLimitResult> querymembergoodslimit(MemberGoodsLimitParam param, HttpServletRequest request) {
+        return iOrganService.querymembergoodslimit(param, request);
+    }
+
+    @ApiOperation("会员机构管理-->机构管理-->商品限制设置--> 新增、修改")
+    @RequestMapping(method = RequestMethod.POST, value = "/addlimit")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult addlimit(@RequestBody MemberGoodsAddParam vo, HttpServletRequest request) {
+        return iOrganService.addlimit(vo, request);
+    }
+
+    @ApiOperation("会员机构管理-->机构管理-->商品限制设置--> 删除")
+    @RequestMapping(method = RequestMethod.GET, value = "/dellimit")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult dellimit(Integer autoid, HttpServletRequest request) {
+        return iOrganService.dellimit(autoid, request);
+    }
+
+    @ApiOperation("会员机构管理-->机构管理-->风控个性化设置-->获取列表")
+    @RequestMapping(method = RequestMethod.GET, value = "/accountriskconfig")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<AccountRiskConfigResult> accountriskconfig(AccountRiskConfigParam param, HttpServletRequest request) {
+        return iOrganService.accountriskconfig(param, request);
+    }
+
+    @ApiOperation("会员机构管理-->机构管理-->风控个性化设置-->详情")
+    @RequestMapping(method = RequestMethod.GET, value = "/accountriskconfigview")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<Accountriskconfig> accountriskconfigview(Long accountid, HttpServletRequest request) {
+        return iOrganService.accountriskconfigview(accountid, request);
+    }
+
+    @ApiOperation("会员机构管理-->机构管理-->风控个性化设置--> 新增")
+    @RequestMapping(method = RequestMethod.POST, value = "/addaccountriskconfig")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult addaccountriskconfig(@RequestBody AccountRiskConfigAddParam vo, HttpServletRequest request) {
+        return iOrganService.addaccountriskconfig(vo, request);
+    }
+
+    @ApiOperation("会员机构管理-->机构管理-->风控个性化设置--> 修改")
+    @RequestMapping(method = RequestMethod.POST, value = "/editaccountriskconfig")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult editaccountriskconfig(@RequestBody AccountRiskConfigAddParam vo, HttpServletRequest request) {
+        return iOrganService.editaccountriskconfig(vo, request);
+    }
+
+    @ApiOperation("会员机构管理-->机构管理-->风控个性化设置--> 删除")
+    @RequestMapping(method = RequestMethod.GET, value = "/delaccountriskconfig")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult delaccountriskconfig(Long accountid, HttpServletRequest request) {
+        return iOrganService.delaccountriskconfig(accountid, request);
+    }
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/TradingAccountController.java

@@ -1,9 +1,14 @@
 package com.muchinfo.mtp3century.controller;
 
 import com.muchinfo.mtp3century.service.ITradingAccountService;
+import com.muchinfo.mtp3century.utils.CenturyDecryptUtil;
+import com.muchinfo.mtp3common.enumtype.Constants;
+import com.muchinfo.mtp3common.enumtype.MessageType;
+import com.muchinfo.mtp3common.utils.JsonUtils;
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3pojos.entity.Loginaccount;
+import com.muchinfo.mtp3pojos.vo.investor.DetailBeforeResult;
 import com.muchinfo.mtp3pojos.vo.tradingacc.InitAddResult;
 import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountAddParam;
 import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryParam;
@@ -11,6 +16,8 @@ import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -24,6 +31,7 @@ import javax.servlet.http.HttpServletRequest;
 @Api(value = "资金账户API", description = "交易账号管理")
 public class TradingAccountController {
 
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
     @Resource
     private ITradingAccountService iTradingAccountService;
 
@@ -72,8 +80,14 @@ public class TradingAccountController {
     @ApiOperation("账号管理-->交易账号管理-->新增")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.POST, value = "/add")
-    public AjaxResult add(@RequestBody TradingAccountAddParam param, HttpServletRequest request) {
-        return iTradingAccountService.add(request, param);
+    public AjaxResult add(@RequestBody String param, HttpServletRequest request) {
+        try {
+            TradingAccountAddParam addParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), TradingAccountAddParam.class);
+            return iTradingAccountService.add(request, addParam);
+        } catch (Exception e) {
+            log.error("交易商修改失败，失败原因：" + e);
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+        }
     }
 
     @ApiOperation("账号管理-->交易账号管理-->新增-->初始化登录账户及授权资金账户")
@@ -82,4 +96,18 @@ public class TradingAccountController {
     public AjaxResult<InitAddResult> initAdd(HttpServletRequest request) {
         return iTradingAccountService.initAdd(request);
     }
+
+
+    @ApiOperation("账号管理-->交易账号管理-->修改")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    @RequestMapping(method = RequestMethod.POST, value = "/edit")
+    public AjaxResult edit(@RequestBody String param, HttpServletRequest request) {
+        try {
+            TradingAccountAddParam addParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), TradingAccountAddParam.class);
+            return iTradingAccountService.edit(request, addParam);
+        } catch (Exception e) {
+            log.error("交易商修改失败，失败原因：" + e);
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+        }
+    }
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/IOrganService.java

@@ -2,6 +2,7 @@ package com.muchinfo.mtp3century.service;
 
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.entity.Accountriskconfig;
 import com.muchinfo.mtp3pojos.vo.organ.*;
 import com.muchinfo.mtp3pojos.vo.taaccount.TaAccountQueryParam;
 import com.muchinfo.mtp3pojos.vo.taaccount.TaAccountQueryResult;
@@ -40,4 +41,20 @@ public interface IOrganService {
     AjaxResult<OrganInitAddResult> initAdd(String role, HttpServletRequest request);
 
     AjaxResult roleadd(OrganRoleModifyParam vo, HttpServletRequest request);
+
+    PageResult<MemberGoodsLimitResult> querymembergoodslimit(MemberGoodsLimitParam param, HttpServletRequest request);
+
+    AjaxResult addlimit(MemberGoodsAddParam vo, HttpServletRequest request);
+
+    AjaxResult dellimit(Integer autoid, HttpServletRequest request);
+
+    PageResult<AccountRiskConfigResult> accountriskconfig(AccountRiskConfigParam param, HttpServletRequest request);
+
+    AjaxResult<Accountriskconfig> accountriskconfigview(Long accountid, HttpServletRequest request);
+
+    AjaxResult addaccountriskconfig(AccountRiskConfigAddParam vo, HttpServletRequest request);
+
+    AjaxResult editaccountriskconfig(AccountRiskConfigAddParam vo, HttpServletRequest request);
+
+    AjaxResult delaccountriskconfig(Long accountid, HttpServletRequest request);
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/ITradingAccountService.java

@@ -26,4 +26,6 @@ public interface ITradingAccountService {
     AjaxResult add(HttpServletRequest request, TradingAccountAddParam param);
 
     AjaxResult<InitAddResult> initAdd(HttpServletRequest request);
+
+    AjaxResult edit(HttpServletRequest request, TradingAccountAddParam addParam);
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/OrganServiceImpl.java

@@ -11,7 +11,6 @@ import com.muchinfo.mtp3century.service.ICommonService;
 import com.muchinfo.mtp3century.service.IOrganService;
 import com.muchinfo.mtp3century.service.ISendMsgService;
 import com.muchinfo.mtp3century.utils.RedisServiceUtil;
-import com.muchinfo.mtp3century.utils.SequenceIDGeneratorUtils;
 import com.muchinfo.mtp3common.enumtype.*;
 import com.muchinfo.mtp3common.utils.*;
 import com.muchinfo.mtp3common.vo.AjaxResult;
@@ -58,14 +57,10 @@ public class OrganServiceImpl implements IOrganService {
     @Resource
     private IBankAccountsignMapper iBankAccountsignMapper;
     @Resource
-    private IUserauthinfoMapper iUserauthinfoMapper;
-    @Resource
     private ISendMsgService iSendMsgService;
     @Resource
     private IDivisionMapper iDivisionMapper;
     @Resource
-    private IMarketrunMapper iMarketrunMapper;
-    @Resource
     private SystemmanagerServiceImpl systemmanagerService;
     @Resource
     private IWskhOpenaccountconfigMapper iWskhOpenaccountconfigMapper;
@@ -78,24 +73,16 @@ public class OrganServiceImpl implements IOrganService {
     @Resource
     private ITaaccountMapper iTaaccountMapper;
     @Resource
-    private ITradepositionMapper iTradepositionMapper;
-    @Resource
     private ILoginaccountMapper iLoginaccountMapper;
     @Resource
     private RabbitTemplate rabbitTemplate;
     @Resource
     private IEnumdicitemMapper iEnumdicitemMapper;
     @Resource
-    private IBankSystemconfigMapper iBankSystemconfigMapper;
-    @Resource
-    private SequenceIDGeneratorUtils idGeneratorUtils;
-    @Resource
     private RedisServiceUtil redisServiceUtil;
     @Resource
     private IUserreckonaccountMapper iUserreckonaccountMapper;
     @Resource
-    private IWskhBlacklistMapper iWskhBlacklistMapper;
-    @Resource
     private IRoleuserMapper iRoleuserMapper;
     @Resource
     private IQuoterMapper iQuoterMapper;
@@ -136,6 +123,10 @@ public class OrganServiceImpl implements IOrganService {
     private ISystemparamMapper iSystemparamMapper;
     @Resource
     private TradingAccountServiceImpl tradingAccountService;
+    @Resource
+    private IMembergoodslimitconfigMapper iMembergoodslimitconfigMapper;
+    @Resource
+    private IAccountriskconfigMapper iAccountriskconfigMapper;
 
     @Override
     public PageResult<UserAccountRspResult> queryByPage(UserAccountReqParam userInfoReqParam, HttpServletRequest request) {
@@ -1011,19 +1002,132 @@ public class OrganServiceImpl implements IOrganService {
             if (vo.getRoleid() <= 5) {
                 addAreaRoleModifyFee(vo, systemmanager, request);
             } else {
-                addAreaRoleModifyMember(vo, systemmanager, request);
+                addAreaRoleModifyMember(vo, systemmanager);
             }
         } else {//修改
             if (vo.getRoleid() <= 5) {
                 editAreaRoleModifyFee(vo, systemmanager, request);
             } else {
-                editARoleModifyMember(vo, systemmanager, request);
+                editARoleModifyMember(vo, systemmanager);
             }
         }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }
 
-    private void editARoleModifyMember(OrganRoleModifyParam vo, Systemmanager opeartion, HttpServletRequest request) {
+    @Override
+    public PageResult<MemberGoodsLimitResult> querymembergoodslimit(MemberGoodsLimitParam param, HttpServletRequest request) {
+        IPage<MemberGoodsLimitResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<MemberGoodsLimitResult> userAccountVos = iWskhUserinfoMapper.querymembergoodslimit(page, param);
+        PageResult<MemberGoodsLimitResult> pageResult = new PageResult<>();
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(userAccountVos.getPages());
+        pageResult.setCurrent(userAccountVos.getCurrent());
+        pageResult.setTotal(userAccountVos.getTotal());
+        pageResult.setPageSize(userAccountVos.getSize());
+        pageResult.setData(userAccountVos.getRecords());
+        return pageResult;
+    }
+
+    @Override
+    public AjaxResult addlimit(MemberGoodsAddParam vo, HttpServletRequest request) {
+        Membergoodslimitconfig config  = iMembergoodslimitconfigMapper.selectOne(new QueryWrapper<Membergoodslimitconfig>()
+                .eq("userid", vo.getUserid())
+                .eq("roletype", vo.getRoletype())
+                .eq("goodsid", vo.getGoodsid()));
+        if (config == null){
+            // 新增
+            config = new Membergoodslimitconfig();
+            config.setUserid(vo.getUserid());
+            config.setGoodsid(vo.getGoodsid());
+            config.setRoletype(vo.getRoletype());
+            iMembergoodslimitconfigMapper.insert(config);
+        }else{
+            config.setUpdatetime(new Date());
+            config.setIsnodisplay(vo.getIsnodisplay());
+            config.setIscannotbuy(vo.getIscannotbuy());
+            config.setIscannotsell(vo.getIscannotsell());
+            iMembergoodslimitconfigMapper.updateById(config);
+        }
+
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult dellimit(Integer autoid, HttpServletRequest request) {
+        iMembergoodslimitconfigMapper.deleteById(autoid);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public PageResult<AccountRiskConfigResult> accountriskconfig(AccountRiskConfigParam param, HttpServletRequest request) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        if(systemmanager.getReletype().intValue() == SysConstants.SYS_TYPE_CLIENT){
+            param.setMemberuserid(systemmanager.getAreauserid());
+        }
+        param.setMember(1);
+        IPage<AccountRiskConfigResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<AccountRiskConfigResult> userAccountVos = iWskhUserinfoMapper.accountriskconfig(page, param);
+        PageResult<AccountRiskConfigResult> pageResult = new PageResult<>();
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(userAccountVos.getPages());
+        pageResult.setCurrent(userAccountVos.getCurrent());
+        pageResult.setTotal(userAccountVos.getTotal());
+        pageResult.setPageSize(userAccountVos.getSize());
+        pageResult.setData(userAccountVos.getRecords());
+        return pageResult;
+    }
+
+    @Override
+    public AjaxResult<Accountriskconfig> accountriskconfigview(Long accountid, HttpServletRequest request) {
+        Accountriskconfig config = iAccountriskconfigMapper.selectOne(new QueryWrapper<Accountriskconfig>().eq("accountid",accountid));
+        Useraccount ua = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid",config.getUserid()));
+        if(ua.getUsertype()==2){
+            Taaccount ta = iTaaccountMapper.selectOne(new QueryWrapper<Taaccount>().eq("accountid",config.getAccountid()));
+            config.setIsmarketacc( ta.getIsmarketaccount());
+        }
+        config.setUsertype(ua.getUsertype());
+        config.setAccountname(ua.getAccountname());
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"),config);
+    }
+
+    @Override
+    public AjaxResult addaccountriskconfig(AccountRiskConfigAddParam vo, HttpServletRequest request) {
+        Accountriskconfig config = new Accountriskconfig();
+        config.setAccountid(vo.getAccountid());
+        config.setUserid(vo.getUserid());
+        config.setCustomertype(vo.getCustomertype());
+        iAccountriskconfigMapper.insert(config);
+
+        iSendMsgService.sendAccountConfigChangeNtf(1, 1, vo.getUserid(), vo.getAccountid(),
+                null, null, null);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult editaccountriskconfig(AccountRiskConfigAddParam vo, HttpServletRequest request) {
+        Accountriskconfig config = iAccountriskconfigMapper.selectOne(new QueryWrapper<Accountriskconfig>().eq("accountid",vo.getAccountid()));
+        config.setAccountid(vo.getAccountid());
+        config.setUserid(vo.getUserid());
+        config.setCustomertype(vo.getCustomertype());
+        iAccountriskconfigMapper.update(config,new QueryWrapper<Accountriskconfig>().eq("accountid",vo.getAccountid()));
+
+        iSendMsgService.sendAccountConfigChangeNtf(1, 2, vo.getUserid(), vo.getAccountid(),
+                null, null, null);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult delaccountriskconfig(Long accountid, HttpServletRequest request) {
+        Accountriskconfig config = iAccountriskconfigMapper.selectOne(new QueryWrapper<Accountriskconfig>().eq("accountid",accountid));
+        iAccountriskconfigMapper.delete(new QueryWrapper<Accountriskconfig>().eq("accountid",accountid));
+        iSendMsgService.sendAccountConfigChangeNtf(1, 3, config.getUserid(), config.getAccountid(),
+                null, null, null);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    private void editARoleModifyMember(OrganRoleModifyParam vo, Systemmanager opeartion) {
         Date date = new Date();
 
         //卖方管理  当前修改角色时 等同自营  2019年6月18日 10:30:28
@@ -1273,7 +1377,7 @@ public class OrganServiceImpl implements IOrganService {
         updateOperateGoodsConfig(vo);
     }
 
-    private void addAreaRoleModifyMember(OrganRoleModifyParam vo, Systemmanager opeartion, HttpServletRequest request) {
+    private void addAreaRoleModifyMember(OrganRoleModifyParam vo, Systemmanager opeartion) {
         Integer roleid = vo.getRoleid();
         Arearole or = new Arearole();
         Date date = new Date();

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/TradingAccountServiceImpl.java

@@ -279,11 +279,11 @@ public class TradingAccountServiceImpl implements ITradingAccountService {
             log.error("交易账号插入失败，失败原因：" + e.getMessage());
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM008.getCode(), request.getHeader("Accept-Language"));
         }
+        if (StringUtils.isNotEmpty(param.getAccountids())) {
+            List<Long> accountids = Arrays.stream(param.getAccountids().split(","))
+                    .map(Long::valueOf)
+                    .collect(Collectors.toList());
 
-        List<Long> accountids = Arrays.stream(param.getAccountids().split(","))
-                .map(Long::valueOf)
-                .collect(Collectors.toList());
-        if (CollectionUtils.isNotEmpty(accountids)) {
             for (Long id : accountids) {
                 Logintaaccount lt = new Logintaaccount();
                 lt.setAccountid(id);
@@ -309,6 +309,56 @@ public class TradingAccountServiceImpl implements ITradingAccountService {
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), result);
     }
 
+    @Override
+    public AjaxResult edit(HttpServletRequest request, TradingAccountAddParam vo) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+
+        iLogintaaccountMapper.delete(new QueryWrapper<Logintaaccount>().eq("loginid", vo.getLoginid()));
+
+        if (StringUtils.isNotEmpty(vo.getAccountids())) {
+            List<Long> accountids = Arrays.stream(vo.getAccountids().split(","))
+                    .map(Long::valueOf)
+                    .collect(Collectors.toList());
+
+            for (Long id : accountids) {
+                Logintaaccount lt = new Logintaaccount();
+                lt.setAccountid(id);
+                lt.setLoginid(vo.getLoginid());
+                lt.setModifierid(systemmanager.getAutoid());
+                lt.setModifytime(new Date());
+                iLogintaaccountMapper.insert(lt);
+            }
+        }
+        Loginaccount la = new Loginaccount();
+        la.setLoginid(vo.getLoginid());
+        sendMsg(la, 4);
+
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    private void sendMsg(Loginaccount la, Integer type) {
+        Set<Long> logins = new HashSet<>();
+        logins.add(la.getLoginid());
+
+        // 0 新增帐号 1 删除帐号  2 修改帐号 3 修改帐号个性化 4 修改账户权限 5 删除三方登陆信息
+        Thread myThread = new Thread(new Runnable() {
+            public void run() {
+                try {
+                    // 使用线程发送消息  延迟5秒发送, 避免数据库未写入
+                    Thread.sleep(5000);
+
+                    sendMsgService.sendLoginMsg(logins, type, 0);
+                } catch (Exception ex) {
+                    log.error("发送消息失败，失败原因：" + ex);
+                }
+            }
+        });
+
+        // 启动线程
+        myThread.start();
+    }
+
+
     public Long getNewLoginIdByUserid(Long userid, int type) {
         if (type == 1) {
             //投资者

mtp3-century/src/main/resources/mapper/WskhUserinfoMapper.xml

@@ -163,5 +163,68 @@
         </where>
         order by o.userstate,o.createtime desc
     </select>
+    <select id="querymembergoodslimit" resultType="com.muchinfo.mtp3pojos.vo.organ.MemberGoodsLimitResult">
+        select t.autoid "autoid", t.userid "userid", t.roletype "roletype", t.goodsid "goodsid",
+        t.isnodisplay "isnodisplay", t.iscannotbuy "iscannotbuy", t.iscannotsell "iscannotsell",
+        ua.userid || '/' || ua.accountname "membername",
+        g.goodscode || '/' || g.goodsname "goodsdisplay",
+        ei.enumdicname "roledisplay", ei2.enumdicname "nodisplay",
+        ei3.enumdicname "cannotbuy", ei4.enumdicname "cannotsell"
+        from MemberGoodsLimitConfig t
+        left join useraccount ua on t.userid = ua.userid
+        left join goods g on t.goodsid = g.goodsid
+        left join enumdicitem ei on ei.enumdiccode='roleType' and t.roletype = ei.enumitemname
+        left join enumdicitem ei2 on ei2.enumdiccode='flag' and t.isnodisplay = ei2.enumitemname
+        left join enumdicitem ei3 on ei3.enumdiccode='flag' and t.iscannotbuy = ei3.enumitemname
+        left join enumdicitem ei4 on ei4.enumdiccode='flag' and t.iscannotsell = ei4.enumitemname
+        where 1 = 1
+        <if test="vo.roletype !=null and vo.roletype!=''">
+            and t.roletype = #{vo.roletype}
+        </if>
+        <if test="vo.userid !=null">
+            and t.userid = #{vo.userid}
+        </if>
+        <if test="vo.goodsid !=null">
+            and t.goodsid = #{vo.goodsid}
+        </if>
+        <if test="vo.marketid != null and vo.marketid != -1">
+            and g.marketid = #{vo.marketid,jdbcType=DECIMAL}
+        </if>
+        order by t.userid, g.goodscode
+    </select>
+    <select id="accountriskconfig" resultType="com.muchinfo.mtp3pojos.vo.organ.AccountRiskConfigResult">
+
+        select a.*,u.accountname,u.memberuserid,t.ismarketaccount from AccountRiskConfig a
+        left join useraccount u on a.userid = u.userid
+        left join taaccount t on a.accountid=t.accountid
+        <where>
+            and u.accountstatus = 4
+            <choose>
+                <when test="vo.member!=null and vo.member==1">
+                    and u.usertype=2
+                </when>
+                <otherwise>
+                    and u.usertype=5
+                </otherwise>
+            </choose>
+
+            <if test="vo.accountid != null">
+                and a.accountid = #{vo.accountid}
+            </if>
+            <if test="vo.username != null and vo.username != ''">
+                and ((u.accountname like
+                '%'||#{vo.username,jdbcType=VARCHAR}||'%')
+                or(u.userid like '%'||#{vo.username,jdbcType=VARCHAR}||'%'))
+            </if>
+            <if test="vo.memberuserid != null">
+                and a.userid in (
+                select t.userid from useraccount t where u.usertype=5 start with t.userid =#{vo.memberuserid}
+                connect by prior t.userid = t.parentuserid
+                and t.usertype !=2
+                )
+            </if>
+            order by a.userid ,a.accountid
+        </where>
+    </select>
 
 </mapper>

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IMembergoodslimitconfigMapper.java

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.Membergoodslimitconfig;
+
+/**
+ * <p>
+ * 会员商品限制配置表(不显示、不能交易的权限) Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2024-12-19
+ */
+public interface IMembergoodslimitconfigMapper extends BaseMapper<Membergoodslimitconfig> {
+
+}

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ITaaccountMapper.java

@@ -12,7 +12,6 @@ import com.muchinfo.mtp3pojos.vo.reportform.TAAccountChildrenSelect;
 import com.muchinfo.mtp3pojos.vo.taaccount.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.security.core.parameters.P;
 
 import java.util.List;
 

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IWskhUserinfoMapper.java

@@ -6,6 +6,10 @@ import com.muchinfo.mtp3pojos.entity.WskhUserinfo;
 import com.muchinfo.mtp3pojos.vo.investor.DealerQueryResult;
 import com.muchinfo.mtp3pojos.vo.investor.InvestorQueryParam;
 import com.muchinfo.mtp3pojos.vo.investor.InvestorQueryResult;
+import com.muchinfo.mtp3pojos.vo.organ.AccountRiskConfigParam;
+import com.muchinfo.mtp3pojos.vo.organ.AccountRiskConfigResult;
+import com.muchinfo.mtp3pojos.vo.organ.MemberGoodsLimitParam;
+import com.muchinfo.mtp3pojos.vo.organ.MemberGoodsLimitResult;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,4 +29,9 @@ public interface IWskhUserinfoMapper extends BaseMapper<WskhUserinfo> {
     IPage<WskhUserinfo> selectByPage(IPage<WskhUserinfo> page, @Param("vo") WskhUserinfo wskhUserinfoVo);
 
     IPage<InvestorQueryResult> queryInvestorPage( IPage<InvestorQueryResult> page,@Param("vo") InvestorQueryParam investorQueryParam);
+
+    IPage<MemberGoodsLimitResult> querymembergoodslimit(IPage<MemberGoodsLimitResult> page, @Param("vo")MemberGoodsLimitParam param);
+
+    IPage<AccountRiskConfigResult> accountriskconfig(IPage<AccountRiskConfigResult> page,@Param("vo") AccountRiskConfigParam param);
+
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Membergoodslimitconfig.java

@@ -0,0 +1,70 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会员商品限制配置表(不显示、不能交易的权限)
+ * </p>
+ *
+ * @author XKF
+ * @since 2024-12-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("MEMBERGOODSLIMITCONFIG")
+@ApiModel(value="Membergoodslimitconfig对象", description="会员商品限制配置表(不显示、不能交易的权限)")
+@KeySequence(value = "SEQ_MEMBERGOODSLIMITCONFIG")
+public class Membergoodslimitconfig extends Model<Membergoodslimitconfig> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "AutoID(SEQ_MEMBERGOODSLIMITCONFIG)")
+    @TableId(value = "AUTOID", type = IdType.INPUT)
+    private Long autoid;
+
+    @ApiModelProperty(value = "会员用户ID")
+    @TableField("USERID")
+    private Long userid;
+
+    @ApiModelProperty(value = "会员角色 - 6:自营会员 7:经纪会员")
+    @TableField("ROLETYPE")
+    private Integer roletype;
+
+    @ApiModelProperty(value = "商品ID")
+    @TableField("GOODSID")
+    private Long goodsid;
+
+    @ApiModelProperty(value = "是否不显示 0:否 1:是")
+    @TableField("ISNODISPLAY")
+    private Integer isnodisplay;
+
+    @ApiModelProperty(value = "是否不能挂买 0:否 1:是")
+    @TableField("ISCANNOTBUY")
+    private Integer iscannotbuy;
+
+    @ApiModelProperty(value = "是否不能挂卖 0:否 1:是")
+    @TableField("ISCANNOTSELL")
+    private Integer iscannotsell;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("UPDATETIME")
+    private Date updatetime;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.autoid;
+    }
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/organ/AccountRiskConfigAddParam.java

@@ -0,0 +1,22 @@
+package com.muchinfo.mtp3pojos.vo.organ;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "AccountRiskConfigAddParam对象", description = "风控个性化新增")
+public class AccountRiskConfigAddParam {
+
+    private Long userid;
+
+    private Long accountid;
+
+    private Integer customertype;
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/organ/AccountRiskConfigParam.java

@@ -0,0 +1,30 @@
+package com.muchinfo.mtp3pojos.vo.organ;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "MemberGoodsAddParam对象", description = "风控个性化设置")
+public class AccountRiskConfigParam {
+
+    @ApiModelProperty(value = "会员")
+    private String username;
+
+    @ApiModelProperty(value = "资金账户")
+    private String accountid;
+
+    private Long memberuserid;
+
+    private Integer member;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/organ/AccountRiskConfigResult.java

@@ -0,0 +1,28 @@
+package com.muchinfo.mtp3pojos.vo.organ;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "AccountRiskConfigResult对象", description = "风控个性化设置")
+public class AccountRiskConfigResult {
+
+    @ApiModelProperty(value = "会员代码")
+    private Long userid;
+
+    @ApiModelProperty(value = "会员名称")
+    private Long username;
+
+    @ApiModelProperty(value = "资金账户")
+    private Long accountid;
+
+    @ApiModelProperty(value = "风险率类型(客户类别)")
+    private Long customertype;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/organ/MemberGoodsAddParam.java

@@ -0,0 +1,32 @@
+package com.muchinfo.mtp3pojos.vo.organ;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "MemberGoodsAddParam对象", description = "商品限制新增")
+public class MemberGoodsAddParam {
+
+    private Integer autoid;
+
+    private Integer roletype;
+
+    private Long userid;
+
+    private Long marketid;
+
+    private Long goodsid;
+
+    private Integer isnodisplay;
+
+    private Integer iscannotbuy;
+
+    private Integer iscannotsell;
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/organ/MemberGoodsLimitParam.java

@@ -0,0 +1,31 @@
+package com.muchinfo.mtp3pojos.vo.organ;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "MemberGoodsLimitParam对象", description = "商品限制设置")
+public class MemberGoodsLimitParam {
+
+    private Integer roletype;
+
+    @ApiModelProperty(value = "经纪会员")
+    private Long userid;
+
+    @ApiModelProperty(value = "商品")
+    private Long goodsid;
+
+    @ApiModelProperty(value = "市场")
+    private Long marketid;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/organ/MemberGoodsLimitResult.java

@@ -0,0 +1,36 @@
+package com.muchinfo.mtp3pojos.vo.organ;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "MemberGoodsLimitResult对象", description = "商品限制设置响应")
+public class MemberGoodsLimitResult {
+
+    private Long autoid;
+
+    @ApiModelProperty(value = "会员机构")
+    private String membername;
+
+    @ApiModelProperty(value = "机构角色")
+    private String roledisplay;
+
+    @ApiModelProperty(value = "商品")
+    private String goodsdisplay;
+
+    @ApiModelProperty(value = "不显示")
+    private Integer nodisplay;
+
+    @ApiModelProperty(value = "不能挂买")
+    private Integer cannotbuy;
+
+    @ApiModelProperty(value = "不能挂卖")
+    private Integer cannotsell;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/tradingacc/TradingAccountQueryResult.java

@@ -7,6 +7,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 @Builder
 @Data
 @AllArgsConstructor
@@ -21,9 +23,9 @@ public class TradingAccountQueryResult {
     private Integer loginstatus;
 
     @ApiModelProperty(value = "修改时间")
-    private Integer modifytime;
+    private Date modifytime;
 
     @ApiModelProperty(value = "修改人")
-    private Integer modifiername;
+    private String modifiername;
 
 }