更改bug

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

@@ -41,11 +41,24 @@ public class TaAccountController {
         return iTaaccountService.queryDetail(request, accountId);
     }
 
+    @ApiOperation("资金账户管理-->资金账户信息修改--> 初始化")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    @RequestMapping(method = RequestMethod.GET, value = "/updateTaAccountInit")
+    public AjaxResult<TaAccountInitResultDetail> updateTaAccountInit(Long accountId, HttpServletRequest request,String orgztypes) {
+        return iTaaccountService.updateTaAccountInit(request, accountId,orgztypes);
+    }
+
     @ApiOperation("资金账户管理-->资金账户信息修改")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.POST, value = "/updateTaAccount")
-    public AjaxResult updateTaAccount(@RequestBody TaAccountUpdateParam param, HttpServletRequest request) {
-        return iTaaccountService.updateTaAccount(param, request);
+    public AjaxResult updateTaAccount(@RequestBody String param, HttpServletRequest request) {
+        try {
+            TaAccountUpdateParam taAccountPwd = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), TaAccountUpdateParam.class);
+            return iTaaccountService.updateTaAccount(taAccountPwd, request);
+        } catch (Exception e) {
+            log.error("资金账户信息修改失败，失败原因：" + e);
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+        }
     }
 
     @ApiOperation("资金账户管理-->资金流水信息列表查询/查询管理-->资金流水信息列表查询")

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

@@ -55,7 +55,7 @@ public interface ICommonService {
 
     AjaxResult<CommonResult> queryCommonFlag(CommonParam commonParam, HttpServletRequest request);
 
-    Boolean checkOranCardNumOrMobile(int type, String message, Long userid);
+    Boolean checkOranCardNumOrMobile(Integer checkType, Integer checkField, Long userid, String message);
 
     AjaxResult<BankAccountsign> getBankAccountSign(Long accountcode, Integer signstatus, HttpServletRequest request);
 

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

@@ -41,4 +41,6 @@ public interface ITaaccountService extends IService<Taaccount> {
     AjaxResult recover(Long areaid, HttpServletRequest request);
 
     AjaxResult rebackChange(Long areaid, HttpServletRequest request);
+
+    AjaxResult<TaAccountInitResultDetail> updateTaAccountInit(HttpServletRequest request, Long accountId,String orgztypes);
 }

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

@@ -382,28 +382,32 @@ public class CommonServiceImpl implements ICommonService {
         return u.getSubarealevelpath().indexOf("," + fUserId + ",") >= 0;
     }
 
-    public Boolean checkOranCardNumOrMobile(int type, String message, Long userid) {
+    public Boolean checkOranCardNumOrMobile(Integer checkType, Integer checkField, Long userid, String message) {
         if (StringUtils.isBlank(message)) return true;
-        List<WskhUserinfo> wskhUserinfoList;
-        List<Userinfo> userinfoList;
-        if (type == 1) {
-            wskhUserinfoList = iWskhUserinfoMapper.selectList(new QueryWrapper<WskhUserinfo>()
-                    .eq("CARDNUM", message)
-                    .eq(userid != null, "userid", userid)
-            );
-            userinfoList = iUserinfoMapper.selectList(new QueryWrapper<Userinfo>()
-                    .eq("CARDNUM", message)
-                    .eq(userid != null, "userid", userid));
-        } else {
-            wskhUserinfoList = iWskhUserinfoMapper.selectList(new QueryWrapper<WskhUserinfo>()
-                    .eq("MOBILEPHONE", message)
-                    .eq(userid != null, "userid", userid));
-            userinfoList = iUserinfoMapper.selectList(new QueryWrapper<Userinfo>()
-                    .eq("MOBILE", message)
-                    .eq(userid != null, "userid", userid));
+        Long wskhUserinfoList = 0L;
+        Long userinfoList = 0L;
+
+        if (checkType == 1) {
+            wskhUserinfoList = iWskhUserinfoMapper.selectCount(new QueryWrapper<WskhUserinfo>()
+                    .eq(checkField == 1,"cardnum", message)
+                    .eq(checkField == 2,"mobile", message)
+                    .ne(userid != null, "userid", userid));
+        } else if (checkType == 2) {
+            userinfoList = iUserinfoMapper.selectCount(new QueryWrapper<Userinfo>()
+                    .eq(checkField == 1,"cardnum", message)
+                    .eq(checkField == 2,"mobile", message)
+                    .ne(userid != null, "userid", userid));
+        } else if (checkType == 3) {
+            wskhUserinfoList = iWskhUserinfoMapper.selectCount(new QueryWrapper<WskhUserinfo>()
+                    .eq(checkField == 1,"cardnum", message)
+                    .eq(checkField == 2,"mobile", message)
+                    .ne(userid != null, "userid", userid));
+            userinfoList = iUserinfoMapper.selectCount(new QueryWrapper<Userinfo>()
+                    .eq(checkField == 1,"cardnum", message)
+                    .eq(checkField == 2,"mobile", message)
+                    .ne(userid != null, "userid", userid));
         }
-
-        return wskhUserinfoList.size() + userinfoList.size() == 0;
+        return wskhUserinfoList + userinfoList == 0;
     }
 
     @Override

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

@@ -579,7 +579,7 @@ public class OrganServiceImpl implements IOrganService {
             } else {
                 roletype.add(role);
             }
-            List<Market> markets = iMarketMapper.getMarketsNameByUseridAndrole(userid, roletype);
+            List<Market> markets = iMarketMapper.getMarketsNameByUseridAndrole(userid, roletype,null);
             result.setMarkets(markets);
         } else if (role == SysEnums.OrganRole.industry.getCode().intValue()) {
             String sm = iCommonService.getSysparmById(SysConstants.SYSPAMA_CODE_NINESERVENNINE);
@@ -588,7 +588,7 @@ public class OrganServiceImpl implements IOrganService {
                 //会员   已选市场
                 List<Integer> roletype = new ArrayList<Integer>();
                 roletype.add(6);
-                List<Market> markets = iMarketMapper.getMarketsNameByUseridAndrole(userid, roletype);
+                List<Market> markets = iMarketMapper.getMarketsNameByUseridAndrole(userid, roletype,null);
                 result.setMarkets(markets);
             }
         } else if (role == SysEnums.OrganRole.marketer.getCode().intValue()) {

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

@@ -450,7 +450,7 @@ public class OrganSonServiceService implements IOrganSonService {
         // 机构开户证件号码是否唯一
         String areacardflag = iCommonService.getSystemParam(Constants.REDIS_HEADER_SYSPARAM, Constants.SYSPARAM_CARD_NO);
         //验证证件号码是否存在
-        Boolean checkFlag1 = iCommonService.checkOranCardNumOrMobile(1, EncryptionUtils.encryptByAES(param.getCardnum().trim()), null);
+        Boolean checkFlag1 = iCommonService.checkOranCardNumOrMobile(3, 1, null, EncryptionUtils.encryptByAES(param.getCardnum().trim()));
         if (areacardflag != null && areacardflag.equals("1") && checkFlag1) {
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_011.getCode(), request.getHeader("Accept-Language"));
         }

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

@@ -184,7 +184,7 @@ public class ProfitSharServiceImpl implements IProfitSharService {
         }
         List<Integer> r = new ArrayList<>() ;
         r.add(7);
-        List<Market> mks = iMarketMapper.getMarketsNameByUseridAndrole(uid, r);
+        List<Market> mks = iMarketMapper.getMarketsNameByUseridAndrole(uid, r,null);
         for (int i = 0; i < mks.size(); i++) {
             if (mks.get(i).getMarketid() < 1000 || !trademodeMap.containsKey(mks.get(i).getTrademode())) {
                 mks.remove(i);

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

@@ -89,6 +89,10 @@ public class TaaccountServiceImpl extends ServiceImpl<ITaaccountMapper, Taaccoun
     private IDraftUseraccountNewMapper iDraftUseraccountNewMapper;
     @Resource
     private IDraftUserinfoMapper iDraftUserinfoMapper;
+    @Resource
+    private IMarketMapper iMarketMapper;
+    @Resource
+    private IMsExtendroleMapper iMsExtendroleMapper;
 
     @Override
     public PageResult<TaAccountQueryResult> queryUserMsg(HttpServletRequest request, TaAccountQueryParam taAccountQueryParam) {
@@ -694,6 +698,113 @@ public class TaaccountServiceImpl extends ServiceImpl<ITaaccountMapper, Taaccoun
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }
 
+    @Override
+    public AjaxResult<TaAccountInitResultDetail> updateTaAccountInit(HttpServletRequest request, Long accountId,String orgztypes) {
+        TaAccountInitResultDetail initResultDetail = new TaAccountInitResultDetail();
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        Taaccount taaccount = iTaaccountMapper.selectOne(new QueryWrapper<Taaccount>().eq("ACCOUNTID", accountId));
+        //是否显示期权市场
+
+        String sp1 = iCommonService.getSysparmById(SysConstants.SYSPAMA_CODE_ACCOUNT_MARKET);
+        if (systemmanager.getReletype() != 1 && !iCommonService.checkIsAreaSon2(systemmanager.getAreauserid(), taaccount.getUserid())) {
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM003.getCode(), request.getHeader("Accept-Language"));
+        }
+
+        String[] roletyes = orgztypes.split(",");
+        for (String role : roletyes) {
+            if (Integer.parseInt(role) == SysEnums.OrganRole.selfsupport.getCode()) {
+                //如果有自营会员角色
+                initResultDetail.setSelfFlag(1);
+                break;
+            }
+        }
+
+        String sp = iCommonService.getSysparmById(SysConstants.SYSPARAM_SETTING_SHOW_RU);
+        if (sp != null) {
+            initResultDetail.setIsshowrelationuser(sp);
+        } else {
+            initResultDetail.setIsshowrelationuser("1");
+        }
+        //自营市场
+        List<Integer> roletype = new ArrayList<Integer>();
+        roletype.add(SysEnums.OrganRole.selfsupport.getCode());
+        int isqq = 0;
+        if (StringUtils.isNotBlank(sp1) && !"1".equals(sp1)) {
+            isqq = 1;
+        }
+        List<Market> Markets = iMarketMapper.getMarketsNameByUseridAndrole(systemmanager.getAreauserid(),roletype,isqq);
+        initResultDetail.setMarkets(Markets);
+        //登录账户
+        QueryWrapper<Loginaccount> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("loginid");
+        queryWrapper.eq("userid", systemmanager.getAreauserid()) // 替换 userId 为实际的参数值
+                .eq("loginstatus", 1);
+        queryWrapper.exists("SELECT * FROM logintaaccount l WHERE l.loginid = loginaccount.loginid");
+        List<Long> loginIds = iLoginaccountMapper.selectObjs(queryWrapper);
+        initResultDetail.setLoginaccount(loginIds);
+        List<Long> defaultLogin = iLoginaccountMapper.getLoginNotExistsLt(systemmanager.getAreauserid());
+        initResultDetail.setDefaultloginaccount(defaultLogin);
+
+        //获取市场权限
+        Map<Long, TaAccountMarketVo> lmap = new HashMap<>();
+        List<TaAccountMarketVo> dty = iTaaccountmarketMapper.selectByAccountId(taaccount.getAccountid());
+        for (TaAccountMarketVo taAccountMarketVo : dty) {
+            taAccountMarketVo.setChecked(1);
+            lmap.put(taAccountMarketVo.getMarketId(), taAccountMarketVo);
+        }
+        for (Market market : Markets) {
+            if (!lmap.containsKey(market.getMarketid())) {
+                TaAccountMarketVo te = new TaAccountMarketVo();
+                te.setChecked(0);
+                te.setMarketId(market.getMarketid());
+                te.setMarketName(market.getMarketname());
+                te.setSpotRightType(market.getSpotrighttype());
+                te.setDType(market.getBuyspotrighttype());
+                te.setTradeMode(market.getTrademode());
+                te.setTradeProperty(market.getTradeproperty());
+                lmap.put(market.getMarketid(), te);
+            } else {
+                lmap.get(market.getMarketid()).setFSpotRightType(market.getSpotrighttype());
+                lmap.get(market.getMarketid()).setFdType(market.getBuyspotrighttype());
+                lmap.get(market.getMarketid()).setTradeMode(market.getTrademode());
+                lmap.get(market.getMarketid()).setTradeProperty(market.getTradeproperty());
+            }
+        }
+        initResultDetail.setClildmarkets(lmap);
+
+        StringBuffer oldLogin = new StringBuffer();
+        //获取当前登录账户资金权限
+        List<Logintaaccount> logintaaccounts = iLogintaaccountMapper.selectList(new QueryWrapper<Logintaaccount>().eq("ACCOUNTID", taaccount.getAccountid()));
+        logintaaccounts.forEach(p -> oldLogin.append(p).append(";"));
+
+        if (taaccount.getRelateduserid() != null) {
+            Useraccount ua = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid",taaccount.getRelateduserid()));
+            initResultDetail.setRelatedU(ua);
+        }
+        if (taaccount.getUserid().compareTo(systemmanager.getAreauserid()) != 0) {
+            initResultDetail.setCannotEdit( 1);
+        }
+        initResultDetail.setOldLogin(oldLogin.toString());
+        initResultDetail.setTaa(taaccount);
+
+        MsExtendrole entity = iMsExtendroleMapper.selectOne(new QueryWrapper<MsExtendrole>()
+                .eq("roletypeid", 5L)
+                .eq("areauserid", taaccount.getUserid()));
+        if (entity != null) {
+            initResultDetail.setCannotEdit(1);
+        }
+
+        //交易类型
+        Map<String, Object> map = redisServiceUtil.getCacheMap(Constants.REDIS_HEADER_DICT + "marketbstype");
+        Map<Integer, String> map_ = new TreeMap<>();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            map_.put(Integer.valueOf(entry.getKey()), entry.getValue().toString());
+        }
+        initResultDetail.setMarketbstype(map_);
+
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"),initResultDetail);
+    }
+
     private AjaxResult refUserAccount(Long areaid, Systemmanager systemmanager, HttpServletRequest request) {
         Useraccount org = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", areaid)); //areaid就是userid
         Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", areaid));

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

@@ -434,14 +434,14 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                     // 机构开户证件号码是否唯一
                     String areacardflag = iCommonService.getSystemParam(Constants.REDIS_HEADER_SYSPARAM, Constants.SYSPARAM_CARD_NO);
                     //验证证件号码是否存在
-                    if (areacardflag != null && areacardflag.equals("1") && !iCommonService.checkOranCardNumOrMobile(1, dui.getCardnum(), dui.getUserid())) {
+                    if (areacardflag != null && areacardflag.equals("1") && !iCommonService.checkOranCardNumOrMobile(3, 1, dui.getUserid(), dui.getCardnum())) {
                         return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_011.getCode(), request.getHeader("Accept-Language"));
                     }
                 }
                 String newMobile = dui.getMobile();
 
                 //验证手机号是否存在
-                if (!iCommonService.checkOranCardNumOrMobile(2, newMobile, dua.getUserid())) {
+                if (!iCommonService.checkOranCardNumOrMobile(2, 2, dua.getUserid(), newMobile)) {
                     return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_016.getCode(), request.getHeader("Accept-Language"));
                 }
 
@@ -619,7 +619,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                     // 机构开户证件号码是否唯一
                     String areacardflag = iCommonService.getSystemParam(Constants.REDIS_HEADER_SYSPARAM, Constants.SYSPARAM_CARD_NO);
                     //验证证件号码是否存在
-                    if (areacardflag != null && areacardflag.equals("1") && !iCommonService.checkOranCardNumOrMobile(1, dui.getCardnum(), dui.getUserid())) {
+                    if (areacardflag != null && areacardflag.equals("1") && !iCommonService.checkOranCardNumOrMobile(3, 1, null, dui.getCardnum())) {
                         return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_011.getCode(), request.getHeader("Accept-Language"));
                     }
                 }

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

@@ -175,11 +175,11 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
         // 机构开户证件号码是否唯一
         String areaCardFlag = iCommonService.getSystemParam(Constants.REDIS_HEADER_SYSPARAM, Constants.SYSPARAM_CARD_NO);
         // 验证证件号码是否存在
-        if (areaCardFlag != null && areaCardFlag.equals("1") && !iCommonService.checkOranCardNumOrMobile(1, vo.getCardnum(), null)) {
+        if (areaCardFlag != null && areaCardFlag.equals("1") && !iCommonService.checkOranCardNumOrMobile(3, 1, null, EncryptionUtils.encryptByAES(vo.getCardnum()))) {
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_011.getCode(), request.getHeader("Accept-Language"));
         }
         // 验证手机号是否存在
-        if (StringUtils.isNotBlank(vo.getMobilephone()) && !iCommonService.checkOranCardNumOrMobile(2, vo.getMobilephone(), null)) {
+        if (StringUtils.isNotBlank(vo.getMobilephone()) && !iCommonService.checkOranCardNumOrMobile(3, 2, null, EncryptionUtils.encryptByAES(vo.getCardnum()))) {
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_016.getCode(), request.getHeader("Accept-Language"));
         }
         //入库重新加密
@@ -288,7 +288,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
                     return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_010.getCode(), request.getHeader("Accept-Language"));
                 }
                 //验证证件号码是否存在
-                if (!iCommonService.checkOranCardNumOrMobile(1, vo.getCardnum(), null)) {
+                if (!iCommonService.checkOranCardNumOrMobile(2, 1, null, vo.getCardnum())) {
                     return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_011.getCode(), request.getHeader("Accept-Language"));
                 }
                 if (wui.getUserinfotype() == 2) {
@@ -381,13 +381,13 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
         Systemparam sysParam = iSystemparamMapper.selectOne(new QueryWrapper<Systemparam>().eq("PARAMCODE", Constants.SYSPARAM_CARD_NOTWO));
         //验证证件号码是否唯一
         if (!base.getCardnum().equals(EncryptionUtils.encryptByAES(currentVo.getCardnum()))) {
-            if (!iCommonService.checkOranCardNumOrMobile(1, EncryptionUtils.encryptByAES(currentVo.getCardnum()), currentVo.getUserid()) && (sysParam == null) || "1".equals(sysParam.getParamvalue())) {
+            if (!iCommonService.checkOranCardNumOrMobile(3, 1, currentVo.getUserid(), EncryptionUtils.encryptByAES(currentVo.getCardnum())) && (sysParam == null) || "1".equals(sysParam.getParamvalue())) {
                 return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_011.getCode(), request.getHeader("Accept-Language"));
             }
         }
         // 验证手机号是否唯一
         if (!base.getMobilephone().equals(EncryptionUtils.encryptByAES(currentVo.getMobilephone()))) {
-            if (!iCommonService.checkOranCardNumOrMobile(2, EncryptionUtils.encryptByAES(currentVo.getMobilephone()), currentVo.getUserid())) {
+            if (!iCommonService.checkOranCardNumOrMobile(3, 2, currentVo.getUserid(), EncryptionUtils.encryptByAES(currentVo.getMobilephone()))) {
                 return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_016.getCode(), request.getHeader("Accept-Language"));
             }
         }
@@ -651,11 +651,11 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
         }
     }
 
-    public void sendLoginAccChangeNtf(Long loginid, int changeType){
-        if (loginid == null ) return ;
+    public void sendLoginAccChangeNtf(Long loginid, int changeType) {
+        if (loginid == null) return;
         Set<Long> logins = new HashSet<>();
         logins.add(loginid);
-        iSendMsgService.sendLoginMsg(logins,changeType, 0);
+        iSendMsgService.sendLoginMsg(logins, changeType, 0);
     }
 
     public void passauto(WskhUserinfo wui, Long userid, String countStr, Systemmanager user, InvestorProcessParam param, Map<String, Object> resultMap) {
@@ -767,6 +767,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
         ui.setRemark(wui.getRemark());
         ui.setUserstatus(1);
         ui.setUsertype(5);
+        ui.setCountryid(wui.getCountryid());
         ui.setSignpdfurl(wui.getSignpdfurl());
         ui.setProvinceid(wui.getProvinceid());
         ui.setCityid(wui.getCityid());

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

@@ -81,6 +81,9 @@
         from market m ,arearolemarket o
         where m.marketid = o.marketid and o.areauserid = #{uid}
         and m.marketstatus = 2
+        <if test="isqq!=null and isqq != 0 ">
+            and m.tradeMode !=18
+        </if>
         and roletype in
         <foreach collection="roletype" close=")" open="(" separator="," item="item">
             #{item}

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

@@ -21,7 +21,7 @@ import java.util.Map;
 @Mapper
 public interface IMarketMapper extends BaseMapper<Market> {
 
-    List<Market> getMarketsNameByUseridAndrole(@Param("uid") Long uid, @Param("roletype") List<Integer> roletype);
+    List<Market> getMarketsNameByUseridAndrole(@Param("uid") Long uid, @Param("roletype") List<Integer> roletype, @Param("roletype") Integer isqq);
 
     List<Market> getNoTradeConfigMarkets(@Param("areauserid") Long areauserid, @Param("usergroupid") Long usergroupid);
 

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/taaccount/TaAccountInitResultDetail.java

@@ -0,0 +1,45 @@
+package com.muchinfo.mtp3pojos.vo.taaccount;
+
+import com.muchinfo.mtp3pojos.entity.Loginaccount;
+import com.muchinfo.mtp3pojos.entity.Market;
+import com.muchinfo.mtp3pojos.entity.Taaccount;
+import com.muchinfo.mtp3pojos.entity.Useraccount;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "TaAccountInitResultDetail对象", description = "资金管理修改初始化")
+public class TaAccountInitResultDetail {
+
+
+    private Integer selfFlag;
+
+    private String isshowrelationuser;
+
+    private List<Market> markets;
+
+    private List<Long> loginaccount;
+
+    private List<Long> defaultloginaccount;
+
+    private Map<Long, TaAccountMarketVo> clildmarkets;
+
+    private Useraccount relatedU;
+
+    private Integer cannotEdit;
+
+    private String oldLogin;
+
+    private Taaccount taa;
+
+    private Map<Integer, String> marketbstype;
+}