root
/
jianshui-all
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/beta' into beta

Browse Source
beta-prop-all^2
dongxiaoke 2 years ago
parent 3ce759bbfe 07166a213f
commit cad61b8492
1 changed files with 18 additions and 41 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 59
      jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java

59
jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java
Unescape View File

@ -53,15 +53,16 @@ public class AutonomousSqServiceImpl implements AutonomousSqService {
*/ */
@Override @Override
public Object autonomousAuthorization(AutonomousAuthorizationDTO autonomousAuthorization) { public Object autonomousAuthorization(AutonomousAuthorizationDTO autonomousAuthorization) {
log.info("自主信息授权回调接口,入参：{}",JSONUtil.toJsonStr(autonomousAuthorization)); log.info("自主信息授权回调接口,入参：{}", JSONUtil.toJsonStr(autonomousAuthorization));
// 存流水号 // 存流水号
InvoiceAllLoginResult invoiceAllLoginResult = new InvoiceAllLoginResult(); InvoiceAllLoginResult invoiceAllLoginResult = new InvoiceAllLoginResult();
BeanUtil.copyProperties(autonomousAuthorization,invoiceAllLoginResult); BeanUtil.copyProperties(autonomousAuthorization, invoiceAllLoginResult);
invoiceAllLoginResult.setCreateTime(new Date());
int count = invoiceAllLoginResultMapper.insertInvoiceAllLoginResult(invoiceAllLoginResult); int count = invoiceAllLoginResultMapper.insertInvoiceAllLoginResult(invoiceAllLoginResult);
if (count > 0){ if (count > 0) {
log.info("全电登录接口，登录返回信息保存成功,信息为：{}",JSONUtil.toJsonStr(invoiceAllLoginResult)); log.info("全电登录接口，登录返回信息保存成功,信息为：{}", JSONUtil.toJsonStr(invoiceAllLoginResult));
}else { } else {
log.error("全电登录接口，登录返回信息失败,信息为：{}",JSONUtil.toJsonStr(invoiceAllLoginResult)); log.error("全电登录接口，登录返回信息失败,信息为：{}", JSONUtil.toJsonStr(invoiceAllLoginResult));
} }
return AjaxResult.success(); return AjaxResult.success();
} }
@ -75,7 +76,7 @@ public class AutonomousSqServiceImpl implements AutonomousSqService {
@Override @Override
public AjaxResult qdLogin(InoviceAllQdLoginDTO inoviceAllQdLoginDTO) { public AjaxResult qdLogin(InoviceAllQdLoginDTO inoviceAllQdLoginDTO) {
// 全电登录 // 全电登录
log.info("全电登录接口，入参：{}",JSONUtil.toJsonStr(inoviceAllQdLoginDTO)); log.info("全电登录接口，入参：{}", JSONUtil.toJsonStr(inoviceAllQdLoginDTO));
ValidateUtils.validate(inoviceAllQdLoginDTO); ValidateUtils.validate(inoviceAllQdLoginDTO);
Companyservice companyservice = companyserviceMapper.selectCompanyserviceByTaxcode(inoviceAllQdLoginDTO.getNsrsbh()); Companyservice companyservice = companyserviceMapper.selectCompanyserviceByTaxcode(inoviceAllQdLoginDTO.getNsrsbh());
if (BeanUtil.isEmpty(inoviceAllQdLoginDTO.getNsrInfo())) { if (BeanUtil.isEmpty(inoviceAllQdLoginDTO.getNsrInfo())) {
@ -90,7 +91,7 @@ public class AutonomousSqServiceImpl implements AutonomousSqService {
// 回调地址 // 回调地址
inoviceAllQdLoginDTO.setLoginType("1"); inoviceAllQdLoginDTO.setLoginType("1");
inoviceAllQdLoginDTO.setCallback("http://dev.goldentaxcloud.com:8081/api/invoice_all/v1/autonomousAuthorization"); inoviceAllQdLoginDTO.setCallback("http://dev.goldentaxcloud.com:8081/api/invoice_all/v1/autonomousAuthorization");
log.info("全电登录接口，请求上游，地址：{},参数：{}","http://221.222.184.98:8880/login/getLogin2",JSONUtil.toJsonStr(inoviceAllQdLoginDTO)); log.info("全电登录接口，请求上游，地址：{},参数：{}", "http://221.222.184.98:8880/login/getLogin2", JSONUtil.toJsonStr(inoviceAllQdLoginDTO));
Thread requestThread = new Thread(() -> { Thread requestThread = new Thread(() -> {
HttpUtils.sendJsonPost("http://221.222.184.98:8880/login/getLogin2", inoviceAllQdLoginDTO); HttpUtils.sendJsonPost("http://221.222.184.98:8880/login/getLogin2", inoviceAllQdLoginDTO);
}); });
@ -140,55 +141,31 @@ public class AutonomousSqServiceImpl implements AutonomousSqService {
*/ */
@Override @Override
public AjaxResult submitNote(InvoiceAllSubmitNoteDTO invoiceAllSubmitNoteDTO) { public AjaxResult submitNote(InvoiceAllSubmitNoteDTO invoiceAllSubmitNoteDTO) {
log.info("自主授权短信提交接口，入参：{}",JSONUtil.toJsonStr(invoiceAllSubmitNoteDTO)); log.info("自主授权短信提交接口，入参：{}", JSONUtil.toJsonStr(invoiceAllSubmitNoteDTO));
// 短信提交 // 短信提交
ValidateUtils.validate(invoiceAllSubmitNoteDTO); ValidateUtils.validate(invoiceAllSubmitNoteDTO);
Companyservice companyservice = companyserviceMapper.selectCompanyserviceByTaxcode(invoiceAllSubmitNoteDTO.getNsrsbh());
// 根据流水号获取登录结果 // 根据流水号获取登录结果
InvoiceAllLoginResult invoiceAllLogin = invoiceAllLoginResultMapper.findByQqlsh(invoiceAllSubmitNoteDTO.getTraceno()); InvoiceAllLoginResult invoiceAllLogin = invoiceAllLoginResultMapper.findByQqlsh(invoiceAllSubmitNoteDTO.getTraceno());
if (invoiceAllLogin == null){ if (invoiceAllLogin == null) {
log.info("自主授权短信提交接口，未查询到该流水号相关信息，请确认后输入"); log.info("自主授权短信提交接口，未查询到该流水号相关信息，请确认后输入");
return AjaxResult.error("未查询到该流水号相关信息，请确认后输入"); return AjaxResult.error("未查询到该流水号相关信息，请确认后输入");
} }
if ("S000".equals(invoiceAllLogin.getCode())){ if ("SMS".equals(invoiceAllLogin.getCode())) {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
try { try {
// 请求封装 // 请求封装
log.info("自主授权短信提交接口，请求上游地址：{}，入参：{}","http://221.222.184.98:8880/login/submitSms",JSONUtil.toJsonStr(invoiceAllSubmitNoteDTO)); log.info("自主授权短信提交接口，请求上游地址：{}，入参：{}", "http://221.222.184.98:8880/login/submitSms", JSONUtil.toJsonStr(invoiceAllSubmitNoteDTO));
String sendFormPost = HttpUtils.sendJsonPost("http://221.222.184.98:8880/login/submitSms", invoiceAllSubmitNoteDTO); String sendFormPost = HttpUtils.sendJsonPost("http://221.222.184.98:8880/login/submitSms", invoiceAllSubmitNoteDTO);
log.info("自主授权短信提交接口，请求上游返回结果：{}",sendFormPost); log.info("自主授权短信提交接口，请求上游返回结果：{}", sendFormPost);
result = JSONUtil.parseObj(sendFormPost);
String code = result.get("code") != null ? result.get("code").toString() : "";
String msg = result.get("msg") != null ? result.get("msg").toString() : "";
String data = result.get("data") != null ? result.get("data").toString() : "";
if ("S000".equals(code)) {
// 调用日志封装
InvoiceAllApiLog invoiceAllApiLog = new InvoiceAllApiLog();
invoiceAllApiLog.setCreateTime(new Date());
invoiceAllApiLog.setCompany(companyservice.getSellertax());
invoiceAllApiLog.setIdentityId(companyservice.getIdentity());
invoiceAllApiLog.setUrl("http://221.222.184.98:8880/login/submitSms");
invoiceAllApiLog.setSendMsg(JSONUtil.toJsonStr(invoiceAllSubmitNoteDTO));
invoiceAllApiLog.setResultMsg(data);
JSONObject dataObject = JSONUtil.parseObj(data);
String tokenId = dataObject.get("dzfp-ssotoken") != null ? dataObject.get("dzfp-ssotoken").toString() : "";
invoiceAllApiLog.setRequestId(tokenId);
allApiLogMapper.insert(invoiceAllApiLog);
} else {
log.error("自主授权短信提交接口，提交短信失败，失败原因：{}",msg);
return AjaxResult.error(msg);
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error("【金四服务类】【金财数科】【全电登录】API请求异常，外部报文返回code非S000。错误信息:{}", e.getMessage()); log.error("【金四服务类】【金财数科】【自主授权提交短信验证码】API请求异常，外部报文返回code非S000。错误信息:{}", e.getMessage());
return AjaxResult.error(ErrorCode.INCOME_ERROR); return AjaxResult.error(ErrorCode.INCOME_ERROR);
} }
log.error("自主授权短信提交接口，提交短信成功，结果：{}",result); log.error("自主授权短信提交接口，提交短信成功，结果：{}", result);
return AjaxResult.success(result); return AjaxResult.success(result);
}else { } else {
log.error("自主授权短信提交接口，提交短信失败，失败原因：{}","登录失败，请重新登录"); log.error("自主授权短信提交接口，提交短信失败，失败原因：{}", "登录失败，请重新登录");
return AjaxResult.error("登录失败，请重新登录"); return AjaxResult.error("登录失败，请重新登录");
} }
} }