xie.kaifeng 1 سال پیش
والد
کامیت
94e92e18ce

+ 0 - 4
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/BankAccountController.java

@@ -31,7 +31,6 @@ public class BankAccountController {
     @ApiOperation("资金账户管理->银行签约信息/签解约管理列表")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/query")
-    @ResponseBody
     public PageResult<AccountSignQueryResult> query(AccountSignQueryParam taAccountQueryParam, HttpServletRequest request) {
         return iBankAccountSignService.query(taAccountQueryParam, request);
     }
@@ -39,7 +38,6 @@ public class BankAccountController {
     @ApiOperation("资金账户管理-->处理银行签约")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.POST, value = "/dealAccountSign")
-    @ResponseBody
     public AjaxResult dealAccountSign(@RequestBody String param, HttpServletRequest request) {
         try {
             AccountSignParam insertParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), AccountSignParam.class);
@@ -60,7 +58,6 @@ public class BankAccountController {
     @ApiOperation("银行业务/查询管理-->出入金查询")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/queryPutOrIn")
-    @ResponseBody
     public PageResult<PutOrInAmountQueryResult> queryPutOrIn(PutOrInAmountQueryParam param, HttpServletRequest request) {
         return iBankAccountSignService.queryPutOrIn(param, request);
     }
@@ -68,7 +65,6 @@ public class BankAccountController {
     @ApiOperation("银行业务/查询管理-->出入金查询详情")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/queryPutOrInDetail")
-    @ResponseBody
     public AjaxResult<PutOrInAmountQueryResultDetail> queryPutOrInDetail(String accountcode, String cusbankid, String tradedate, String exchticket, HttpServletRequest request) {
         return iBankAccountSignService.queryPutOrInDetail(accountcode, cusbankid, tradedate, exchticket, request);
     }

+ 0 - 42
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/InvestorController.java

@@ -47,7 +47,6 @@ public class InvestorController {
 
 
     @ApiOperation("交易商管理-->开户管理-->交易商开户列表信息获取")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/query")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     public PageResult<InvestorQueryResult> query(InvestorQueryParam investorQueryParam, HttpServletRequest request) {
@@ -69,7 +68,6 @@ public class InvestorController {
     }
 
     @ApiOperation("交易商管理-->开户管理-->获取交易商开户详情信息")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/querySunDetail")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     private AjaxResult<WskhUserinfo> querySunDetail(Long userId, HttpServletRequest request) {
@@ -77,7 +75,6 @@ public class InvestorController {
     }
 
     @RequestMapping(method = RequestMethod.POST, value = "/dealSunOrgan")
-    @ResponseBody
     @ApiOperation("交易商管理-->开户管理-->交易商开户")
     public AjaxResult dealSunOrgan(@RequestBody String wskhUserInfo, HttpServletRequest request) {
         try {
@@ -95,7 +92,6 @@ public class InvestorController {
     }
 
     @RequestMapping(method = RequestMethod.GET, value = "/investorProcess")
-    @ResponseBody
     @ApiOperation("交易商管理-->开户管理-->交易商初审/复审")
     public AjaxResult investorProcess(InvestorProcessParam param, HttpServletRequest request) {
         try {
@@ -107,7 +103,6 @@ public class InvestorController {
     }
 
     @ApiOperation("交易商管理-->交易商管理-->获取交易商列表信息")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/initQuery")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     public PageResult<DealerQueryResult> initQuery(DealerQueryParam dealerQueryParam, HttpServletRequest request) {
@@ -121,7 +116,6 @@ public class InvestorController {
     }
 
     @ApiOperation("交易商管理-->交易商管理-->获取交易商详情信息")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/initQueryDetail")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     public AjaxResult<DealerQueryDetailResult> initQueryDetail(DealerQueryDetailParam dealerQueryDetailParam, HttpServletRequest request) {
@@ -129,7 +123,6 @@ public class InvestorController {
     }
 
     @ApiOperation("交易商管理-->交易商管理-->修改")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.POST, value = "/investorEdit")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     public AjaxResult investorEdit(@RequestBody DetailBeforeResult param, HttpServletRequest request) {
@@ -142,42 +135,36 @@ public class InvestorController {
     }
 
     @ApiOperation("交易商管理-->交易商管理-->查询个性化设置")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/accountQuery")
     public AjaxResult<InvestorPersonalizationResult> accountQuery(Long goodsid, Long accountid, HttpServletRequest request) {
         return iUseraccountService.accountQuery(goodsid, accountid, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->注销")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/logOff")
     public AjaxResult logOff(Long areaid, HttpServletRequest request) {
         return iTaaccountService.logOff(areaid, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->撤回变更")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/rebackChange")
     public AjaxResult rebackChange(Long areaid, HttpServletRequest request) {
         return iTaaccountService.rebackChange(areaid, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->恢复")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/recover")
     public AjaxResult recover(Long areaid, HttpServletRequest request) {
         return iTaaccountService.recover(areaid, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->资金账户、资金账户详情(userid不传)")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/showAccount")
     public PageResult<Taaccount> showAccount(Long userid, String accountid, Integer pageNum, Integer pageSize, HttpServletRequest request) {
         return iTaaccountService.showAccount(userid, accountid, pageNum, pageSize, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->资金账户-->修改")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.POST, value = "/edit")
     public AjaxResult edit(@RequestBody String param, HttpServletRequest request) {
         try {
@@ -190,63 +177,54 @@ public class InvestorController {
     }
 
     @ApiOperation("交易商管理-->交易商管理-->登录账户列表查询")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/queryInvestor")
     public PageResult<InvestorLoginQueryResult> queryInvestor(InvestorLoginQueryParam param, HttpServletRequest request) {
         return iDealLoginService.queryInvestor(param, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->登录账户列表查询-->查看登录流水")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/queryLoginLog")
     public PageResult<Userloginflow> queryLoginLog(Long loginid, Integer pageNum, Integer pageSize, HttpServletRequest request) {
         return iDealLoginService.queryLoginLog(loginid, pageNum, pageSize, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->登录账户列表查询-->重置密码")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/resetPwd")
     public AjaxResult resetPwd(Long loginid, HttpServletRequest request) {
         return iDealLoginService.resetPwd(loginid, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->登录账户列表查询-->账号锁定、解锁")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/lockAccount")
     public AjaxResult lockAccount(Long loginid, Integer status, HttpServletRequest request) {
         return iDealLoginService.lockAccount(loginid, status, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->登录账户列表查询-->注销停用")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/deleteAccount")
     public AjaxResult deleteAccount(Long loginid, HttpServletRequest request) {
         return iDealLoginService.deleteAccount(loginid, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->登录账户列表查询-->恢复")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/restoreAccount")
     public AjaxResult restoreAccount(Long loginid, HttpServletRequest request) {
         return iDealLoginService.restoreAccount(loginid, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->登录账户列表查询-->查看手机号")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/queryUserAuthInfo")
     public AjaxResult<Userauthinfo> queryUserAuthInfo(Long loginid, Integer authtype, HttpServletRequest request) {
         return iDealLoginService.queryUserAuthInfo(loginid, authtype, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->交易商管理导出")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/export")
     public AjaxResult export(HttpServletRequest request) {
         return iUseraccountService.export(request);
     }
 
     @ApiOperation("交易商管理-->交易商变更审核-->查询交易商变更审核列表")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/queryModifyPage")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     public PageResult<InvestorModifyResult> queryModifyPage(InvestorModifyParam param, HttpServletRequest request) {
@@ -254,7 +232,6 @@ public class InvestorController {
     }
 
     @ApiOperation("交易商管理-->交易商变更审核-->审核")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/modifyAudit")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     public AjaxResult modifyAudit(InvestorModifyAuditParam param, HttpServletRequest request) {
@@ -262,21 +239,18 @@ public class InvestorController {
     }
 
     @ApiOperation("交易商管理-->个性化管理-->交易商分组管理-->获取列表")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/queryPersonalized")
     public PageResult<InvestorPersonalizedResult> queryPersonalized(String groupname, Integer pageNum, Integer pageSize, HttpServletRequest request) {
         return iUseraccountService.queryPersonalized(groupname, pageNum, pageSize, request);
     }
 
     @ApiOperation("交易商管理-->个性化管理-->交易商分组管理-->获取所选客户信息对应风险率")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/getRiskRatioTypeForMarketer")
     public AjaxResult<Riskratiotype> getRiskRatioTypeForMarketer(Integer customertype, HttpServletRequest request) {
         return iUseraccountService.getRiskRatioTypeForMarketer(customertype, request);
     }
 
     @ApiOperation("交易商管理-->个性化管理-->交易商分组管理-->新增/修改")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.POST, value = "/addPersonalized")
     public AjaxResult addPersonalized(@RequestBody String param, HttpServletRequest request) {
         try {
@@ -289,21 +263,18 @@ public class InvestorController {
     }
 
     @ApiOperation("交易商管理-->个性化管理-->交易商分组管理-->分组交易商获取列表")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/queryPersonalizedDetail")
     public PageResult<InvestorPerDetailQueryResult> queryPersonalizedDetail(InvestorPerDetailQueryParam param, HttpServletRequest request) {
         return iUseraccountService.queryPersonalizedDetail(param, request);
     }
 
     @ApiOperation("交易商管理-->个性化管理-->交易商分组管理-->分组交易商获取列表-->初始化交易商")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/queryInvestorForPer")
     public AjaxResult<Useraccount> queryInvestorForPer(Long usergroupid, HttpServletRequest request) {
         return iUseraccountService.queryInvestorForPer(usergroupid, request);
     }
 
     @ApiOperation("交易商管理-->个性化管理-->交易商分组管理-->分组交易商获取列表-->新增")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.POST, value = "/addInvestorForPer")
     public AjaxResult addInvestorForPer(@RequestBody String param, HttpServletRequest request) {
         try {
@@ -316,35 +287,30 @@ public class InvestorController {
     }
 
     @ApiOperation("交易商管理-->个性化管理-->交易商分组管理-->分组交易商获取列表-->删除")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/delInvestorForPer")
     public AjaxResult delInvestorForPer(Long userid, HttpServletRequest request) {
         return iUseraccountService.delInvestorForPer(userid, request);
     }
 
     @ApiOperation("交易商管理-->个性化管理-->交易商分组管理-->删除")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/delInvest")
     public AjaxResult delInvest(Long autoid, HttpServletRequest request) {
         return iUseraccountService.delInvest(autoid, request);
     }
 
     @ApiOperation("交易商管理-->个性化管理-->风控个性化-->获取列表")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/queryAccountRiskConfig")
     public PageResult<AccountRiskConfigResult> queryAccountRiskConfig(AccountRiskConfigParam param, HttpServletRequest request) {
         return iUseraccountService.queryAccountRiskConfig(param, request);
     }
 
     @ApiOperation("交易商管理-->个性化管理-->风控个性化-->新增获取交易商资金账户信息")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/getTaaccountList")
     public AjaxResult getTaaccountList(Long userid, HttpServletRequest request) {
         return iUseraccountService.getTaaccountList(userid, request);
     }
 
     @ApiOperation("交易商管理-->个性化管理-->风控个性化-->新增/修改")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.POST, value = "/addAccountRiskConfig")
     public AjaxResult addAccountRiskConfig(@RequestBody String param, HttpServletRequest request) {
         try {
@@ -357,21 +323,18 @@ public class InvestorController {
     }
 
     @ApiOperation("交易商管理-->个性化管理-->风控个性化-->详情")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/view")
     public AjaxResult<Accountriskconfig> view(Long accountid, HttpServletRequest request) {
         return iUseraccountService.view(accountid, request);
     }
 
     @ApiOperation("交易商管理-->个性化管理-->风控个性化-->删除")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/deleteConfig")
     public AjaxResult deleteConfig(Long accountid, HttpServletRequest request) {
         return iUseraccountService.deleteConfig(accountid, request);
     }
 
     @ApiOperation("交易商管理-->个性化管理-->交易商个性化-->获取树结构")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/getTree")
     public AjaxResult<UserGroupTreeResult> getTree(HttpServletRequest request) {
         return iUseraccountService.getTree(request);
@@ -379,14 +342,12 @@ public class InvestorController {
 
 
     @ApiOperation("交易商管理-->个性化管理-->交易商个性化-->新增-->初始化交易商个性化信息")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/initInvestorPerson")
     public AjaxResult<InvestorInitPerAddResult> initGoodsAndBZ(Long usergroupid, Long marketid, Long goodsid, HttpServletRequest request) {
         return iUseraccountService.initGoodsAndBZ(usergroupid, marketid, goodsid, request);
     }
 
     @ApiOperation("交易商管理-->个性化管理-->交易商个性化-->新增/修改")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.POST, value = "/traderPersonAdd")
     public AjaxResult traderPersonAdd(@RequestBody String param, HttpServletRequest request) {
         try {
@@ -399,7 +360,6 @@ public class InvestorController {
     }
 
     @ApiOperation("交易商管理-->个性化管理-->交易商个性化-->删除")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.POST, value = "/deleteTraderConfig")
     public AjaxResult deleteTraderConfig(@RequestBody String param, HttpServletRequest request) {
         try {
@@ -412,7 +372,6 @@ public class InvestorController {
     }
 
     @ApiOperation("交易商管理-->个性化管理-->交易商个性化-->详情")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/tradeConfigView")
     public AjaxResult<UserGroupTradeConfigVo> tradeConfigView(InvestorPersonViewParam param, HttpServletRequest request) {
         return iUseraccountService.tradeConfigView(param, request);
@@ -420,7 +379,6 @@ public class InvestorController {
 
 
     @ApiOperation("交易商管理-->个性化管理-->资金账户个性化-->获取树结构")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/getAccTradeTree")
     public AjaxResult<AccountTradeConfigTreeVo> getAccTradeTree(HttpServletRequest request) {
         return iUseraccountService.getAccTradeTree(request);

+ 0 - 2
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/OrganDetailController.java

@@ -21,7 +21,6 @@ public class OrganDetailController {
     private IOrganService iOrganService;
 
     @ApiOperation("会员机构管理-->机构管理-->机构资料管理-->获取机构资料列表")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/query")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     private PageResult<UserAccountVo> query(UserAccountReqParam userInfoReqParam, HttpServletRequest request) {
@@ -29,7 +28,6 @@ public class OrganDetailController {
     }
 
     @ApiOperation("会员机构管理-->机构管理-->机构资料管理-->获取机构资料详情信息")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/queryDetail")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     private AjaxResult<UserAccountVo> queryDetail(Long areaId) {

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

@@ -30,7 +30,6 @@ public class TaAccountController {
     @ApiOperation("资金账户管理-->资金账户管理查询")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/query")
-    @ResponseBody
     public PageResult<TaAccountQueryResult> query(TaAccountQueryParam taAccountQueryParam, HttpServletRequest request) {
         return iTaaccountService.queryUserMsg(request, taAccountQueryParam);
     }
@@ -38,7 +37,6 @@ public class TaAccountController {
     @ApiOperation("资金账户管理-->资金账户详情信息")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/queryDetail")
-    @ResponseBody
     public AjaxResult<TaAccountQueryResultDetail> queryDetail(Long accountId, HttpServletRequest request) {
         return iTaaccountService.queryDetail(request, accountId);
     }
@@ -46,7 +44,6 @@ public class TaAccountController {
     @ApiOperation("资金账户管理-->资金账户信息修改")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.POST, value = "/updateTaAccount")
-    @ResponseBody
     public AjaxResult updateTaAccount(@RequestBody TaAccountUpdateParam param, HttpServletRequest request) {
         return iTaaccountService.updateTaAccount(param, request);
     }
@@ -54,7 +51,6 @@ public class TaAccountController {
     @ApiOperation("资金账户管理-->资金流水信息列表查询/查询管理-->资金流水信息列表查询")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/queryAmountStream")
-    @ResponseBody
     public PageResult<TaAccountAmountStreamResult> queryAmountStream(TaAccountAmountStreamParam taAccountAmountStreamParam, HttpServletRequest request) {
         return iTaaccountService.queryAmountStream(request, taAccountAmountStreamParam);
     }
@@ -62,7 +58,6 @@ public class TaAccountController {
     @ApiOperation("资金账户管理-->资金流水信息导出")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/queryAmountStreamExport")
-    @ResponseBody
     public AjaxResult queryAmountStreamExport(TaAccountAmountStreamParam taAccountAmountStreamParam, HttpServletRequest request) {
         return iTaaccountService.queryAmountStreamExport(taAccountAmountStreamParam, request);
     }
@@ -70,7 +65,6 @@ public class TaAccountController {
     @ApiOperation("资金账户管理-->资金账户修改密码")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.POST, value = "/updatePwd")
-    @ResponseBody
     public AjaxResult updatePwd(@RequestBody String pwd, HttpServletRequest request) {
         try {
             TaAccountPwd taAccountPwd = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(pwd, request), TaAccountPwd.class);
@@ -84,7 +78,6 @@ public class TaAccountController {
     @ApiOperation("资金账户管理-->网上出入金申请")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.POST, value = "/inOrOutAmount")
-    @ResponseBody
     public AjaxResult inOrOutAmount(@RequestBody String param, HttpServletRequest request) {
         try {
             TaAccountInOrOutAmountParam taAccountPwd = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), TaAccountInOrOutAmountParam.class);

+ 0 - 6
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/WskhUserinfoController.java

@@ -45,7 +45,6 @@ public class WskhUserinfoController {
 
 
     @ApiOperation("会员机构管理-->机构管理-->机构开户申请-->获取机构开户列表信息")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/query")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     private PageResult<WskhUserinfo> query(String username, Integer pageNum, Integer pageSize, HttpServletRequest request) {
@@ -53,7 +52,6 @@ public class WskhUserinfoController {
     }
 
     @ApiOperation("会员机构管理-->机构管理-->机构开户申请-->获取机构开户列表详情信息")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/queryDetail")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     private AjaxResult<WskhUserinfo> queryDetail(Long userId, HttpServletRequest request) {
@@ -61,7 +59,6 @@ public class WskhUserinfoController {
     }
 
     @ApiOperation("会员机构管理-->机构管理-->机构开户申请-->处理开户信息  新增、修改")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.POST, value = "/add")
     private AjaxResult add(@RequestBody String wskhUserinfoVo, HttpServletRequest request) {
         try {
@@ -80,21 +77,18 @@ public class WskhUserinfoController {
     }
 
     @ApiOperation("会员机构管理-->机构管理-->机构开户申请-->撤回提交的待审核信息")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/reBack")
     private AjaxResult reBack(Long userid, HttpServletRequest request) {
         return iWskhUserinfoService.reBack(userid, request);
     }
 
     @ApiOperation("会员机构管理-->机构管理-->机构开户申请-->删除待提交的开户申请")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/delete")
     private AjaxResult delete(Long userid, HttpServletRequest request) {
         return iWskhUserinfoService.delete(userid, request);
     }
 
     @ApiOperation("会员机构管理-->机构管理-->机构开户申请-->审核通过")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.POST, value = "/approved")
     private AjaxResult approved(@RequestBody String vo, HttpServletRequest request) {
         try {

+ 0 - 1
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/QueryServiceImpl.java

@@ -1309,7 +1309,6 @@ public class QueryServiceImpl implements IQueryService {
      * 判断当前管理员是否有市场权限,只要机构有一个角色有权限就返回true
      * 1、运营机构对市场、商品组,商品修改的权限(其实没有必要的很)
      * 2、查询委托单、成交单、持仓单等的查看权限,经纪会员应该无所谓,就算可以根据市场查询,也查不出数据,运营机构就算看到应该也没关系
-     * 3、
      */
     protected boolean checkMarketAuth(Systemmanager systemmanager, Long marketId, String orgztypes) {
         if (systemmanager.getAreauserid() == 0 || systemmanager.getAreauserid() == 1) {

+ 1 - 3
mtp3-century/src/main/resources/mapper/TaaccountMapper.xml

@@ -241,10 +241,8 @@
             and t.operatetype = #{vo.operatetype}
         </if>
         <if test="vo.logType == 2 and vo.startTime != null and vo.startTime != '' and vo.endTime != null and vo.endTime != '' ">
-            <![CDATA[and t.histradedate >= #{vo.startdate} and t.histradedate <= #{vo.enddate}]]>
+            <![CDATA[and t.histradedate >= #{vo.startTime} and t.histradedate <= #{vo.endTime}]]>
         </if>
-
-
         order by t.autoid desc
     </select>