|
@@ -880,12 +880,13 @@ public class WmTaxHelperController {
|
|
|
throw new RuntimeException("存在在途操作");
|
|
|
}
|
|
|
|
|
|
+ // 获取税邦云账号
|
|
|
+ SysSocialDetails condition = new SysSocialDetails();
|
|
|
+ condition.setType(LoginTypeEnum.TAX_HELPER.getType());
|
|
|
+ SysSocialDetails socialDetails = sysSocialDetailsMapper.selectOne(new QueryWrapper<>(condition));
|
|
|
+ String randomKey = socialDetails.getRandomKey();
|
|
|
+
|
|
|
try {
|
|
|
- // 获取税邦云账号
|
|
|
- SysSocialDetails condition = new SysSocialDetails();
|
|
|
- condition.setType(LoginTypeEnum.TAX_HELPER.getType());
|
|
|
- SysSocialDetails socialDetails = sysSocialDetailsMapper.selectOne(new QueryWrapper<>(condition));
|
|
|
- String randomKey = socialDetails.getRandomKey();
|
|
|
|
|
|
//解密回调信息
|
|
|
String resInfo = taxHelperService.decryptResp(body, randomKey);
|
|
@@ -893,17 +894,20 @@ public class WmTaxHelperController {
|
|
|
String code = jsonObject.getStr("code");
|
|
|
String streamId = jsonObject.getStr("streamId");
|
|
|
|
|
|
+ log.info("回调解密信息:{}", jsonObject);
|
|
|
+
|
|
|
int settleStatus = 1;
|
|
|
// 回调成功操作
|
|
|
if (!"2000".equals(code)) {
|
|
|
settleStatus = 2;
|
|
|
}
|
|
|
-
|
|
|
+ log.info("更新结算状态:{}", settleStatus);
|
|
|
settleNoteService.settleNotify(streamId, settleStatus, true);
|
|
|
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
- log.error("税邦云解密失败");
|
|
|
+ log.error("税邦云回调失败");
|
|
|
+ e.printStackTrace();
|
|
|
throw new RuntimeException(e.getMessage());
|
|
|
}
|
|
|
return responseJson(2000,"结算通知回调成功");
|
|
@@ -934,12 +938,13 @@ public class WmTaxHelperController {
|
|
|
throw new RuntimeException("存在在途操作");
|
|
|
}
|
|
|
|
|
|
+ // 获取税邦云账号
|
|
|
+ SysSocialDetails condition = new SysSocialDetails();
|
|
|
+ condition.setType(LoginTypeEnum.TAX_HELPER.getType());
|
|
|
+ SysSocialDetails socialDetails = sysSocialDetailsMapper.selectOne(new QueryWrapper<>(condition));
|
|
|
+ String randomKey = socialDetails.getRandomKey();
|
|
|
+
|
|
|
try {
|
|
|
- // 获取税邦云账号
|
|
|
- SysSocialDetails condition = new SysSocialDetails();
|
|
|
- condition.setType(LoginTypeEnum.TAX_HELPER.getType());
|
|
|
- SysSocialDetails socialDetails = sysSocialDetailsMapper.selectOne(new QueryWrapper<>(condition));
|
|
|
- String randomKey = socialDetails.getRandomKey();
|
|
|
|
|
|
//解密回调信息
|
|
|
String resInfo = taxHelperService.decryptResp(body, randomKey);
|
|
@@ -947,12 +952,15 @@ public class WmTaxHelperController {
|
|
|
String code = jsonObject.getStr("code");
|
|
|
String streamId = jsonObject.getStr("streamId");
|
|
|
|
|
|
+ log.info("回调解密信息:{}", jsonObject);
|
|
|
+
|
|
|
int settleStatus = 1;
|
|
|
// 回调成功操作
|
|
|
if (!"2000".equals(code)) {
|
|
|
settleStatus = 2;
|
|
|
}
|
|
|
|
|
|
+ log.info("更新结算状态:{}", settleStatus);
|
|
|
R<?> r = settleNoteService.settleNotify(streamId, settleStatus, !userId.contains("|"));
|
|
|
|
|
|
//回调
|
|
@@ -963,7 +971,8 @@ public class WmTaxHelperController {
|
|
|
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
- log.error("税邦云解密失败");
|
|
|
+ log.error("税邦云回调失败");
|
|
|
+ e.printStackTrace();
|
|
|
throw new RuntimeException(e.getMessage());
|
|
|
}
|
|
|
|