|
@@ -398,11 +398,11 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public AjaxResult modifyAudit(InvestorModifyAuditParam param, HttpServletRequest request) {
|
|
public AjaxResult modifyAudit(InvestorModifyAuditParam param, HttpServletRequest request) {
|
|
|
Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
|
|
Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
|
|
|
- if (!iCommonService.checkUserAccountRole(systemmanager, param.getAuditid())) {
|
|
|
|
|
|
|
+ if (!iCommonService.checkUserAccountRole(systemmanager, param.getUserid())) {
|
|
|
return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM003.getCode(), request.getHeader("Accept-Language"));
|
|
return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM003.getCode(), request.getHeader("Accept-Language"));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- DraftUseraccountNew dua = iDraftUseraccountNewMapper.selectOne(new QueryWrapper<DraftUseraccountNew>().eq("userid", param.getAuditid()));
|
|
|
|
|
|
|
+ DraftUseraccountNew dua = iDraftUseraccountNewMapper.selectOne(new QueryWrapper<DraftUseraccountNew>().eq("userid", param.getUserid()));
|
|
|
if (dua == null) {
|
|
if (dua == null) {
|
|
|
return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_018.getCode(), request.getHeader("Accept-Language"));
|
|
return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_018.getCode(), request.getHeader("Accept-Language"));
|
|
|
}
|
|
}
|
|
@@ -413,12 +413,12 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
|
|
|
if (dua.getModifystatus() != 3 && dua.getModifystatus() != 4) {
|
|
if (dua.getModifystatus() != 3 && dua.getModifystatus() != 4) {
|
|
|
return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_018.getCode(), request.getHeader("Accept-Language"));
|
|
return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_018.getCode(), request.getHeader("Accept-Language"));
|
|
|
}
|
|
}
|
|
|
- Useraccount ua = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", param.getAuditid()));
|
|
|
|
|
|
|
+ Useraccount ua = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", param.getUserid()));
|
|
|
boolean flag = 1 == ua.getHasauth();
|
|
boolean flag = 1 == ua.getHasauth();
|
|
|
usertype = ua.getUsertype();
|
|
usertype = ua.getUsertype();
|
|
|
if (param.getAuditflag() == 1) {
|
|
if (param.getAuditflag() == 1) {
|
|
|
//交易所审核通过
|
|
//交易所审核通过
|
|
|
- DraftUserinfo dui = iDraftUserinfoMapper.selectOne(new QueryWrapper<DraftUserinfo>().eq("userid", param.getAuditid()));
|
|
|
|
|
|
|
+ DraftUserinfo dui = iDraftUserinfoMapper.selectOne(new QueryWrapper<DraftUserinfo>().eq("userid", param.getUserid()));
|
|
|
// 机构或子机构
|
|
// 机构或子机构
|
|
|
if (dua.getUsertype().equals(2) || dua.getUsertype().equals(3)) {
|
|
if (dua.getUsertype().equals(2) || dua.getUsertype().equals(3)) {
|
|
|
// 机构开户证件号码是否唯一
|
|
// 机构开户证件号码是否唯一
|
|
@@ -459,19 +459,19 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
|
|
|
iUseraccountMapper.update(ua, new QueryWrapper<Useraccount>().eq("userid", ua.getUserid()));
|
|
iUseraccountMapper.update(ua, new QueryWrapper<Useraccount>().eq("userid", ua.getUserid()));
|
|
|
iDraftUseraccountNewMapper.deleteById(dua);
|
|
iDraftUseraccountNewMapper.deleteById(dua);
|
|
|
|
|
|
|
|
- Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", param.getAuditid()));
|
|
|
|
|
|
|
+ Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", param.getUserid()));
|
|
|
Integer needinvoice = ui.getNeedinvoice();
|
|
Integer needinvoice = ui.getNeedinvoice();
|
|
|
String oldMobile = ui.getMobile();
|
|
String oldMobile = ui.getMobile();
|
|
|
|
|
|
|
|
BeanUtils.copyProperties(dui, ui, new String[]{"userid", "halfbodyphotourl",
|
|
BeanUtils.copyProperties(dui, ui, new String[]{"userid", "halfbodyphotourl",
|
|
|
"cardfrontphotourl", "cardbackphotourl", "mobile", "bankid", "bankaccount", "bankcardfrontphotourl"});
|
|
"cardfrontphotourl", "cardbackphotourl", "mobile", "bankid", "bankaccount", "bankcardfrontphotourl"});
|
|
|
- if (dui.getHalfbodyphotourl() != null && !"".equals(dui.getHalfbodyphotourl().trim())) {
|
|
|
|
|
|
|
+ if (dui.getHalfbodyphotourl() != null && !dui.getHalfbodyphotourl().trim().isEmpty()) {
|
|
|
ui.setHalfbodyphotourl(dui.getHalfbodyphotourl());
|
|
ui.setHalfbodyphotourl(dui.getHalfbodyphotourl());
|
|
|
}
|
|
}
|
|
|
- if (dui.getCardfrontphotourl() != null && !"".equals(dui.getCardfrontphotourl().trim())) {
|
|
|
|
|
|
|
+ if (dui.getCardfrontphotourl() != null && !dui.getCardfrontphotourl().trim().isEmpty()) {
|
|
|
ui.setCardfrontphotourl(dui.getCardfrontphotourl());
|
|
ui.setCardfrontphotourl(dui.getCardfrontphotourl());
|
|
|
}
|
|
}
|
|
|
- if (dui.getCardbackphotourl() != null && !"".equals(dui.getCardbackphotourl().trim())) {
|
|
|
|
|
|
|
+ if (dui.getCardbackphotourl() != null && !dui.getCardbackphotourl().trim().isEmpty()) {
|
|
|
ui.setCardbackphotourl(dui.getCardbackphotourl());
|
|
ui.setCardbackphotourl(dui.getCardbackphotourl());
|
|
|
}
|
|
}
|
|
|
if (dui.getMobile() != null && StringUtils.isNotBlank(dui.getMobile())) {
|
|
if (dui.getMobile() != null && StringUtils.isNotBlank(dui.getMobile())) {
|
|
@@ -584,14 +584,13 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
|
|
|
Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", ua.getUserid()));
|
|
Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", ua.getUserid()));
|
|
|
try {
|
|
try {
|
|
|
List<String> params = new ArrayList<>();
|
|
List<String> params = new ArrayList<>();
|
|
|
- String p[] = o.toString().split(",");
|
|
|
|
|
|
|
+ String[] p = o.toString().split(",");
|
|
|
params.add(ua.getAccountname().replaceAll("\\*", ""));
|
|
params.add(ua.getAccountname().replaceAll("\\*", ""));
|
|
|
params.add(param.getMsg().replaceAll("\\*", ""));
|
|
params.add(param.getMsg().replaceAll("\\*", ""));
|
|
|
params.add(p[1]);
|
|
params.add(p[1]);
|
|
|
iSendMsgService.sendSMSConnetion(31, EncryptionUtils.decryptForAES(ui.getMobile()), params);
|
|
iSendMsgService.sendSMSConnetion(31, EncryptionUtils.decryptForAES(ui.getMobile()), params);
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
|
|
- log.error("error systemparam----------------------");
|
|
|
|
|
|
|
+ log.error("error systemparam----------------------" + Arrays.toString(e.getStackTrace()));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -601,16 +600,15 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
|
|
|
if (dua.getModifystatus() != 3) {
|
|
if (dua.getModifystatus() != 3) {
|
|
|
return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_018.getCode(), request.getHeader("Accept-Language"));
|
|
return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_018.getCode(), request.getHeader("Accept-Language"));
|
|
|
}
|
|
}
|
|
|
- Useraccount ua = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", param.getAuditid()));
|
|
|
|
|
|
|
+ Useraccount ua = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", param.getUserid()));
|
|
|
usertype = ua.getUsertype();
|
|
usertype = ua.getUsertype();
|
|
|
if (param.getAuditflag() == 1) {
|
|
if (param.getAuditflag() == 1) {
|
|
|
- DraftUserinfo dui = iDraftUserinfoMapper.selectOne(new QueryWrapper<DraftUserinfo>().eq("userid", param.getAuditid()));
|
|
|
|
|
|
|
+ DraftUserinfo dui = iDraftUserinfoMapper.selectOne(new QueryWrapper<DraftUserinfo>().eq("userid", param.getUserid()));
|
|
|
// 机构或子机构
|
|
// 机构或子机构
|
|
|
if (dua.getUsertype().equals(2) || dua.getUsertype().equals(3)) {
|
|
if (dua.getUsertype().equals(2) || dua.getUsertype().equals(3)) {
|
|
|
// 机构开户证件号码是否唯一
|
|
// 机构开户证件号码是否唯一
|
|
|
String areacardflag = iCommonService.getSystemParam(Constants.REDIS_HEADER_SYSPARAM, Constants.SYSPARAM_CARD_NO);
|
|
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(1, dui.getCardnum(), dui.getUserid())) {
|
|
|
return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_011.getCode(), request.getHeader("Accept-Language"));
|
|
return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_011.getCode(), request.getHeader("Accept-Language"));
|
|
|
}
|
|
}
|
|
@@ -650,8 +648,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
|
|
|
params.add(p[1]);
|
|
params.add(p[1]);
|
|
|
iSendMsgService.sendSMSConnetion(31, EncryptionUtils.decryptForAES(ui.getMobile()), params);
|
|
iSendMsgService.sendSMSConnetion(31, EncryptionUtils.decryptForAES(ui.getMobile()), params);
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
|
|
- log.error("error systemparam----------------------");
|
|
|
|
|
|
|
+ log.error("error systemparam----------------------%s" + Arrays.toString(e.getStackTrace()));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -659,9 +656,9 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (usertype == 3 || usertype == 4)
|
|
if (usertype == 3 || usertype == 4)
|
|
|
- systemmanagerService.writeOperateLog(SysConstants.PART_CODE_ORGZ_ZJG, "审核确认id={\"auditid\":" + param.getAuditid() + "}", systemmanager, null, null, null);
|
|
|
|
|
|
|
+ systemmanagerService.writeOperateLog(SysConstants.PART_CODE_ORGZ_ZJG, "审核确认id={\"auditid\":" + param.getUserid() + "}", systemmanager, null, null, null);
|
|
|
else
|
|
else
|
|
|
- systemmanagerService.writeOperateLog(SysConstants.PART_INVESTOR_MODIFY, "审核确认id={\"auditid\":" + param.getAuditid() + "}", systemmanager, null, null, null);
|
|
|
|
|
|
|
+ systemmanagerService.writeOperateLog(SysConstants.PART_INVESTOR_MODIFY, "审核确认id={\"auditid\":" + param.getUserid() + "}", systemmanager, null, null, null);
|
|
|
|
|
|
|
|
return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
|
|
return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
|
|
|
}
|
|
}
|
|
@@ -1469,7 +1466,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
|
|
|
Map<Integer, List<Accounttradeconfig>> type = new HashMap<>();
|
|
Map<Integer, List<Accounttradeconfig>> type = new HashMap<>();
|
|
|
for (Accounttradeconfig fig : list) {
|
|
for (Accounttradeconfig fig : list) {
|
|
|
fig.setAccountname(iUseraccountMapper.selectOrganName(fig.getUserid()));
|
|
fig.setAccountname(iUseraccountMapper.selectOrganName(fig.getUserid()));
|
|
|
- fig.setGoodsname(iGoodsMapper.selectOne(new QueryWrapper<Goods>().eq("goodsid",fig.getGoodsid())).getGoodsname());
|
|
|
|
|
|
|
+ fig.setGoodsname(iGoodsMapper.selectOne(new QueryWrapper<Goods>().eq("goodsid", fig.getGoodsid())).getGoodsname());
|
|
|
Integer key = fig.getTradetype();
|
|
Integer key = fig.getTradetype();
|
|
|
if (type.containsKey(key)) {
|
|
if (type.containsKey(key)) {
|
|
|
type.get(key).add(fig);
|
|
type.get(key).add(fig);
|