修改bug

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

@@ -0,0 +1,54 @@
+package com.muchinfo.mtp3century.controller;
+
+import com.muchinfo.mtp3century.service.ITradingAccountService;
+import com.muchinfo.mtp3common.vo.AjaxResult;
+import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountDetailResult;
+import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryParam;
+import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/tradingAcc")
+@Api(value = "资金账户API", description = "交易账号管理")
+public class TradingAccountController {
+
+    @Resource
+    private ITradingAccountService iTradingAccountService;
+
+    @ApiOperation("账号管理-->交易账号管理-->获取列表")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @RequestMapping(method = RequestMethod.GET, value = "/query")
+    public PageResult<TradingAccountQueryResult> query(TradingAccountQueryParam param, HttpServletRequest request) {
+        return iTradingAccountService.query(request, param);
+    }
+
+    @ApiOperation("账号管理-->交易账号管理-->详情")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    @RequestMapping(method = RequestMethod.GET, value = "/view")
+    public AjaxResult<TradingAccountDetailResult> view(Long loginid, HttpServletRequest request) {
+        return iTradingAccountService.view(request, loginid);
+    }
+
+    @ApiOperation("账号管理-->交易账号管理-->重置密码")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    @RequestMapping(method = RequestMethod.GET, value = "/resetPwd")
+    public AjaxResult resetPwd(Long loginid, HttpServletRequest request) {
+        return iTradingAccountService.resetPwd(request, loginid);
+    }
+
+    @ApiOperation("账号管理-->交易账号管理-->锁定")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    @RequestMapping(method = RequestMethod.GET, value = "/lockAccount")
+    public AjaxResult lockAccount(Long loginid,Integer status, HttpServletRequest request) {
+        return iTradingAccountService.lockAccount(request,status,loginid);
+    }
+}

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

@@ -56,4 +56,8 @@ public interface ICommonService {
     AjaxResult<BankAccountsign> getBankAccountSign(Long accountcode, Integer signstatus, HttpServletRequest request);
 
     AjaxResult queryMoney(Long accountid, Integer type, Integer mtype, HttpServletRequest request);
+
+    boolean checkTaaccountReport(Systemmanager systemmanager, Long accountid);
+
+    boolean checkLoginAccountRole(Systemmanager systemmanager, Long loginid);
 }

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

@@ -0,0 +1,19 @@
+package com.muchinfo.mtp3century.service;
+
+import com.muchinfo.mtp3common.vo.AjaxResult;
+import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountDetailResult;
+import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryParam;
+import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryResult;
+
+import javax.servlet.http.HttpServletRequest;
+
+public interface ITradingAccountService {
+    PageResult<TradingAccountQueryResult> query(HttpServletRequest request, TradingAccountQueryParam param);
+
+    AjaxResult<TradingAccountDetailResult> view(HttpServletRequest request, Long loginid);
+
+    AjaxResult resetPwd(HttpServletRequest request, Long loginid);
+
+    AjaxResult lockAccount(HttpServletRequest request, Integer status, Long loginid);
+}

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

@@ -1,6 +1,7 @@
 package com.muchinfo.mtp3century.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.muchinfo.mtp.proto.AkernelMI1;
 import com.muchinfo.mtp.proto.Common;
@@ -77,6 +78,9 @@ public class CommonServiceImpl implements ICommonService {
     private IBankBankinfoMapper iBankBankinfoMapper;
     @Resource
     private RabbitTemplate rabbitTemplate;
+    @Resource
+    private ILoginaccountMapper iLoginaccountMapper;
+
 
     /**
      * 获取当前登入用户loginCode
@@ -455,6 +459,46 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
+    public boolean checkTaaccountReport(Systemmanager systemmanager, Long accountid) {
+        if (systemmanager.getReletype() == 1) {
+            return true;
+        }
+        TaAccountReportParam vo = new TaAccountReportParam();
+        vo.setAccountId(accountid);
+        vo.setUserId(systemmanager.getAreauserid());
+        List<TaAccountQueryResult> taAccountQueryResults = iTaaccountMapper.queryTAAccount(vo);
+        //不是本机构的资金账户不能使用
+        if (CollectionUtils.isNotEmpty(taAccountQueryResults)) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean checkLoginAccountRole(Systemmanager systemmanager, Long loginid) {
+        //平台
+        if (systemmanager.getReletype() == 1) {
+            return true;
+        }
+
+        //会员或子机构
+        if (systemmanager.getReletype() == 2 || systemmanager.getReletype() == 3) {
+            Loginaccount la = iLoginaccountMapper.selectOne(new QueryWrapper<Loginaccount>().eq("loginid", loginid));
+            if (la == null){
+                return false;
+            }
+            Useraccount ua = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid",la.getUserid()));
+            if (ua == null){
+                return false;
+            }
+            if (ua.getSubarealevelpath().contains("," + systemmanager.getAreauserid().toString() + ",")) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
     public AjaxResult<CommonResult> queryCommonFlag(CommonParam commonParam, HttpServletRequest request) {
         CommonResult commonResult = new CommonResult();
         if (commonParam.getAccountid() != null) {

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

@@ -90,6 +90,7 @@ public class ReportFormServiceImpl implements IReportFormService {
                 param.setTradedate(param.getTradedate() + param.getQuarter());
             }
             if (param.getCycletype() == 4 && param.getTradedate().length() == 8) {
+                param.setTradedate(null);
                 param.setCycletime(param.getTradedate());
             }
             resultIPage = detailMapper.queryReportDivide(page, param);
@@ -138,6 +139,12 @@ public class ReportFormServiceImpl implements IReportFormService {
     @Override
     public PageResult<OrgReportQueryResult> orgReportQuery(OrgReportQueryParam param, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        PageResult<OrgReportQueryResult> pageResult = new PageResult<>();
+        if(!iCommonService.checkTaaccountReport(systemmanager,param.getAccountid())){
+            pageResult.setCode(Constants.Error_Code_Design);
+            pageResult.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_004.getCode(), request.getHeader("Accept-Language")));
+            return pageResult;
+        }
         if (systemmanager.getReletype() != 1) {
             if (("," + param.getOrgztypes() + ",").contains(",3,")) {
                 param.setChangeflag(3);
@@ -157,7 +164,6 @@ public class ReportFormServiceImpl implements IReportFormService {
         } else {
             resultIPage = detailMapper.queryOrgReportSum(page, param);
         }
-        PageResult<OrgReportQueryResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
         pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
         pageResult.setPages(resultIPage.getPages());
@@ -261,17 +267,15 @@ public class ReportFormServiceImpl implements IReportFormService {
             }
         }
         String value = iCommonService.getSysparmById("082") == null ? "0" : iCommonService.getSysparmById("082");
-        /**  #68530
+        /*  #68530
          * 其他收入 = 原其他收入 - （收到延期交割补偿费 + 收到货款）
          * 其他支出 = 原其他支出 - （支出延期交割补偿费 + 支出货款）
          */
         if ("1".equals(value)) {
             BigDecimal income = dealNull(reportTaaccount.getDeliverycompensationfeein()).add(dealNull(reportTaaccount.getDeliveryamountin()));
-            BigDecimal otherincome = dealNull(reportTaaccount.getOtherincome()).subtract(income);
-            reportTaaccount.setOtherincome(otherincome);
+            reportTaaccount.setOtherincome(dealNull(reportTaaccount.getOtherincome()).subtract(income));
             BigDecimal pay = dealNull(reportTaaccount.getDeliverycompensationfeeout()).add(dealNull(reportTaaccount.getDeliveryamountout()));
-            BigDecimal otherpay = dealNull(reportTaaccount.getOtherpay()).subtract(pay);
-            reportTaaccount.setOtherpay(otherpay);
+            reportTaaccount.setOtherpay(dealNull(reportTaaccount.getOtherpay()).subtract(pay));
         }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), reportTaaccount);
     }
@@ -390,7 +394,7 @@ public class ReportFormServiceImpl implements IReportFormService {
                     Date date = DateTimeUtils.parseDate(cycletime);
                     rdate = DateTimeUtils.format(date, DateTimeUtils.DATE_CHAR_PATTERN);
                 } catch (ParseException e) {
-                    e.printStackTrace();
+                    log.error(e.getMessage());
                 }
             }
         } else if (cycletype == 1) {

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

@@ -160,6 +160,8 @@ public class SystemmanagerServiceImpl extends ServiceImpl<ISystemmanagerMapper,
             rsp.setActive(size == null ? 0 : size);
         }
         rsp.setReleType(systemmanager.getReletype());
+        rsp.setLogincode(systemmanager.getLogincode());
+        rsp.setUsername(systemmanager.getUsername());
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM007.getCode(), request.getHeader("Accept-Language"), rsp);
     }
 

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

@@ -0,0 +1,239 @@
+package com.muchinfo.mtp3century.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.muchinfo.mtp.proto.Common;
+import com.muchinfo.mtp.proto.SystemMI1;
+import com.muchinfo.mtp3century.service.ICommonService;
+import com.muchinfo.mtp3century.service.ISystemmanagerService;
+import com.muchinfo.mtp3century.service.ITradingAccountService;
+import com.muchinfo.mtp3common.enumtype.Constants;
+import com.muchinfo.mtp3common.enumtype.FunCodeConstants;
+import com.muchinfo.mtp3common.enumtype.MessageType;
+import com.muchinfo.mtp3common.enumtype.SysConstants;
+import com.muchinfo.mtp3common.utils.EncryptionUtils;
+import com.muchinfo.mtp3common.utils.SerialNumberUtils;
+import com.muchinfo.mtp3common.vo.ProtoHelper;
+import com.muchinfo.mtp3common.vo.AjaxResult;
+import com.muchinfo.mtp3common.vo.Calculator;
+import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3interface.mapper.*;
+import com.muchinfo.mtp3pojos.entity.*;
+import com.muchinfo.mtp3pojos.vo.ProtoErrorCodes;
+import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountDetailResult;
+import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryParam;
+import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.core.MessageProperties;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class TradingAccountServiceImpl implements ITradingAccountService {
+
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Resource
+    private ICommonService iCommonService;
+    @Resource
+    private ISystemmanagerMapper iSystemmanagerMapper;
+    @Resource
+    private ISystemmanagerlogMapper iSystemmanagerlogMapper;
+    @Resource
+    private ILoginaccountMapper iLoginaccountMapper;
+    @Resource
+    private ILogintaaccountMapper iLogintaaccountMapper;
+    @Resource
+    private ITaaccountMapper iTaaccountMapper;
+    @Resource
+    private IUserinfoMapper iUserinfoMapper;
+    @Resource
+    private SendMsgServiceImpl sendMsgService;
+    @Resource
+    private IFuncmenulistMapper iFuncmenulistMapper;
+    @Resource
+    private RabbitTemplate rabbitTemplate;
+    @Resource
+    private SystemmanagerServiceImpl systemmanagerService;
+    @Override
+    public PageResult<TradingAccountQueryResult> query(HttpServletRequest request, TradingAccountQueryParam param) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        param.setUserid(systemmanager.getAreauserid());
+        param.setLoginusertype(2);
+        IPage<TradingAccountQueryResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<TradingAccountQueryResult> userAccountVos = iLoginaccountMapper.queryTradingAccount(page,param);
+        PageResult<TradingAccountQueryResult> 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<TradingAccountDetailResult> view(HttpServletRequest request, Long loginid) {
+        Loginaccount loginaccount = iLoginaccountMapper.selectOne(new QueryWrapper<Loginaccount>().eq("loginid", loginid));
+        List<Logintaaccount> list = iLogintaaccountMapper.selectList(new QueryWrapper<Logintaaccount>().eq("loginid", loginid));
+        if(CollectionUtils.isEmpty(list)){
+            List<Taaccount> tas = iTaaccountMapper.selectList(new QueryWrapper<Taaccount>().eq("userid", loginaccount.getUserid()));
+            List<Long> ids = tas.stream().map(Taaccount::getAccountid).collect(Collectors.toList());
+            loginaccount.setAccountIdS(ids);
+        }else {
+            List<Long> ids = list.stream().map(Logintaaccount::getAccountid).collect(Collectors.toList());
+            loginaccount.setAccountIdS(ids);
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), loginaccount);
+    }
+
+    @Override
+    public AjaxResult resetPwd(HttpServletRequest request, Long loginid) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        if(!iCommonService.checkLoginAccountRole(systemmanager,loginid)){
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM003.getCode(), request.getHeader("Accept-Language"));
+        }
+        String password = iCommonService.getSystemParam(Constants.REDIS_HEADER_SYSPARAM,"046");
+        Loginaccount la = iLoginaccountMapper.selectOne(new QueryWrapper<Loginaccount>().eq("loginid", loginid));
+        if(la != null){
+            la.setHasupdatedpwd(0);
+            la.setPassword(EncryptionUtils.encryptSHA(la.getLoginid()+password));
+            la.setModifierid(systemmanager.getAutoid());
+            la.setModifytime(new Date());
+
+            iLoginaccountMapper.update(new QueryWrapper<Loginaccount>().eq("LOGINID",la.getLoginid()));
+            writelog(la, systemmanager, SysConstants.BUTTON_CODE_RESET);
+
+            //重置密码短信消息
+            Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid",la.getUserid()));
+            if(StringUtils.isNotBlank(ui.getMobile())){
+                List<String> strs = new ArrayList<String>();
+                strs.add(ui.getCustomername());
+                strs.add(loginid.toString());
+                strs.add("登录");
+                strs.add(password);
+                //尊敬的{accountname}，根据您的申请，您的交易账号{accountid}{type}密码已经重置为:{password};请及时登录系统修改您的相关密码,并注意妥善保管。
+                sendMsgService.sendSMSConnetion(23, EncryptionUtils.decryptForAES(ui.getMobile()), strs);
+            }
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult lockAccount(HttpServletRequest request, Integer status, Long loginid) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        Loginaccount la = iLoginaccountMapper.selectOne(new QueryWrapper<Loginaccount>().eq("loginid", loginid));
+        if(la != null){
+            // 发送消息 解锁 ,回应
+            Long uuid = SerialNumberUtils.getNewSerialNumber(SerialNumberUtils.prefix_account);
+
+            SystemMI1.LoginStatusOperReq.Builder builder = SystemMI1.LoginStatusOperReq.newBuilder();
+            Common.MessageHead.Builder hd = Common.MessageHead.newBuilder();
+            hd.setUUID(uuid.toString());
+            hd.setClientTime(System.currentTimeMillis());
+            hd.setResponseTopic(SysConstants.RabbitUserNtfKey);
+            hd.setFunCode(FunCodeConstants.FunCode_LoginStatusOperReq);
+            builder.setHeader(hd);
+            builder.setLoginID(loginid);
+            builder.setLoginStatus(status);
+            builder.setOperatorID(systemmanager.getAutoid().intValue());
+
+            log.info("手工锁定：{}",builder.build().toString());
+            byte[] body = ProtoHelper.getNTAS(builder.build().toByteArray(),
+                    FunCodeConstants.FunCode_LoginStatusOperReq);
+
+            Calculator ca = new Calculator(uuid);
+            SerialNumberUtils.lockMap.put(uuid, ca);
+
+            rabbitTemplate.send(SysConstants.RabbitUserNtfKey,new Message(body, new MessageProperties()));
+
+            if (status == 1){
+                systemmanagerService.writeOperateLog(SysConstants.PART_INVESTOR_MANAGE, String.format("解锁登录账户(loginid=%s)成功", loginid), systemmanager, null, null, null);
+            }else if (status == 2){
+                systemmanagerService.writeOperateLog(SysConstants.PART_INVESTOR_MANAGE, String.format("锁定登录账户(loginid=%s)成功", loginid), systemmanager, null, null, null);
+            }
+
+            synchronized(ca){
+                try {
+                    ca.wait(10000);
+                    Object rsp = ca.obj;
+                    if(rsp!=null){
+                        SystemMI1.LoginStatusOperRsp rsp_ = (SystemMI1.LoginStatusOperRsp) rsp;
+                        if(rsp_.getRetCode()==0){
+                            return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM008.getCode(), request.getHeader("Accept-Language"));
+                        }else{
+                            return AjaxResult.error(Constants.Error_Code_Design, ProtoErrorCodes.resultMsg(rsp_.getRetCode()), "");
+                        }
+                    }else{
+                        return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM006.getCode(), request.getHeader("Accept-Language"));
+                    }
+                } catch (InterruptedException e) {
+                    log.error("收取锁定交易账号通知失败，失败原因：" + e.getMessage());
+                }finally {
+                    SerialNumberUtils.lockMap.remove(uuid);
+                }
+            }
+        }
+        return null;
+    }
+
+    private void writelog(Loginaccount la, Systemmanager opeartion, String button_code){
+        try{
+            Systemmanagerlog log = new Systemmanagerlog();
+            log.setUserid(opeartion.getAutoid());
+            log.setReletype(opeartion.getReletype());
+            log.setLogincode(opeartion.getLogincode());
+            log.setUsername(opeartion.getUsername());
+            log.setParentuserid(opeartion.getAreauserid());
+            log.setOperatetime(new Date());
+            log.setIp(opeartion.getLoginip());
+            if(la.getLoginusertype() == 1){
+                log.setResourcecode(SysConstants.PART_INVESTOR_MANAGE);
+                Funcmenulist menu = iFuncmenulistMapper.selectOne(new QueryWrapper<Funcmenulist>().eq("RESOURCECODE",SysConstants.PART_INVESTOR_MANAGE));
+                if(menu != null)
+                    log.setResourcename(menu.getResourcename());
+                else
+                    log.setResourcename("交易商管理");
+                if(button_code.equals(SysConstants.BUTTON_CODE_DEL))
+                    log.setContent("注销交易商登录账户(loginid="+ la.getLoginid() +")成功");
+                if(button_code.equals(SysConstants.BUTTON_CODE_ACTIVE))
+                    log.setContent("恢复交易商登录账户(loginid="+ la.getLoginid() +")成功");
+                if(button_code.equals(SysConstants.BUTTON_CODE_ADD))
+                    log.setContent("新增交易商登录账户(loginid="+ la.getLoginid() +")成功");
+                if(button_code.equals(SysConstants.BUTTON_CODE_RESET))
+                    log.setContent("重置交易商登录账户(loginid="+ la.getLoginid() +")密码成功");
+            }else{
+                log.setResourcecode(SysConstants.OPERATION_LOGIN);
+                Funcmenulist menu = iFuncmenulistMapper.selectOne(new QueryWrapper<Funcmenulist>().eq("RESOURCECODE",SysConstants.PART_INVESTOR_MANAGE));
+                if(menu != null)
+                    log.setResourcename(menu.getResourcename());
+                else
+                    log.setResourcename("自营登录账户管理");
+                if(button_code.equals(SysConstants.BUTTON_CODE_DEL))
+                    log.setContent("注销自营登录账户(loginid="+ la.getLoginid() +")成功");
+                if(button_code.equals(SysConstants.BUTTON_CODE_ACTIVE))
+                    log.setContent("恢复自营登录账户(loginid="+ la.getLoginid() +")成功");
+                if(button_code.equals(SysConstants.BUTTON_CODE_ADD))
+                    log.setContent("新增自营登录账户(loginid="+ la.getLoginid() +")成功");
+                if(button_code.equals(SysConstants.BUTTON_CODE_RESET))
+                    log.setContent("重置自营登录账户(loginid="+ la.getLoginid() +")密码成功");
+            }
+            log.setOldvalue("");
+            log.setNewvalue("");
+            iSystemmanagerlogMapper.insert(log);
+        }catch(Exception e){
+            log.error("插入操作日志失败，失败原因："+e.getMessage());
+        }
+    }
+}

mtp3-century/src/main/java/com/muchinfo/mtp3century/vo/systemlogin/LoginRsp.java

@@ -30,4 +30,8 @@ public class LoginRsp implements Serializable {
     private String forcechangepass;
 
     private Integer releType;
+
+    private String username;
+
+    private String logincode;
 }

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

@@ -74,4 +74,32 @@
         </where>
         order by t.loginstatus,t.loginid
     </select>
+
+    <select id="queryTradingAccount" resultType="com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryResult"
+            parameterType="com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryParam">
+        select t.*,s.username,smr.rolename,
+        (select listagg(uai.authid, ',') within group(order by uai.authtype,uai.authid)
+        from userauthinfo uai where uai.loginid=t.loginid and uai.userid=t.userid) "auth",
+        (select listagg(uai.authtype, ',') within group(order by uai.authtype,uai.authid)
+        from userauthinfo uai where uai.loginid=t.loginid and uai.userid=t.userid) "authtype"
+        from loginaccount t
+        left join systemmanager s on t.logincode = s.logincode
+        left join SystemManagerRole smr on t.clientroleid = smr.autoid
+        <where>
+            <if test="vo.loginusertype != null">
+                and t.loginusertype = #{vo.loginusertype}
+            </if>
+            <if test="vo.loginid !=null">
+                and t.loginid = #{vo.loginid}
+            </if>
+            <if test="vo.loginstatus != null">
+                and t.loginstatus = #{vo.loginstatus}
+            </if>
+            <if test="vo.userid != null">
+                and t.userid = #{vo.userid}
+            </if>
+        </where>
+        order by t.loginstatus,t.loginid
+    </select>
+
 </mapper>

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

@@ -95,7 +95,7 @@
             </if>
             <choose>
                 <when test="vo.areatype != null">
-                    and o.areatype = #{areatype,jdbcType=DECIMAL}
+                    and o.areatype = #{vo.areatype,jdbcType=DECIMAL}
                 </when>
                 <otherwise>
                     and o.areatype != 12

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

@@ -149,7 +149,7 @@
                 <where>
                     and t.tradefeetype in (101,102,201,202,301,302,110,108,109,103,104,107,211,212,311,312)
                     <if test="vo.tradedate != null and vo.tradedate != '' ">
-                        and t.tradedate = #{tradedate,jdbcType=CHAR}
+                        and t.tradedate = #{vo.tradedate,jdbcType=CHAR}
                     </if>
                     <if test="vo.areaid != null">
                         <choose>
@@ -382,8 +382,8 @@
             <when test="vo.cycletype==0">
                 SELECT
                 T.RECKONDATE,
-                T.GOODSID,
-                T.MARKETID,
+                g.goodsname,
+                m.marketname,
                 SUM(T.TRADEQTY) TRADEQTY,
                 SUM(T.OPENQTY) OPENQTY,
                 SUM(T.CLOSEQTY) CLOSEQTY,
@@ -394,6 +394,8 @@
                 FROM RECKON_DAYACCOUNTTRADE T
                 inner join taaccount ta on t.accountid = ta.accountid
                 inner join useraccount ua on ta.userid in ua.userid
+                inner join goods g on g.goodsid = T.goodsid
+                inner join market m on m.marketid = T.marketid
                 <where>
                     <if test="vo.userid != null and vo.userid != ''">
                         and ua.memberuserid = #{vo.userid}
@@ -402,14 +404,14 @@
                         and T.reckondate=#{vo.cycletime}
                     </if>
                 </where>
-                group by T.RECKONDATE, T.GOODSID, T.MARKETID
+                group by T.RECKONDATE,g.goodsname, m.marketname
             </when>
             <otherwise>
                 SELECT
                 T.CYCLETIME as reckondate,
                 T.CYCLETYPE,
-                T.GOODSID,
-                T.MARKETID,
+                g.goodsname,
+                m.marketname,
                 SUM(T.TRADEQTY) TRADEQTY,
                 SUM(T.OPENQTY) OPENQTY,
                 SUM(T.CLOSEQTY) CLOSEQTY,
@@ -420,6 +422,8 @@
                 FROM REPORT_DAYACCOUNTTRADE T
                 inner join taaccount ta on t.accountid = ta.accountid
                 inner join useraccount ua on ta.userid in ua.userid
+                inner join goods g on g.goodsid = T.goodsid
+                inner join market m on m.marketid = T.marketid
                 <where>
                     <if test="vo.userid != null and vo.userid != ''">
                         and ua.memberuserid = #{vo.userid}
@@ -431,7 +435,7 @@
                         and T.CYCLETIME = #{vo.cycletime}
                     </if>
                 </where>
-                group by T.CYCLETIME, t.CYCLETYPE, T.GOODSID, T.MARKETID
+                group by T.CYCLETIME, t.CYCLETYPE,g.goodsname, m.marketname
             </otherwise>
         </choose>
     </select>
@@ -439,53 +443,57 @@
     <select id="queryOrgReckonSum" parameterType="com.muchinfo.mtp3pojos.vo.reportform.OrgReportQueryParam"
             resultType="com.muchinfo.mtp3pojos.vo.reportform.OrgReportQueryResult">
         select
+        t.userid as "userId",
+        t.reckondate as "cycleTime",
+        ua.userid || '/' || ua.accountname as "accountName",
         <if test="vo.type == 1">
             <!-- 包含子机构 -->
-            sum(nvl(t.investorinamount2, 0)) as "investorInAmount",
-            sum(nvl(t.investoroutamount2, 0)) as "investorOutAmount",
-            sum(nvl(t.investorclosepl2, 0)) as "investorClosePl",
-            sum(nvl(t.investorreckonpl2, 0)) as "investorReckonPl",
-            sum(nvl(t.investorbuytradeqty2, 0)) as "investorBuyTradeQty",
-            sum(nvl(t.investorselltradeqty2, 0)) as "investorSellTradeQty",
-            sum(nvl(t.investortradefee2, 0)) as "investorTradeFee",
-            sum(nvl(t.investordeliveryfee2, 0)) as "investorDeliveryFee",
-            sum(nvl(t.investorholdfee2, 0)) as "investorHoldFee",
-            sum(nvl(t.investorbuydeliveryamount2, 0)) as "investorBuyDeliveryAmount",
-            sum(nvl(t.investorusedmargin2, 0)) as "investorusedmargin",
-            sum(nvl(t.investorbuyholdqty2, 0)) as "investorBuyHoldQty",
-            sum(nvl(t.investorsellholdqty2, 0)) as "investorSellHoldQty",
-            sum(nvl(t.investorsignqty2, 0)) as "investorSignQty",
-            sum(nvl(t.investortotalnum2, 0)) as "investorTotalNum",
-            sum(nvl(t.investortrialnum2, 0)) as "investorTrialNum",
-            sum(nvl(t.investorretrialnum2, 0)) as "investorRetrialNum",
-            sum(nvl(t.investoramount2, 0)) as "investorAmount"
+            t.investortotalnum2 as "investorTotalNum",
+            t.investortrialnum2 as "investorTrialNum",
+            t.investorretrialnum2 as "investorRetrialNum",
+            t.investorsignqty2 as "investorSignQty",
+            t.investorinamount2 as "investorInAmount",
+            t.investoroutamount2 as "investorOutAmount",
+            t.investoramount2 as "investorAmount",
+            t.investorclosepl2 as "investorClosePl",
+            t.investorreckonpl2 as "investorReckonPl",
+            t.investorbuytradeqty2 as "investorBuyTradeQty",
+            t.investorselltradeqty2 as "investorSellTradeQty",
+            t.investorbuyholdqty2 as "investorBuyHoldQty",
+            t.investorsellholdqty2 as "investorSellHoldQty",
+            t.investortradefee2 as "investorTradeFee",
+            t.investordeliveryfee2 as "investorDeliveryFee",
+            t.investorholdfee2 as "investorHoldFee",
+            t.investorbuydeliveryamount2 as "investorBuyDeliveryAmount",
+            t.investorselldeliveryamount2 as "investorSellDeliveryAmount",
+            t.investorusedmargin2 as "investorusedmargin"
         </if>
         <if test="vo.type != 1">
-            sum(nvl(t.investorinamount, 0)) as "investorInAmount",
-            sum(nvl(t.investoroutamount, 0)) as "investorOutAmount",
-            sum(nvl(t.investorclosepl, 0)) as "investorClosePl",
-            sum(nvl(t.investorreckonpl, 0)) as "investorReckonPl",
-            sum(nvl(t.investorbuytradeqty, 0)) as "investorBuyTradeQty",
-            sum(nvl(t.investorselltradeqty, 0)) as "investorSellTradeQty",
-            sum(nvl(t.investortradefee, 0)) as "investorTradeFee",
-            sum(nvl(t.investordeliveryfee, 0)) as "investorDeliveryFee",
-            sum(nvl(t.investorholdfee, 0)) as "investorHoldFee",
-            sum(nvl(t.investorbuydeliveryamount, 0)) as "investorBuyDeliveryAmount",
-            sum(nvl(t.investorusedmargin, 0)) as "investorusedmargin",
-            sum(nvl(t.investorbuyholdqty, 0)) as "investorBuyHoldQty",
-            sum(nvl(t.investorsellholdqty, 0)) as "investorSellHoldQty",
-            sum(nvl(t.investorsignqty, 0)) as "investorSignQty",
-            sum(nvl(t.investortotalnum, 0)) as "investorTotalNum",
-            sum(nvl(t.investortrialnum, 0)) as "investorTrialNum",
-            sum(nvl(t.investorretrialnum, 0)) as "investorRetrialNum",
-            sum(nvl(t.investoramount, 0)) as "investorAmount"
+            t.investortotalnum as "investorTotalNum",
+            t.investortrialnum as "investorTrialNum",
+            t.investorretrialnum as "investorRetrialNum",
+            t.investorsignqty as "investorSignQty",
+            t.investorinamount as "investorInAmount",
+            t.investoroutamount as "investorOutAmount",
+            t.investoramount as "investorAmount",
+            t.investorclosepl as "investorClosePl",
+            t.investorreckonpl as "investorReckonPl",
+            t.investorbuytradeqty as "investorBuyTradeQty",
+            t.investorselltradeqty as "investorSellTradeQty",
+            t.investorbuyholdqty as "investorBuyHoldQty",
+            t.investorsellholdqty as "investorSellHoldQty",
+            t.investortradefee as "investorTradeFee",
+            t.investordeliveryfee as "investorDeliveryFee",
+            t.investorholdfee as "investorHoldFee",
+            t.investorbuydeliveryamount as "investorBuyDeliveryAmount",
+            t.investorselldeliveryamount as "investorSellDeliveryAmount",
+            t.investorusedmargin as "investorusedmargin"
         </if>
         from reckon_daymember t
         left join useraccount ua on t.userid=ua.userid
         <where>
             <if test="vo.reckondate != null and vo.reckondate != '' and vo.reckondateend != null and vo.reckondateend != ''">
-                and (t.reckondate >= #{vo.reckondate,jdbcType=CHAR} and t.reckondate &lt;=
-                #{vo.reckondateend,jdbcType=CHAR})
+                and (t.reckondate >= #{vo.reckondate,jdbcType=CHAR} and t.reckondate &lt;= #{vo.reckondateend,jdbcType=CHAR})
             </if>
             <if test="vo.accountid !=null and vo.accountid != '' ">
                 and t.userid = #{vo.accountid}
@@ -508,6 +516,9 @@
     <select id="queryOrgReportSum" parameterType="com.muchinfo.mtp3pojos.vo.reportform.OrgReportQueryParam"
             resultType="com.muchinfo.mtp3pojos.vo.reportform.OrgReportQueryResult">
         select
+        t.userid as "userId",
+        t.cycletime as "cycleTime",
+        ua.userid || '/' || ua.accountname as "accountName",
         <if test="vo.type == 1">
             <!-- 包含子机构 -->
             sum(nvl(t.investorinamount2, 0)) as "investorInAmount",
@@ -580,6 +591,7 @@
                 </choose>
             </if>
         </where>
+        GROUP BY t.userid, t.cycletime, ua.accountname, ua.userid
     </select>
 
     <select id="queryReckonDayTa" parameterType="com.muchinfo.mtp3pojos.vo.reportform.InvestorReportQueryParam"
@@ -625,18 +637,16 @@
                 and (ra.reckondate >= #{vo.reckondate,jdbcType=CHAR} and ra.reckondate &lt;=
                 #{vo.reckondateend,jdbcType=CHAR})
             </if>
-            <if test="vo.flag != null and vo.flag == 0">
-                and ua.usertype=5
-            </if>
+             and ua.usertype=5
             <if test="vo.memberid !=null and vo.memberid != ''">
-                and ua.subarealevelpath like concat('%','#{vo.memberid}', '%')
+                and ua.subarealevelpath like '%'||#{vo.memberid}||'%'
             </if>
             <if test="vo.accountid  !=null and vo.accountid  != '' ">
                 and ra.userid = #{vo.accountid}
             </if>
             <if test="vo.subareaid !=null and vo.subareaid  != ''">
                 and us.subarealevelpath like
-                concat('%','#{vo.subareaid}', '%')
+                '%'||#{vo.subareaid}||'%'
             </if>
             <if test="vo.brokerid !=null and vo.brokerid  != ''">
                 and ua.broker = #{vo.brokerid }
@@ -900,15 +910,17 @@
         ra.floatpl,
         ra.floatnetvalue,
         ra.riskrate,
-        ra.otherincome
+        ra.otherincome,
+        u.memberuserid || '/' || t.accountname memberaccountname
         from REPORT_TAACCOUNT ra
         left join useraccount ua on ra.userid=ua.userid
         left join useraccount us on ua.parentuserid=us.userid
         left join loginaccount la on ra.userid = la.userid
+        left join taaccount ta on ta.accountid = ra.accountid
+        left join useraccount u on ta.userid = u.userid
+        left join useraccount t on u.memberuserid = t.userid
         <where>
-            <if test="vo.flag != null and vo.flag == 0">
-                and ua.usertype=5
-            </if>
+            and ua.usertype=5
             <if test="vo.usertype != null">
                 and ua.usertype=#{vo.usertype}
             </if>
@@ -928,14 +940,14 @@
                 and ra.userid = #{vo.accountid}
             </if>
             <if test="vo.memberid !=null and vo.memberid != ''">
-                and ua.subarealevelpath like concat('%','#{vo.memberid}', '%')
+                and ua.subarealevelpath like '%'||#{vo.memberid}||'%'
             </if>
             <if test="vo.brokerid !=null and vo.brokerid != ''">
                 and ua.broker = #{vo.brokerid}
             </if>
             <if test="vo.subareaid !=null and vo.subareaid  != ''">
                 and us.subarealevelpath like
-                concat('%','#{vo.subareaid}', '%')
+                '%'||#{vo.subareaid}||'%'
             </if>
             <if test="vo.parentuserid != null">
                 <choose>
@@ -953,10 +965,10 @@
                 </choose>
             </if>
             <if test="vo.inamount != null and vo.inamount !='' ">
-                and ra.inamount >= #{vo.inamount}
+                and ra.inamount >= #{vo.inamount, jdbcType=DECIMAL}
             </if>
             <if test="vo.outamount != null and vo.outamount !='' ">
-                and ra.outamount >= #{outamount}
+                and ra.outamount >= #{vo.outamount, jdbcType=DECIMAL}
             </if>
         </where>
         group by ra.cycletype,
@@ -985,8 +997,9 @@
         ra.floatpl,
         ra.floatnetvalue,
         ra.riskrate,
-        ra.otherincome
-
+        ra.otherincome,
+        u.memberuserid,
+        t.accountname
         <choose>
             <when test="vo.sortfield != null and vo.sortfield == 1">
                 <choose>

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

@@ -305,7 +305,8 @@
         where ba.signstatus=4 group by ta.userid
         )
         select uaref.accountname refereeName, t1.loginid loginId,ta.accountid accountId,o.accountname accountName
-         ,o.hasauth isAuth,o.accountstatus,o.modifystatus,o.createtime,o.modifytime,o.audittime,o.canceltime,o.userid
+         ,o.hasauth isAuth,o.accountstatus,o.modifystatus,o.createtime,o.modifytime,o.audittime,o.canceltime,o.userid,
+        o.memberuserid, o.parentuserid
         from useraccount o
         left join t1 on o.userid = t1.userid
         left join userinfo u on o.userid = u.userid

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

@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.muchinfo.mtp3pojos.entity.Loginaccount;
 import com.muchinfo.mtp3pojos.vo.investor.InvestorLoginQueryParam;
 import com.muchinfo.mtp3pojos.vo.investor.InvestorLoginQueryResult;
+import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryParam;
+import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryResult;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,4 +26,6 @@ public interface ILoginaccountMapper extends BaseMapper<Loginaccount> {
     List<Long> getLoginNotExistsLt(Long userId);
 
     IPage<InvestorLoginQueryResult> queryLoginAccountPage(IPage<InvestorLoginQueryResult> page, InvestorLoginQueryParam param);
+
+    IPage<TradingAccountQueryResult> queryTradingAccount(IPage<TradingAccountQueryResult> page, @Param("vo") TradingAccountQueryParam param);
 }

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

@@ -13,6 +13,7 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -138,6 +139,9 @@ public class Loginaccount extends Model<Loginaccount> implements Serializable{
     @TableField("SUBJECTID")
     private Long subjectid;
 
+    @TableField(select = false)
+    @ApiModelProperty(value = "授权资金账户List")
+    List<Long> accountIdS;
 
     @Override
     public Serializable pkVal() {

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/settlement/SecondProfitSharDetailParam.java

@@ -29,7 +29,7 @@ public class SecondProfitSharDetailParam {
     private String shareorgname;
 
     @ApiModelProperty(value = "交易日")
-    private Date tradedate;
+    private String tradedate;
 
     @ApiModelProperty(value = "* 页码 *")
     private Integer pageNum;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/settlement/SecondProfitSharDetailResult.java

@@ -37,4 +37,6 @@ public class SecondProfitSharDetailResult {
 
     @ApiModelProperty(value = "状态")
     private Integer paystatus;
+
+    private Long areaid;
 }

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

@@ -0,0 +1,20 @@
+package com.muchinfo.mtp3pojos.vo.tradingacc;
+
+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="TradingAccountDetailResult对象", description="交易账号管理详情")
+public class TradingAccountDetailResult {
+
+    @ApiModelProperty(value = "登录账号")
+    private Long loginid;
+
+}

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

@@ -0,0 +1,30 @@
+package com.muchinfo.mtp3pojos.vo.tradingacc;
+
+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="TradingAccountQueryParam对象", description="交易账号管理获取列表")
+public class TradingAccountQueryParam {
+
+    @ApiModelProperty(value = "登录账号")
+    private Long loginid;
+
+    @ApiModelProperty(value = "账户状态")
+    private Integer loginstatus;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    private Integer loginusertype;
+
+    private Long userid;
+}

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

@@ -0,0 +1,29 @@
+package com.muchinfo.mtp3pojos.vo.tradingacc;
+
+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="TradingAccountQueryResult对象", description="交易账号管理获取列表响应")
+public class TradingAccountQueryResult {
+
+    @ApiModelProperty(value = "登录账号")
+    private Long loginid;
+
+    @ApiModelProperty(value = "账号状态")
+    private Integer loginstatus;
+
+    @ApiModelProperty(value = "修改时间")
+    private Integer modifytime;
+
+    @ApiModelProperty(value = "修改人")
+    private Integer modifiername;
+
+}