Merge remote-tracking branch 'origin/dev-dlcf' into test

# Conflicts:
#	order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/service/impl/SimsBackServiceImpl.java
#	order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java
release
wangrangrang 2 years ago
commit 10bd737554
  1. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/aop/SysLogAspect.java
  2. 4
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/filter/UserCenterAuthenticationFilter.java
  3. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/controller/BusinessTypeController.java
  4. 14
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/controller/DictionaryController.java
  5. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/controller/DownloadExcelController.java
  6. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/controller/SysQueueConfigController.java
  7. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/controller/UserGuiderController.java
  8. 8
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/BaseServiceImpl.java
  9. 10
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/BusinessTypeServiceImpl.java
  10. 4
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/DrawerInfoServiceImpl.java
  11. 8
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/SalerWarningServiceImpl.java
  12. 4
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/SysQueueConfigServiceImpl.java
  13. 6
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/controller/BuyerController.java
  14. 10
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java
  15. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
  16. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/GroupCommodityController.java
  17. 34
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
  18. 4
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/controller/GroupTaxClassCodeController.java
  19. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/itaxlog/service/impl/ItaxLogServiceImpl.java
  20. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/itaxmsg/service/impl/ItaxMsgServiceImpl.java
  21. 12
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/openapi/service/impl/OpenApiServiceImpl.java
  22. 14
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/rabbitmq/service/impl/RabbitMqSendMessageServiceImpl.java
  23. 8
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/controller/SimsBackController.java
  24. 24
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/service/impl/BaseSimsBackServiceImpl.java
  25. 34
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/service/impl/SimsBackServiceImpl.java
  26. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/api/BaseServiceApiForOrder.java
  27. 62
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/api/BaseServiceApiForQd.java
  28. 24
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/api/BaseServiceCommon.java
  29. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/impl/BaseBaseCommonDisposeServiceImpl.java
  30. 12
      order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java
  31. 2
      order-management-common/src/main/java/com/dxhy/order/utils/HmacSha1Util.java
  32. 16
      order-management-common/src/main/java/com/dxhy/order/utils/HttpUtils.java
  33. 4
      order-management-common/src/main/java/com/dxhy/order/utils/NsrsbhUtils.java
  34. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/InvoiceApplicationPushHandler.java
  35. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/InvoiceFpkjHandler.java
  36. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/InvoiceFptsHandler.java
  37. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/InvoiceInsertCardHander.java
  38. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/InvoiceQyzttsHandler.java
  39. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/InvoiceYxtsHandler.java
  40. 8
      order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderCommonHandler.java
  41. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderFanoutHandler.java
  42. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderGetRepairHandler.java
  43. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderReceiveInvoiceHandler.java
  44. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveGhfInfoHandler.java
  45. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java
  46. 12
      order-management-consumer/src/main/java/com/dxhy/order/consumer/filter/OrderSecurityFilter.java
  47. 14
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/C48LxpTask.java
  48. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/FangGeInvoiceResendMsgTask.java
  49. 4
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/GetGsClientTask.java
  50. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/GzhProcessFailInvoiceTask.java
  51. 4
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/ProcessQueueTask.java
  52. 4
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/SyncQdHzqrdTask.java
  53. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/SyncSpecialInvoiceReversalTask.java
  54. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/SyncTask.java
  55. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/U180InvalidInvoiceResultTask.java
  56. 4
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/bigdata/service/impl/BigDataServiceImpl.java
  57. 38
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/controller/InvoiceReceiveController.java
  58. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/controller/ProcessInvoiceController.java
  59. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceDataServiceImpl.java
  60. 10
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
  61. 18
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
  62. 14
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/oil/controller/OilController.java
  63. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java
  64. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
  65. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java
  66. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderRollbackController.java
  67. 4
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/PriceTaxSeparationController.java
  68. 4
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/QrcodeController.java
  69. 22
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java
  70. 4
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoiceRushRedServiceImpl.java
  71. 4
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/MakeOutAnInvoiceServiceImpl.java
  72. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/MyInvoiceRequestServiceImpl.java
  73. 4
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java
  74. 4
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java
  75. 20
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
  76. 1
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java
  77. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java
  78. 18
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderRollbackServiceImpl.java
  79. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderStatusStatisticsImpl.java
  80. 24
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/PollInvoiceServiceImpl.java
  81. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/ReceiveOrderServiceImpl.java
  82. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/rabbitmq/controller/RabbitListenController.java
  83. 12
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/rabbitmq/service/impl/RabbitMqStartListenerServiceImpl.java
  84. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/scaninvoice/controller/ScanInvoiceController.java
  85. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/smallapp/SmallAppQrcodeController.java
  86. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/ticketpool/service/impl/PushTicketPoolServiceImpl.java
  87. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateOrderInfoServiceImpl.java
  88. 60
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/CommonRest.java
  89. 10
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/FangGeInvoiceRestApi.java
  90. 62
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceQdApi.java
  91. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV1.java
  92. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV3V4.java
  93. 10
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV5.java
  94. 10
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java
  95. 8
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java
  96. 14
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonDisposeServiceImpl.java
  97. 30
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java
  98. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/DynamicCodeInterfaceServiceImplV3.java
  99. 34
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java
  100. 64
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImpl.java
  101. Some files were not shown because too many files have changed in this diff Show More

@ -164,7 +164,7 @@ public class SysLogAspect {
sysLogEntity.setParams("");
reslutStr = "";
}
log.debug("{}调用时间:{}请求参数:{},返回参数:{}", LOG_MSG, sysLogEntity.getTime(), JsonUtils.getInstance().toJsonString(sysLogEntity), reslutStr);
log.info("{}调用时间:{}请求参数:{},返回参数:{}", LOG_MSG, sysLogEntity.getTime(), JsonUtils.getInstance().toJsonString(sysLogEntity), reslutStr);
if (ConfigureConstant.STRING_0.equals(userCenterConfig.configUserCenterType()) && StringUtils.isNotBlank(sysLogEntity.getUserId())) {
itaxLogService.saveItaxLog(sysLogEntity);
}

@ -94,7 +94,7 @@ public class UserCenterAuthenticationFilter implements Filter {
userCenterTypeName = "Saas";
}
log.debug("权限拦截器,当前用户选择部署方式为:{},对应的请求token为:{},请求地址为:{}", userCenterTypeName, requestToken, servletPath);
log.info("权限拦截器,当前用户选择部署方式为:{},对应的请求token为:{},请求地址为:{}", userCenterTypeName, requestToken, servletPath);
if (StringUtils.isBlank(requestToken)) {
log.warn("token为空,非法访问!请求地址为:{},ip:{}", servletPath, request.getRemoteAddr());
@ -102,7 +102,7 @@ public class UserCenterAuthenticationFilter implements Filter {
//如果当前请求为退出登录,则请求用户中心使token失效
if (StringUtils.isNotBlank(logoutPath) && logoutPath.equals(servletPath)) {
log.debug("权限拦截器,当前登录方式为登出,跳转到登录页面:{}", redirectUrl);
log.info("权限拦截器,当前登录方式为登出,跳转到登录页面:{}", redirectUrl);
//调用用户中心,使当前的token失效
res.sendRedirect(redirectUrl);
} else {

@ -236,7 +236,7 @@ public class BusinessTypeController {
public R deleteYwlx(
@ApiParam(name = "id", value = "主键id", required = true) @RequestParam(name = "id") String id,
@ApiParam(name = "xhfNsrsbh", value = "销货方纳税人识别号", required = true) @RequestParam(name = "xhfNsrsbh") String xhfNsrsbh) {
log.debug("业务类型删除接口,页面入参id:{} 税号:{}", id, xhfNsrsbh);
log.info("业务类型删除接口,页面入参id:{} 税号:{}", id, xhfNsrsbh);
if (StringUtils.isBlank(id)) {
return R.error("id不能为空");
}

@ -139,7 +139,7 @@ public class DictionaryController {
//从excel中读取数据
long t1 = System.currentTimeMillis();
log.debug("excel读取开始,当前时间{}", t1);
log.info("excel读取开始,当前时间{}", t1);
Map<String, String> headToProperty = new HashMap<>(10);
for (DictionaryImportExcelEnum flowStatus : DictionaryImportExcelEnum.values()) {
@ -147,7 +147,7 @@ public class DictionaryController {
}
List<DictionaryExcel> dictionaryExcelList = excelReadService.transExcelToList(file, DictionaryExcel.class, headToProperty, ConfigureConstant.INT_0, ConfigureConstant.INT_0);
long t2 = System.currentTimeMillis();
log.debug("excel读取开始,当前时间{},耗时:{}", t2, t2 - t1);
log.info("excel读取开始,当前时间{},耗时:{}", t2, t2 - t1);
if (dictionaryExcelList.size() <= 0) {
@ -157,15 +157,15 @@ public class DictionaryController {
}
//导入的条数
int count = dictionaryExcelList.size();
log.debug("{}从excel中读取到的数据条数:{}", LOGGER_MSG, count);
log.info("{}从excel中读取到的数据条数:{}", LOGGER_MSG, count);
long t3 = System.currentTimeMillis();
log.debug("excel校验开始,当前时间{}", t3);
log.info("excel校验开始,当前时间{}", t3);
Map<String, String> checkResultMap = checkDictionary(dictionaryExcelList);
long t4 = System.currentTimeMillis();
log.debug("excel校验结束,当前时间{},耗时:{}", t4, t4 - t3);
log.info("excel校验结束,当前时间{},耗时:{}", t4, t4 - t3);
if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
log.error("{}字典表数据校验失败:{}", LOGGER_MSG, checkResultMap.get(OrderManagementConstant.ERRORMESSAGE));
return R.error(checkResultMap.get(OrderManagementConstant.ERRORCODE), checkResultMap.get(OrderManagementConstant.ERRORMESSAGE));
@ -206,7 +206,7 @@ public class DictionaryController {
@PostMapping("/updateDictionary")
@SysLog(operation = "更新字典信息", operationDesc = "更新字典信息", key = "字典信息管理")
public R updateDictionary(@RequestBody List<DictionaryEntity> dictionaryEntityList) {
log.debug("{}更新字典表请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dictionaryEntityList));
log.info("{}更新字典表请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dictionaryEntityList));
dictionaryService.processDictionaryList(dictionaryEntityList);
return R.ok();
@ -222,7 +222,7 @@ public class DictionaryController {
@PostMapping("/delDictionary")
@SysLog(operation = "删除字典信息", operationDesc = "删除字典信息", key = "字典信息管理")
public R delDictionary(@RequestBody List<DictionaryEntity> dictionaryEntityList) {
log.debug("{}删除字典表请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dictionaryEntityList));
log.info("{}删除字典表请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dictionaryEntityList));
for (DictionaryEntity dictionaryEntity : dictionaryEntityList) {
if (ObjectUtil.isNotEmpty(dictionaryEntity)) {

@ -48,7 +48,7 @@ public class DownloadExcelController {
@RequestMapping(method = RequestMethod.GET)
@ApiOperation(value = "模板下载", notes = "模板下载管理-模板下载")
public void downloadExcel(String excelType, HttpServletRequest request, HttpServletResponse response) {
log.debug("{}模板下载开始执行 参数 {}", LOGGER_MSG, excelType);
log.info("{}模板下载开始执行 参数 {}", LOGGER_MSG, excelType);
if (StringUtils.isEmpty(excelType)) {
log.error("{}模板下载请求参数为空!", LOGGER_MSG);
}

@ -153,7 +153,7 @@ public class SysQueueConfigController {
@RequestMapping(value = "/saveRabbitQueue", method = RequestMethod.POST)
public R saveRabbitQueue(@RequestBody PageRabbitQueue pageRabbitQueue) {
log.debug("{}设置队列请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageRabbitQueue));
log.info("{}设置队列请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageRabbitQueue));
if (ObjectUtil.isNull(pageRabbitQueue)) {
log.error("{}设置队列请求参数为空", LOGGER_MSG);
return R.error("设置队列请求参数为空");

@ -43,7 +43,7 @@ public class UserGuiderController {
@SysLog(operation = "查询用户引导", operationDesc = "查询用户引导", key = "用户引导")
public R queryUserGuider(@RequestBody UserGuiderInfo queryUserGuider) {
log.debug("{}用户引导步骤查询,入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(queryUserGuider));
log.info("{}用户引导步骤查询,入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(queryUserGuider));
if (StringUtils.isBlank(queryUserGuider.getXhfNsrsbh()) || StringUtils.isBlank(queryUserGuider.getUid())) {
return R.error().put(OrderManagementConstant.MESSAGE, "请求参数不能为空");
}

@ -121,7 +121,7 @@ public class BaseServiceImpl implements BaseService {
if (strLength > ConfigureConstant.INT_90) {
spmc = StringUtil.subStringByByte(spmc, ConfigureConstant.INT_90);
log.debug("对明细行商品名称进行截取,截取后数据为:{}", spmc);
log.info("对明细行商品名称进行截取,截取后数据为:{}", spmc);
}
} catch (Exception e) {
@ -156,7 +156,7 @@ public class BaseServiceImpl implements BaseService {
String operateDdqqlshKey = String.format(RedisConstant.REDIS_ORDER_OPERATE_STATUS, fpqqlsh);
String redisResult = redisService.get(operateDdqqlshKey);
log.debug("{}操作状态缓存查询,请求缓存key为:{},数据为:{}", LOGGER_MSG, operateDdqqlshKey, redisResult);
log.info("{}操作状态缓存查询,请求缓存key为:{},数据为:{}", LOGGER_MSG, operateDdqqlshKey, redisResult);
return redisResult;
}
@ -171,7 +171,7 @@ public class BaseServiceImpl implements BaseService {
String operateDdqqlshKey = String.format(RedisConstant.REDIS_ORDER_OPERATE_STATUS, fpqqlsh);
redisService.set(operateDdqqlshKey, status, RedisConstant.REDIS_EXPIRE_TIME_1DAYS);
log.debug("{}操作状态缓存修改,请求缓存key为:{},数据为:{}", LOGGER_MSG, operateDdqqlshKey, status);
log.info("{}操作状态缓存修改,请求缓存key为:{},数据为:{}", LOGGER_MSG, operateDdqqlshKey, status);
if (OrderInfoEnum.ORDER_OPERATE_STATUS_5.getKey().equals(status) ||
OrderInfoEnum.ORDER_OPERATE_STATUS_6.getKey().equals(status) ||
@ -179,7 +179,7 @@ public class BaseServiceImpl implements BaseService {
OrderInfoEnum.ORDER_OPERATE_STATUS_8.getKey().equals(status)) {
String syncKey = String.format(RedisConstant.REDIS_ORDER_SYNC_KEY, fpqqlsh);
redisService.del(syncKey);
log.debug("{}操作状态缓存修改为可用状态,删除5分钟限制缓存,请求key:{}", LOGGER_MSG, syncKey);
log.info("{}操作状态缓存修改为可用状态,删除5分钟限制缓存,请求key:{}", LOGGER_MSG, syncKey);
}
}

@ -64,7 +64,7 @@ public class BusinessTypeServiceImpl implements BusinessTypeService {
try {
//查询业务类型信息
BusinessTypeInfo businessTypeInfo = businessTypeMapper.queryYwlxInfoByNameAndNsrsbh(businessName, shList);
log.debug("{}查询到的业务类型信息为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(businessTypeInfo));
log.info("{}查询到的业务类型信息为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(businessTypeInfo));
if (ObjectUtil.isNull(businessTypeInfo)) {
String businessId = RandomUtil.randomString(20);
businessTypeInfo = new BusinessTypeInfo();
@ -79,7 +79,7 @@ public class BusinessTypeServiceImpl implements BusinessTypeService {
businessTypeInfo.setCreateTime(new Date());
businessTypeInfo.setUpdateTime(new Date());
//保存业务类型信息
log.debug("{} 业务类型信息保存信息为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(businessTypeInfo));
log.info("{} 业务类型信息保存信息为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(businessTypeInfo));
businessTypeMapper.saveBusinessTypeInfo(businessTypeInfo);
return R.ok().put("businessId", businessTypeInfo.getBusinessId());
} else {
@ -89,9 +89,9 @@ public class BusinessTypeServiceImpl implements BusinessTypeService {
businessTypeInfo.setStatus(OrderInfoEnum.DATE_DELETE_STATUS_0.getKey());
businessTypeInfo.setUpdateTime(new Date());
businessTypeMapper.updateYwlxById(businessTypeInfo, shList);
log.debug("{} 业务类型信息更新,返回业务类型Id:{}", LOGGER_MSG, businessTypeInfo.getBusinessId());
log.info("{} 业务类型信息更新,返回业务类型Id:{}", LOGGER_MSG, businessTypeInfo.getBusinessId());
} else {
log.debug("{} 业务类型信息已存在,返回业务类型Id:{}", LOGGER_MSG, businessTypeInfo.getBusinessId());
log.info("{} 业务类型信息已存在,返回业务类型Id:{}", LOGGER_MSG, businessTypeInfo.getBusinessId());
}
return R.ok().put("businessId", businessTypeInfo.getBusinessId());
}
@ -130,7 +130,7 @@ public class BusinessTypeServiceImpl implements BusinessTypeService {
int currPage = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_CURR_PAGE)));
// 这里前端从1开始需要进行-1操作
// currPage=currPage-1;
log.debug("订单查询,当前页:{},页面条数:{}", currPage, pageSize);
log.info("订单查询,当前页:{},页面条数:{}", currPage, pageSize);
PageHelper.startPage(currPage, pageSize);
List<BusinessTypeInfo> list = businessTypeMapper.selectYwlxByParam(paramMap, xhfNsrsbh);
PageInfo<BusinessTypeInfo> pageInfo = new PageInfo<>(list);

@ -63,11 +63,11 @@ public class DrawerInfoServiceImpl implements DrawerInfoService {
*/
@Override
public DrawerInfoEntity queryDrawerInfo(String taxpayerCode, String userId) {
log.debug("开票人信息查询,参数为当前登录人:{} 纳税人识别号:{}", userId, taxpayerCode);
log.info("开票人信息查询,参数为当前登录人:{} 纳税人识别号:{}", userId, taxpayerCode);
List<String> shList = new ArrayList<>();
shList.add(taxpayerCode);
DrawerInfoEntity drawerInfoEntity = drawerInfoMapper.queryDrawerInfo(shList, userId);
log.debug("开票人信息查询 结果为{}", JsonUtils.getInstance().toJsonString(drawerInfoEntity));
log.info("开票人信息查询 结果为{}", JsonUtils.getInstance().toJsonString(drawerInfoEntity));
return drawerInfoEntity;
}

@ -76,7 +76,7 @@ public class SalerWarningServiceImpl implements SalerWarningService {
try {
if (ObjectUtil.isNotNull(orderInvoiceInfo)) {
log.debug("异常订单信息推动大B开始...");
log.info("异常订单信息推动大B开始...");
if (OrderInfoEnum.INVOICE_STATUS_3.getKey().equals(orderInvoiceInfo.getKpzt())) {
//纳税人识别号
String nsrsbh = orderInvoiceInfo.getXhfNsrsbh();
@ -86,12 +86,12 @@ public class SalerWarningServiceImpl implements SalerWarningService {
if (salerWarningList != null && salerWarningList.size() > 0) {
for (SalerWarning salerWarning : salerWarningList) {
log.debug("异常订单信息推动大B-查询预警信息结果:{}", JsonUtils.getInstance().toJsonString(salerWarning));
log.info("异常订单信息推动大B-查询预警信息结果:{}", JsonUtils.getInstance().toJsonString(salerWarning));
if (Objects.nonNull(salerWarning) && StringUtils.equals(OrderInfoEnum.ORDER_WARNING_OPEN.getKey(),
salerWarning.getWarningFlag())) {
String errorMsg = String.format(RedisConstant.ERROR_MESSAGE_ORDER, nsrsbh, orderInvoiceInfo.getFpqqlsh(), orderInvoiceInfo.getDdh(), orderInvoiceInfo.getSbyy());
log.debug("异常订单信息推动大B-消息主体:{}", errorMsg);
log.info("异常订单信息推动大B-消息主体:{}", errorMsg);
itaxMsgService.sessMessageToTax("异常订单预警", errorMsg, "2",
salerWarning.getCreateId(), salerWarning.getDeptId());
}
@ -99,7 +99,7 @@ public class SalerWarningServiceImpl implements SalerWarningService {
}
}
log.debug("异常订单信息推动大B结束...");
log.info("异常订单信息推动大B结束...");
} else {
log.error("推送信息为空!");
}

@ -182,7 +182,7 @@ public class SysQueueConfigServiceImpl implements SysQueueConfigService {
*/
@Override
public List<SysQueueConfig> querySysQueueConfigList(SysQueueConfigPage sysQueueConfigPage) {
log.debug("{}查询队列配置列表请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sysQueueConfigPage));
log.info("{}查询队列配置列表请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sysQueueConfigPage));
sysQueueConfigPage.setDelFlag(OrderInfoEnum.DATE_DELETE_STATUS_0.getKey());
return sysQueueConfigMapper.selectSysQueueConfigList(sysQueueConfigPage);
}
@ -229,7 +229,7 @@ public class SysQueueConfigServiceImpl implements SysQueueConfigService {
*/
@Override
public List<SysQdQueueConfig> querySysQdQueueConfigList(SysQdQueueConfig sysQdQueueConfig) {
log.debug("{}查询渠道队列配置列表请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sysQdQueueConfig));
log.info("{}查询渠道队列配置列表请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sysQdQueueConfig));
sysQdQueueConfig.setDelFlag(OrderInfoEnum.DATE_DELETE_STATUS_0.getKey());
return sysQdQueueConfigMapper.selectSysQdQueueConfigList(sysQdQueueConfig);
}

@ -184,7 +184,7 @@ public class BuyerController {
try {
// 从excel中读取数据
long t1 = System.currentTimeMillis();
log.debug("{}excel读取开始,当前时间:{}", LOGGER_MSG, t1);
log.info("{}excel读取开始,当前时间:{}", LOGGER_MSG, t1);
Map<String, String> headToProperty = new HashMap<>(10);
// 转换枚举类
@ -193,7 +193,7 @@ public class BuyerController {
}
List<BuyerImportExcel> importExcelList = excelReadService.transExcelToList(file, BuyerImportExcel.class, headToProperty, ConfigureConstant.INT_0, ConfigureConstant.INT_0);
long t2 = System.currentTimeMillis();
log.debug("{}excel读取开始,当前时间{},耗时:{}", LOGGER_MSG, t2, t2 - t1);
log.info("{}excel读取开始,当前时间{},耗时:{}", LOGGER_MSG, t2, t2 - t1);
if (ObjectUtil.isEmpty(importExcelList)) {
Map<String, Object> resultMap = new HashMap<>(10);
@ -281,7 +281,7 @@ public class BuyerController {
@ApiOperation(value = "购方信息精确查询", notes = "购方信息管理-购方信息精确查询")
@SysLog(operation = "购方信息精确查询", operationDesc = "购方信息精确查询操作", key = "购方信息管理")
public R queryPlatformBuyerInfo(@RequestParam String purchaseName, @RequestParam(required = false) String xhfNsrsbh, @ApiParam(name = "entList", value = "数据组织Id数组", required = false) @RequestParam(value = "entList", required = false) String entList) {
log.debug("{}查询购方发票列表开始,购方名称:{},税号:{}", LOGGER_MSG, purchaseName, xhfNsrsbh);
log.info("{}查询购方发票列表开始,购方名称:{},税号:{}", LOGGER_MSG, purchaseName, xhfNsrsbh);
BuyerEntity buyerEntity = new BuyerEntity();
List<String> shList;
if (StringUtils.isNotBlank(xhfNsrsbh)) {

@ -73,7 +73,7 @@ public class BuyerServiceImpl implements BuyerService {
public PageUtils queryBuyerList(Map<String, Object> paramMap, List<String> shList) {
int pageSize = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_PAGE_SIZE)));
int currPage = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_CURR_PAGE)));
log.debug("{}订单查询,当前页:{},页面条数:{}", LOGGER_MSG, currPage, pageSize);
log.info("{}订单查询,当前页:{},页面条数:{}", LOGGER_MSG, currPage, pageSize);
Integer integer = buyerMapper.selectBuyerCount(paramMap, shList);
PageHelper.startPage(currPage, pageSize);
List<BuyerEntity> list = buyerMapper.selectBuyerList(paramMap, shList);
@ -235,7 +235,7 @@ public class BuyerServiceImpl implements BuyerService {
}
}
long t3 = System.currentTimeMillis();
log.debug("{}校验耗时:{}", LOGGER_MSG, (t3 - t2));
log.info("{}校验耗时:{}", LOGGER_MSG, (t3 - t2));
//导入成功的条数
int importSuccessCount = 0;
@ -659,7 +659,7 @@ public class BuyerServiceImpl implements BuyerService {
shList.add(buyerEntity.getXhfNsrsbh());
List<BuyerEntity> result = buyerMapper.selectBuyerByBuyerEntity(queryBuyerEntity, shList);
if (result != null && result.size() > 0) {
log.debug("{}购方名称和税号信息已存在,数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(result));
log.info("{}购方名称和税号信息已存在,数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(result));
return result.get(0);
}
@ -812,7 +812,7 @@ public class BuyerServiceImpl implements BuyerService {
requestMap.put("nsrmc", purchaseName);
headMap.put("Content-Type", ConfigureConstant.STRING_APPLICATION_JSON);
headMap.put("Authorization", baseServiceConfig.configBigDataAuthId());
log.debug("{}调用大象云平台企业模糊查询请求信息为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(requestMap));
log.info("{}调用大象云平台企业模糊查询请求信息为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(requestMap));
String result = HttpUtils.doPostWithHeader(baseServiceConfig.configBigDataQueryEnterprise(), JsonUtils.getInstance().toJsonString(requestMap), headMap);
log.info("{}调用大象云平台企业模糊查询 {} ", LOGGER_MSG, JsonUtils.getInstance().toJsonString(result));
@ -883,7 +883,7 @@ public class BuyerServiceImpl implements BuyerService {
requestMap.put("nsrmc", purchaseName);
headMap.put("Content-Type", ConfigureConstant.STRING_APPLICATION_JSON);
headMap.put("Authorization", baseServiceConfig.configBigDataAuthId());
log.debug("{}调用大象云平台企业精确查询请求信息为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(requestMap));
log.info("{}调用大象云平台企业精确查询请求信息为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(requestMap));
String result = HttpUtils.doPostWithHeader(baseServiceConfig.configBigDataExactQueryEnterprise(), JsonUtils.getInstance().toJsonString(requestMap), headMap);
log.info("{}调用大象云平台企业精确查询结果:{} ", LOGGER_MSG, JsonUtils.getInstance().toJsonString(result));

@ -306,7 +306,7 @@ public class CommodityController {
@ApiParam(name = "pageSize", value = "页面条数") @RequestParam(required = false) String pageSize,
@ApiParam(name = "orderBy", value = "排序方式 0 : 创建时间正序排,1 : 创建时间倒叙排") @RequestParam(required = false) String orderBy) {
log.debug("{}查询发票列表开始 入参,merchandiseName:{},encoding:{},xhfNsrsbh:{},currentPage:{},pageSize:{},orderBy:{}", LOGGER_MSG, merchandiseName, encoding, xhfNsrsbh,
log.info("{}查询发票列表开始 入参,merchandiseName:{},encoding:{},xhfNsrsbh:{},currentPage:{},pageSize:{},orderBy:{}", LOGGER_MSG, merchandiseName, encoding, xhfNsrsbh,
currentPage, pageSize, orderBy);
Map<String, String> queryMap = convertToQueryMap(merchandiseName, encoding, xhfNsrsbh, currentPage, pageSize, orderBy);
List<String> shList = NsrsbhUtils.transShListByXhfNsrsbh(xhfNsrsbh);

@ -142,7 +142,7 @@ public class GroupCommodityController {
@ApiOperation(value = "导入集团分组", notes = "集团分组-导入集团分组")
public R uploadExcel(@RequestParam("file") MultipartFile file,
HttpServletResponse response, HttpServletRequest request) throws Exception {
log.debug("商品分组管理");
log.info("商品分组管理");
List<GroupCommodity> groupCommodity = ExcelUtils.getExcelGroupCommodityInfo(file.getInputStream(), file.getOriginalFilename());
//获取当前登录人ID 获取税号,拦截获取第一个

@ -121,7 +121,7 @@ public class CommodityServiceImpl implements CommodityService {
}
codeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_1.getKey());
if (count > 0 && ObjectUtil.isNotEmpty(commodityCodeEntities)) {
log.debug("修改操作 id = {}", id);
log.info("修改操作 id = {}", id);
if (StringUtils.isNotEmpty(codeEntity.getSpbm())) {
//已匹配
codeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey());
@ -174,7 +174,7 @@ public class CommodityServiceImpl implements CommodityService {
@Override
public R deleteCommodity(List<Map> ids) {
R r = new R();
log.debug("参数 id = {}", ids);
log.info("参数 id = {}", ids);
for (Map map : ids) {
String id = (String) map.get("id");
String nsrsbh = (String) map.get("xhfNsrsbh");
@ -216,7 +216,7 @@ public class CommodityServiceImpl implements CommodityService {
*/
@Override
public R checkRepeat(CommodityCodeCheckQuery commodityCodeCheckQuery, List<String> shList, boolean isEdit) {
log.debug("校验商品信息是否重复请求参数 :{}", JsonUtils.getInstance().toJsonString(commodityCodeCheckQuery));
log.info("校验商品信息是否重复请求参数 :{}", JsonUtils.getInstance().toJsonString(commodityCodeCheckQuery));
R r = new R();
String deptId = commodityCodeCheckQuery.getDeptId();
//商品名称校验
@ -231,7 +231,7 @@ public class CommodityServiceImpl implements CommodityService {
map.put("encoding", commodityCodeCheckQuery.getZxbm());
map.put("merchandiseName", commodityCodeCheckQuery.getXmmc());
i = groupTaxClassCodeMapper.selectByName(map);
log.debug("商品名称数量:{}", i);
log.info("商品名称数量:{}", i);
if (i == 0) {
return R.ok().put("msg", "检验通过");
} else {
@ -260,7 +260,7 @@ public class CommodityServiceImpl implements CommodityService {
map1.put("zxbm", zxbm);
map1.put("entId",commodityCodeCheckQuery.getDeptId());
log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map1);
log.info("{}校验名称是否存在 参数:{}", LOGGER_MSG, map1);
List<CommodityCodeEntity> commodityCodeEntityList = commodityMapper.queryProductList(map1, null);
/*
如果返回数组中没有数据,直接返回校验通过
@ -298,7 +298,7 @@ public class CommodityServiceImpl implements CommodityService {
map.put("encoding", commodityCodeCheckQuery.getZxbm());
map.put("merchandiseName", commodityCodeCheckQuery.getXmmc());
k = groupTaxClassCodeMapper.selectByCode(map);
log.debug("商品编码数量:{}", k);
log.info("商品编码数量:{}", k);
if (k == 0) {
return R.ok().put("msg", "检验通过");
} else {
@ -345,7 +345,7 @@ public class CommodityServiceImpl implements CommodityService {
commodityCodeEntity.setId(baseService.getGenerateShotKey());
commodityCodeEntity.setCommodityId(commodityCodeEntity.getId());
log.debug("物料导入开始执行");
log.info("物料导入开始执行");
String name = commodityCodeEntity.getGroupName();
// 获取分组id
if (StringUtils.isNotBlank(commodityCodeEntity.getGroupName())) {
@ -472,7 +472,7 @@ public class CommodityServiceImpl implements CommodityService {
*/
@Override
public List<CommodityCodeEntity> queryCommodityInfoList(PageSpxxReq pageSpxxReq, List<String> shList) {
log.debug("商品信息查询开始,参数为{}", JsonUtils.getInstance().toJsonString(pageSpxxReq));
log.info("商品信息查询开始,参数为{}", JsonUtils.getInstance().toJsonString(pageSpxxReq));
if (StringUtils.isNotBlank(pageSpxxReq.getId())) {
pageSpxxReq.setDataStatus("");
} else {
@ -487,7 +487,7 @@ public class CommodityServiceImpl implements CommodityService {
}
});
}
log.debug("商品信息查询结束 结果为{}", JsonUtils.getInstance().toJsonString(dataList));
log.info("商品信息查询结束 结果为{}", JsonUtils.getInstance().toJsonString(dataList));
return dataList;
}
@ -573,7 +573,7 @@ public class CommodityServiceImpl implements CommodityService {
log.error("同步商品信息异常:{}", e);
orderInfoContentEnum = OrderInfoContentEnum.COMMODITY_MESSAGE_SYNC_ERROR;
}
log.debug("同步商品信息:{}", orderInfoContentEnum.getMessage());
log.info("同步商品信息:{}", orderInfoContentEnum.getMessage());
return R.setCodeAndMsg(orderInfoContentEnum, null);
}
@ -585,11 +585,11 @@ public class CommodityServiceImpl implements CommodityService {
*/
@Override
public List<CommodityCodeEntity> queryProductList(Map<String, String> map, List<String> shList) {
log.debug("参数 {}", map.toString());
log.info("参数 {}", map.toString());
List<CommodityCodeEntity> commodityCodeEntity = commodityMapper.queryProductList(map, shList);
log.debug("返回参数 {}", JsonUtils.getInstance().toJsonString(commodityCodeEntity));
log.info("返回参数 {}", JsonUtils.getInstance().toJsonString(commodityCodeEntity));
if (commodityCodeEntity != null) {
log.debug("返回值:{}", commodityCodeEntity);
log.info("返回值:{}", commodityCodeEntity);
}
return commodityCodeEntity;
}
@ -605,7 +605,7 @@ public class CommodityServiceImpl implements CommodityService {
int pageSize = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_PAGE_SIZE)));
int currPage = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_CURR_PAGE)));
log.debug("订单查询,当前页:{},页面条数:{}", currPage, pageSize);
log.info("订单查询,当前页:{},页面条数:{}", currPage, pageSize);
PageHelper.startPage(currPage, pageSize);
List<CommodityCodeEntity> list = commodityMapper.queryCommodityInfoListByMap(paramMap, shList);
PageInfo<CommodityCodeEntity> pageInfo = new PageInfo<>(list);
@ -638,10 +638,10 @@ public class CommodityServiceImpl implements CommodityService {
map.put("entId",receiveSpxxReq.getEntId());
if(StringUtils.isBlank(receiveSpxxReq.getEntId())){
log.debug("公司代码为空不允许保存物料信息");
log.info("公司代码为空不允许保存物料信息");
return;
}
log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map);
log.info("{}校验名称是否存在 参数:{}", LOGGER_MSG, map);
List<CommodityCodeEntity> commodityCodeEntityList = commodityMapper.queryProductList(map, null);
TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(receiveSpxxReq.getSpbm());
CommodityCodeEntity commodityCodeEntity = null;
@ -658,7 +658,7 @@ public class CommodityServiceImpl implements CommodityService {
commodityCodeEntity.setUserId(userInfoService.getUser() != null && userInfoService.getUser().getUserId() != null ? userInfoService.getUser().getUserId().toString():"");
commodityCodeEntity.setCreateTime(new Date());
commodityMapper.insertCommodity(commodityCodeEntity);
log.debug("添加成功");
log.info("添加成功");
}
}else if(commodityCodeEntityList.size() == 1){

@ -275,7 +275,7 @@ public class GroupTaxClassCodeController {
@ApiOperation(value = "集团税编信息模板导入", notes = "集团商品信息-集团税编信息模板导入")
@SysLog(operation = "集团税编信息模板导入", operationDesc = "集团税编信息模板导入", key = "集团税编信息")
public R uploadGroupTaxClassCodeExcel(@RequestParam("file") MultipartFile file) throws Exception {
log.debug("上传集团excel信息");
log.info("上传集团excel信息");
Map<String, String> map = new HashMap<>(5);
DeptEntity dept = userInfoService.getDepartment();
List<String> taxplayerCodeList = userInfoService.getTaxpayerCodeList();
@ -305,7 +305,7 @@ public class GroupTaxClassCodeController {
String deptId = paraMap.get("deptId");
log.info("集团Id:{}", deptId);
log.debug("商品编码导入");
log.info("商品编码导入");
for (GroupTaxClassCodeEntity groupTaxClassCodeEntity : commodityCodeEntityList) {
groupTaxClassCodeEntity.setDeptId(deptId);
}

@ -29,7 +29,7 @@ public class ItaxLogServiceImpl implements ItaxLogService {
@Override
public void saveItaxLog(SysLogEntity sysLogEntity) {
log.debug("{}请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sysLogEntity));
log.info("{}请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sysLogEntity));
SysLogDto sysLogDto = transitionSysLog(sysLogEntity);
HttpUtils.doPost(userCenterConfig.configBigBMsgUrl(), JsonUtils.getInstance().toJsonString(sysLogDto));

@ -81,7 +81,7 @@ public class ItaxMsgServiceImpl implements ItaxMsgService {
}
} else if (ConfigureConstant.STRING_1.equals(userCenterType)) {
log.debug("{}当前用户配置为SaaS,不进行大B消息推送!", LOGGER_MSG);
log.info("{}当前用户配置为SaaS,不进行大B消息推送!", LOGGER_MSG);
}
return false;
}

@ -46,9 +46,9 @@ public class OpenApiServiceImpl implements OpenApiService {
// 拼接请求路径
String requestUrl = baseServiceConfig.getOpenApiToken() + ConfigureConstant.TOKEN;
log.debug("{}调用token接口开始,URL:{},请求参数为:{}", LOGGER_MSG, requestUrl, JsonUtils.getInstance().toJsonString(beanToMap));
log.info("{}调用token接口开始,URL:{},请求参数为:{}", LOGGER_MSG, requestUrl, JsonUtils.getInstance().toJsonString(beanToMap));
String result = HttpUtils.doPost(requestUrl, beanToMap);
log.debug("{}调用token接口返回参数:{}", LOGGER_MSG, result);
log.info("{}调用token接口返回参数:{}", LOGGER_MSG, result);
return JsonUtils.getInstance().parseObject(result, AccessTokenBean.class);
}
@ -65,9 +65,9 @@ public class OpenApiServiceImpl implements OpenApiService {
String requestUrl = baseServiceConfig.getOpenApiNewTokenUrl();
log.debug("{}调用token接口开始,URL:{},请求参数为:{}", LOGGER_MSG_NEW, requestUrl, JsonUtils.getInstance().toJsonString(requestMap));
log.info("{}调用token接口开始,URL:{},请求参数为:{}", LOGGER_MSG_NEW, requestUrl, JsonUtils.getInstance().toJsonString(requestMap));
String result = HttpUtils.doPost(requestUrl, JsonUtils.getInstance().toJsonString(requestMap));
log.debug("{}调用token接口返回参数:{}", LOGGER_MSG_NEW, result);
log.info("{}调用token接口返回参数:{}", LOGGER_MSG_NEW, result);
return JsonUtils.getInstance().parseObject(result, AccessTokenBean.class);
}
@ -97,9 +97,9 @@ public class OpenApiServiceImpl implements OpenApiService {
}
GlobalInfo globalInfo = buildGlobalInfo(content,useNewOpenApi);
String requestParam = JsonUtils.getInstance().toJsonString(globalInfo);
log.debug("{},请求地址为:{},请求参数为:{}", useNewOpenApi?LOGGER_MSG_NEW:LOGGER_MSG, urlWithOutToken, requestParam);
log.info("{},请求地址为:{},请求参数为:{}", useNewOpenApi?LOGGER_MSG_NEW:LOGGER_MSG, urlWithOutToken, requestParam);
String doPost = HttpUtils.doPost(urlWithOutToken, requestParam);
log.debug("{}请求地址为:{},返回参数为:{}", useNewOpenApi?LOGGER_MSG_NEW:LOGGER_MSG, urlWithOutToken, doPost);
log.info("{}请求地址为:{},返回参数为:{}", useNewOpenApi?LOGGER_MSG_NEW:LOGGER_MSG, urlWithOutToken, doPost);
return JsonUtils.getInstance().parseObject(doPost, OpenApiResponse.class);
}

@ -90,7 +90,7 @@ public class RabbitMqSendMessageServiceImpl implements RabbitMqSendMessageServic
try {
String queueName = getQueueName(nsrsbh, entId);
String realName = queuePrefix + queueName;
log.debug("{}消息数据存入队列,请求税号为:{},队列名称为:{},存入数据为:{}", LOGGER_MSG, nsrsbh, realName, content);
log.info("{}消息数据存入队列,请求税号为:{},队列名称为:{},存入数据为:{}", LOGGER_MSG, nsrsbh, realName, content);
QueueDeclare queueDeclare = setQueueDeclare(nsrsbh, realName);
queueDeclare.convertAndSend(rabbitTemplate, content,messagePriority);
@ -116,7 +116,7 @@ public class RabbitMqSendMessageServiceImpl implements RabbitMqSendMessageServic
queueName = String.valueOf(RandomUtil.randomInt(ConfigureConstant.INT_1));
}
String realName = queuePrefix + queueName;
log.debug("{}业务消息数据存入队列,队列名称为:{},存入数据为:{}", LOGGER_MSG, realName, content);
log.info("{}业务消息数据存入队列,队列名称为:{},存入数据为:{}", LOGGER_MSG, realName, content);
QueueDeclare queueDeclare = setQueueDeclare(ConfigureConstant.STRING_ORDER_BUSINESS, realName);
queueDeclare.convertAndSend(rabbitTemplate, content,0);
@ -146,7 +146,7 @@ public class RabbitMqSendMessageServiceImpl implements RabbitMqSendMessageServic
}
String realName = queuePrefix + queueName;
String realTtlName = ttlQueuePrefix + queueName;
log.debug("{}业务消息数据存入延时队列,延时队列为:{},存入数据为:{},延时后恢复队列为:{},ttl时间为:{}", LOGGER_MSG, realTtlName, JsonUtils.getInstance().toJsonString(obj), realName, ttl);
log.info("{}业务消息数据存入延时队列,延时队列为:{},存入数据为:{},延时后恢复队列为:{},ttl时间为:{}", LOGGER_MSG, realTtlName, JsonUtils.getInstance().toJsonString(obj), realName, ttl);
/**
* 判断ttl队列是否存在,如果不存在需要创建.
*/
@ -180,7 +180,7 @@ public class RabbitMqSendMessageServiceImpl implements RabbitMqSendMessageServic
String queueName = getQueueName(nsrsbh, entId);
String realName = queuePrefix + queueName;
String realTtlName = ttlQueuePrefix + queueName;
log.debug("{}消息数据存入延时队列,请求税号为:{},延时队列为:{},存入数据为:{},延时后恢复队列为:{},ttl时间为:{}", LOGGER_MSG, nsrsbh, realTtlName, JsonUtils.getInstance().toJsonString(obj), realName, ttl);
log.info("{}消息数据存入延时队列,请求税号为:{},延时队列为:{},存入数据为:{},延时后恢复队列为:{},ttl时间为:{}", LOGGER_MSG, nsrsbh, realTtlName, JsonUtils.getInstance().toJsonString(obj), realName, ttl);
/**
* 判断ttl队列是否存在,如果不存在需要创建.
*/
@ -202,7 +202,7 @@ public class RabbitMqSendMessageServiceImpl implements RabbitMqSendMessageServic
try {
String realName = queuePrefix + queueName;
log.debug("{}消息数据存入离线队列,请求税号为:{},队列名称为:{}", LOGGER_MSG, nsrsbh, realName);
log.info("{}消息数据存入离线队列,请求税号为:{},队列名称为:{}", LOGGER_MSG, nsrsbh, realName);
setQueueDeclare(nsrsbh, realName);
} catch (Exception e) {
@ -227,7 +227,7 @@ public class RabbitMqSendMessageServiceImpl implements RabbitMqSendMessageServic
try {
String realName = queuePrefix + queueName;
String realTtlName = ttlQueuePrefix + queueName;
log.debug("{}消息数据存入离线票延时队列,请求税号为:{},延时队列为:{},存入数据为:{},延时后恢复队列为:{},ttl时间为:{}", LOGGER_MSG, nsrsbh, realTtlName, JsonUtils.getInstance().toJsonString(obj), realName, ttl);
log.info("{}消息数据存入离线票延时队列,请求税号为:{},延时队列为:{},存入数据为:{},延时后恢复队列为:{},ttl时间为:{}", LOGGER_MSG, nsrsbh, realTtlName, JsonUtils.getInstance().toJsonString(obj), realName, ttl);
/**
* 判断ttl队列是否存在,如果不存在需要创建.
*/
@ -288,7 +288,7 @@ public class RabbitMqSendMessageServiceImpl implements RabbitMqSendMessageServic
}
log.debug("线程ID:{}--> queue {} insert db success", Thread.currentThread().getId(), queueName);
log.info("线程ID:{}--> queue {} insert db success", Thread.currentThread().getId(), queueName);
} catch (Exception e) {
log.error("线程ID:{}--> 广播队列放入异常:{}", Thread.currentThread().getId(), e);
}

@ -34,9 +34,9 @@ public class SimsBackController {
@ApiOperation(value = "查询税控设备信息", notes = "查询税控设备信息")
@PostMapping("/queryTaxEquipment")
public R queryTaxEquipment(@RequestBody PageQueryTaxEquipment pageQueryTaxEquipment) {
log.debug("{}查询税控设备信息输入参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageQueryTaxEquipment));
log.info("{}查询税控设备信息输入参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageQueryTaxEquipment));
TaxEquipmentInfo taxEquipmentInfo = simsBackService.queryTaxEquipment(pageQueryTaxEquipment.getNsrsbh(), pageQueryTaxEquipment.getEntId());
log.debug("{}查询税控设备信息响应参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfo));
log.info("{}查询税控设备信息响应参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfo));
return R.ok(taxEquipmentInfo);
}
@ -50,9 +50,9 @@ public class SimsBackController {
@PostMapping("/groupByTaxEquipment")
public R groupByTaxEquipment(@RequestBody PageQueryGroupTaxEquipmentReq pageQueryGroupTaxEquipmentReq) {
log.debug("{}分组查询税控设备信息输入参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageQueryGroupTaxEquipmentReq));
log.info("{}分组查询税控设备信息输入参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageQueryGroupTaxEquipmentReq));
Map<String, List<Map<String,Object>>> dataList = simsBackService.groupByTaxEquipment(pageQueryGroupTaxEquipmentReq.getParamContent());
log.debug("{}分组查询税控设备信息响应参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
log.info("{}分组查询税控设备信息响应参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
return R.ok(dataList);
}

@ -61,11 +61,11 @@
// long start = System.currentTimeMillis();
// String requestData = JsonUtils.getInstance().toJsonString(taxEquipmentInfoReq);
// String configQueryTaxEquipmentList = baseServiceConfig.configQueryTaxEquipmentList();
// log.debug("{}调用销项后台获取税控设备接口,URL为:{},入参:{}", LOGGER_MSG, configQueryTaxEquipmentList, requestData);
// log.info("{}调用销项后台获取税控设备接口,URL为:{},入参:{}", LOGGER_MSG, configQueryTaxEquipmentList, requestData);
//
// String result = HttpUtils.doPostWithHeader(configQueryTaxEquipmentList, requestData, headMap);
// long end = System.currentTimeMillis();
// log.debug("{}调用销项后台获取税控设备接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
// log.info("{}调用销项后台获取税控设备接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
// if (StringUtils.isNotBlank(result)) {
// JSONObject jsonObject = JSON.parseObject(result);
// JSONArray list = jsonObject.getJSONObject("content").getJSONArray("list");
@ -75,7 +75,7 @@
// log.error("{}调用销项后台获取税控设备接口异常:{}", LOGGER_MSG, e);
// }
// if (ObjectUtil.isNotEmpty(taxEquipmentInfoList)) {
// log.debug("{}调用销项后台获取税控设备返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfoList.get(0)));
// log.info("{}调用销项后台获取税控设备返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfoList.get(0)));
// }
// return taxEquipmentInfoList;
// }
@ -109,7 +109,7 @@
// }
// }
//
// log.debug("根据税号查询到的税控设备:{}", JsonUtils.getInstance().toJsonString(taxEquipmentInfoList));
// log.info("根据税号查询到的税控设备:{}", JsonUtils.getInstance().toJsonString(taxEquipmentInfoList));
// for (Map map : paramlist1) {
// boolean b = false;
// for (TaxEquipmentInfo taxEquipmentInfo : taxEquipmentInfoList) {
@ -144,7 +144,7 @@
// log.error("{}调用销项后台获取税控设备分组接口异常:{}", LOGGER_MSG, e);
// }
// if (ObjectUtil.isNotEmpty(listHashMap)) {
// log.debug("{}调用销项后台获取税控设备分组返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(listHashMap));
// log.info("{}调用销项后台获取税控设备分组返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(listHashMap));
// }
// return listHashMap;
// }
@ -161,7 +161,7 @@
// String sksbKey = String.format(RedisConstant.REDIS_SKSB_NSRSBH, cacheKey);
// String sksbResult = redisService.get(sksbKey);
// if (StringUtils.isNotBlank(sksbResult)) {
// log.debug("{}使用缓存获取税控设备返回数据为:{}", LOGGER_MSG, sksbResult);
// log.info("{}使用缓存获取税控设备返回数据为:{}", LOGGER_MSG, sksbResult);
// taxEquipmentInfo = JsonUtils.getInstance().parseObject(sksbResult, TaxEquipmentInfo.class);
// } else {
// try {
@ -186,11 +186,11 @@
//
// String configQueryTaxEquipment = baseServiceConfig.configQueryTaxEquipment();
//
// log.debug("{}根据企业Id调用销项后台获取税控设备接口,URL为:{},入参:{}", LOGGER_MSG, configQueryTaxEquipment, requestData);
// log.info("{}根据企业Id调用销项后台获取税控设备接口,URL为:{},入参:{}", LOGGER_MSG, configQueryTaxEquipment, requestData);
//
// String result = HttpUtils.doPostWithHeader(configQueryTaxEquipment, requestData, headMap);
// long end = System.currentTimeMillis();
// log.debug("{}根据企业Id调用销项后台获取税控设备接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
// log.info("{}根据企业Id调用销项后台获取税控设备接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
// if (StringUtils.isNotBlank(result)) {
// JSONObject jsonObject = JSON.parseObject(result);
// if (ConfigureConstant.STRING_0000.equals(jsonObject.getString("code"))) {
@ -204,7 +204,7 @@
// log.error("{}调用销项后台获取税控设备接口异常:{}", LOGGER_MSG, e);
// }
// if (ObjectUtil.isNotNull(taxEquipmentInfo)) {
// log.debug("{}调用销项后台获取税控设备返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfo));
// log.info("{}调用销项后台获取税控设备返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfo));
// //增加缓存逻辑
// redisService.set(sksbKey, JsonUtils.getInstance().toJsonString(taxEquipmentInfo), RedisConstant.REDIS_EXPIRE_TIME_2HOUR);
// }
@ -241,7 +241,7 @@
// String sksbKey = String.format(RedisConstant.REDIS_SKSB_NSRSBH, cacheKey);
// String sksbResult = redisService.get(sksbKey);
// if (StringUtils.isNotBlank(sksbResult)) {
// log.debug("{}删除缓存获取税控设备返回数据为:{}", LOGGER_MSG, sksbResult);
// log.info("{}删除缓存获取税控设备返回数据为:{}", LOGGER_MSG, sksbResult);
// redisService.del(sksbKey);
// }
// }
@ -280,11 +280,11 @@
//
// String configAddTaxEquipment = baseServiceConfig.configAddTaxEquipment();
//
// log.debug("{}调用销项后台同步税控设备接口,URL为:{},入参:{}", LOGGER_MSG, configAddTaxEquipment, requestData);
// log.info("{}调用销项后台同步税控设备接口,URL为:{},入参:{}", LOGGER_MSG, configAddTaxEquipment, requestData);
//
// String result = HttpUtils.doPostWithHeader(configAddTaxEquipment, requestData, headMap);
// long end = System.currentTimeMillis();
// log.debug("{}调用销项后台同步税控设备接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
// log.info("{}调用销项后台同步税控设备接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
// if (StringUtils.isNotBlank(result)) {
// r = JsonUtils.getInstance().parseObject(result, R.class);
// }

@ -61,11 +61,11 @@ public class SimsBackServiceImpl implements SimsBackService {
long start = System.currentTimeMillis();
String requestData = JsonUtils.getInstance().toJsonString(pageQueryTaxEquipmentListReq);
String configQueryTaxEquipmentList = baseServiceConfig.configQueryTaxEquipmentList();
log.debug("{}调用销项后台获取税控设备接口,URL为:{},入参:{}", LOGGER_MSG, configQueryTaxEquipmentList, requestData);
log.info("{}调用销项后台获取税控设备接口,URL为:{},入参:{}", LOGGER_MSG, configQueryTaxEquipmentList, requestData);
String result = HttpUtils.doPostWithHeader(configQueryTaxEquipmentList, requestData, headMap);
long end = System.currentTimeMillis();
log.debug("{}调用销项后台获取税控设备接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
log.info("{}调用销项后台获取税控设备接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
if (StringUtils.isNotBlank(result)) {
JSONObject jsonObject = JSON.parseObject(result);
JSONArray list = jsonObject.getJSONObject("content").getJSONArray("list");
@ -75,7 +75,7 @@ public class SimsBackServiceImpl implements SimsBackService {
log.error("{}调用销项后台获取税控设备接口异常:{}", LOGGER_MSG, e);
}
if (ObjectUtil.isNotEmpty(taxEquipmentInfoList)) {
log.debug("{}调用销项后台获取税控设备返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfoList.get(0)));
log.info("{}调用销项后台获取税控设备返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfoList.get(0)));
}
return taxEquipmentInfoList;
}
@ -90,11 +90,11 @@ public class SimsBackServiceImpl implements SimsBackService {
long start = System.currentTimeMillis();
String requestData = JsonUtils.getInstance().toJsonString(taxEquipmentInfoReq);
String configQueryTaxEquipmentList = baseServiceConfig.configQueryTaxEquipmentList();
log.debug("{}调用销项后台获取税控设备接口,URL为:{},入参:{}", LOGGER_MSG, configQueryTaxEquipmentList, requestData);
log.info("{}调用销项后台获取税控设备接口,URL为:{},入参:{}", LOGGER_MSG, configQueryTaxEquipmentList, requestData);
String result = HttpUtils.doPostWithHeader(configQueryTaxEquipmentList, requestData, headMap);
long end = System.currentTimeMillis();
log.debug("{}调用销项后台获取税控设备接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
log.info("{}调用销项后台获取税控设备接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
if (StringUtils.isNotBlank(result)) {
JSONObject jsonObject = JSON.parseObject(result);
JSONArray list = jsonObject.getJSONObject("content").getJSONArray("list");
@ -104,7 +104,7 @@ public class SimsBackServiceImpl implements SimsBackService {
log.error("{}调用销项后台获取税控设备接口异常:{}", LOGGER_MSG, e);
}
if (ObjectUtil.isNotEmpty(taxEquipmentInfoList)) {
log.debug("{}调用销项后台获取税控设备返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfoList.get(0)));
log.info("{}调用销项后台获取税控设备返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfoList.get(0)));
}
return taxEquipmentInfoList;
}
@ -138,7 +138,7 @@ public class SimsBackServiceImpl implements SimsBackService {
}
}
log.debug("根据税号查询到的税控设备:{}", JsonUtils.getInstance().toJsonString(taxEquipmentInfoList));
log.info("根据税号查询到的税控设备:{}", JsonUtils.getInstance().toJsonString(taxEquipmentInfoList));
for (Map map : paramlist1) {
boolean b = false;
for (TaxEquipmentInfo taxEquipmentInfo : taxEquipmentInfoList) {
@ -173,7 +173,7 @@ public class SimsBackServiceImpl implements SimsBackService {
log.error("{}调用销项后台获取税控设备分组接口异常:{}", LOGGER_MSG, e);
}
if (ObjectUtil.isNotEmpty(listHashMap)) {
log.debug("{}调用销项后台获取税控设备分组返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(listHashMap));
log.info("{}调用销项后台获取税控设备分组返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(listHashMap));
}
return listHashMap;
}
@ -190,7 +190,7 @@ public class SimsBackServiceImpl implements SimsBackService {
String sksbKey = String.format(RedisConstant.REDIS_SKSB_NSRSBH, cacheKey);
String sksbResult = redisService.get(sksbKey);
if (StringUtils.isNotBlank(sksbResult)) {
log.debug("{}使用缓存获取税控设备返回数据为:{}", LOGGER_MSG, sksbResult);
log.info("{}使用缓存获取税控设备返回数据为:{}", LOGGER_MSG, sksbResult);
taxEquipmentInfo = JsonUtils.getInstance().parseObject(sksbResult, TaxEquipmentInfo.class);
}else{
try {
@ -215,11 +215,11 @@ public class SimsBackServiceImpl implements SimsBackService {
String configQueryTaxEquipment = baseServiceConfig.configQueryTaxEquipment();
log.debug("{}根据企业Id调用销项后台获取税控设备接口,URL为:{},入参:{}", LOGGER_MSG, configQueryTaxEquipment, requestData);
log.info("{}根据企业Id调用销项后台获取税控设备接口,URL为:{},入参:{}", LOGGER_MSG, configQueryTaxEquipment, requestData);
String result = HttpUtils.doPostWithHeader(configQueryTaxEquipment, requestData, headMap);
long end = System.currentTimeMillis();
log.debug("{}根据企业Id调用销项后台获取税控设备接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
log.info("{}根据企业Id调用销项后台获取税控设备接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
if (StringUtils.isNotBlank(result)) {
JSONObject jsonObject = JSON.parseObject(result);
if(ConfigureConstant.STRING_0000.equals(jsonObject.getString("code"))){
@ -233,7 +233,7 @@ public class SimsBackServiceImpl implements SimsBackService {
log.error("{}调用销项后台获取税控设备接口异常:{}", LOGGER_MSG, e);
}
if (ObjectUtil.isNotNull(taxEquipmentInfo)&&StringUtils.isNotBlank(taxEquipmentInfo.getSksbCode())) {
log.debug("{}调用销项后台获取税控设备返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfo));
log.info("{}调用销项后台获取税控设备返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfo));
//增加缓存逻辑
redisService.set(sksbKey, JsonUtils.getInstance().toJsonString(taxEquipmentInfo), RedisConstant.REDIS_EXPIRE_TIME_2HOUR);
}
@ -270,7 +270,7 @@ public class SimsBackServiceImpl implements SimsBackService {
String sksbKey = String.format(RedisConstant.REDIS_SKSB_NSRSBH, cacheKey);
String sksbResult = redisService.get(sksbKey);
if (StringUtils.isNotBlank(sksbResult)) {
log.debug("{}删除缓存获取税控设备返回数据为:{}", LOGGER_MSG, sksbResult);
log.info("{}删除缓存获取税控设备返回数据为:{}", LOGGER_MSG, sksbResult);
redisService.del(sksbKey);
}
}
@ -338,11 +338,11 @@ public class SimsBackServiceImpl implements SimsBackService {
String configAddTaxEquipment = baseServiceConfig.configAddTaxEquipment();
log.debug("{}调用销项后台同步税控设备接口,URL为:{},入参:{}", LOGGER_MSG, configAddTaxEquipment, requestData);
log.info("{}调用销项后台同步税控设备接口,URL为:{},入参:{}", LOGGER_MSG, configAddTaxEquipment, requestData);
String result = HttpUtils.doPostWithHeader(configAddTaxEquipment, requestData, headMap);
long end = System.currentTimeMillis();
log.debug("{}调用销项后台同步税控设备接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
log.info("{}调用销项后台同步税控设备接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
if (StringUtils.isNotBlank(result)) {
r = JsonUtils.getInstance().parseObject(result, R.class);
}
@ -375,11 +375,11 @@ public class SimsBackServiceImpl implements SimsBackService {
String requestData = JsonUtils.getInstance().toJsonString(param);
String configQueryQdConfigInterface = baseServiceConfig.configQueryQdConfigInterface();
log.debug("{}根据税号或者渠道查询渠道配置接口,URL为:{},入参:{}", LOGGER_MSG, configQueryQdConfigInterface, requestData);
log.info("{}根据税号或者渠道查询渠道配置接口,URL为:{},入参:{}", LOGGER_MSG, configQueryQdConfigInterface, requestData);
String result = HttpUtils.doPostWithHeader(configQueryQdConfigInterface, requestData, headMap);
long end = System.currentTimeMillis();
log.debug("{}根据税号或者渠道查询渠道配置接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
log.info("{}根据税号或者渠道查询渠道配置接口为,耗时(毫秒):{},出参:{}", LOGGER_MSG, end - start, result.length() > 100 ? result.substring(0, 90) : result);
if (StringUtils.isNotBlank(result)) {
JSONObject jsonObject = JSON.parseObject(result);
qdConfigCommon = JsonUtils.getInstance().parseObject(jsonObject.getString("content"), QdConfigCommon.class);

@ -108,7 +108,7 @@ public class BaseServiceApiForOrder {
if (param.length() > ConfigureConstant.INT_500) {
param = param.substring(0, 400);
}
log.debug("{}业务接口,加密返回数据:{}", LOGGER_MSG, param);
log.info("{}业务接口,加密返回数据:{}", LOGGER_MSG, param);
return interfaceData;
}

@ -91,10 +91,10 @@ public class BaseServiceApiForQd {
InterfaceData interfaceData = new InterfaceData();
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}全电商品信息查询接口,入参:{}", LOGGER_MSG, data);
log.info("{}全电商品信息查询接口,入参:{}", LOGGER_MSG, data);
interfaceData = ProtocolUtil.decodeData(data);
log.debug("{}全电商品信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
log.info("{}全电商品信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
PageSpxxReq pageSpxxReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageSpxxReq.class);
if (ObjectUtil.isNull(pageSpxxReq)) {
@ -114,7 +114,7 @@ public class BaseServiceApiForQd {
}
});
log.debug("{}全电商品信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
log.info("{}全电商品信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
return buildReturnData(interfaceData, OrderInfoEnum.INTERFACE_SUCCESS.getKey(), OrderInfoEnum.INTERFACE_SUCCESS.getValue(), dataList);
} catch (OrderReceiveException e) {
log.error("{}全电商品信息查询接口,异常:{}", LOGGER_MSG, e);
@ -132,10 +132,10 @@ public class BaseServiceApiForQd {
InterfaceData interfaceData = new InterfaceData();
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}全电商品信息同步接口,入参:{}", LOGGER_MSG, data);
log.info("{}全电商品信息同步接口,入参:{}", LOGGER_MSG, data);
interfaceData = ProtocolUtil.decodeData(data);
log.debug("{}全电商品信息同步接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
log.info("{}全电商品信息同步接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
List<ReceiveSpxxReq> pageUpdateSpxxReqList = JsonUtils.getInstance().jsonToList(interfaceData.getData(), ReceiveSpxxReq.class);
if (ObjectUtil.isEmpty(pageUpdateSpxxReqList)) {
@ -179,7 +179,7 @@ public class BaseServiceApiForQd {
commodityService.saveCommodityCodeEntity(pageUpdateSpxxReqList);
}
log.debug("{}全电商品信息同步接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(R.ok()));
log.info("{}全电商品信息同步接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(R.ok()));
return buildReturnData(interfaceData, OrderInfoEnum.INTERFACE_SUCCESS.getKey(), OrderInfoEnum.INTERFACE_SUCCESS.getValue(), null);
} catch (OrderReceiveException e) {
log.error("{}全电商品信息同步接口,异常:{}", LOGGER_MSG, e);
@ -197,10 +197,10 @@ public class BaseServiceApiForQd {
InterfaceData interfaceData = new InterfaceData();
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}全电购方信息查询接口,入参:{}", LOGGER_MSG, data);
log.info("{}全电购方信息查询接口,入参:{}", LOGGER_MSG, data);
interfaceData = ProtocolUtil.decodeData(data);
log.debug("{}全电购方信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
log.info("{}全电购方信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
PageGfxxReq pageGfxxReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageGfxxReq.class);
if (ObjectUtil.isNull(pageGfxxReq)) {
@ -209,7 +209,7 @@ public class BaseServiceApiForQd {
List<String> shList = NsrsbhUtils.transShListByNsrsbh(pageGfxxReq.getXhfNsrsbh());
List<BuyerEntity> buyerEntityList = buyerService.autoQueryBuyerInfoList(pageGfxxReq.getGfmc(), pageGfxxReq.getGfbm(), shList, null);
log.debug("{}全电购方信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(buyerEntityList));
log.info("{}全电购方信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(buyerEntityList));
return buildReturnData(interfaceData, OrderInfoEnum.INTERFACE_SUCCESS.getKey(), OrderInfoEnum.INTERFACE_SUCCESS.getValue(), buyerEntityList);
} catch (OrderReceiveException e) {
log.error("{}全电购方信息查询接口,异常:{}", LOGGER_MSG, e);
@ -227,10 +227,10 @@ public class BaseServiceApiForQd {
InterfaceData interfaceData = new InterfaceData();
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}全电购方详细信息查询接口,入参:{}", LOGGER_MSG, data);
log.info("{}全电购方详细信息查询接口,入参:{}", LOGGER_MSG, data);
interfaceData = ProtocolUtil.decodeData(data);
log.debug("{}全电购方详细信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
log.info("{}全电购方详细信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
PageGfxxReq pageGfxxReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageGfxxReq.class);
if (ObjectUtil.isNull(pageGfxxReq)) {
@ -239,7 +239,7 @@ public class BaseServiceApiForQd {
List<String> shList = NsrsbhUtils.transShListByNsrsbh(pageGfxxReq.getXhfNsrsbh());
BuyerEntity buyerEntity = buyerService.autoQueryBuyerInfo(pageGfxxReq.getGfmc(), pageGfxxReq.getGfbm(), shList, null);
log.debug("{}全电购方详细信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(buyerEntity));
log.info("{}全电购方详细信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(buyerEntity));
return buildReturnData(interfaceData, OrderInfoEnum.INTERFACE_SUCCESS.getKey(), OrderInfoEnum.INTERFACE_SUCCESS.getValue(), buyerEntity);
} catch (OrderReceiveException e) {
log.error("{}全电购方详细信息查询接口,异常:{}", LOGGER_MSG, e);
@ -256,10 +256,10 @@ public class BaseServiceApiForQd {
InterfaceData interfaceData = new InterfaceData();
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}全电购方信息同步接口,入参:{}", LOGGER_MSG, data);
log.info("{}全电购方信息同步接口,入参:{}", LOGGER_MSG, data);
interfaceData = ProtocolUtil.decodeData(data);
log.debug("{}全电购方信息同步接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
log.info("{}全电购方信息同步接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
PageUpdateGfxxReq pageUpdateGfxxReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageUpdateGfxxReq.class);
if (ObjectUtil.isNull(pageUpdateGfxxReq)) {
@ -269,7 +269,7 @@ public class BaseServiceApiForQd {
BuyerEntity buyerEntity = transBuyerEntity(pageUpdateGfxxReq);
buyerService.saveOrUpdateBuyerInfo(buyerEntity);
log.debug("{}全电购方信息同步接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(R.ok()));
log.info("{}全电购方信息同步接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(R.ok()));
return buildReturnData(interfaceData, OrderInfoEnum.INTERFACE_SUCCESS.getKey(), OrderInfoEnum.INTERFACE_SUCCESS.getValue(), null);
} catch (OrderReceiveException e) {
log.error("{}全电购方信息同步接口,异常:{}", LOGGER_MSG, e);
@ -340,10 +340,10 @@ public class BaseServiceApiForQd {
InterfaceData interfaceData = new InterfaceData();
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}全电局端税编信息查询接口,入参:{}", LOGGER_MSG, data);
log.info("{}全电局端税编信息查询接口,入参:{}", LOGGER_MSG, data);
interfaceData = ProtocolUtil.decodeData(data);
log.debug("{}全电局端税编信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
log.info("{}全电局端税编信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
PageJdsbxxReq pageJdsbxxReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageJdsbxxReq.class);
if (ObjectUtil.isNull(pageJdsbxxReq)) {
@ -362,7 +362,7 @@ public class BaseServiceApiForQd {
PageUtils dataList = taxClassCodeService.queryTaxClassCode(map);
log.debug("{}全电局端税编信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
log.info("{}全电局端税编信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
return buildReturnData(interfaceData, OrderInfoEnum.INTERFACE_SUCCESS.getKey(), OrderInfoEnum.INTERFACE_SUCCESS.getValue(), dataList);
} catch (OrderReceiveException e) {
log.error("{}全电局端税编信息查询接口,异常:{}", LOGGER_MSG, e);
@ -380,10 +380,10 @@ public class BaseServiceApiForQd {
InterfaceData interfaceData = new InterfaceData();
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}全电开票人信息查询接口,入参:{}", LOGGER_MSG, data);
log.info("{}全电开票人信息查询接口,入参:{}", LOGGER_MSG, data);
interfaceData = ProtocolUtil.decodeData(data);
log.debug("{}全电开票人信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
log.info("{}全电开票人信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
PageKprxxReq pageKprxxReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageKprxxReq.class);
if (ObjectUtil.isNull(pageKprxxReq)) {
@ -391,7 +391,7 @@ public class BaseServiceApiForQd {
}
List<String> shList = NsrsbhUtils.transShListByNsrsbh(pageKprxxReq.getXhfNsrsbh());
DrawerInfoEntity dataList = drawerInfoService.queryDrawerInfo(shList.get(0), pageKprxxReq.getUserId());
log.debug("{}全电开票人信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
log.info("{}全电开票人信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
return buildReturnData(interfaceData, OrderInfoEnum.INTERFACE_SUCCESS.getKey(), OrderInfoEnum.INTERFACE_SUCCESS.getValue(), dataList);
} catch (OrderReceiveException e) {
log.error("{}全电开票人信息查询接口,异常:{}", LOGGER_MSG, e);
@ -409,10 +409,10 @@ public class BaseServiceApiForQd {
InterfaceData interfaceData = new InterfaceData();
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}全电业务类型查询接口,入参:{}", LOGGER_MSG, data);
log.info("{}全电业务类型查询接口,入参:{}", LOGGER_MSG, data);
interfaceData = ProtocolUtil.decodeData(data);
log.debug("{}全电业务类型查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
log.info("{}全电业务类型查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
PageYwlxReq pageYwlxReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageYwlxReq.class);
if (ObjectUtil.isNull(pageYwlxReq)) {
@ -426,7 +426,7 @@ public class BaseServiceApiForQd {
}
List<BuinessTypeBO> dataList = businessTypeService.queryYwlxOrNsrsbh(map, shList);
log.debug("{}全电业务类型查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
log.info("{}全电业务类型查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
return buildReturnData(interfaceData, OrderInfoEnum.INTERFACE_SUCCESS.getKey(), OrderInfoEnum.INTERFACE_SUCCESS.getValue(), dataList);
} catch (OrderReceiveException e) {
log.error("{}全电业务类型查询接口,异常:{}", LOGGER_MSG, e);
@ -443,10 +443,10 @@ public class BaseServiceApiForQd {
InterfaceData interfaceData = new InterfaceData();
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}开票组织管理查询接口,入参:{}", LOGGER_MSG, data);
log.info("{}开票组织管理查询接口,入参:{}", LOGGER_MSG, data);
interfaceData = ProtocolUtil.decodeData(data);
log.debug("{}开票组织管理查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
log.info("{}开票组织管理查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
PageKpzzglReq pageKpzzglReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageKpzzglReq.class);
if (ObjectUtil.isNull(pageKpzzglReq)) {
@ -485,7 +485,7 @@ public class BaseServiceApiForQd {
});
pageKpzzglRsp.setPageXfxxList(pageXfxxList);
}
log.debug("{}开票组织管理查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageKpzzglRsp));
log.info("{}开票组织管理查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageKpzzglRsp));
return buildReturnData(interfaceData, OrderInfoEnum.INTERFACE_SUCCESS.getKey(), OrderInfoEnum.INTERFACE_SUCCESS.getValue(), pageKpzzglRsp);
} catch (OrderReceiveException e) {
log.error("{}开票组织管理查询接口,异常:{}", LOGGER_MSG, e);
@ -503,10 +503,10 @@ public class BaseServiceApiForQd {
InterfaceData interfaceData = new InterfaceData();
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}用户信息查询接口,入参:{}", LOGGER_MSG, data);
log.info("{}用户信息查询接口,入参:{}", LOGGER_MSG, data);
interfaceData = ProtocolUtil.decodeData(data);
log.debug("{}用户信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
log.info("{}用户信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
PageUserInfoReq pageUserInfoReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageUserInfoReq.class);
if (Objects.isNull(pageUserInfoReq)) {
@ -523,7 +523,7 @@ public class BaseServiceApiForQd {
userInfoQuery.setIsFilter(OrderInfoEnum.ORDER_USER_INFO_IS_FILTER_1.getKey());
userInfoQuery.setRequestUrl(pageUserInfoReq.getRequestUrl());
R r = userInfoService.getUserInfo(userInfoQuery);
log.debug("{}查询用户中心,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(r));
log.info("{}查询用户中心,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(r));
if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))) {
UserEntity userEntity = (UserEntity) r.get(OrderManagementConstant.DATA);
return buildReturnData(interfaceData, OrderInfoEnum.INTERFACE_SUCCESS.getKey(), OrderInfoEnum.INTERFACE_SUCCESS.getValue(), userEntity);
@ -563,7 +563,7 @@ public class BaseServiceApiForQd {
} catch (Exception e) {
log.error("{}全电业务数据加密,异常:{}", LOGGER_MSG, e);
}
log.debug("{}全电业务接口,加密返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(interfaceData));
log.info("{}全电业务接口,加密返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(interfaceData));
return interfaceData;
}

@ -69,7 +69,7 @@ public class BaseServiceCommon {
public R recacheSpsb(@RequestBody String content) {
Map<String, String> reqMap = JsonUtils.getInstance().parseObject(content, Map.class);
log.debug("{}对外重新缓存商品税编请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
log.info("{}对外重新缓存商品税编请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
if (ObjectUtil.isNull(reqMap)) {
log.error("{}对外重新缓存商品税编请求参数为空", LOGGER_MSG);
return R.error("对外重新缓存商品税编请求参数为空");
@ -99,12 +99,12 @@ public class BaseServiceCommon {
key = baseServiceConfig.getAesSimsBack();
}
String resultContent = AesEncryptUtil.desEncrypt(aesContent, key);
log.debug("{}对外重新缓存商品税编解密后数据:{}", LOGGER_MSG, resultContent);
log.info("{}对外重新缓存商品税编解密后数据:{}", LOGGER_MSG, resultContent);
if (StringUtils.isNotBlank(resultContent)) {
taxClassCodeService.cacheTaxClassCode();
log.debug("{}对外重新缓存商品税编成功", LOGGER_MSG);
log.info("{}对外重新缓存商品税编成功", LOGGER_MSG);
} else {
log.error("{}对外重新缓存商品税编异常,content数据为空", LOGGER_MSG);
return R.error("对外重新缓存商品税编异常");
@ -124,7 +124,7 @@ public class BaseServiceCommon {
@RequestMapping(value = "/api/autoConfigEnterprise", method = RequestMethod.POST)
public R autoConfigEnterprise(@RequestBody PageInterfaceReq pageInterfaceReq) {
String result = "";
log.debug("{}初始化企业信息,请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageInterfaceReq));
log.info("{}初始化企业信息,请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageInterfaceReq));
if (ObjectUtil.isNull(pageInterfaceReq)) {
log.error("{}初始化企业信息,请求参数为空", LOGGER_MSG);
return R.error("初始化企业信息,请求参数为空");
@ -154,14 +154,14 @@ public class BaseServiceCommon {
key = baseServiceConfig.getAesSimsBack();
}
String resultContent = AesEncryptUtil.desEncrypt(aesContent, key);
log.debug("{}初始化企业信息,解密后数据:{}", LOGGER_MSG, resultContent);
log.info("{}初始化企业信息,解密后数据:{}", LOGGER_MSG, resultContent);
if (StringUtils.isNotBlank(resultContent)) {
PageConfigEnterpriseInfo pageConfigEnterpriseInfo = JsonUtils.getInstance().parseObject(resultContent, PageConfigEnterpriseInfo.class);
if (ObjectUtil.isNotNull(pageConfigEnterpriseInfo)) {
enterpriseConfigService.autoConfigEnterprise(pageConfigEnterpriseInfo.getXhfNsrsbh(), pageConfigEnterpriseInfo.getXhfMc(), pageConfigEnterpriseInfo.getEntId());
}
log.debug("{}初始化企业信息,成功", LOGGER_MSG);
log.info("{}初始化企业信息,成功", LOGGER_MSG);
} else {
log.error("{}初始化企业信息,异常,content数据为空", LOGGER_MSG);
return R.error("初始化企业信息,异常");
@ -181,7 +181,7 @@ public class BaseServiceCommon {
@RequestMapping(value = "/api/updateRedis", method = RequestMethod.POST)
public R updateRedis(@RequestBody PageInterfaceReq pageInterfaceReq) {
String result = "";
log.debug("{}修改redis缓存请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageInterfaceReq));
log.info("{}修改redis缓存请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageInterfaceReq));
if (ObjectUtil.isNull(pageInterfaceReq)) {
log.error("{}修改redis缓存请求参数为空", LOGGER_MSG);
return R.error("修改redis缓存请求参数为空");
@ -211,7 +211,7 @@ public class BaseServiceCommon {
key = baseServiceConfig.getAesSimsBack();
}
String resultContent = AesEncryptUtil.desEncrypt(aesContent, key);
log.debug("{}修改redis缓存解密后数据:{}", LOGGER_MSG, resultContent);
log.info("{}修改redis缓存解密后数据:{}", LOGGER_MSG, resultContent);
if (StringUtils.isNotBlank(resultContent)) {
PageInterfaceUpdateRedis pageInterfaceUpdateRedis = JsonUtils.getInstance().parseObject(resultContent, PageInterfaceUpdateRedis.class);
@ -244,7 +244,7 @@ public class BaseServiceCommon {
}
}
log.debug("{}修改redis缓存成功", LOGGER_MSG);
log.info("{}修改redis缓存成功", LOGGER_MSG);
} else {
log.error("{}修改redis缓存异常,content数据为空", LOGGER_MSG);
return R.error("修改redis缓存异常");
@ -265,7 +265,7 @@ public class BaseServiceCommon {
public R reCacheSksb(@RequestBody String content) {
Map<String, String> reqMap = JsonUtils.getInstance().parseObject(content, Map.class);
log.debug("{}对外重新缓存税控设备请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
log.info("{}对外重新缓存税控设备请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
if (ObjectUtil.isNull(reqMap)) {
log.error("{}对外重新缓存税控设备请求参数为空", LOGGER_MSG);
return R.error("重新缓存税控设备请求参数为空");
@ -295,13 +295,13 @@ public class BaseServiceCommon {
key = baseServiceConfig.getAesSimsBack();
}
String resultContent = AesEncryptUtil.desEncrypt(aesContent, key);
log.debug("{}对外重新缓存税控设备解密后数据:{}", LOGGER_MSG, resultContent);
log.info("{}对外重新缓存税控设备解密后数据:{}", LOGGER_MSG, resultContent);
if (StringUtils.isNotBlank(resultContent)) {
List<String> list = JsonUtils.getInstance().parseObject(resultContent, List.class);
if (ObjectUtil.isNotEmpty(list)) {
simsBackService.reCacheTaxEquipmentInfo(list.get(1),list.get(0));
}
log.debug("{}对外重新缓存税控设备成功", LOGGER_MSG);
log.info("{}对外重新缓存税控设备成功", LOGGER_MSG);
} else {
log.error("{}对外重新缓存税控设备异常,content数据为空", LOGGER_MSG);
return R.error("对外重新缓存税控设备异常");

@ -46,7 +46,7 @@ public class BaseBaseCommonDisposeServiceImpl implements BaseCommonDisposeServic
//没值查询数据库,存值并返回
String value = StringUtils.EMPTY;
List<AuthenticationInfo> authenticateAction = authenticationService.queryAuthInfoList(new AuthenticationInfo(), null);
log.debug("{},初始化,遍历数据库数据条数:{}", LOGGER_MSG, authenticateAction.size());
log.info("{},初始化,遍历数据库数据条数:{}", LOGGER_MSG, authenticateAction.size());
for (AuthenticationInfo authenticationInfo : authenticateAction) {
if (secretId.equals(authenticationInfo.getSecretId())) {
redisService.set(redisSecretId, authenticationInfo.getSecretKey(), RedisConstant.REDIS_EXPIRE_TIME_DEFAULT);

@ -352,7 +352,7 @@ public class CommonUtils {
} else {
fplxdm = fpzldm;
}
log.debug("{}旧版本发票种类转换为新税控发票种类,请求参数为:{},输出参数为:{}", LOGGER_MSG, fpzldm, fplxdm);
log.info("{}旧版本发票种类转换为新税控发票种类,请求参数为:{},输出参数为:{}", LOGGER_MSG, fpzldm, fplxdm);
return fplxdm;
}
@ -390,7 +390,7 @@ public class CommonUtils {
}else {
fplxdm = fpzldm;
}
log.debug("{}山能业务系统发票种类转换为标品开票接口发票种类,请求参数为:{},输出参数为:{}", LOGGER_MSG, fpzldm, fplxdm);
log.info("{}山能业务系统发票种类转换为标品开票接口发票种类,请求参数为:{},输出参数为:{}", LOGGER_MSG, fpzldm, fplxdm);
return fplxdm;
}
@ -429,7 +429,7 @@ public class CommonUtils {
}else {
fplxdm = fpzldm;
}
log.debug("{}标品开票接口发票种类转换为山能SAP发票种类,请求参数为:{},输出参数为:{}", LOGGER_MSG, fpzldm, fplxdm);
log.info("{}标品开票接口发票种类转换为山能SAP发票种类,请求参数为:{},输出参数为:{}", LOGGER_MSG, fpzldm, fplxdm);
return fplxdm;
}
@ -517,7 +517,7 @@ public class CommonUtils {
//如果发票种类为电票或者是电专,并且税控设备类型为新税控,方格UKey,UKey托管,U180UKey,返回都是ofd
if (OrderInfoEnum.ORDER_INVOICE_TYPE_51.getKey().equals(fpzldm) || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getKey().equals(fpzldm)) {
if (OrderInfoEnum.TAX_EQUIPMENT_NEWTAX.getKey().equals(terminalCode) || OrderInfoEnum.TAX_EQUIPMENT_FGUKEY.getKey().equals(terminalCode) || OrderInfoEnum.TAX_EQUIPMENT_UKEY.getKey().equals(terminalCode) || OrderInfoEnum.TAX_EQUIPMENT_U180_UKEY.getKey().equals(terminalCode)) {
log.debug("{}根据发票种类代码:{},税控设备类型:{},判断为ofd", LOGGER_MSG, fpzldm, terminalCode);
log.info("{}根据发票种类代码:{},税控设备类型:{},判断为ofd", LOGGER_MSG, fpzldm, terminalCode);
return true;
}
}
@ -660,7 +660,7 @@ public class CommonUtils {
* @return
*/
public static String getBz(String bz, String kplx, String fpzldm, String terminalCode, String yfpdm, String yfphm, String kce, String hzxxbbh) {
log.debug("{}获取备注信息请求参数,原始备注:{},开票类型为:{},发票种类代码为:{},终端标识为:{},原发票代码为:{},原发票号码为:{},扣除额为:{},红字信息表编号为:{}", LOGGER_MSG, bz, kplx, fpzldm, terminalCode, yfpdm, yfphm, kce, hzxxbbh);
log.info("{}获取备注信息请求参数,原始备注:{},开票类型为:{},发票种类代码为:{},终端标识为:{},原发票代码为:{},原发票号码为:{},扣除额为:{},红字信息表编号为:{}", LOGGER_MSG, bz, kplx, fpzldm, terminalCode, yfpdm, yfphm, kce, hzxxbbh);
String resultBz = bz;
if (StringUtils.isEmpty(bz)) {
bz = "";
@ -909,7 +909,7 @@ public class CommonUtils {
// }
// }
log.debug("{}获取备注信息返回备注为:{}", LOGGER_MSG, resultBz);
log.info("{}获取备注信息返回备注为:{}", LOGGER_MSG, resultBz);
return resultBz;
}

@ -69,7 +69,7 @@ public class HmacSha1Util {
if (flag) {
// 2、拼接API密钥
String content = url + keyVal.substring(0, keyVal.length() - 1);
log.debug("签名生成的String:{}", content);
log.info("签名生成的String:{}", content);
byte[] signBytes = hmacsha1(content.getBytes(StandardCharsets.UTF_8), secretKey.getBytes(StandardCharsets.UTF_8));
signStr = Base64.encodeBase64URLSafeString(signBytes);
}

@ -1,9 +1,7 @@
package com.dxhy.order.utils;
import cn.hutool.crypto.digest.MD5;
import cn.hutool.http.HttpRequest;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
@ -32,7 +30,7 @@ public class HttpUtils {
long startTime = System.currentTimeMillis();
String body = HttpRequest.post(url).form(requestMap).timeout(300000).execute().body();
long endTime = System.currentTimeMillis();
log.debug("{}以Map调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
log.info("{}以Map调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
return body;
}
//调用开放平台 bigdata 税控 票池
@ -40,7 +38,7 @@ public class HttpUtils {
long startTime = System.currentTimeMillis();
String body = HttpRequest.post(url).body(request).timeout(300000).execute().body();
long endTime = System.currentTimeMillis();
log.debug("{}以字符串调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
log.info("{}以字符串调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
return body;
}
//调用基础服务 如果不使用c48不用改造
@ -48,7 +46,7 @@ public class HttpUtils {
long startTime = System.currentTimeMillis();
String body = HttpRequest.post(url).addHeaders(header).body(data).timeout(300000).execute().body();
long endTime = System.currentTimeMillis();
log.debug("{}带head调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
log.info("{}带head调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
return body;
}
//调用大B获取用户 调用mqtt
@ -56,7 +54,7 @@ public class HttpUtils {
long startTime = System.currentTimeMillis();
String body = HttpRequest.get(url).addHeaders(header).timeout(300000).execute().body();
long endTime = System.currentTimeMillis();
log.debug("{}带head调用get请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
log.info("{}带head调用get请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
return body;
}
@ -64,7 +62,7 @@ public class HttpUtils {
long startTime = System.currentTimeMillis();
String body = HttpRequest.get(url).body(request).timeout(300000).execute().body();
long endTime = System.currentTimeMillis();
log.debug("{}以字符串调用get请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
log.info("{}以字符串调用get请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
return body;
}
@ -75,7 +73,7 @@ public class HttpUtils {
httpRequest.basicAuth(userName,password);
String body = httpRequest.body(request).timeout(300000).execute().body();
long endTime = System.currentTimeMillis();
log.debug("{}以字符串调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
log.info("{}以字符串调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
return body;
}
@ -85,7 +83,7 @@ public class HttpUtils {
httpRequest.basicAuth(userName,password);
String body = httpRequest.addHeaders(header).body(request).timeout(300000).execute().body();
long endTime = System.currentTimeMillis();
log.debug("{}以字符串调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
log.info("{}以字符串调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
return body;
}
/**

@ -70,7 +70,7 @@ public class NsrsbhUtils {
if (StringUtils.isNotEmpty(nsrsbh)) {
shList = new ArrayList<>();
shList.add(nsrsbh);
log.debug("{}转换之前数据为:{},转换之后数据为:{}", LOGGER_MSG, nsrsbh, JsonUtils.getInstance().toJsonString(shList));
log.info("{}转换之前数据为:{},转换之后数据为:{}", LOGGER_MSG, nsrsbh, JsonUtils.getInstance().toJsonString(shList));
}
return shList;
@ -99,7 +99,7 @@ public class NsrsbhUtils {
shList = null;
}
log.debug("{}转换之前数据为:{},转换之后数据为:{}", LOGGER_MSG, xhfNsrsbh, JsonUtils.getInstance().toJsonString(shList));
log.info("{}转换之前数据为:{},转换之后数据为:{}", LOGGER_MSG, xhfNsrsbh, JsonUtils.getInstance().toJsonString(shList));
return shList;
}

@ -48,7 +48,7 @@ public class InvoiceApplicationPushHandler implements BaseListener {
*/
public void reverse(String message) {
message = JsonUtils.getInstance().parseObject(message, String.class);
log.debug("{}发票申领任务推送队列消息数据:{}", LOGGER_MSG, message);
log.info("{}发票申领任务推送队列消息数据:{}", LOGGER_MSG, message);
try {
QyslTsMqData qyslTsMqData = JsonUtils.getInstance().parseObject(message, QyslTsMqData.class);
CommonTsMqData commonTsMqData = new CommonTsMqData();

@ -53,7 +53,7 @@ public class InvoiceFpkjHandler implements BaseListener {
*/
public void reverse(String message) {
message = JsonUtils.getInstance().parseObject(message, String.class);
log.debug("{}发票开具数据队列消息数据:{}", LOGGER_MSG, message);
log.info("{}发票开具数据队列消息数据:{}", LOGGER_MSG, message);
pollInvoiceService.pollInvoice(message);
}

@ -64,7 +64,7 @@ public class InvoiceFptsHandler implements BaseListener {
public void reverse(String message) {
message = JsonUtils.getInstance().parseObject(message, String.class);
log.debug("{}发票数据推送队列消息数据:{}", LOGGER_MSG, message);
log.info("{}发票数据推送队列消息数据:{}", LOGGER_MSG, message);
try {
//发票推送的message保证格式为带外层的数据
pushInvoiceService.pushRouting(message);

@ -51,7 +51,7 @@ public class InvoiceInsertCardHander implements BaseListener {
public void reverse(String message) {
message = JsonUtils.getInstance().parseObject(message, String.class);
log.debug("{}发票数据进行插卡数据:{}", LOGGER_MSG, message);
log.info("{}发票数据进行插卡数据:{}", LOGGER_MSG, message);
insertCardService.insertCard(message);
}

@ -54,7 +54,7 @@ public class InvoiceQyzttsHandler implements BaseListener {
*/
public void reverse(String message) {
message = JsonUtils.getInstance().parseObject(message, String.class);
log.debug("{}企业状态推送队列消息数据:{}", LOGGER_MSG, message);
log.info("{}企业状态推送队列消息数据:{}", LOGGER_MSG, message);
try {
QyztTsMqData qyztTsMqData = JsonUtils.getInstance().parseObject(message, QyztTsMqData.class);
CommonTsMqData commonTsMqData = new CommonTsMqData();

@ -53,7 +53,7 @@ public class InvoiceYxtsHandler implements BaseListener {
public void reverse(String message) {
message = JsonUtils.getInstance().parseObject(message, String.class);
log.debug("{}邮箱发送队列消息数据:{}", LOGGER_MSG, message);
log.info("{}邮箱发送队列消息数据:{}", LOGGER_MSG, message);
emailService.pushWithEmail(message);
}

@ -70,14 +70,14 @@ public class OrderCommonHandler implements BaseListener {
try {
message = JsonUtils.getInstance().parseObject(message, String.class);
log.debug("{}接收订单基础业务监听数据:{}", LOGGER_MSG, message);
log.info("{}接收订单基础业务监听数据:{}", LOGGER_MSG, message);
RabbitMqCommonMessage rabbitMqFanoutMessage = JsonUtils.getInstance().parseObject(message, RabbitMqCommonMessage.class);
if (OrderInfoEnum.RABBIT_COMMON_TYPE_0.getKey().equals(rabbitMqFanoutMessage.getType())) {
FgCommonOrderStatusBO fgCommonOrderStatusBO = JsonUtils.getInstance().parseObject(rabbitMqFanoutMessage.getData(), FgCommonOrderStatusBO.class);
List<FgCommonOrderStatusBO> fgCommonOrderStatusBOList = new ArrayList<>();
fgCommonOrderStatusBOList.add(fgCommonOrderStatusBO);
log.debug("方格通知接收成功:订单请求流水号:{}", fgCommonOrderStatusBO.getDDQQLSH());
log.info("方格通知接收成功:订单请求流水号:{}", fgCommonOrderStatusBO.getDDQQLSH());
fangGeInterfaceService.getInvoiceStatus(fgCommonOrderStatusBOList);
} else if (OrderInfoEnum.RABBIT_COMMON_TYPE_1.getKey().equals(rabbitMqFanoutMessage.getType())) {
OrderInvoiceInfo orderInvoiceInfo = JsonUtils.getInstance().parseObject(rabbitMqFanoutMessage.getData(), OrderInvoiceInfo.class);
@ -90,12 +90,12 @@ public class OrderCommonHandler implements BaseListener {
invoiceDataService.updateInvoiceBatchAndInvoiceInfo(updateOrderInvoiceInfo, NsrsbhUtils.transShListByNsrsbh(orderInvoiceInfo.getXhfNsrsbh()));
log.debug("{}修改发票和订单状态成功", LOGGER_MSG);
log.info("{}修改发票和订单状态成功", LOGGER_MSG);
} else if (OrderInfoEnum.RABBIT_COMMON_TYPE_2.getKey().equals(rabbitMqFanoutMessage.getType())) {
RabbitMqCommonInvoice orderInvoiceInfo = JsonUtils.getInstance().parseObject(rabbitMqFanoutMessage.getData(), RabbitMqCommonInvoice.class);
orderInvoiceInfoService.processDataAfterInvoice(orderInvoiceInfo);
log.debug("{}开票失败数据后续数据统一处理成功", LOGGER_MSG);
log.info("{}开票失败数据后续数据统一处理成功", LOGGER_MSG);
}
} catch (Exception e) {

@ -60,7 +60,7 @@ public class OrderFanoutHandler implements BaseListener {
try {
message = JsonUtils.getInstance().parseObject(message, String.class);
log.debug("{}接收广播模式消息数据:{}", LOGGER_MSG, message);
log.info("{}接收广播模式消息数据:{}", LOGGER_MSG, message);
RabbitMqFanoutMessage rabbitMqFanoutMessage = JsonUtils.getInstance().parseObject(message, RabbitMqFanoutMessage.class);
if (OrderInfoEnum.OPERATE_RABBITMQ_BY_FANOUT_TYPE_0.getKey().equals(rabbitMqFanoutMessage.getType())) {

@ -63,7 +63,7 @@ public class OrderGetRepairHandler implements BaseListener {
try {
message = JsonUtils.getInstance().parseObject(message, String.class);
log.debug("{}接收底层推送修复消息数据:{}", LOGGER_MSG, message);
log.info("{}接收底层推送修复消息数据:{}", LOGGER_MSG, message);
//数据接收对象和历史数据导入对象一致,
DdfpdrReqBO ddfpdrReqBO = JsonUtils.getInstance().parseObject(message, DdfpdrReqBO.class);
if (ObjectUtil.isEmpty(ddfpdrReqBO)) {

@ -57,7 +57,7 @@ public class OrderReceiveInvoiceHandler implements BaseListener {
try {
message = JsonUtils.getInstance().parseObject(message, String.class);
log.debug("{}订单接收发票消息数据:{}", LOGGER_MSG, message);
log.info("{}订单接收发票消息数据:{}", LOGGER_MSG, message);
InvoicePush invoicePush = JsonUtils.getInstance().parseObject(message, InvoicePush.class);
invoiceReceiveService.receiveInvoice(invoicePush);

@ -65,7 +65,7 @@ public class OrderSaveGhfInfoHandler implements BaseListener {
try {
message = JsonUtils.getInstance().parseObject(message, String.class);
log.debug("{}保存购方消息数据:{}", LOGGER_MSG, message);
log.info("{}保存购方消息数据:{}", LOGGER_MSG, message);
OrderInvoiceInfo orderInvoiceInfo = JsonUtils.getInstance().parseObject(message, OrderInvoiceInfo.class);
//数据不为空组装数据,更新购方信息

@ -97,7 +97,7 @@ public class OrderSaveSpxxHandler implements BaseListener {
try {
message = JsonUtils.getInstance().parseObject(message, String.class);
log.debug("{}保存商品消息数据:{}", LOGGER_MSG, message);
log.info("{}保存商品消息数据:{}", LOGGER_MSG, message);
OrderInvoiceInfo orderInvoiceInfo = JsonUtils.getInstance().parseObject(message, OrderInvoiceInfo.class);
/**
* 根据发票种类判断插入商品税编还是车辆税编

@ -105,19 +105,19 @@ public class OrderSecurityFilter implements Filter {
public String filter(final String input) {
String s = input;
log.debug("************************************************");
log.debug(" INPUT: " + input);
log.info("************************************************");
log.info(" INPUT: " + input);
s = checkSqlInjection(s);
log.debug(" checkSqlInjection: " + s);
log.info(" checkSqlInjection: " + s);
s = checkShellCommandInjection(s);
log.debug(" checkShellCommandInjection: " + s);
log.info(" checkShellCommandInjection: " + s);
s = checkScriptAttack(s);
log.debug(" checkScriptAttack: " + s);
log.info(" checkScriptAttack: " + s);
log.debug("************************************************\n\n");
log.info("************************************************\n\n");
return s;
}

@ -63,7 +63,7 @@ public class C48LxpTask {
@XxlJob("C48LxpTask")
public ReturnT<String> execute(String param) {
log.debug("{}定时任务开始,请求参数:{}", LOGGER_MSG, param);
log.info("{}定时任务开始,请求参数:{}", LOGGER_MSG, param);
/**
* 根据请求参数去处理数据
@ -145,7 +145,7 @@ public class C48LxpTask {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return ReturnT.FAIL;
}
log.debug("{}定时任务完成", LOGGER_MSG);
log.info("{}定时任务完成", LOGGER_MSG);
return ReturnT.SUCCESS;
}
@ -156,9 +156,9 @@ public class C48LxpTask {
Map<String, String> headMap = new HashMap<>(2);
headMap.put("Content-Type", ConfigureConstant.STRING_APPLICATION_JSON);
log.debug("{}请求参数为:{}", LOGGER_MSG, request);
log.info("{}请求参数为:{}", LOGGER_MSG, request);
String post = HttpUtils.doPostWithHeader(url, request, headMap);
log.debug("{}请求结果为:{}", LOGGER_MSG, post);
log.info("{}请求结果为:{}", LOGGER_MSG, post);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (ConfigureConstant.STRING_0.equals(jsonObject.get(CODE))) {
int count = 0;
@ -175,7 +175,7 @@ public class C48LxpTask {
}
log.debug("请求数据为:{},请求结果数量为:{}", nsrsbh, count);
log.info("请求数据为:{},请求结果数量为:{}", nsrsbh, count);
} else {
if (jsonObject.get(MSG).toString().contains(RETURN_MSG2)
|| jsonObject.get(MSG).toString().contains(RETURN_MSG3)) {
@ -241,7 +241,7 @@ public class C48LxpTask {
headMap1.put("Content-Type", ConfigureConstant.STRING_APPLICATION_JSON);
String post1 = HttpUtils.doPostWithHeader(lxpurl, lxprequest, headMap1);
log.debug("线程为:{},请求数据:{},离线上传请求结果为:{}", Thread.currentThread().getId(), JsonUtils.getInstance().toJsonString(reqList.get(0)), post1);
log.info("线程为:{},请求数据:{},离线上传请求结果为:{}", Thread.currentThread().getId(), JsonUtils.getInstance().toJsonString(reqList.get(0)), post1);
JSONObject jsonObject2 = JSONUtil.parseObj(post1);
if (ConfigureConstant.STRING_0.equals(jsonObject2.get("code"))) {
@ -252,7 +252,7 @@ public class C48LxpTask {
if (lxpsbCount > 30) {
break;
}
log.debug("线程为:{},离线上传请求成功,一共:{}条数据,当前为:{}条,处理成功:{}条", Thread.currentThread().getId(), list.size(), (i1 + 1), lxpcgCount);
log.info("线程为:{},离线上传请求成功,一共:{}条数据,当前为:{}条,处理成功:{}条", Thread.currentThread().getId(), list.size(), (i1 + 1), lxpcgCount);
} catch (Exception e) {
log.error("线程为:{},当前处理第{}条数据,离线上传异常:{}", Thread.currentThread().getId(), (i1 + 1), e);
continue;

@ -79,7 +79,7 @@ public class FangGeInvoiceResendMsgTask {
for (TaxEquipmentInfo taxEquipmentInfo : taxEquipmentInfos) {
shList.add(taxEquipmentInfo.getXhfNsrsbh());
}
log.debug("========>{}定时任务开始!!!!参数:{}", LOGGER_MSG, param);
log.info("========>{}定时任务开始!!!!参数:{}", LOGGER_MSG, param);
if (StringUtils.isEmpty(param)) {
log.warn("请输入参数,要重发多少分钟之前的开票信息");
return ReturnT.FAIL;
@ -99,7 +99,7 @@ public class FangGeInvoiceResendMsgTask {
paraMap.put(ConfigureConstant.REQUEST_PARAM_ORDER_STATUS, OrderInfoEnum.ORDER_VALID_STATUS_0.getKey());
List<OrderProcessInfo> orderProcessInfos = orderProcessService.selectOrderProcessByFpqqlshDdhNsrsbh(paraMap, shList);
log.debug("===========》需要开票的数据:{}", JsonUtils.getInstance().toJsonString(orderProcessInfos));
log.info("===========》需要开票的数据:{}", JsonUtils.getInstance().toJsonString(orderProcessInfos));
if (ObjectUtil.isEmpty(orderProcessInfos)) {
return ReturnT.SUCCESS;
}
@ -163,7 +163,7 @@ public class FangGeInvoiceResendMsgTask {
//存放redis成功,修改开票状态为开票中
boolean isSuccess = orderProcessService.updateKpzt(info.getFpqqlsh(), OrderInfoEnum.ORDER_STATUS_4.getKey(), OrderInfoEnum.INVOICE_STATUS_1.getKey(), "", "", "", "", shList);
if (isSuccess) {
log.debug("===========》开票中状态发票数据更新成功,流水号为:[{}]", info.getDdzt());
log.info("===========》开票中状态发票数据更新成功,流水号为:[{}]", info.getDdzt());
}
}

@ -47,7 +47,7 @@ public class GetGsClientTask {
@XxlJob("/getGsClient")
public ReturnT<String> execute(String s) {
try {
log.debug("{}任务开始", LOGGER_MSG);
log.info("{}任务开始", LOGGER_MSG);
long startTime = System.currentTimeMillis();
List<GsClient> list = new ArrayList<>();
String poClient = baseServiceConfig.getPoClient();
@ -91,7 +91,7 @@ public class GetGsClientTask {
log.info("{}插入gs_client表",LOGGER_MSG);
gsClientMapper.insertList(list);
long endTime = System.currentTimeMillis();
log.debug("{}任务结束,耗时:{}", LOGGER_MSG, endTime - startTime);
log.info("{}任务结束,耗时:{}", LOGGER_MSG, endTime - startTime);
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return ReturnT.FAIL;

@ -94,11 +94,11 @@ public class GzhProcessFailInvoiceTask {
/**
* 查询数据库数据
*/
log.debug("{}查询公众号已授权未开票请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(paramMap));
log.info("{}查询公众号已授权未开票请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(paramMap));
List<OrderQrcodeExtendInfo> orderQrcodeExtendInfoList = orderQrcodeExtendService.selectOrderQrcodeExtendInfoForTask(paramMap, shList);
if (ObjectUtil.isNotEmpty(orderQrcodeExtendInfoList)) {
for (OrderQrcodeExtendInfo orderQrcodeExtendInfo : orderQrcodeExtendInfoList) {
log.debug("{}处理公众号已授权未开票数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderQrcodeExtendInfo));
log.info("{}处理公众号已授权未开票数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderQrcodeExtendInfo));
try {
@ -136,7 +136,7 @@ public class GzhProcessFailInvoiceTask {
r = scanInvoiceService.authOrderInvoice(orderQrcodeExtendInfo.getAuthOrderId());
}
log.debug("{}开票申请调用结果为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(r));
log.info("{}开票申请调用结果为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(r));
}

@ -59,7 +59,7 @@ public class ProcessQueueTask {
@XxlJob("processQueueTask")
public ReturnT<String> execute(String param) {
log.debug("{}定时任务开始,请求参数:{}", LOGGER_MSG, param);
log.info("{}定时任务开始,请求参数:{}", LOGGER_MSG, param);
/**
* 根据请求参数去处理数据
@ -169,7 +169,7 @@ public class ProcessQueueTask {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return ReturnT.FAIL;
}
log.debug("{}定时任务完成", LOGGER_MSG);
log.info("{}定时任务完成", LOGGER_MSG);
return ReturnT.SUCCESS;
}

@ -57,7 +57,7 @@ public class SyncQdHzqrdTask {
@PostMapping("/sync")
@XxlJob("/qdHzqrdTask")
public ReturnT<String> execute(String param) {
log.debug("{}定时任务开始,请求参数:{}", LOGGER_MSG, param);
log.info("{}定时任务开始,请求参数:{}", LOGGER_MSG, param);
try {
/**
* {
@ -124,7 +124,7 @@ public class SyncQdHzqrdTask {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return ReturnT.FAIL;
}
log.debug("{}定时任务完成", LOGGER_MSG);
log.info("{}定时任务完成", LOGGER_MSG);
return ReturnT.SUCCESS;
}

@ -49,7 +49,7 @@ public class SyncSpecialInvoiceReversalTask {
List<String> taxpayerCodes = specialInvoiceReversalService.querySpecialInvoiceReversalTaxpayerCodes();
log.debug("{}同步红色申请单定时任务开始,总企业税号数:{}", LOGGER_MSG, taxpayerCodes.size());
log.info("{}同步红色申请单定时任务开始,总企业税号数:{}", LOGGER_MSG, taxpayerCodes.size());
for (String taxpayerCode : taxpayerCodes) {
Calendar currentCalendar = Calendar.getInstance();
@ -68,12 +68,12 @@ public class SyncSpecialInvoiceReversalTask {
}
}
log.debug("红字申请单信息同步返回信息:{}", JsonUtils.getInstance().toJsonString(resultMap));
log.info("红字申请单信息同步返回信息:{}", JsonUtils.getInstance().toJsonString(resultMap));
}
long endTime = System.currentTimeMillis();
log.debug("{}同步红色申请单定时任务结束,耗时:{}", LOGGER_MSG, endTime - startTime);
log.info("{}同步红色申请单定时任务结束,耗时:{}", LOGGER_MSG, endTime - startTime);
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return ReturnT.FAIL;

@ -58,7 +58,7 @@ public class SyncTask {
@XxlJob(value = "ukeySyncTask")
public void ukeySyncTask() {
String param = XxlJobHelper.getJobParam();
log.debug("{}定时任务开始,请求参数:{}", LOGGER_MSG, param);
log.info("{}定时任务开始,请求参数:{}", LOGGER_MSG, param);
/**
* 根据请求参数去处理数据
@ -118,7 +118,7 @@ public class SyncTask {
if (StringUtils.isBlank(operateStatusResult) || OrderInfoEnum.ORDER_OPERATE_STATUS_99.getKey().equals(operateStatusResult) || OrderInfoEnum.ORDER_OPERATE_STATUS_8.getKey().equals(operateStatusResult)) {
//调用同步接口
R r = invoiceService.syncInvoice(orderProcessInfo.getFpqqlsh(), orderProcessInfo.getXhfNsrsbh());
log.debug("{}定时任务执行结果:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(r));
log.info("{}定时任务执行结果:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(r));
}
}
@ -132,7 +132,7 @@ public class SyncTask {
return ;
}
XxlJobHelper.log("{}定时任务完成", LOGGER_MSG);
log.debug("{}定时任务完成", LOGGER_MSG);
log.info("{}定时任务完成", LOGGER_MSG);
return ;
}

@ -134,7 +134,7 @@ public class U180InvalidInvoiceResultTask {
}
} else {
log.debug("{}未查询到需要获取作废结果的数据", LOGGER_MSG);
log.info("{}未查询到需要获取作废结果的数据", LOGGER_MSG);
}
} catch (Exception e) {

@ -87,9 +87,9 @@ public class BigDataServiceImpl implements BigDataService {
final DateTime begin = DateTime.now();
String pushBigDataUrl = openApiConfig.getPushBigDataUrl();
log.debug("{}向大数据发送数据开始,URL:{},请求参数为:{}", LOGGER_MSG, pushBigDataUrl, pushXml);
log.info("{}向大数据发送数据开始,URL:{},请求参数为:{}", LOGGER_MSG, pushBigDataUrl, pushXml);
String result = HttpUtils.doPost(pushBigDataUrl, pushXml);
log.debug("{}大数据接口返回报文:{},, 耗时{}毫秒", LOGGER_MSG, result, new Duration(begin, DateTime.now()).getMillis());
log.info("{}大数据接口返回报文:{},, 耗时{}毫秒", LOGGER_MSG, result, new Duration(begin, DateTime.now()).getMillis());
} catch (Exception e) {
log.error("{}流水号:{},大数据接口异常信息:{}", LOGGER_MSG, orderInvoiceInfo1.getFpqqlsh(), e);

@ -103,10 +103,10 @@ public class InvoiceReceiveController {
//调用数据处理的接口
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{},接收发票推送的接口入参:{}", LOGGER_MSG, data);
log.info("{},接收发票推送的接口入参:{}", LOGGER_MSG, data);
rabbitMqSendMessageService.autoSendRabbitMqMessageForBusiness(NsrQueueEnum.ORDER_RECEIVE_INVOICE_MESSAGE.getValue(), data);
log.debug("{},接收发票推送的接口完成", LOGGER_MSG);
log.info("{},接收发票推送的接口完成", LOGGER_MSG);
return R.ok();
} catch (Exception e) {
log.error("{}接收发票信息异常:{}", LOGGER_MSG, e);
@ -123,7 +123,7 @@ public class InvoiceReceiveController {
public R invoiceRepair(HttpServletRequest request) {
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{},接收发票修复推送的接口入参:{}", LOGGER_MSG, data);
log.info("{},接收发票修复推送的接口入参:{}", LOGGER_MSG, data);
//数据接收对象和历史数据导入对象一致,
DdfpdrReqBO ddfpdrReqBO = JsonUtils.getInstance().parseObject(data, DdfpdrReqBO.class);
if (ObjectUtil.isEmpty(ddfpdrReqBO)) {
@ -135,7 +135,7 @@ public class InvoiceReceiveController {
}
List<DdfpdrRspBO> ddfpdrRspList = interfaceServiceV3.importIssuedInvoice(ddfpzxxList, OrderInfoEnum.ORDER_SOURCE_9.getKey(),
"", ConfigurerInfo.INTERFACE_VERSION_V4);
log.debug("{}接收发票修复数据接口返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(ddfpdrRspList));
log.info("{}接收发票修复数据接口返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(ddfpdrRspList));
return R.ok().put(OrderManagementConstant.DATA, JsonUtils.getInstance().toJsonStringNullToEmpty(ddfpdrRspList));
} catch (OrderReceiveException e) {
@ -161,7 +161,7 @@ public class InvoiceReceiveController {
log.info("{}接收数电发票数据回推数据,入参:{}", LOGGER_MSG, data);
interfaceData = ProtocolUtil.decodeData(data);
log.debug("{}接收数电发票数据回推数据,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
log.info("{}接收数电发票数据回推数据,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
List<QdInvoicePushBackRequest> qdInvoicePushBackRequestList = JsonUtils.getInstance().jsonToList(interfaceData.getData(), QdInvoicePushBackRequest.class);
//判断入参是否为空
@ -219,10 +219,10 @@ public class InvoiceReceiveController {
InterfaceData interfaceData = new InterfaceData();
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}接收税控发票修复数据,入参:{}", LOGGER_MSG, data);
log.info("{}接收税控发票修复数据,入参:{}", LOGGER_MSG, data);
interfaceData = ProtocolUtil.decodeData(data);
log.debug("{}接收税控发票修复数据,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
log.info("{}接收税控发票修复数据,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
DdfpdrReqBO ddfpdrReqBO = JsonUtils.getInstance().parseObject(interfaceData.getData(), DdfpdrReqBO.class);
if (ObjectUtil.isEmpty(ddfpdrReqBO)) {
@ -232,7 +232,7 @@ public class InvoiceReceiveController {
List<DdfpzxxBO> ddfpzxxList = ddfpdrReqBO.getDDFPZXX();
List<DdfpdrRspBO> ddfpdrRspList = interfaceServiceV3.importIssuedInvoice(ddfpzxxList, OrderInfoEnum.ORDER_SOURCE_9.getKey(),
"", ConfigurerInfo.INTERFACE_VERSION_V4);
log.debug("{}接收税控发票修复数据,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(ddfpdrRspList));
log.info("{}接收税控发票修复数据,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(ddfpdrRspList));
return buildReturnData(interfaceData, OrderInfoEnum.INTERFACE_SUCCESS.getKey(),
OrderInfoEnum.INTERFACE_SUCCESS.getValue(), ddfpdrRspList);
@ -257,7 +257,7 @@ public class InvoiceReceiveController {
} catch (Exception e) {
log.error("{}接收税控发票修复数据加密,异常:{}", LOGGER_MSG, e);
}
log.debug("{}接收税控发票修复数据接口,加密返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(interfaceData));
log.info("{}接收税控发票修复数据接口,加密返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(interfaceData));
return interfaceData;
}
@ -271,9 +271,9 @@ public class InvoiceReceiveController {
//调用数据处理的接口
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}方格开票结果接收入参:{}", LOGGER_MSG, data);
log.info("{}方格开票结果接收入参:{}", LOGGER_MSG, data);
InterfaceData interfaceData = ProtocolUtil.decodeData(data);
log.debug("{}方格开票结果,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
log.info("{}方格开票结果,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
InvoicePushFg invoicePushFg = JsonUtils.getInstance().parseObject(interfaceData.getData(), InvoicePushFg.class);
R r = R.ok();
@ -308,7 +308,7 @@ public class InvoiceReceiveController {
}
TaxEquipmentInfo taxEquipmentInfo = simsBackService.queryTaxEquipment(interfaceData.getTaxpayerNo(), oldOrderInvoiceInfo.getEntId());
log.debug("{}查询销项后台销方开票状态,返回结果:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfo));
log.info("{}查询销项后台销方开票状态,返回结果:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfo));
//开票开关
String invoicingSwitch = "";
if (Objects.nonNull(taxEquipmentInfo)) {
@ -399,7 +399,7 @@ public class InvoiceReceiveController {
r = invoiceReceiveService.receiveInvoice(invoicePush);
}
log.debug("{}方格开票结果的接口完成", LOGGER_MSG);
log.info("{}方格开票结果的接口完成", LOGGER_MSG);
return r;
} catch (Exception e) {
log.error("{}方格开票结果异常:{}", LOGGER_MSG, e);
@ -417,11 +417,11 @@ public class InvoiceReceiveController {
//调用数据处理的接口
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}方格信息表上传结果接收入参:{}", LOGGER_MSG, data);
log.info("{}方格信息表上传结果接收入参:{}", LOGGER_MSG, data);
R r = specialInvoiceService.receiveFgSpecialInvoiceDownLoad(data);
log.debug("{}方格信息表下载结果的接口完成", LOGGER_MSG);
log.info("{}方格信息表下载结果的接口完成", LOGGER_MSG);
return r;
} catch (Exception e) {
log.error("{}方格信息表下载结果异常:{}", LOGGER_MSG, e);
@ -439,11 +439,11 @@ public class InvoiceReceiveController {
//调用数据处理的接口
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}方格信息表上传结果接收入参:{}", LOGGER_MSG, data);
log.info("{}方格信息表上传结果接收入参:{}", LOGGER_MSG, data);
R r = specialInvoiceService.receiveFgSpecialInvoiceUpLoad(data);
log.debug("{}方格信息表上传结果接口完成", LOGGER_MSG);
log.info("{}方格信息表上传结果接口完成", LOGGER_MSG);
return r;
} catch (Exception e) {
log.error("{}方格信息表上传结果异常:{}", LOGGER_MSG, e);
@ -462,11 +462,11 @@ public class InvoiceReceiveController {
//调用数据处理的接口
try {
String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
log.debug("{}方格作废结果接收入参:{}", LOGGER_MSG, data);
log.info("{}方格作废结果接收入参:{}", LOGGER_MSG, data);
R r = invalidInvoiceService.receiveFgInvoiceInvalid(data);
log.debug("{}方格作废结果接口完成", LOGGER_MSG);
log.info("{}方格作废结果接口完成", LOGGER_MSG);
return r;
} catch (Exception e) {
log.error("{}方格作废结果异常:{}", LOGGER_MSG, e);

@ -41,7 +41,7 @@ public class ProcessInvoiceController {
@PostMapping("/invalidAndReInvoice")
@SysLog(operation = "发票批量作废重开接口", operationDesc = "提供产品使用,发票批量作废重开", key = "发票作废重开")
public R invalidAndReInvoice(@ApiParam(name = "ddqqlshList", value = "请求数据", required = true) @RequestBody String ddqqlshList) {
log.debug("{}发票批量作废重开接口,入参:{}", LOGGER_MSG, ddqqlshList);
log.info("{}发票批量作废重开接口,入参:{}", LOGGER_MSG, ddqqlshList);
/**
* 请求参数

@ -142,7 +142,7 @@ public class InvoiceDataServiceImpl implements InvoiceDataService {
*
*
*/
log.debug("{}更新发票相关信息,发票数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInvoiceInfo));
log.info("{}更新发票相关信息,发票数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInvoiceInfo));
//数据库查询发票数据,如果不为空,执行相关操作
OrderInvoiceInfo dbOrderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfoByFpqqlsh(orderInvoiceInfo.getFpqqlsh(), shList);
@ -162,7 +162,7 @@ public class InvoiceDataServiceImpl implements InvoiceDataService {
if (updateInvoiceBatchItemByKplsh == 0) {
log.error("{}更新批次明细表状态失败,数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(insertInvoiceBatchRequestItem));
}
log.debug("{}更新批次明细表状态完成,发票请求流水号为:{}", LOGGER_MSG, dbOrderInvoiceInfo.getFpqqlsh());
log.info("{}更新批次明细表状态完成,发票请求流水号为:{}", LOGGER_MSG, dbOrderInvoiceInfo.getFpqqlsh());
//查询发票批次表数据,如果不为空,更新批次表状态
InvoiceBatchRequest oldInvoiceBatchRequest = invoiceBatchRequestMapper.selectInvoiceBatchRequestByFpqqpch(oldInvoiceBatchRequestItem.getFpqqpch(), shList);
@ -179,7 +179,7 @@ public class InvoiceDataServiceImpl implements InvoiceDataService {
if (updateInvoiceBatchRequest == 0) {
log.error("{}修改发票批次表失败,数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(insertInvoiceBatchRequest));
}
log.debug("{}更新批次表状态完成,发票请求流水号为:{}", LOGGER_MSG, dbOrderInvoiceInfo.getFpqqlsh());
log.info("{}更新批次表状态完成,发票请求流水号为:{}", LOGGER_MSG, dbOrderInvoiceInfo.getFpqqlsh());
} else {
log.error("{}通发批次号{}得到批次表信息为空!", LOGGER_MSG, oldInvoiceBatchRequestItem.getFpqqpch());

@ -810,7 +810,7 @@ public class InvoiceServiceImpl implements InvoiceService {
throw e;
}
}
log.debug("数据拆分补全后的数据:{}", JsonUtils.getInstance().toJsonString(orderSplit));
log.info("数据拆分补全后的数据:{}", JsonUtils.getInstance().toJsonString(orderSplit));
splitList.add(orderSplit);
}
//超限额返回前端提示
@ -1090,7 +1090,7 @@ public class InvoiceServiceImpl implements InvoiceService {
if (ObjectUtil.isNotNull(orderInvoiceInfo) && OrderInfoEnum.INVOICE_STATUS_1.getKey().equals(orderInvoiceInfo.getKpzt())) {
//订单请求未发送到底层,返回前端不可编辑或者
log.debug("{}订单请求未发送到底层,返回前端不可编辑或者", LOGGER_MSG);
log.info("{}订单请求未发送到底层,返回前端不可编辑或者", LOGGER_MSG);
CommonInvoiceStatus commonInvoicestatus = new CommonInvoiceStatus();
commonInvoicestatus.setFpzt(OrderInfoEnum.INVOICE_QUERY_STATUS_4001.getKey());
commonInvoicestatus.setFpqqlsh(orderInvoiceInfo.getKplsh());
@ -1105,7 +1105,7 @@ public class InvoiceServiceImpl implements InvoiceService {
if (StringUtils.isNotEmpty(operateDdqqlshResult)) {
if (OrderInfoEnum.ORDER_OPERATE_STATUS_1.getKey().equals(operateDdqqlshResult)) {
//订单请求未发送到底层,返回前端不可编辑或者
log.debug("{}订单请求未发送到底层,返回前端不可编辑或者", LOGGER_MSG);
log.info("{}订单请求未发送到底层,返回前端不可编辑或者", LOGGER_MSG);
CommonInvoiceStatus commonInvoicestatus = new CommonInvoiceStatus();
commonInvoicestatus.setFpzt(OrderInfoEnum.INVOICE_QUERY_STATUS_4001.getKey());
commonInvoicestatus.setFpqqlsh(orderInvoiceInfo.getKplsh());
@ -1131,7 +1131,7 @@ public class InvoiceServiceImpl implements InvoiceService {
commonInvoicestatus.setFpqqlsh(orderInvoiceInfo.getKplsh());
commonInvoicestatus.setStatusCode(OrderInfoContentEnum.SUCCESS.getKey());
commonInvoicestatus.setStatusMessage(OrderInfoContentEnum.SUCCESS.getMessage());
log.debug("{}订单请求未发送到底层,返回前端不可编辑或者", LOGGER_MSG);
log.info("{}订单请求未发送到底层,返回前端不可编辑或者", LOGGER_MSG);
if (OrderInfoEnum.INVOICE_STATUS_3.getKey().equals(orderInvoiceInfo.getKpzt())) {
commonInvoicestatus.setFpzt(OrderInfoEnum.INVOICE_QUERY_STATUS_2101.getKey());
commonInvoicestatus.setFpztms(OrderInfoEnum.INVOICE_QUERY_STATUS_2101.getValue());
@ -1242,7 +1242,7 @@ public class InvoiceServiceImpl implements InvoiceService {
* 同步底层数据,如果发票表有数据,并且是开票中,根据底层返回状态,更新对应状态为开票失败
*/
if (ObjectUtil.isNotEmpty(orderInvoiceInfo) && OrderInfoEnum.INVOICE_STATUS_1.getKey().equals(orderInvoiceInfo.getKpzt())) {
log.debug("{}开票查询结果更新发票和订单状态", LOGGER_MSG);
log.info("{}开票查询结果更新发票和订单状态", LOGGER_MSG);
orderProcessService.updateKpzt(orderInvoiceInfo.getFpqqlsh(), OrderInfoEnum.ORDER_STATUS_6.getKey(), OrderInfoEnum.INVOICE_STATUS_3.getKey(), commonInvoiceStatus.getFpztms(), "", "", "", shList);
}

@ -1135,7 +1135,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
String fpqqlsh = commonTsMqData.getFpTsMqData().getFpqqlsh();
String pollDelayCountKey = String.format(RedisConstant.POOL_SEND_PUSH_DELAY_RETRY_COUNT, fpqqlsh);
String pollDelayCount = redisService.get(pollDelayCountKey);
log.debug("{}获取redis缓存中推送数据放入延时队列重试次数,key值:{},次数:{}", LOGGER_MSG,
log.info("{}获取redis缓存中推送数据放入延时队列重试次数,key值:{},次数:{}", LOGGER_MSG,
pollDelayCountKey, pollDelayCount);
/**
* 数据放入延时队列,按照次数判断时长,
@ -1177,9 +1177,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
updatePushErrorMsgToDb(fpqqlsh, errorMsg, shList);
//不删除,改为修改过期时间,5分钟内不会再次推送
redisService.set(pollDelayCountKey, Integer.toString(count), RedisConstant.REDIS_EXPIRE_TIME_5MIN);
log.debug("{}推送数据放入延时队列重试次数删除redis缓存,key值:{}", LOGGER_MSG, pollDelayCountKey);
log.info("{}推送数据放入延时队列重试次数删除redis缓存,key值:{}", LOGGER_MSG, pollDelayCountKey);
}
log.debug("{}设置redis缓存中推送数据放入延时队列重试次数,key值:{},次数:{}", LOGGER_MSG,
log.info("{}设置redis缓存中推送数据放入延时队列重试次数,key值:{},次数:{}", LOGGER_MSG,
pollDelayCountKey, count);
}
@ -1201,7 +1201,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
*/
updateOrderInvoiceInfo.setFpqqlsh(ddfptsV5.getDDQQLSH());
if (ConfigureConstant.STRING_000000.equals(ddfptsV5.getZTDM())) {
log.debug("==>推送返回解析成功,更新数据库表开始!");
log.info("==>推送返回解析成功,更新数据库表开始!");
updateOrderInvoiceInfo.setPushStatus(OrderInfoEnum.PUSH_STATUS_1.getKey());
updateOrderInvoiceInfo.setInvoicePushSbyy("");
} else {
@ -1277,7 +1277,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
if (!ConfigureConstant.STRING_0000.equals(responseV4BO.getZTDM())) {
log.error("推送返回结果失败");
} else {
log.debug("推送返回结果完成");
log.info("推送返回结果完成");
}
log.info("{}推送企业状态结束", LOGGER_MSG);
@ -1287,7 +1287,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
if (!ConfigureConstant.STRING_0000.equals(pushfpslRspBO.getZTDM())) {
log.error("推送企业状态返回结果失败");
} else {
log.debug("推送企业状态返回结果完成");
log.info("推送企业状态返回结果完成");
}
log.info("{}推送企业状态结束", LOGGER_MSG);
@ -1297,7 +1297,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
if (!ConfigureConstant.STRING_000000.equals(responseV4BO.getZTDM())) {
log.error("推送京东万家返回结果失败");
} else {
log.debug("推送京东万家返回结果完成");
log.info("推送京东万家返回结果完成");
}
log.info("{}推送京东万家结束", LOGGER_MSG);
@ -1307,7 +1307,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
if (!ConfigureConstant.STRING_000000.equals(responseV4BO.getZTDM())) {
log.error("推送京东失败状态返回结果失败");
} else {
log.debug("推送京东失败状态返回结果完成");
log.info("推送京东失败状态返回结果完成");
}
log.info("{}推送京东失败状态结束", LOGGER_MSG);
@ -1430,7 +1430,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
JdwjMqData jdwjMqData = commonTsMqData.getJdwjMqData();
content = getJdwjPushContent(jdwjMqData);
}
log.debug("{}组装推送content为:{}",LOGGER_MSG,content);
log.info("{}组装推送content为:{}",LOGGER_MSG,content);
return content;
}

@ -63,7 +63,7 @@ public class OilController {
R r;
try {
log.debug("{},局端库存查询入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(request));
log.info("{},局端库存查询入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(request));
r = oilService.queryOilJdkc(request);
return r;
} catch (Exception e) {
@ -82,7 +82,7 @@ public class OilController {
//调用数据处理的接口
R r;
try {
log.debug("{},成品油库存下载入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(request));
log.info("{},成品油库存下载入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(request));
r = oilService.oilDownload(request);
return r;
} catch (Exception e) {
@ -101,7 +101,7 @@ public class OilController {
//调用数据处理的接口
R r;
try {
log.debug("{},成品油库下载、退回记录查询入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(request));
log.info("{},成品油库下载、退回记录查询入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(request));
r = oilService.queryOilLog(request);
return r;
} catch (Exception e) {
@ -119,7 +119,7 @@ public class OilController {
public R retryOilDownload(@RequestBody OilLog request) {
R r;
try {
log.debug("{},成品油库存下载-重试入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(request));
log.info("{},成品油库存下载-重试入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(request));
r = oilService.retryOilDownload(request);
return r;
} catch (Exception e) {
@ -137,7 +137,7 @@ public class OilController {
R r;
try {
log.debug("{},本地库存查询入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(request));
log.info("{},本地库存查询入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(request));
r = oilService.queryOilBdkc(request);
return r;
} catch (Exception e) {
@ -155,7 +155,7 @@ public class OilController {
R r;
try {
log.debug("{},成品油库存退回入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(request));
log.info("{},成品油库存退回入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(request));
r = oilService.oilReturn(request);
return r;
} catch (Exception e) {
@ -173,7 +173,7 @@ public class OilController {
R r;
try {
log.debug("{},成品油库存退回-重试入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(request));
log.info("{},成品油库存退回-重试入参:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(request));
r = oilService.retryOilReturn(request);
return r;
} catch (Exception e) {

@ -253,7 +253,7 @@ public class BuyerController {
try {
// 从excel中读取数据
long t1 = System.currentTimeMillis();
log.debug("{}excel读取开始,当前时间:{}", LOGGER_MSG, t1);
log.info("{}excel读取开始,当前时间:{}", LOGGER_MSG, t1);
Map<String, String> headToProperty = new HashMap<>(10);
// 转换枚举类
@ -262,7 +262,7 @@ public class BuyerController {
}
List<BuyerImportExcel> importExcelList = excelReadService.transExcelToList(file, BuyerImportExcel.class, headToProperty, ConfigureConstant.INT_0, ConfigureConstant.INT_0);
long t2 = System.currentTimeMillis();
log.debug("{}excel读取开始,当前时间{},耗时:{}", LOGGER_MSG, t2, t2 - t1);
log.info("{}excel读取开始,当前时间{},耗时:{}", LOGGER_MSG, t2, t2 - t1);
if (ObjectUtil.isEmpty(importExcelList)) {
Map<String, Object> resultMap = new HashMap<>(10);
@ -370,7 +370,7 @@ public class BuyerController {
@ApiOperation(value = "购方信息精确查询", notes = "购方信息管理-购方信息精确查询")
@SysLog(operation = "购方信息精确查询", operationDesc = "购方信息精确查询操作", key = "购方信息管理")
public R queryPlatformBuyerInfo(@RequestParam String purchaseName, @RequestParam(required = false) String xhfNsrsbh, @ApiParam(name = "entList", value = "数据组织Id数组", required = false) @RequestParam(value = "entList", required = false) String entList) {
log.debug("{}查询购方发票列表开始,购方名称:{},税号:{}", LOGGER_MSG, purchaseName, xhfNsrsbh);
log.info("{}查询购方发票列表开始,购方名称:{},税号:{}", LOGGER_MSG, purchaseName, xhfNsrsbh);
BuyerEntity buyerEntity = new BuyerEntity();
List<String> shList;
if (StringUtils.isNotBlank(xhfNsrsbh)) {

@ -88,7 +88,7 @@ public class OrderInfoController {
@SysLog(operation = "查询订单列表rest接口", operationDesc = "查询订单列表", key = "订单列表")
public R queryOrderList(@RequestBody OrderListQuery orderBatchQuery) {
log.debug("{}发票明细列表查询参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderBatchQuery));
log.info("{}发票明细列表查询参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderBatchQuery));
try {
@ -396,7 +396,7 @@ public class OrderInfoController {
@ApiParam(name = "fphm", value = "发票号码", required = true) @RequestParam("fphm") String fphm,
@ApiParam(name = "xhfnsrsbh", value = "销货方税号", required = true) @RequestParam("xhfnsrsbh") String xhfnsrsbh) {
log.debug("根据订单号和税号获取订单信息的接口,入参:fpdm:{},fphm:{}", fpdm, fphm);
log.info("根据订单号和税号获取订单信息的接口,入参:fpdm:{},fphm:{}", fpdm, fphm);
Map<String, Object> resultMap = orderInfoService.querySimpleOrderInfoByFpdmAndFphm(fpdm, fphm, xhfnsrsbh);
return R.ok().put(OrderManagementConstant.DATA, resultMap);
}
@ -447,7 +447,7 @@ public class OrderInfoController {
@SysLog(operation = "查询可用税率列表rest接口", operationDesc = "查询可用税率列表rest接口", key = "订单基础查询")
public R queryAvailableSlList(@RequestBody PageKySlReq pageKySlReq) {
log.debug("{}查询可用税率列表,入参:{}", LOGGER_MSG,JsonUtils.getInstance().toJsonString(pageKySlReq));
log.info("{}查询可用税率列表,入参:{}", LOGGER_MSG,JsonUtils.getInstance().toJsonString(pageKySlReq));
List<PageKySlRsp> pageKySlRspList = new ArrayList<>();
try {
pageKySlRspList = orderInfoService.queryAvailableSlList(pageKySlReq);

@ -191,7 +191,7 @@ public class OrderInvoiceController {
R result = commonInterfaceService.dealWithSldStartV3("", commonOrder.getOrderInfo().getFpzlDm(), commonOrder.getOrderInfo().getXhfNsrsbh(), commonOrder.getOrderInfo().getQdBz(), terminalCode);
log.debug("{}受理点查询结果:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(result));
log.info("{}受理点查询结果:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(result));
if (!OrderInfoContentEnum.SUCCESS.getKey().equals(String.valueOf(result.get(OrderManagementConstant.CODE)))) {
return R.error(String.valueOf(result.get(OrderManagementConstant.MESSAGE)));
} else {
@ -211,7 +211,7 @@ public class OrderInvoiceController {
} else {
if (CommonUtils.judgeIsFgTerminalType(terminalCode)) {
R result = commonInterfaceService.dealWithSldStartV3("", commonOrder.getOrderInfo().getFpzlDm(), commonOrder.getOrderInfo().getXhfNsrsbh(), commonOrder.getOrderInfo().getQdBz(), terminalCode);
log.debug("{}受理点查询结果:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(result));
log.info("{}受理点查询结果:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(result));
if (!OrderInfoContentEnum.SUCCESS.getKey().equals(String.valueOf(result.get(OrderManagementConstant.CODE)))) {
return R.error(String.valueOf(result.get(OrderManagementConstant.MESSAGE)));
} else {
@ -356,7 +356,7 @@ public class OrderInvoiceController {
@SysLog(operation = "订单删除rest接口", operationDesc = "逻辑删除订单单据", key = "订单删除")
public R updateOrderStatus(
@ApiParam(name = "pageRequestList", value = "需要同步数据数组") @RequestBody List<PageRequestVO> pageRequestList, String ly) {
log.debug("{}订单删除请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageRequestList));
log.info("{}订单删除请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageRequestList));
/**
* 需要使用到PageRequestVO对象中的,(orderProcessId,xhfNsrsbh)
*/

@ -48,7 +48,7 @@ public class OrderRollbackController {
@SysLog(operation = "订单回退rest接口", operationDesc = "订单回退到上一个订单", key = "订单回退")
public R orderRollback(HttpServletRequest request,
@ApiParam(name = "orderId", value = "订单和销货方税号", required = true) @RequestBody String orderId) {
log.debug("{}收到回退请求,数据:{}", ORDER_ROLLBACK_CONTROLLER, orderId);
log.info("{}收到回退请求,数据:{}", ORDER_ROLLBACK_CONTROLLER, orderId);
if (orderId != null) {
List<Map> idList = JSON.parseArray(orderId, Map.class);

@ -50,10 +50,10 @@ public class PriceTaxSeparationController {
public R separationOrder(HttpServletRequest req,
@ApiParam(name = "order", value = "企业订单", required = true) @RequestBody() CommonOrderInfo order) throws OrderSeparationException {
log.debug("{}得到订单信息:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(order));
log.info("{}得到订单信息:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(order));
CommonOrderInfo orderInfoAndItemInfo = separationService.taxSeparationService(order);
if (orderInfoAndItemInfo != null) {
log.debug("{}返回价税分离后的订单信息:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInfoAndItemInfo));
log.info("{}返回价税分离后的订单信息:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInfoAndItemInfo));
return InterfaceResponseUtils.buildReturnInfo(OrderInfoContentEnum.PRICE_TAX_SEPARATION_SUCCESS, orderInfoAndItemInfo);
}
return InterfaceResponseUtils.buildErrorInfo(OrderInfoContentEnum.PARAM_NULL);

@ -427,7 +427,7 @@ public class QrcodeController {
@ApiParam(name = "xhfNsrsbh", value = "销货方纳税人识别号", required = true) @RequestParam(value = "xhfNsrsbh") String xhfNsrsbh,
@ApiParam(name = "backGround", value = "二维码背景色") @RequestParam(value = "backGround", required = false) String backGround) {
log.debug("查询二维码和发票信息的接口,入参,qrcodeId:{},type:{},xhfNsrsbh:{}", qrcodeId, type, xhfNsrsbh);
log.info("查询二维码和发票信息的接口,入参,qrcodeId:{},type:{},xhfNsrsbh:{}", qrcodeId, type, xhfNsrsbh);
List<String> shList = NsrsbhUtils.transShListByXhfNsrsbh(xhfNsrsbh);
PageQrcodeAndInvoiceDetailInfo queryEwmConfigInfo = qrcodeService.queryQrcodeAndInvoiceDetail(qrcodeId, type, shList, backGround);
return R.ok().put(OrderManagementConstant.DATA, queryEwmConfigInfo);
@ -447,7 +447,7 @@ public class QrcodeController {
* 修改id为数组格式,传递多个[{"id":"xxxx","xhfNsrsbh":"dddddd"}]
* 二维码状态 0 失效 1 激活
*/
log.debug("更新二维码状态的接口,参数,id:{}", param);
log.info("更新二维码状态的接口,参数,id:{}", param);
if (StringUtils.isBlank(param)) {
return R.error().put("9999", "请求参数不能为空");
}

@ -152,7 +152,7 @@ public class ReceiveOrderController {
.put(OrderManagementConstant.MESSAGE, excuSingle.get(OrderManagementConstant.MESSAGE));
}
List<CommonOrderInfo> commonOrderInfos = (List<CommonOrderInfo>) excuSingle.get(OrderManagementConstant.DATA);
log.debug("页面填写开票,补全后的数据:{}", JsonUtils.getInstance().toJsonString(commonOrderInfos));
log.info("页面填写开票,补全后的数据:{}", JsonUtils.getInstance().toJsonString(commonOrderInfos));
//如果是机动车、二手车填开,返回发票请求流水号,用于判断页面是否打印
//新增:纸票返回发票请求流水号,用于页面同步开票并打印
@ -213,7 +213,7 @@ public class ReceiveOrderController {
log.error("页面填开异常:{}", orderReceiveException.getMessage());
return R.error(orderReceiveException.getCode(), orderReceiveException.getMessage());
}
log.debug("页面填写开票,拆分后的数据:{}", JsonUtils.getInstance().toJsonString(commonOrderInfos));
log.info("页面填写开票,拆分后的数据:{}", JsonUtils.getInstance().toJsonString(commonOrderInfos));
Map<String, PageSld> sldMap = new HashMap<>(2);
PageSld pageSld = new PageSld();
@ -295,10 +295,10 @@ public class ReceiveOrderController {
//从excel中读取数据
long t1 = System.currentTimeMillis();
log.debug("excel读取开始,当前时间{}", t1);
log.info("excel读取开始,当前时间{}", t1);
List<NewOrderExcel> newOrderExcels = orderExcelReadService.readOrderInfoFromExcelxls(file);
long t2 = System.currentTimeMillis();
log.debug("excel读取结束,当前时间{},耗时:{}", t2, t2 - t1);
log.info("excel读取结束,当前时间{},耗时:{}", t2, t2 - t1);
for (NewOrderExcel excel : newOrderExcels) {
if (StringUtils.isNotBlank(excel.getIsNcp()) && "是".equals(excel.getIsNcp().trim())) {
@ -355,7 +355,7 @@ public class ReceiveOrderController {
//导入的条数
count = newOrderExcels.size();
log.debug("{}从excel中读取到的数据条数:{}", LOGGER_MSG, count);
log.info("{}从excel中读取到的数据条数:{}", LOGGER_MSG, count);
//替换特殊字符串
excelReplaceCharacter(newOrderExcels);
@ -364,10 +364,10 @@ public class ReceiveOrderController {
//订单校验
long t3 = System.currentTimeMillis();
log.debug("excel校验开始,当前时间{}", t3);
log.info("excel校验开始,当前时间{}", t3);
Map<String, Object> examinByMap = orderExcelReadService.examinByMap(orderExcelMap, xhfNsrsbh, userId, terminalCode, qdfwlx,entId);
long t4 = System.currentTimeMillis();
log.debug("excel校验结束,当前时间{},耗时:{}", t4, t4 - t3);
log.info("excel校验结束,当前时间{},耗时:{}", t4, t4 - t3);
if (!(boolean) examinByMap.get(ConfigureConstant.STRING_IS_PASS)) {
log.error("{}订单信息校验失败,请求数据为:{},响应数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderExcelMap), JsonUtils.getInstance().toJsonString(examinByMap));
return InterfaceResponseUtils.buildReturnInfo(OrderInfoContentEnum.RECEIVE_FAILD,
@ -377,11 +377,11 @@ public class ReceiveOrderController {
//组装订单信息
long t5 = System.currentTimeMillis();
log.debug("excel转换开始,当前时间{}", t5);
log.info("excel转换开始,当前时间{}", t5);
List<CommonOrderInfo> orderExcel2OrderInfo = orderExcelReadService.excelToOrderInfo(orderExcelMap, paramMap,terminalCode);
orderExcel2OrderInfo.stream().forEach(f -> {f.getOrderInfo().setGsdm(gsdm);});
long t6 = System.currentTimeMillis();
log.debug("excel转换结束,当前时间{},耗时:{}", t6, t6 - t5);
log.info("excel转换结束,当前时间{},耗时:{}", t6, t6 - t5);
// 将数据插入数据库\
long time1 = System.currentTimeMillis();
log.info("数据库开始:{}", time1);
@ -563,10 +563,10 @@ public class ReceiveOrderController {
return orderInfoService.openRedInvoice(commonOrderInfo, commonOrderInfo.getUserId());
} catch (OrderSeparationException orderSeparationException) {
log.debug("{},发生异常:{}", LOGGER_MSG, orderSeparationException);
log.info("{},发生异常:{}", LOGGER_MSG, orderSeparationException);
return vo.put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey()).put("msg", orderSeparationException.getMessage());
} catch (Exception e) {
log.debug("{},发生异常:{}", LOGGER_MSG, e);
log.info("{},发生异常:{}", LOGGER_MSG, e);
return vo.put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey()).put("msg", OrderInfoContentEnum.RECEIVE_FAILD.getMessage());
}
}

@ -47,7 +47,7 @@ public class InvoiceRushRedServiceImpl implements InvoiceRushRedService {
@Override
public R eleRush(String fpdm, String fphm, String chyy, String entId, List<String> shList) throws OrderSeparationException {
log.debug("{}接收到发票冲红请求,发票代码{},发票号码{},冲红原因{},税号:{}", LOGGER_MSG, fpdm, fphm, chyy, JsonUtils.getInstance().toJsonString(shList));
log.info("{}接收到发票冲红请求,发票代码{},发票号码{},冲红原因{},税号:{}", LOGGER_MSG, fpdm, fphm, chyy, JsonUtils.getInstance().toJsonString(shList));
Map<String, Object> map = rushRedInvoiceRequestInfoService.mergeSpecialInvoiceAndReversal(fpdm, fphm, "", shList);
log.info("{}根据发票代码发票号码查看发票版式文件 ", LOGGER_MSG);
@ -102,7 +102,7 @@ public class InvoiceRushRedServiceImpl implements InvoiceRushRedService {
if (OrderInfoEnum.RED_INVOICE_2.getKey().equals(orderInvoiceInfo.getChBz())) {
ch = OrderInfoEnum.RED_INVOICE_2.getValue();
}
log.debug("{},发票处于:{}", LOGGER_MSG, ch);
log.info("{},发票处于:{}", LOGGER_MSG, ch);
return R.error(OrderInfoContentEnum.INVOICE_TSCHBZ_ERROR.getKey(), ch);
}
} else {

@ -396,7 +396,7 @@ public class MakeOutAnInvoiceServiceImpl implements MakeOutAnInvoiceService {
invoiceBatchRequest.setFpqqpch(fpqqpch);
insertBatchRequest.add(invoiceBatchRequest);
log.debug("{},循环次数{}", LOGGER_MSG, m + 1);
log.info("{},循环次数{}", LOGGER_MSG, m + 1);
/**
@ -545,7 +545,7 @@ public class MakeOutAnInvoiceServiceImpl implements MakeOutAnInvoiceService {
OrderInvoiceInfo selectInvoiceInfoByFpdhm = orderInvoiceInfoService.selectOrderInvoiceInfoByFpdmAndFphm(orderInfo.getYfpDm(), orderInfo.getYfpHm(), shList);
log.debug("{}根据原蓝票代码号码查询到的orderInvoice:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(selectInvoiceInfoByFpdhm));
log.info("{}根据原蓝票代码号码查询到的orderInvoice:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(selectInvoiceInfoByFpdhm));
// 如果原始订单查不到数据,使用之前数据的订单号即可
if (selectInvoiceInfoByFpdhm != null) {
//发票冲红后更新原蓝票的冲红标志

@ -46,9 +46,9 @@ public class MyInvoiceRequestServiceImpl implements MyInvoiceRequestService {
Map<String, Object> postReturnMap = null;
try {
log.debug("调用微信服务的获取授权开票页面地址:{},参数map为:{}", openApiConfig.configGetAuthUrl(), JsonUtils.getInstance().toJsonString(param));
log.info("调用微信服务的获取授权开票页面地址:{},参数map为:{}", openApiConfig.configGetAuthUrl(), JsonUtils.getInstance().toJsonString(param));
String doPost = HttpUtils.doPost(openApiConfig.configGetAuthUrl(), JsonUtils.getInstance().toJsonString(param));
log.debug("调用微信服务的获取授权开票页面 返回map为:{}", doPost);
log.info("调用微信服务的获取授权开票页面 返回map为:{}", doPost);
if (StringUtils.isNotBlank(doPost)) {
postReturnMap = JsonUtils.getInstance().parseObject(doPost, Map.class);
return postReturnMap;
@ -83,7 +83,7 @@ public class MyInvoiceRequestServiceImpl implements MyInvoiceRequestService {
Map<String, String> header = new HashMap<>(5);
header.put("Content-Type", "application/json");
String doPost = HttpUtils.doPostWithHeader(openApiConfig.configGetAuthStatus(), JsonUtils.getInstance().toJsonString(param), header);
log.debug("调用微信服务的获取授权状态接口 返回map为:{}", doPost);
log.info("调用微信服务的获取授权状态接口 返回map为:{}", doPost);
/**
* 返回数据结构
* {

@ -650,7 +650,7 @@ public class OrderCommonServiceImpl implements OrderCommonService {
if (insertSelective <= 0) {
return insertSelective;
}
log.debug("存订单到数据库处理完成");
log.info("存订单到数据库处理完成");
// update by ysy 添加明细的非空校验 供应链的订单没有明细
if (ObjectUtil.isNotEmpty(insertOrderItem)) {
@ -963,7 +963,7 @@ public class OrderCommonServiceImpl implements OrderCommonService {
}
private int insertAutoInvoiceBatch(List<InvoiceBatchRequest> invoiceBatchRequests, List<List<InvoiceBatchRequestItem>> invoiceBatchRequestItemList, List<String> shList) {
log.debug("{}发票信息保存的接口,批次信息:{},明细信息:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(invoiceBatchRequests), JsonUtils.getInstance().toJsonString(invoiceBatchRequestItemList));
log.info("{}发票信息保存的接口,批次信息:{},明细信息:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(invoiceBatchRequests), JsonUtils.getInstance().toJsonString(invoiceBatchRequestItemList));
for (int i = 0; i < invoiceBatchRequests.size(); i++) {
InvoiceBatchRequest invoiceBatchRequest = invoiceBatchRequests.get(i);
InvoiceBatchRequest invoiceBatchCount = invoiceBatchRequestMapper.selectInvoiceBatchRequestByFpqqpch(invoiceBatchRequest.getFpqqpch(), shList);

@ -1789,9 +1789,9 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService {
final DateTime endTime7 = DateTime.now();
final long time7 = new Duration(startTime7, endTime7).getMillis();
log.debug("{},5000一批数据库查询数据获取耗时:{}毫秒", LOGGER_MSG, time7);
log.info("{},5000一批数据库查询数据获取耗时:{}毫秒", LOGGER_MSG, time7);
if (ObjectUtil.isNull(selectOrderInfo) || ObjectUtil.isEmpty(selectOrderInfo.getList())) {
log.debug("{}表格导出数据处理完成!", LOGGER_MSG);
log.info("{}表格导出数据处理完成!", LOGGER_MSG);
break;
} else {
currentPage = currentPage + 1;

@ -242,7 +242,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfoByFpqqlsh(fpqqlsh, shList);
log.debug("{}根据流水号:{},查询订单发票数据,返回信息:{}", LOGGER_MSG, fpqqlsh, JsonUtils.getInstance().toJsonString(orderInvoiceInfo));
log.info("{}根据流水号:{},查询订单发票数据,返回信息:{}", LOGGER_MSG, fpqqlsh, JsonUtils.getInstance().toJsonString(orderInvoiceInfo));
}
@ -268,7 +268,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
List<OrderItemInfo> orderItemList = orderItemInfoService.selectOrderItemInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList);
log.debug("{}根据订单id:{},查询订单明细:{}", LOGGER_MSG, orderProcessInfo.getOrderInfoId(), JsonUtils.getInstance().toJsonString(orderItemList));
log.info("{}根据订单id:{},查询订单明细:{}", LOGGER_MSG, orderProcessInfo.getOrderInfoId(), JsonUtils.getInstance().toJsonString(orderItemList));
oderDetailInfo = this.convertOderDetailInfo(orderProcessInfo, orderItemList, orderInfo, pageOrderExts, orderInvoiceInfo);
@ -316,7 +316,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
*/
formatCommonOrder(oderDetailInfo);
log.debug("{}返回前端订单详情为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(oderDetailInfo));
log.info("{}返回前端订单详情为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(oderDetailInfo));
return oderDetailInfo;
}
@ -330,7 +330,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
*/
List<OrderProcessInfoExt> orderProcessInfoExtList = orderProcessInfoExtService.selectOrderProcessInfoExtByOrderProcessId(orderProcessInfo.getId(), shList);
log.debug("{}根据Processid查询父类订单号:{},返回信息:{}", LOGGER_MSG, orderProcessInfo.getId(), JsonUtils.getInstance().toJsonString(orderProcessInfoExtList));
log.info("{}根据Processid查询父类订单号:{},返回信息:{}", LOGGER_MSG, orderProcessInfo.getId(), JsonUtils.getInstance().toJsonString(orderProcessInfoExtList));
if (orderProcessInfoExtList != null && orderProcessInfoExtList.size() > 0) {
for (OrderProcessInfoExt processInfoExt : orderProcessInfoExtList) {
@ -338,7 +338,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
PageOrderExt pageOrderExt = new PageOrderExt();
if (processInfoExt != null) {
OrderProcessInfo parentOrderProcessInfo = orderProcessService.selectOrderProcessInfoByProcessId(processInfoExt.getParentOrderProcessId(), shList);
log.debug("{}根据父类订单号:{},获取订单返回信息:{}", LOGGER_MSG, processInfoExt.getParentOrderInfoId(), JsonUtils.getInstance().toJsonString(parentOrderProcessInfo));
log.info("{}根据父类订单号:{},获取订单返回信息:{}", LOGGER_MSG, processInfoExt.getParentOrderInfoId(), JsonUtils.getInstance().toJsonString(parentOrderProcessInfo));
if (parentOrderProcessInfo != null) {
if (processInfoExt.getOrderProcessInfoId().equals(processInfoExt.getParentOrderProcessId())) {
@ -1520,7 +1520,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
public R openRedInvoice(CommonOrderInfo commonOrderInfo, String uid) throws OrderSeparationException {
R vo = new R();
//校验填写的报账单号是不是负数订单
log.debug("{}校验填写的报账单号是不是负数订单",LOGGER_MSG);
log.info("{}校验填写的报账单号是不是负数订单",LOGGER_MSG);
OrderProcessInfo op = null;
if(StrUtil.isNotBlank(commonOrderInfo.getOrderInfo().getBzdh())){
Map map = new HashMap();
@ -1570,18 +1570,18 @@ public class OrderInfoServiceImpl implements OrderInfoService {
}
//负数订单保存后,删除SAP传过来的结算单
if(ObjectUtil.isNotNull(op)){
log.debug("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单");
log.info("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单");
if(ConfigureConstant.STRING_1.equals(op.getOrderStatus())){
log.debug("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单,已经是删除状态");
log.info("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单,已经是删除状态");
}else {
OrderProcessInfo updateOp = new OrderProcessInfo();
updateOp.setId(op.getId());
updateOp.setOrderStatus(ConfigureConstant.STRING_1);
int i = orderProcessInfoMapper.updateOrderProcessInfoByProcessId(updateOp, null);
if(i == 0){
log.debug("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单失败");
log.info("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单失败");
}else {
log.debug("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单成功");
log.info("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单成功");
}
}
}

@ -1008,6 +1008,7 @@ public class OrderMergeServiceImpl implements OrderMergeService {
//对比合计税额的误差,此处将不参与和与参与合并合并对比
BigDecimal hjse = mergeOutItem.stream().map(t -> new BigDecimal(t.getSe())).reduce(BigDecimal::add).get();
log.info("明细合并合并后{},合并前税额{},合并后税额{}", JSONObject.toJSONString(mergeOutItem),oldhjse,hjse);
if((termType && hjse.subtract(oldhjse).abs().doubleValue() > 0.06) || (!termType && hjse.subtract(oldhjse).abs().doubleValue() > 1.27)){
return R.error("合并失败,合并明细后价税合计超过总的误差范围");
}

@ -79,7 +79,7 @@ public class OrderProcessServiceImpl implements OrderProcessService {
public PageUtils selectOrderInfo(Map<String, Object> paramMap, List<String> shList, List<String> entList) {
int pageSize = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_PAGE_SIZE)));
int currPage = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_CURR_PAGE)));
log.debug("订单查询,当前页:{},页面条数:{}", currPage, pageSize);
log.info("订单查询,当前页:{},页面条数:{}", currPage, pageSize);
PageHelper.startPage(currPage, pageSize);
List<OrderProcessInfo> list = orderProcessInfoMapper.queryOrderInfo(paramMap, shList, entList);
Map<String, String> collect = null;

@ -51,7 +51,7 @@ public class OrderRollbackServiceImpl implements OrderRollbackService {
@Override
public R orderRollback(List<Map> orderId) {
log.debug("{},收到回退请求,数据{}", LOGGER_MSG, orderId);
log.info("{},收到回退请求,数据{}", LOGGER_MSG, orderId);
R vo = new R();
int k = 0;
int b = 0;
@ -66,7 +66,7 @@ public class OrderRollbackServiceImpl implements OrderRollbackService {
OrderProcessInfo processInfo = orderProcessInfoMapper.selectByOrderId(id, shList);
if (processInfo != null) {
String jsonString = JsonUtils.getInstance().toJsonString(processInfo);
log.debug("{},通过当前订单id得到处理表数据:{}", LOGGER_MSG, jsonString);
log.info("{},通过当前订单id得到处理表数据:{}", LOGGER_MSG, jsonString);
R rollback = rollback(processInfo);
if (ConfigureConstant.STRING_0000.equals(rollback.get(OrderManagementConstant.CODE))) {
k += 1;
@ -79,22 +79,22 @@ public class OrderRollbackServiceImpl implements OrderRollbackService {
}
}
} else {
log.debug("{}此orderId:{}没有处理表信息", LOGGER_MSG, id);
log.info("{}此orderId:{}没有处理表信息", LOGGER_MSG, id);
b += 1;
}
}
if (orderId.size() == k) {
log.debug("{},全部成功", LOGGER_MSG);
log.info("{},全部成功", LOGGER_MSG);
vo.put(OrderManagementConstant.CODE, OrderInfoContentEnum.SUCCESS.getKey()).put("msg", OrderInfoContentEnum.SUCCESS.getMessage());
return vo;
}
if (orderId.size() == b) {
log.debug("{},全部失败", LOGGER_MSG);
log.info("{},全部失败", LOGGER_MSG);
vo.put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey()).put("msg", OrderInfoContentEnum.RECEIVE_FAILD.getMessage());
return vo;
}
log.debug("{},成功回退{}条数据", LOGGER_MSG, k);
log.info("{},成功回退{}条数据", LOGGER_MSG, k);
vo.put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey()).put("msg", "成功回退" + k + "条数据").put("errorMessage", errorMessageList);
return vo;
}
@ -126,7 +126,7 @@ public class OrderRollbackServiceImpl implements OrderRollbackService {
if (OrderInfoEnum.ORDER_STATUS_6.getKey().equals(processInfo.getDdzt())
|| OrderInfoEnum.ORDER_STATUS_8.getKey().equals(processInfo.getDdzt())) {
/*// 修改处理表状态为待开具ORDER_STATUS_3
log.debug("{}要回退异常订单的orderId:{}", LOGGER_MSG, processInfo.getOrderInfoId());
log.info("{}要回退异常订单的orderId:{}", LOGGER_MSG, processInfo.getOrderInfoId());
OrderProcessInfo orderProcessInfo = new OrderProcessInfo();
orderProcessInfo.setId(processInfo.getId());
orderProcessInfo.setDdzt(OrderInfoEnum.ORDER_STATUS_3.getKey());
@ -255,7 +255,7 @@ public class OrderRollbackServiceImpl implements OrderRollbackService {
}
// 更新子订单状态为无效
log.debug("{}需要更新为无效状态的数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(validStatusData));
log.info("{}需要更新为无效状态的数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(validStatusData));
for (String validProcessId : validStatusData) {
OrderProcessInfo orderProcessInfo2 = new OrderProcessInfo();
orderProcessInfo2.setId(validProcessId);
@ -266,7 +266,7 @@ public class OrderRollbackServiceImpl implements OrderRollbackService {
}
}
log.debug("{}需要更新为有效状态的数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(statusData));
log.info("{}需要更新为有效状态的数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(statusData));
// 修改父订单状态为有效
for (String processId : statusData) {
OrderProcessInfo orderProcessInfo2 = new OrderProcessInfo();

@ -40,7 +40,7 @@ public class OrderStatusStatisticsImpl implements OrderStatusStatisticsService {
int pageSize = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_PAGE_SIZE)));
int currPage = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_CURR_PAGE)));
// 这里前端从1开始需要进行-1操作
log.debug("订单查询,当前页:{},页面条数:{}", currPage, pageSize);
log.info("订单查询,当前页:{},页面条数:{}", currPage, pageSize);
PageHelper.startPage(currPage, pageSize);
List<OrderStatusStatistics> list = orderStatusStatisticsMapper.queryOrderStatusInfo(paramMap, shList);
PageInfo<OrderStatusStatistics> pageInfo = new PageInfo<>(list);

@ -192,7 +192,7 @@ public class PollInvoiceServiceImpl implements PollInvoiceService {
}
//暂停开票功能,如果企业暂停开票,并且暂停开票的原因为不需要继续请求开票code,数据不请求底层开票
TaxEquipmentInfo taxEquipmentInfo = simsBackService.queryTaxEquipment(fpkjMqData.getNsrsbh(), fpkjMqData.getEntId());
log.debug("{}查询销项后台销方开票状态,返回结果:{}",LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfo));
log.info("{}查询销项后台销方开票状态,返回结果:{}",LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfo));
//开票开关
String invoicingSwitch = "";
@ -515,11 +515,11 @@ public class PollInvoiceServiceImpl implements PollInvoiceService {
boolean retry = processPreInvoice(allocateInvoicesReq, fpkjMqData, terminalCode, invoicingSwitch, qdfwlx);
if (retry) {
log.debug("{}开票点正忙,继续轮询其他开票点,当前轮训次数为:{},上次请求开票点为:{},下次使用开票点为:{}", LOGGER_MSG, (i + 1), kpd, searchSld.getSldId());
log.info("{}开票点正忙,继续轮询其他开票点,当前轮训次数为:{},上次请求开票点为:{},下次使用开票点为:{}", LOGGER_MSG, (i + 1), kpd, searchSld.getSldId());
usedList.add(searchSld.getSldId());
//如果为最后一次循环,放入延时队列进行重开
if (i == newSldList.size() - 1) {
log.debug("{}轮训完所有开票点依旧正忙,放入延时队列:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(fpkjMqData));
log.info("{}轮训完所有开票点依旧正忙,放入延时队列:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(fpkjMqData));
sendDelayMessage(fpkjMqData, ConfigureConstant.STRING_9999,
String.format(errorMsg, "开票点正忙"), "","", shList);
@ -680,7 +680,7 @@ public class PollInvoiceServiceImpl implements PollInvoiceService {
String syncKey = String.format(RedisConstant.REDIS_ORDER_SYNC_KEY, fpkjMqData.getFpqqlsh());
String invoiceStatus = redisService.get(syncKey);
if (StrUtil.isNotBlank(invoiceStatus)) {
log.debug("{}放入延时队列前,需要去除并发请求验证,请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(fpkjMqData));
log.info("{}放入延时队列前,需要去除并发请求验证,请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(fpkjMqData));
redisService.del(syncKey);
}
@ -708,7 +708,7 @@ public class PollInvoiceServiceImpl implements PollInvoiceService {
String syncKey = String.format(RedisConstant.REDIS_ORDER_SYNC_KEY, fpkjMqData.getFpqqlsh());
String invoiceStatus = redisService.get(syncKey);
if (StrUtil.isNotBlank(invoiceStatus)) {
log.debug("{}放入延时队列前,需要去除并发请求验证,请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(fpkjMqData));
log.info("{}放入延时队列前,需要去除并发请求验证,请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(fpkjMqData));
redisService.del(syncKey);
}
@ -905,7 +905,7 @@ public class PollInvoiceServiceImpl implements PollInvoiceService {
//设置延时队列
String sendDealyMqRetrycountKey = String.format(RedisConstant.POOL_SENDDEALYMQ_RETRY_COUNT, fpkjMqData.getFpqqlsh());
redisService.del(sendDealyMqRetrycountKey);
log.debug("{}开票数据放入延时队列重试次数删除redis缓存,key值:{}", LOGGER_MSG, sendDealyMqRetrycountKey);
log.info("{}开票数据放入延时队列重试次数删除redis缓存,key值:{}", LOGGER_MSG, sendDealyMqRetrycountKey);
}else {
@ -1064,7 +1064,7 @@ public class PollInvoiceServiceImpl implements PollInvoiceService {
String sendDealyMqRetrycountKey = String.format(RedisConstant.POOL_SENDDEALYMQ_RETRY_COUNT, fpkjMqData.getFpqqlsh());
redisService.del(sendDealyMqRetrycountKey);
log.debug("{}开票数据放入延时队列重试次数删除redis缓存,key值:{}", LOGGER_MSG, sendDealyMqRetrycountKey);
log.info("{}开票数据放入延时队列重试次数删除redis缓存,key值:{}", LOGGER_MSG, sendDealyMqRetrycountKey);
}
@ -1073,7 +1073,7 @@ public class PollInvoiceServiceImpl implements PollInvoiceService {
log.warn("{}数据存入延时队列,数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(fpkjMqData));
String sendDealyMqRetrycountKey = String.format(RedisConstant.POOL_SENDDEALYMQ_RETRY_COUNT, fpkjMqData.getFpqqlsh());
String sendDealyMqRetryCacheCount = redisService.get(sendDealyMqRetrycountKey);
log.debug("{}获取redis缓存中开票数据放入延时队列重试次数,key值:{},次数:{}", LOGGER_MSG,
log.info("{}获取redis缓存中开票数据放入延时队列重试次数,key值:{},次数:{}", LOGGER_MSG,
sendDealyMqRetrycountKey, sendDealyMqRetryCacheCount);
//轮询开票,开票数据放入延时队列重试次数阈值
/**
@ -1095,7 +1095,7 @@ public class PollInvoiceServiceImpl implements PollInvoiceService {
String syncKey = String.format(RedisConstant.REDIS_ORDER_SYNC_KEY, fpkjMqData.getFpqqlsh());
String invoiceStatus = redisService.get(syncKey);
if (StrUtil.isNotBlank(invoiceStatus)) {
log.debug("{}放入延时队列前,需要去除并发请求验证,请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(fpkjMqData));
log.info("{}放入延时队列前,需要去除并发请求验证,请求数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(fpkjMqData));
redisService.del(syncKey);
}
@ -1128,7 +1128,7 @@ public class PollInvoiceServiceImpl implements PollInvoiceService {
//超过重试次数数据更新最后的开票中失败原因
updateSbyy(fpkjMqData.getFpqqlsh(), errorCode, errorMsg, skcwdm, skcwms, shList);
log.debug("{}设置redis缓存中开票数据放入延时队列重试次数,key值:{},次数:{}", LOGGER_MSG,
log.info("{}设置redis缓存中开票数据放入延时队列重试次数,key值:{},次数:{}", LOGGER_MSG,
sendDealyMqRetrycountKey, count);
}
@ -1394,7 +1394,7 @@ public class PollInvoiceServiceImpl implements PollInvoiceService {
* @return
*/
public SearchSld getValidKpd(List<String> usedKpd, List<SearchSld> kpdList) {
log.debug("{}获取可用开票点,已经使用开票点为:{},开票点列表为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(usedKpd), JsonUtils.getInstance().toJsonString(kpdList));
log.info("{}获取可用开票点,已经使用开票点为:{},开票点列表为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(usedKpd), JsonUtils.getInstance().toJsonString(kpdList));
SearchSld resultSearchSld = new SearchSld();
/**
* 抛出已经用过的受理点,
@ -1419,7 +1419,7 @@ public class PollInvoiceServiceImpl implements PollInvoiceService {
}
}
log.debug("{}最终使用的开票点为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(resultSearchSld));
log.info("{}最终使用的开票点为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(resultSearchSld));
return resultSearchSld;
}

@ -75,7 +75,7 @@ public class ReceiveOrderServiceImpl implements ReceiveOrderService {
}
commonOrderInfos = generateReadyOpenOrderService.saveOrderSplitInfo(orderSplit);
}
log.debug("页面填写开票,拆分后的数据:{}", JsonUtils.getInstance().toJsonString(commonOrderInfos));
log.info("页面填写开票,拆分后的数据:{}", JsonUtils.getInstance().toJsonString(commonOrderInfos));
//如果是机动车、二手车填开,返回发票请求流水号,用于判断页面是否打印
//新增:纸票返回发票请求流水号,用于页面同步开票并打印

@ -48,7 +48,7 @@ public class RabbitListenController {
rabbitMqStartListenerService.startRabbitMqListener(nsrsbh, queueName);
log.debug("{}队列监听启动完成", LOGGER_MSG);
log.info("{}队列监听启动完成", LOGGER_MSG);
return R.ok();
}
@ -67,7 +67,7 @@ public class RabbitListenController {
rabbitMqStartListenerService.stopRabbitMqListener(queueNameList);
log.debug("{}队列停止监听完成", LOGGER_MSG);
log.info("{}队列停止监听完成", LOGGER_MSG);
return R.ok();
}
@ -88,7 +88,7 @@ public class RabbitListenController {
*
*/
log.debug("{}清除无效队列请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(queueNameList));
log.info("{}清除无效队列请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(queueNameList));
rabbitMqStartListenerService.delNoListenQueue(queueNameList);

@ -200,7 +200,7 @@ public class RabbitMqStartListenerServiceImpl implements RabbitMqStartListenerSe
buildListener(map, factory, queue.getNsrsbh(), realQueueName);
}
log.debug("{}监听的基础数据为:{}条,缓存中监听{}条", LOGGER_MSG, baseList.size(), map.size());
log.info("{}监听的基础数据为:{}条,缓存中监听{}条", LOGGER_MSG, baseList.size(), map.size());
}
if (ObjectUtil.isNotEmpty(businessList)) {
@ -236,7 +236,7 @@ public class RabbitMqStartListenerServiceImpl implements RabbitMqStartListenerSe
queueNameList.add(queue);
ListenerDeclare lisener = new ListenerDeclare(rabbitConnectionFactory, queueNameList, orderFanoutHandler);
boolean b = lisener.declareListener(ConfigureConstant.INT_30);
log.debug("(广播模式监听)线程ID:{}-->队列:{}启动监听,结果:{}", Thread.currentThread().getId(), queue, b);
log.info("(广播模式监听)线程ID:{}-->队列:{}启动监听,结果:{}", Thread.currentThread().getId(), queue, b);
} catch (IOException e) {
e.printStackTrace();
}
@ -257,7 +257,7 @@ public class RabbitMqStartListenerServiceImpl implements RabbitMqStartListenerSe
*/
if (map.get(factory.getListenerMapKey(rabbitConnectionFactory, realQueueName)) == null) {
log.debug("(动态监听定时)线程ID:{}-->队列:{}开始启动监听", Thread.currentThread().getId(), realQueueName);
log.info("(动态监听定时)线程ID:{}-->队列:{}开始启动监听", Thread.currentThread().getId(), realQueueName);
List<String> queueNameList = new ArrayList<>();
queueNameList.add(realQueueName);
@ -293,7 +293,7 @@ public class RabbitMqStartListenerServiceImpl implements RabbitMqStartListenerSe
listenSize = ConfigureConstant.INT_1;
}
boolean b = lisener.declareListener(listenSize);
log.debug("(动态监听定时)线程ID:{}-->队列:{}启动监听,结果:{}", Thread.currentThread().getId(), realQueueName, b);
log.info("(动态监听定时)线程ID:{}-->队列:{}启动监听,结果:{}", Thread.currentThread().getId(), realQueueName, b);
}
}
} catch (Exception e) {
@ -315,7 +315,7 @@ public class RabbitMqStartListenerServiceImpl implements RabbitMqStartListenerSe
/**
* 根据队列名称从mq服务器中获取队列数据,如果为空则进行创建队列.
*/
log.debug("{}队列:{},业务队列开始启动监听", LOGGER_MSG, realQueueName);
log.info("{}队列:{},业务队列开始启动监听", LOGGER_MSG, realQueueName);
if (map.get(factory.getListenerMapKey(rabbitConnectionFactory, realQueueName)) == null) {
List<String> queueNameList = new ArrayList<>();
@ -395,7 +395,7 @@ public class RabbitMqStartListenerServiceImpl implements RabbitMqStartListenerSe
QueueDeclare queueDeclare = rabbitMqSendMessageService.setQueueDeclare(nsrsbh, realQueueName);
if (queueDeclare.declareQueue()) {
boolean b = lisener.declareListener(ConfigureConstant.INT_25);
log.debug("{}线程ID:{}-->队列:{}启动监听,结果:{}", LOGGER_MSG, Thread.currentThread().getId(), realQueueName, b);
log.info("{}线程ID:{}-->队列:{}启动监听,结果:{}", LOGGER_MSG, Thread.currentThread().getId(), realQueueName, b);
}
}

@ -113,7 +113,7 @@ public class ScanInvoiceController {
//用户授权完成后 调用开票接口开票
WxAuthNoDto readRequest = readRequest(request, WxAuthNoDto.class);
log.debug("接受微信授权推送,入参:{}", JsonUtils.getInstance().toJsonString(readRequest));
log.info("接受微信授权推送,入参:{}", JsonUtils.getInstance().toJsonString(readRequest));
R r = new R();
if (StringUtils.isNotBlank(readRequest.getSuccOrderId())) {
//授权成功的订单去开票

@ -73,7 +73,7 @@ public class SmallAppQrcodeController {
@ApiParam(name = "pageSize", value = "每页条数") @RequestParam(value = "pageSize", required = false) String pageSize,
@ApiParam(name = "currentPage", value = "当前页") @RequestParam(value = "currentPage", required = false) String currPage) {
log.debug("{}静态二维码列表", LOGGER_MSG);
log.info("{}静态二维码列表", LOGGER_MSG);
return qrcodeController.qrCodeList(ywlxId, xmmc, xhfNsrsbh, sjly, pageSize, currPage);
}
@ -218,7 +218,7 @@ public class SmallAppQrcodeController {
@ApiParam(name = "xhfNsrsbh", value = "销货方纳税人识别号", required = true) @RequestParam(value = "xhfNsrsbh") String xhfNsrsbh,
@ApiParam(name = "backGround", value = "二维码背景色") @RequestParam(value = "backGround", required = false) String backGround) {
log.debug("查询二维码和发票信息的接口,入参,qrcodeId:{},type:{},xhfNsrsbh:{}", qrcodeId, type, xhfNsrsbh);
log.info("查询二维码和发票信息的接口,入参,qrcodeId:{},type:{},xhfNsrsbh:{}", qrcodeId, type, xhfNsrsbh);
return qrcodeController.queryQrcodeAndInvoiceDateil(qrcodeId, type, xhfNsrsbh, backGround);
}
@ -324,7 +324,7 @@ public class SmallAppQrcodeController {
@SysLog(operation = "查询订单列表rest接口", operationDesc = "查询订单列表", key = "订单列表")
public R queryOrderList(@RequestBody OrderListQuery orderBatchQuery) {
log.debug("{}发票明细列表查询参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderBatchQuery));
log.info("{}发票明细列表查询参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderBatchQuery));
return orderInfoController.queryOrderList(orderBatchQuery);
}

@ -424,7 +424,7 @@ public class PushTicketPoolServiceImpl implements PushTicketPoolService {
} else {
invoiceType = fpzldm;
}
log.debug("{}票池发票类型转换,请求参数为:{},输出参数为:{}", LOGGER_MSG, fpzldm, invoiceType);
log.info("{}票池发票类型转换,请求参数为:{},输出参数为:{}", LOGGER_MSG, fpzldm, invoiceType);
return invoiceType;
}

@ -59,7 +59,7 @@ public class ValidateOrderInfoServiceImpl implements ValidateOrderInfoService {
*/
@Override
public Map<String, String> checkOrderInvoice(CommonOrderInfo commonOrderInfo) {
log.debug("{},数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(commonOrderInfo));
log.info("{},数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(commonOrderInfo));
// 声明校验结果map
Map<String, String> checkResultMap = new HashMap<>(10);
checkResultMap.put(OrderManagementConstant.ERRORCODE, OrderInfoContentEnum.SUCCESS.getKey());
@ -512,7 +512,7 @@ public class ValidateOrderInfoServiceImpl implements ValidateOrderInfoService {
*/
private Map<String, String> checkRedInvoiceData(CommonOrderInfo commonOrderInfo) {
String jsonString = JsonUtils.getInstance().toJsonString(commonOrderInfo);
log.debug("{},红票数据入参:{}", LOGGER_MSG, jsonString);
log.info("{},红票数据入参:{}", LOGGER_MSG, jsonString);
Map<String, String> checkResultMap = new HashMap<>(5);
OrderInfo orderInfo = commonOrderInfo.getOrderInfo();
List<String> shList = new ArrayList<>();
@ -595,7 +595,7 @@ public class ValidateOrderInfoServiceImpl implements ValidateOrderInfoService {
|| OrderInfoEnum.ORDER_INVOICE_TYPE_2.getKey().equals(orderInvoiceInfo.getFpzlDm())) {
if (OrderInfoEnum.READY_ORDER_SJLY_2.getKey().equals(commonOrderInfo.getSjywly())) {
if (StringUtils.isBlank(orderInfo.getSld())) {
log.debug("{},纸票必须传开票点,发票种类代码{}", LOGGER_MSG, orderInvoiceInfo.getFpzlDm());
log.info("{},纸票必须传开票点,发票种类代码{}", LOGGER_MSG, orderInvoiceInfo.getFpzlDm());
checkResultMap.put(OrderManagementConstant.ERRORCODE, OrderInfoContentEnum.INVOICE_RUSH_RED_INVOICE_SLD.getKey());
checkResultMap.put(OrderManagementConstant.ERRORMESSAGE, OrderInfoContentEnum.INVOICE_RUSH_RED_INVOICE_SLD.getMessage());
return checkResultMap;

@ -164,7 +164,7 @@ public class CommonRest {
@ApiOperation(value = "订单对外接口-初始化企业信息", notes = "订单对外接口-初始化企业信息")
@RequestMapping(value = "/api/autoConfigEnterprise", method = RequestMethod.POST)
public R autoConfigEnterprise(@RequestBody PageConfigEnterpriseInfo pageConfigEnterpriseInfo) {
log.debug("{}企业初始化数据请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageConfigEnterpriseInfo));
log.info("{}企业初始化数据请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageConfigEnterpriseInfo));
if (ObjectUtil.isNull(pageConfigEnterpriseInfo)) {
log.error("{}企业初始化数据请求参数为空", LOGGER_MSG);
return R.error("企业初始化数据请求参数为空");
@ -174,7 +174,7 @@ public class CommonRest {
*/
enterpriseConfigService.autoConfigEnterprise(pageConfigEnterpriseInfo.getXhfNsrsbh(), pageConfigEnterpriseInfo.getXhfMc(), pageConfigEnterpriseInfo.getEntId());
log.debug("{}企业初始化数据成功", LOGGER_MSG);
log.info("{}企业初始化数据成功", LOGGER_MSG);
return R.ok();
}
@ -186,7 +186,7 @@ public class CommonRest {
mdc.put("X-B3-TraceId", RandomUtil.randomString(25));
Map<String, String> reqMap = JsonUtils.getInstance().parseObject(content, Map.class);
log.debug("{}接收emqx消息请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
log.info("{}接收emqx消息请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
if (ObjectUtil.isNull(reqMap)) {
log.error("{}接收emqx消息请求参数为空", LOGGER_MSG);
return R.error("接收emqx消息请求参数为空");
@ -247,7 +247,7 @@ public class CommonRest {
}
log.debug("{}接收emqx消息成功", LOGGER_MSG);
log.info("{}接收emqx消息成功", LOGGER_MSG);
return R.ok();
}
@ -256,7 +256,7 @@ public class CommonRest {
public R initRepeatInvoice(@RequestBody String content) {
Map<String, String> reqMap = JsonUtils.getInstance().parseObject(content, Map.class);
log.debug("{}初始化重复数据请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
log.info("{}初始化重复数据请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
if (ObjectUtil.isNull(reqMap)) {
log.error("{}初始化重复数据请求参数为空", LOGGER_MSG);
return R.error("初始化重复数据请求参数为空");
@ -271,7 +271,7 @@ public class CommonRest {
R r = orderCommonService.initRepeatInvoice(fpqqlsh, kplsh, xhfNsrsbh);
if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))) {
log.debug("{}初始化重复数据成功", LOGGER_MSG);
log.info("{}初始化重复数据成功", LOGGER_MSG);
return R.ok();
} else {
log.error("{}初始化重复数据失败:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(r));
@ -291,7 +291,7 @@ public class CommonRest {
public R sendEmail(@RequestBody String content) {
Map<String, String> reqMap = JsonUtils.getInstance().parseObject(content, Map.class);
log.debug("{}发送邮件请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
log.info("{}发送邮件请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
if (ObjectUtil.isNull(reqMap)) {
log.error("{}发送邮件请求参数为空", LOGGER_MSG);
return R.error("发送邮件请求参数为空");
@ -317,10 +317,10 @@ public class CommonRest {
key = baseServiceConfig.getAesSimsBack();
}
String resultContent = AesEncryptUtil.desEncrypt(aesContent, key);
log.debug("{}发送邮件解密后数据:{}", LOGGER_MSG, resultContent);
log.info("{}发送邮件解密后数据:{}", LOGGER_MSG, resultContent);
if (StringUtils.isNotBlank(resultContent)) {
openApiService.sendEmail(resultContent);
log.debug("{}发送邮件成功", LOGGER_MSG);
log.info("{}发送邮件成功", LOGGER_MSG);
} else {
log.error("{}解密邮件异常", LOGGER_MSG);
return R.error("解密邮件异常");
@ -341,7 +341,7 @@ public class CommonRest {
public R reCacheSksb(@RequestBody String content) {
Map<String, String> reqMap = JsonUtils.getInstance().parseObject(content, Map.class);
log.debug("{}对外重新缓存税控设备请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
log.info("{}对外重新缓存税控设备请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
if (ObjectUtil.isNull(reqMap)) {
log.error("{}对外重新缓存税控设备请求参数为空", LOGGER_MSG);
return R.error("重新缓存税控设备请求参数为空");
@ -371,13 +371,13 @@ public class CommonRest {
key = baseServiceConfig.getAesSimsBack();
}
String resultContent = AesEncryptUtil.desEncrypt(aesContent, key);
log.debug("{}对外重新缓存税控设备解密后数据:{}", LOGGER_MSG, resultContent);
log.info("{}对外重新缓存税控设备解密后数据:{}", LOGGER_MSG, resultContent);
if (StringUtils.isNotBlank(resultContent)) {
List<String> list = JsonUtils.getInstance().parseObject(resultContent, List.class);
if (ObjectUtil.isNotEmpty(list)) {
simsBackService.reCacheTaxEquipmentInfo(list.get(1),list.get(0));
}
log.debug("{}对外重新缓存税控设备成功", LOGGER_MSG);
log.info("{}对外重新缓存税控设备成功", LOGGER_MSG);
} else {
log.error("{}对外重新缓存税控设备异常,content数据为空", LOGGER_MSG);
return R.error("对外重新缓存税控设备异常");
@ -397,7 +397,7 @@ public class CommonRest {
public R reStartFanoutListener(@RequestBody String content) {
Map<String, String> reqMap = JsonUtils.getInstance().parseObject(content, Map.class);
log.debug("{}对外重启系统广播监听请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
log.info("{}对外重启系统广播监听请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
if (ObjectUtil.isNull(reqMap)) {
log.error("{}对外重启系统广播监听请求参数为空", LOGGER_MSG);
return R.error("重新缓存税控设备请求参数为空");
@ -427,12 +427,12 @@ public class CommonRest {
key = baseServiceConfig.getAesSimsBack();
}
String resultContent = AesEncryptUtil.desEncrypt(aesContent, key);
log.debug("{}对外重启系统广播监听解密后数据:{}", LOGGER_MSG, resultContent);
log.info("{}对外重启系统广播监听解密后数据:{}", LOGGER_MSG, resultContent);
if (StringUtils.isNotBlank(resultContent)) {
rabbitMqStartListenerService.startRabbitMqFanoutListener();
log.debug("{}对外重启系统广播监听成功", LOGGER_MSG);
log.info("{}对外重启系统广播监听成功", LOGGER_MSG);
} else {
log.error("{}对外重启系统广播监听异常,content数据为空", LOGGER_MSG);
return R.error("对外重启系统广播监听异常");
@ -452,7 +452,7 @@ public class CommonRest {
public R recacheSpsb(@RequestBody String content) {
Map<String, String> reqMap = JsonUtils.getInstance().parseObject(content, Map.class);
log.debug("{}对外重新缓存商品税编请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
log.info("{}对外重新缓存商品税编请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
if (ObjectUtil.isNull(reqMap)) {
log.error("{}对外重新缓存商品税编请求参数为空", LOGGER_MSG);
return R.error("对外重新缓存商品税编请求参数为空");
@ -482,12 +482,12 @@ public class CommonRest {
key = baseServiceConfig.getAesSimsBack();
}
String resultContent = AesEncryptUtil.desEncrypt(aesContent, key);
log.debug("{}对外重新缓存商品税编解密后数据:{}", LOGGER_MSG, resultContent);
log.info("{}对外重新缓存商品税编解密后数据:{}", LOGGER_MSG, resultContent);
if (StringUtils.isNotBlank(resultContent)) {
taxClassCodeService.cacheTaxClassCode();
log.debug("{}对外重新缓存商品税编成功", LOGGER_MSG);
log.info("{}对外重新缓存商品税编成功", LOGGER_MSG);
} else {
log.error("{}对外重新缓存商品税编异常,content数据为空", LOGGER_MSG);
return R.error("对外重新缓存商品税编异常");
@ -507,7 +507,7 @@ public class CommonRest {
public R pushJdwj(@RequestBody String content) {
Map<String, String> reqMap = JsonUtils.getInstance().parseObject(content, Map.class);
log.debug("{}推送京东万家数据请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
log.info("{}推送京东万家数据请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(reqMap));
if (ObjectUtil.isNull(reqMap)) {
log.error("{}推送京东万家数据请求参数为空", LOGGER_MSG);
return R.error("推送京东万家数据请求参数为空");
@ -537,7 +537,7 @@ public class CommonRest {
key = baseServiceConfig.getAesSimsBack();
}
String resultContent = AesEncryptUtil.desEncrypt(aesContent, key);
log.debug("{}推送京东万家数据解密后数据:{}", LOGGER_MSG, resultContent);
log.info("{}推送京东万家数据解密后数据:{}", LOGGER_MSG, resultContent);
if (StringUtils.isNotBlank(resultContent)) {
JdwjMqData jdwjMqData = JsonUtils.getInstance().parseObject(resultContent, JdwjMqData.class);
CommonTsMqData commonTsMqData = new CommonTsMqData();
@ -548,7 +548,7 @@ public class CommonRest {
R s = pushInvoiceService.pushRouting(JsonUtils.getInstance().toJsonString(commonTsMqData));
log.debug("{}推送京东万家数据成功", LOGGER_MSG);
log.info("{}推送京东万家数据成功", LOGGER_MSG);
return R.ok(s);
} else {
log.error("{}推送京东万家数据异常,content数据为空", LOGGER_MSG);
@ -568,7 +568,7 @@ public class CommonRest {
@RequestMapping(value = "/api/updateRedis", method = RequestMethod.POST)
public R updateRedis(@RequestBody PageInterfaceReq pageInterfaceReq) {
String result = "";
log.debug("{}修改redis缓存请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageInterfaceReq));
log.info("{}修改redis缓存请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageInterfaceReq));
if (ObjectUtil.isNull(pageInterfaceReq)) {
log.error("{}修改redis缓存请求参数为空", LOGGER_MSG);
return R.error("修改redis缓存请求参数为空");
@ -598,7 +598,7 @@ public class CommonRest {
key = baseServiceConfig.getAesSimsBack();
}
String resultContent = AesEncryptUtil.desEncrypt(aesContent, key);
log.debug("{}修改redis缓存解密后数据:{}", LOGGER_MSG, resultContent);
log.info("{}修改redis缓存解密后数据:{}", LOGGER_MSG, resultContent);
if (StringUtils.isNotBlank(resultContent)) {
PageInterfaceUpdateRedis pageInterfaceUpdateRedis = JsonUtils.getInstance().parseObject(resultContent, PageInterfaceUpdateRedis.class);
@ -631,7 +631,7 @@ public class CommonRest {
}
}
log.debug("{}修改redis缓存成功", LOGGER_MSG);
log.info("{}修改redis缓存成功", LOGGER_MSG);
} else {
log.error("{}修改redis缓存异常,content数据为空", LOGGER_MSG);
return R.error("修改redis缓存异常");
@ -651,7 +651,7 @@ public class CommonRest {
@RequestMapping(value = "/api/updateRabbitMq", method = RequestMethod.POST)
public R updateRabbitMq(@RequestBody PageInterfaceReq pageInterfaceReq) {
String result = "";
log.debug("{}修改rabbitmq数据请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageInterfaceReq));
log.info("{}修改rabbitmq数据请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageInterfaceReq));
if (ObjectUtil.isNull(pageInterfaceReq)) {
log.error("{}修改rabbitmq数据请求参数为空", LOGGER_MSG);
return R.error("修改rabbitmq数据请求参数为空");
@ -681,7 +681,7 @@ public class CommonRest {
key = baseServiceConfig.getAesSimsBack();
}
String resultContent = AesEncryptUtil.desEncrypt(aesContent, key);
log.debug("{}对外重新缓存税控设备解密后数据:{}", LOGGER_MSG, resultContent);
log.info("{}对外重新缓存税控设备解密后数据:{}", LOGGER_MSG, resultContent);
if (StringUtils.isNotBlank(resultContent)) {
PageInterfaceUpdateRabbitMq pageInterfaceUpdateRabbitMq = JsonUtils.getInstance().parseObject(resultContent, PageInterfaceUpdateRabbitMq.class);
@ -727,7 +727,7 @@ public class CommonRest {
rabbitMqSendMessageService.sendRabbitMqFanout(JsonUtils.getInstance().toJsonString(rabbitMqFanoutMessage));
}
}
log.debug("{}修改rabbitmq数据成功", LOGGER_MSG);
log.info("{}修改rabbitmq数据成功", LOGGER_MSG);
} else {
log.error("{}修改rabbitmq数据异常,content数据为空", LOGGER_MSG);
return R.error("修改rabbitmq数据异常");
@ -746,7 +746,7 @@ public class CommonRest {
@RequestMapping(value = "/api/setDataToRabbitMq", method = RequestMethod.POST)
public R setDataToRabbitMq(@RequestBody PageInterfaceReq pageInterfaceReq) {
String result = "";
log.debug("{}指定队列存放rabbitmq数据请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageInterfaceReq));
log.info("{}指定队列存放rabbitmq数据请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageInterfaceReq));
if (ObjectUtil.isNull(pageInterfaceReq)) {
log.error("{}指定队列存放rabbitmq数据请求参数为空", LOGGER_MSG);
return R.error("指定队列存放rabbitmq数据请求参数为空");
@ -776,7 +776,7 @@ public class CommonRest {
key = baseServiceConfig.getAesSimsBack();
}
String resultContent = AesEncryptUtil.desEncrypt(aesContent, key);
log.debug("{}指定队列存放rabbitmq数据解密后数据:{}", LOGGER_MSG, resultContent);
log.info("{}指定队列存放rabbitmq数据解密后数据:{}", LOGGER_MSG, resultContent);
if (StringUtils.isNotBlank(resultContent)) {
PageInterfaceSetDataToRabbitMq pageInterfaceSetDataToRabbitMq = JsonUtils.getInstance().parseObject(resultContent, PageInterfaceSetDataToRabbitMq.class);
@ -793,7 +793,7 @@ public class CommonRest {
}
}
log.debug("{}修改rabbitmq数据成功", LOGGER_MSG);
log.info("{}修改rabbitmq数据成功", LOGGER_MSG);
} else {
log.error("{}修改rabbitmq数据异常,content数据为空", LOGGER_MSG);
return R.error("修改rabbitmq数据异常");

@ -100,7 +100,7 @@ public class FangGeInvoiceRestApi {
result = commonInterfaceService.auth(request, response);
final long millSeconds1 = new Duration(begin1, now()).getMillis();
log.debug("{}鉴权耗时{}毫秒", LOGGER_INVOICES, millSeconds1);
log.info("{}鉴权耗时{}毫秒", LOGGER_INVOICES, millSeconds1);
responseStatus = (ResponseStatus) result.get(ConfigurerInfo.RESPONSESTATUS);
@ -126,7 +126,7 @@ public class FangGeInvoiceRestApi {
* 获取待开具数据
*/
FgGetInvoiceReqBO paramContent = JsonUtils.getInstance().parseObject(commonDecrypt2, FgGetInvoiceReqBO.class);
log.debug("方格查询:订单请求流水号:{}", paramContent.getDDQQLSH());
log.info("方格查询:订单请求流水号:{}", paramContent.getDDQQLSH());
invoices = fangGeInterfaceService.getInvoices(paramContent);
} else if (ConfigurerInfo.FANG_GE_GETINVOICESTATUS.equals(interfaceName)) {
@ -135,7 +135,7 @@ public class FangGeInvoiceRestApi {
* 接收待开订单数据状态
*/
List<FgCommonOrderStatusBO> paramContent = JsonUtils.getInstance().jsonToList(commonDecrypt2, FgCommonOrderStatusBO.class);
log.debug("方格通知接收成功:订单请求流水号:{}", paramContent.get(0).getDDQQLSH());
log.info("方格通知接收成功:订单请求流水号:{}", paramContent.get(0).getDDQQLSH());
invoices = fangGeInterfaceService.getInvoiceStatus(paramContent);
} else if (ConfigurerInfo.FANG_GE_UPDATEINVOICES.equals(interfaceName)) {
@ -144,7 +144,7 @@ public class FangGeInvoiceRestApi {
* 接收开票完成数据
*/
List<FgCommonInvoiceInfoBO> paramContent = JsonUtils.getInstance().jsonToList(commonDecrypt2, FgCommonInvoiceInfoBO.class);
log.debug("方格开票结果返回:订单请求流水号:{}", paramContent.get(0).getDDQQLSH());
log.info("方格开票结果返回:订单请求流水号:{}", paramContent.get(0).getDDQQLSH());
invoices = fangGeInterfaceService.updateInvoices(paramContent);
} else if (ConfigurerInfo.FANG_GE_GETUPLOADREDINVOICE.equals(interfaceName)) {
@ -387,7 +387,7 @@ public class FangGeInvoiceRestApi {
}
String data = null;
returnJsonString = JsonUtils.getInstance().toJsonString(invoices.getData());
log.debug("{},接口返回数据:{}", LOGGER_INVOICES, returnJsonString);
log.info("{},接口返回数据:{}", LOGGER_INVOICES, returnJsonString);
if (!StringUtils.isBlank(returnJsonString)) {
commonRequestParam.setContent(returnJsonString);

@ -113,10 +113,10 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// InterfaceData interfaceData = new InterfaceData();
// try {
// String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
// log.debug("{}全电商品信息查询接口,入参:{}", LOGGER_MSG, data);
// log.info("{}全电商品信息查询接口,入参:{}", LOGGER_MSG, data);
//
// interfaceData = ProtocolUtil.decodeData(data);
// log.debug("{}全电商品信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// log.info("{}全电商品信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// PageSpxxReq pageSpxxReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageSpxxReq.class);
//
// if (ObjectUtil.isNull(pageSpxxReq)) {
@ -136,7 +136,7 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// }
// });
//
// log.debug("{}全电商品信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
// log.info("{}全电商品信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
// return buildReturnData(interfaceData,OrderInfoEnum.INTERFACE_SUCCESS.getKey(),OrderInfoEnum.INTERFACE_SUCCESS.getValue(),dataList);
// } catch (OrderReceiveException e) {
// log.error("{}全电商品信息查询接口,异常:{}", LOGGER_MSG, e);
@ -154,10 +154,10 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// InterfaceData interfaceData = new InterfaceData();
// try {
// String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
// log.debug("{}全电商品信息同步接口,入参:{}", LOGGER_MSG, data);
// log.info("{}全电商品信息同步接口,入参:{}", LOGGER_MSG, data);
//
// interfaceData = ProtocolUtil.decodeData(data);
// log.debug("{}全电商品信息同步接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// log.info("{}全电商品信息同步接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// List<PageUpdateSpxxReq> pageUpdateSpxxReqList = JsonUtils.getInstance().jsonToList(interfaceData.getData(), PageUpdateSpxxReq.class);
//
// if (ObjectUtil.isEmpty(pageUpdateSpxxReqList)) {
@ -201,7 +201,7 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// commodityService.saveInvoiceItem(orderItemInfoList, pageUpdateSpxxReq.getXhfMc(), NsrsbhUtils.transShListByNsrsbh(pageUpdateSpxxReq.getXhfNsrsbh()));
// }
//
// log.debug("{}全电商品信息同步接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(R.ok()));
// log.info("{}全电商品信息同步接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(R.ok()));
// return buildReturnData(interfaceData,OrderInfoEnum.INTERFACE_SUCCESS.getKey(),OrderInfoEnum.INTERFACE_SUCCESS.getValue(),null);
// } catch (OrderReceiveException e) {
// log.error("{}全电商品信息同步接口,异常:{}", LOGGER_MSG, e);
@ -226,10 +226,10 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// InterfaceData interfaceData = new InterfaceData();
// try {
// String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
// log.debug("{}全电购方信息查询接口,入参:{}", LOGGER_MSG, data);
// log.info("{}全电购方信息查询接口,入参:{}", LOGGER_MSG, data);
//
// interfaceData = ProtocolUtil.decodeData(data);
// log.debug("{}全电购方信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// log.info("{}全电购方信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// PageGfxxReq pageGfxxReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageGfxxReq.class);
//
// if (ObjectUtil.isNull(pageGfxxReq)) {
@ -238,7 +238,7 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// List<String> shList = NsrsbhUtils.transShListByNsrsbh(pageGfxxReq.getXhfNsrsbh());
// List<BuyerEntity> buyerEntityList = buyerService.autoQueryBuyerInfoList(pageGfxxReq.getGfmc(), shList,null);
//
// log.debug("{}全电购方信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(buyerEntityList));
// log.info("{}全电购方信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(buyerEntityList));
// return buildReturnData(interfaceData,OrderInfoEnum.INTERFACE_SUCCESS.getKey(),OrderInfoEnum.INTERFACE_SUCCESS.getValue(),buyerEntityList);
// } catch (OrderReceiveException e) {
// log.error("{}全电购方信息查询接口,异常:{}", LOGGER_MSG, e);
@ -256,10 +256,10 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// InterfaceData interfaceData = new InterfaceData();
// try {
// String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
// log.debug("{}全电购方详细信息查询接口,入参:{}", LOGGER_MSG, data);
// log.info("{}全电购方详细信息查询接口,入参:{}", LOGGER_MSG, data);
//
// interfaceData = ProtocolUtil.decodeData(data);
// log.debug("{}全电购方详细信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// log.info("{}全电购方详细信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// PageGfxxReq pageGfxxReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageGfxxReq.class);
//
// if (ObjectUtil.isNull(pageGfxxReq)) {
@ -268,7 +268,7 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// List<String> shList = NsrsbhUtils.transShListByNsrsbh(pageGfxxReq.getXhfNsrsbh());
// BuyerEntity buyerEntity = buyerService.autoQueryBuyerInfo(pageGfxxReq.getGfmc(), shList,null);
//
// log.debug("{}全电购方详细信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(buyerEntity));
// log.info("{}全电购方详细信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(buyerEntity));
// return buildReturnData(interfaceData,OrderInfoEnum.INTERFACE_SUCCESS.getKey(),OrderInfoEnum.INTERFACE_SUCCESS.getValue(),buyerEntity);
// } catch (OrderReceiveException e) {
// log.error("{}全电购方详细信息查询接口,异常:{}", LOGGER_MSG, e);
@ -285,10 +285,10 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// InterfaceData interfaceData = new InterfaceData();
// try {
// String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
// log.debug("{}全电购方信息同步接口,入参:{}", LOGGER_MSG, data);
// log.info("{}全电购方信息同步接口,入参:{}", LOGGER_MSG, data);
//
// interfaceData = ProtocolUtil.decodeData(data);
// log.debug("{}全电购方信息同步接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// log.info("{}全电购方信息同步接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// PageUpdateGfxxReq pageUpdateGfxxReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageUpdateGfxxReq.class);
//
// if (ObjectUtil.isNull(pageUpdateGfxxReq)) {
@ -298,7 +298,7 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// BuyerEntity buyerEntity = transBuyerEntity(pageUpdateGfxxReq);
// buyerService.saveOrUpdateBuyerInfo(buyerEntity);
//
// log.debug("{}全电购方信息同步接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(R.ok()));
// log.info("{}全电购方信息同步接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(R.ok()));
// return buildReturnData(interfaceData,OrderInfoEnum.INTERFACE_SUCCESS.getKey(),OrderInfoEnum.INTERFACE_SUCCESS.getValue(),null);
// } catch (OrderReceiveException e) {
// log.error("{}全电购方信息同步接口,异常:{}", LOGGER_MSG, e);
@ -369,10 +369,10 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// InterfaceData interfaceData = new InterfaceData();
// try {
// String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
// log.debug("{}全电局端税编信息查询接口,入参:{}", LOGGER_MSG, data);
// log.info("{}全电局端税编信息查询接口,入参:{}", LOGGER_MSG, data);
//
// interfaceData = ProtocolUtil.decodeData(data);
// log.debug("{}全电局端税编信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// log.info("{}全电局端税编信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// PageJdsbxxReq pageJdsbxxReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageJdsbxxReq.class);
//
// if (ObjectUtil.isNull(pageJdsbxxReq)) {
@ -391,7 +391,7 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
//
// PageUtils dataList = taxClassCodeService.queryTaxClassCode(map);
//
// log.debug("{}全电局端税编信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
// log.info("{}全电局端税编信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
// return buildReturnData(interfaceData,OrderInfoEnum.INTERFACE_SUCCESS.getKey(),OrderInfoEnum.INTERFACE_SUCCESS.getValue(),dataList);
// } catch (OrderReceiveException e) {
// log.error("{}全电局端税编信息查询接口,异常:{}", LOGGER_MSG, e);
@ -409,10 +409,10 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// InterfaceData interfaceData = new InterfaceData();
// try {
// String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
// log.debug("{}全电开票人信息查询接口,入参:{}", LOGGER_MSG, data);
// log.info("{}全电开票人信息查询接口,入参:{}", LOGGER_MSG, data);
//
// interfaceData = ProtocolUtil.decodeData(data);
// log.debug("{}全电开票人信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// log.info("{}全电开票人信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// PageKprxxReq pageKprxxReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageKprxxReq.class);
//
// if (ObjectUtil.isNull(pageKprxxReq)) {
@ -420,7 +420,7 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// }
// List<String> shList = NsrsbhUtils.transShListByNsrsbh(pageKprxxReq.getXhfNsrsbh());
// DrawerInfoEntity dataList = drawerInfoService.queryDrawerInfo(shList.get(0), pageKprxxReq.getUserId());
// log.debug("{}全电开票人信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
// log.info("{}全电开票人信息查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
// return buildReturnData(interfaceData,OrderInfoEnum.INTERFACE_SUCCESS.getKey(),OrderInfoEnum.INTERFACE_SUCCESS.getValue(),dataList);
// } catch (OrderReceiveException e) {
// log.error("{}全电开票人信息查询接口,异常:{}", LOGGER_MSG, e);
@ -438,10 +438,10 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// InterfaceData interfaceData = new InterfaceData();
// try {
// String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
// log.debug("{}全电业务类型查询接口,入参:{}", LOGGER_MSG, data);
// log.info("{}全电业务类型查询接口,入参:{}", LOGGER_MSG, data);
//
// interfaceData = ProtocolUtil.decodeData(data);
// log.debug("{}全电业务类型查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// log.info("{}全电业务类型查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// PageYwlxReq pageYwlxReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageYwlxReq.class);
//
// if (ObjectUtil.isNull(pageYwlxReq)) {
@ -455,7 +455,7 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// }
//
// List<BuinessTypeBO> dataList = businessTypeService.queryYwlxOrNsrsbh(map, shList);
// log.debug("{}全电业务类型查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
// log.info("{}全电业务类型查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(dataList));
// return buildReturnData(interfaceData,OrderInfoEnum.INTERFACE_SUCCESS.getKey(),OrderInfoEnum.INTERFACE_SUCCESS.getValue(),dataList);
// } catch (OrderReceiveException e) {
// log.error("{}全电业务类型查询接口,异常:{}", LOGGER_MSG, e);
@ -472,10 +472,10 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// InterfaceData interfaceData = new InterfaceData();
// try {
// String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
// log.debug("{}开票组织管理查询接口,入参:{}", LOGGER_MSG, data);
// log.info("{}开票组织管理查询接口,入参:{}", LOGGER_MSG, data);
//
// interfaceData = ProtocolUtil.decodeData(data);
// log.debug("{}开票组织管理查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// log.info("{}开票组织管理查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// PageKpzzglReq pageKpzzglReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageKpzzglReq.class);
//
// if (ObjectUtil.isNull(pageKpzzglReq)) {
@ -511,7 +511,7 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// });
// pageKpzzglInfo.setPageXfxxList(pageXfxxList);
// }
// log.debug("{}开票组织管理查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageKpzzglInfo));
// log.info("{}开票组织管理查询接口,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pageKpzzglInfo));
// return buildReturnData(interfaceData,OrderInfoEnum.INTERFACE_SUCCESS.getKey(),OrderInfoEnum.INTERFACE_SUCCESS.getValue(),pageKpzzglInfo);
// } catch (OrderReceiveException e) {
// log.error("{}开票组织管理查询接口,异常:{}", LOGGER_MSG, e);
@ -529,10 +529,10 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// InterfaceData interfaceData = new InterfaceData();
// try {
// String data = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
// log.debug("{}用户信息查询接口,入参:{}", LOGGER_MSG, data);
// log.info("{}用户信息查询接口,入参:{}", LOGGER_MSG, data);
//
// interfaceData = ProtocolUtil.decodeData(data);
// log.debug("{}用户信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// log.info("{}用户信息查询接口,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
// PageUserInfoReq pageUserInfoReq = JsonUtils.getInstance().parseObject(interfaceData.getData(), PageUserInfoReq.class);
//
// if(Objects.isNull(pageUserInfoReq)){
@ -548,7 +548,7 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// userInfoQuery.setBusinessDataType(OrderInfoEnum.ORDER_USER_INFO_BUSINESS_DATA_TYPE_2.getKey());
// userInfoQuery.setIsFilter(OrderInfoEnum.ORDER_USER_INFO_IS_FILTER_1.getKey());
// R r = userInfoService.getUserInfo(userInfoQuery);
// log.debug("{}查询用户中心,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(r));
// log.info("{}查询用户中心,返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(r));
// if(ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))){
// UserEntity userEntity = (UserEntity) r.get(OrderManagementConstant.DATA);
// return buildReturnData(interfaceData,OrderInfoEnum.INTERFACE_SUCCESS.getKey(),OrderInfoEnum.INTERFACE_SUCCESS.getValue(),userEntity);
@ -585,7 +585,7 @@ package com.dxhy.order.consumer.openapi.api;//package com.dxhy.order.consumer.op
// } catch (Exception e) {
// log.error("{}全电业务数据加密,异常:{}", LOGGER_MSG, e);
// }
// log.debug("{}全电业务接口,加密返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(interfaceData));
// log.info("{}全电业务接口,加密返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(interfaceData));
// return interfaceData;
// }
//

@ -141,7 +141,7 @@ public class InvoiceRestApiV1 {
result = commonInterfaceService.auth(request, response);
final long millSeconds1 = new Duration(begin1, now()).getMillis();
log.debug("{}鉴权耗时{}毫秒", LOGGER_MSG, millSeconds1);
log.info("{}鉴权耗时{}毫秒", LOGGER_MSG, millSeconds1);
responseStatus = (ResponseStatus) result.get(ConfigurerInfo.RESPONSESTATUS);
@ -151,7 +151,7 @@ public class InvoiceRestApiV1 {
}
//解密
String commonDecrypt2 = commonDisposeService.commonDecrypt(commonRequestParam);
log.debug("{}解密日志:{}", LOGGER_MSG, commonDecrypt2);
log.info("{}解密日志:{}", LOGGER_MSG, commonDecrypt2);
//返回参数
String returnJsonString = orderapiV2Process(interfaceName, interfaceVersion, commonDecrypt2);
@ -159,7 +159,7 @@ public class InvoiceRestApiV1 {
String data = null;
log.debug("{},接口返回数据:{}", LOGGER_MSG, returnJsonString);
log.info("{},接口返回数据:{}", LOGGER_MSG, returnJsonString);
if (!StringUtils.isBlank(returnJsonString)) {
commonRequestParam.setContent(returnJsonString);
/**

@ -294,7 +294,7 @@ public class InvoiceRestApiV3V4 {
result = commonInterfaceService.auth(request, response);
final long millSeconds1 = new Duration(begin1, now()).getMillis();
log.debug("{}鉴权耗时{}毫秒", LOGGER_MSG, millSeconds1);
log.info("{}鉴权耗时{}毫秒", LOGGER_MSG, millSeconds1);
responseStatus = (ResponseStatus) result.get(ConfigurerInfo.RESPONSESTATUS);

@ -104,7 +104,7 @@ public class InvoiceRestApiV5 {
@PathVariable("interfaceName") String interfaceName,
@ApiParam(name = "requestParam", value = "请求内容", required = true) @RequestBody String content) {
log.debug("{}订单对外统一接口请求内容:{}", LOGGER_MSG, content);
log.info("{}订单对外统一接口请求内容:{}", LOGGER_MSG, content);
String interfaceVersion = ConfigurerInfo.INTERFACE_VERSION_V5;
DxhyInterfaceResponse dxhyInterfaceResponse = new DxhyInterfaceResponse(RespStatusEnum.FAIL2);
@ -159,7 +159,7 @@ public class InvoiceRestApiV5 {
}
final long millSeconds1 = new Duration(begin1, now()).getMillis();
log.debug("{}鉴权耗时{}毫秒", LOGGER_MSG, millSeconds1);
log.info("{}鉴权耗时{}毫秒", LOGGER_MSG, millSeconds1);
if (!ConfigurerInfo.SUCCSSCODE.equals(result.getCode())) {
@ -175,15 +175,15 @@ public class InvoiceRestApiV5 {
commonRequestParam.setSecretId(dxhyInterfaceRequest.getSecretId());
String commonDecrypt2 = commonDisposeService.commonDecrypt(commonRequestParam);
log.debug("{}解密日志:{}", LOGGER_MSG, commonDecrypt2);
log.info("{}解密日志:{}", LOGGER_MSG, commonDecrypt2);
String returnJsonString = "";
long start = System.currentTimeMillis();
//调用业务处理逻辑方法
returnJsonString = orderApiV5HandingBusiness(interfaceName, commonDecrypt2, dxhyInterfaceRequest.getSecretId());
long end = System.currentTimeMillis();
log.debug("{}接口:{},请求耗时:{}", LOGGER_MSG, interfaceName, end - start);
log.info("{}接口:{},请求耗时:{}", LOGGER_MSG, interfaceName, end - start);
log.debug("{},接口返回数据:{}", LOGGER_MSG, returnJsonString);
log.info("{},接口返回数据:{}", LOGGER_MSG, returnJsonString);
if (!StringUtils.isBlank(returnJsonString)) {
commonRequestParam.setContent(returnJsonString);
/**

@ -119,7 +119,7 @@ public class InvoiceRestApiV6 {
@ApiParam(name = "requestParam", value = "请求内容", required = true) @RequestBody String content) {
log.debug("{}订单对外统一接口请求内容:{}", LOGGER_MSG, content);
log.info("{}订单对外统一接口请求内容:{}", LOGGER_MSG, content);
DxhyInterfaceResponse dxhyInterfaceResponse = new DxhyInterfaceResponse(RespStatusEnum.FAIL2);
long startTime = System.currentTimeMillis();
@ -163,7 +163,7 @@ public class InvoiceRestApiV6 {
result = new CheckResult(RespStatusEnum.AUTHFAIL);
}
final long millSeconds1 = new Duration(begin1, now()).getMillis();
log.debug("{}鉴权耗时{}毫秒", LOGGER_MSG, millSeconds1);
log.info("{}鉴权耗时{}毫秒", LOGGER_MSG, millSeconds1);
if (!ConfigurerInfo.SUCCSSCODE.equals(result.getCode())) {
log.error("{},鉴权未通过", LOGGER_MSG);
throw new OrderReceiveException(result.getCode(), result.getMsg());
@ -177,13 +177,13 @@ public class InvoiceRestApiV6 {
commonRequestParam.setSecretId(dxhyInterfaceRequest.getSecretId());
String commonDecrypt2 = commonDisposeService.commonDecrypt(commonRequestParam);
log.debug("{}解密日志:{}", LOGGER_MSG, commonDecrypt2);
log.info("{}解密日志:{}", LOGGER_MSG, commonDecrypt2);
long start = System.currentTimeMillis();
//调用业务处理逻辑方法
String returnJsonString = orderApiV6HandingBusiness(interfaceName, commonDecrypt2, dxhyInterfaceRequest.getSecretId());
long end = System.currentTimeMillis();
log.debug("{}接口:{},请求耗时:{}", LOGGER_MSG, interfaceName, end - start);
log.debug("{},接口返回数据:{}", LOGGER_MSG, returnJsonString);
log.info("{}接口:{},请求耗时:{}", LOGGER_MSG, interfaceName, end - start);
log.info("{},接口返回数据:{}", LOGGER_MSG, returnJsonString);
if (!StringUtils.isBlank(returnJsonString)) {
commonRequestParam.setContent(returnJsonString);

@ -184,7 +184,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
* 8. 放入开票队列
*
* */
log.debug("{},发票开具数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(ddpcxxReq));
log.info("{},发票开具数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(ddpcxxReq));
//请求参数非空校验
DdpcxxRspBO ddpcxxRsp = checkRequestParamNonNull(ddpcxxReq);
@ -360,7 +360,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
//订单信息是否开过票,true表示开票中或开票失败;false表示未开票
OrderProcessInfo selectOrderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(ddqqlsh, shList);
log.debug("{}查询数据库处理表校验数据是否已经存在,结果为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(selectOrderProcessInfo));
log.info("{}查询数据库处理表校验数据是否已经存在,结果为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(selectOrderProcessInfo));
boolean flag = isBillingSuccess(ddqqpch, ddqqlsh, commonOrderInfo, selectOrderProcessInfo);
//价税分离
@ -407,7 +407,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
String xhfmc = commonOrderInfo.getOrderInfo().getXhfMc();
if (StringUtils.isNotBlank(ywlx)) {
//如果接口传递业务类型不为空,走业务类型采集流程 todo 后期是不是可以放进统一队列中进行加载
log.debug("{} 业务类型采集,业务类型名称:{},税号:{},销货方名称:{}", LOGGER_MSG, ywlx, nsrsbh, xhfmc);
log.info("{} 业务类型采集,业务类型名称:{},税号:{},销货方名称:{}", LOGGER_MSG, ywlx, nsrsbh, xhfmc);
R businessTypeInfo = businessTypeService.saveBusinessTypeInfo(ywlx, xhfmc, ConfigureConstant.STRING_0, "", shList);
if (ConfigureConstant.STRING_0000.equals(businessTypeInfo.get(OrderManagementConstant.CODE)) && StringUtils.isNotEmpty(businessTypeInfo.get("businessId").toString())) {
ywlxId = businessTypeInfo.get("businessId").toString();
@ -945,7 +945,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
} else {
for (FpkjMqData fpkjMqData : fpkjMqDataList) {
String jsonString = JsonUtils.getInstance().toJsonString(fpkjMqData);
log.debug("{}放入mq的数据:{}", LOGGER_MSG, jsonString);
log.info("{}放入mq的数据:{}", LOGGER_MSG, jsonString);
openInvoiceService.openAnInvoice(jsonString, fpkjMqData.getEntId(), fpkjMqData.getNsrsbh(), fpkjMqData.getCreateTime(), fpkjMqData.getFpqqlsh());
}
if (ObjectUtil.isNotEmpty(updatePchList)) {

@ -84,7 +84,7 @@ public class CommonDisposeServiceImpl implements CommonDisposeService {
//没值查询数据库,存值并返回
String value = StringUtils.EMPTY;
List<AuthenticationInfo> authenticateAction = authenticationInfoMapper.selectAuthticationAll(ConfigureConstant.STRING_0, "");
log.debug("{},初始化,遍历数据库数据条数:{}", LOGGER_MSG, authenticateAction.size());
log.info("{},初始化,遍历数据库数据条数:{}", LOGGER_MSG, authenticateAction.size());
for (AuthenticationInfo authenticationInfo : authenticateAction) {
if (secretId.equals(authenticationInfo.getSecretId())) {
redisService.set(redisSecretId, authenticationInfo.getSecretKey(), RedisConstant.REDIS_EXPIRE_TIME_DEFAULT);
@ -201,9 +201,9 @@ public class CommonDisposeServiceImpl implements CommonDisposeService {
* 根据税号读取对应的secretId
*/
String secretId = getAuthMap(nsrsbh);
log.debug("{}根据税号:{},获取到的secretId为:{}", LOGGER_MSG, nsrsbh, secretId);
log.info("{}根据税号:{},获取到的secretId为:{}", LOGGER_MSG, nsrsbh, secretId);
String secretKey = getAuthMap(secretId);
log.debug("{}根据secretId:{},获取到的secretKey为:{}", LOGGER_MSG, secretId, secretKey);
log.info("{}根据secretId:{},获取到的secretKey为:{}", LOGGER_MSG, secretId, secretKey);
CommonRequestParam commonRequestParam = new CommonRequestParam();
commonRequestParam.setZipCode(zipCode);
@ -225,7 +225,7 @@ public class CommonDisposeServiceImpl implements CommonDisposeService {
String secretKey = openApiConfig.configPushTicketPoolSecretKey();
String signUrl = commonInterfaceService.getAuthUrl(url, "POST");
log.debug("{}根据数据库请求URL:{},获取到的签名URL为:{}", LOGGER_MSG, url, signUrl);
log.info("{}根据数据库请求URL:{},获取到的签名URL为:{}", LOGGER_MSG, url, signUrl);
CommonRequestParam commonRequestParam = new CommonRequestParam();
commonRequestParam.setZipCode(zipCode);
@ -256,7 +256,7 @@ public class CommonDisposeServiceImpl implements CommonDisposeService {
HashMap<String, String> reqMap = new HashMap<>(10);
String signUrl = commonInterfaceService.getAuthUrl(url, "POST");
log.debug("{}根据数据库请求URL:{},获取到的签名URL为:{}", LOGGER_MSG, url, signUrl);
log.info("{}根据数据库请求URL:{},获取到的签名URL为:{}", LOGGER_MSG, url, signUrl);
TreeMap<String, String> sortMap = new TreeMap<>();
@ -283,7 +283,7 @@ public class CommonDisposeServiceImpl implements CommonDisposeService {
}
try {
String localSign = HmacSha1Util.genSign(signUrl, sortMap, secretKey);
log.debug("{}生成的签名值为:{}", LOGGER_MSG, localSign);
log.info("{}生成的签名值为:{}", LOGGER_MSG, localSign);
sortMap.put(ConfigurerInfo.SIGNATURE, localSign);
reqMap = new HashMap<>(sortMap);
} catch (Exception e) {
@ -313,7 +313,7 @@ public class CommonDisposeServiceImpl implements CommonDisposeService {
byte[] bytes = HmacSha1Util.hmacsha1(srcStr.getBytes(StandardCharsets.UTF_8), secretKey.getBytes(StandardCharsets.UTF_8));
localSign = Base64.encodeBase64URLSafeString(bytes);
log.debug("{}生成的签名值为:{}", LOGGER_MSG, localSign);
log.info("{}生成的签名值为:{}", LOGGER_MSG, localSign);
String formatStr1 = "{" +
" \"data\": \"%s\"," +
" \"globalInfo\": {" +

@ -263,7 +263,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
String encryptCode = request.getParameter(ConfigurerInfo.ENCRYPTCODE);
String content = request.getParameter(ConfigurerInfo.CONTENT);
String reqSign = request.getParameter(ConfigurerInfo.SIGNATURE);
log.debug("{}签名请求的secretId:{},nonce:{},timestamp:{},zipCode:{},encryptCode:{},签名值sign:{},内容content:{}", LOGGER_MSG, secretId, nonce, timeStamp, zipCode, encryptCode, reqSign, content);
log.info("{}签名请求的secretId:{},nonce:{},timestamp:{},zipCode:{},encryptCode:{},签名值sign:{},内容content:{}", LOGGER_MSG, secretId, nonce, timeStamp, zipCode, encryptCode, reqSign, content);
StringBuilder url = new StringBuilder();
url.append(request.getMethod()).append(request.getServerName());
if (ConfigureConstant.INT_80 != request.getServerPort() && ConfigureConstant.INT_443 != request.getServerPort()) {
@ -352,11 +352,11 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
sortMap.put(ConfigurerInfo.ZIPCODE, dxhyInterfaceRequest.getZipCode());
sortMap.put(ConfigurerInfo.CONTENT, dxhyInterfaceRequest.getContent());
String secretKey = commonDisposeService.getAuthMap(dxhyInterfaceRequest.getSecretId());
log.debug("{}通过secretId:{},获取的对应的secretKey:{}", LOGGER_MSG, dxhyInterfaceRequest.getSecretId(), secretKey);
log.info("{}通过secretId:{},获取的对应的secretKey:{}", LOGGER_MSG, dxhyInterfaceRequest.getSecretId(), secretKey);
String localSign = HmacSha1Util.genSign(signUrl, sortMap, secretKey);
log.debug("{}生成的本地签名值为local:{}", LOGGER_MSG, localSign);
log.info("{}生成的本地签名值为local:{}", LOGGER_MSG, localSign);
return localSign;
}
@ -493,7 +493,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
orderInfo.setKpr(drawerInfoEntity.getDrawerName());
orderInfo.setSkr(StringUtils.isBlank(orderInfo.getSkr()) ? drawerInfoEntity.getNameOfPayee() : orderInfo.getSkr());
orderInfo.setFhr(StringUtils.isBlank(orderInfo.getFhr()) ? drawerInfoEntity.getReCheckName() : orderInfo.getFhr());
log.debug("{}流水号为:{}的数据补全开票人为:{},复核人为:{},收款人为:{}", LOGGER_MSG, orderInfo.getFpqqlsh(), orderInfo.getKpr(), orderInfo.getFhr(), orderInfo.getSkr());
log.info("{}流水号为:{}的数据补全开票人为:{},复核人为:{},收款人为:{}", LOGGER_MSG, orderInfo.getFpqqlsh(), orderInfo.getKpr(), orderInfo.getFhr(), orderInfo.getSkr());
}
}
@ -602,7 +602,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
if (StringUtils.isBlank(item.getZzstsgl())) {
item.setZzstsgl("");
}
log.debug("{}项目名称:{},智能赋码成功,匹配到税编:{}",LOGGER_MSG,item.getXmmc(),item.getSpbm());
log.info("{}项目名称:{},智能赋码成功,匹配到税编:{}",LOGGER_MSG,item.getXmmc(),item.getSpbm());
//如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全
String spmc = item.getXmmc();
StringBuilder stringBuilder = new StringBuilder();
@ -614,14 +614,14 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
item.setXmmc(spmc);
cpy = taxClassCodeEntity.getCpy();
}else {
log.debug("{}项目名称:{},智能赋码未匹配到税编",LOGGER_MSG,item.getXmmc());
log.info("{}项目名称:{},智能赋码未匹配到税编",LOGGER_MSG,item.getXmmc());
/*errorStr.append(indexStr)
.append(ConfigureConstant.STRING_UNDERLINE)
.append(OrderInfoContentEnum.INVOICE_SPBM_MATCH_NULL.getMessage())
.append("\r\n");*/
}
}else{
log.debug("{}项目名称为空,智能赋码失败",LOGGER_MSG);
log.info("{}项目名称为空,智能赋码失败",LOGGER_MSG);
}
}
@ -631,13 +631,13 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
// 如果没有找到,记录异常
if (commodityCodeEntity == null) {
log.debug("{}根据物料编码在公司库和集团库未匹配到税编", LOGGER_MSG);
log.info("{}根据物料编码在公司库和集团库未匹配到税编", LOGGER_MSG);
/*errorStr.append(indexStr)
.append(ConfigureConstant.STRING_UNDERLINE)
.append(OrderInfoContentEnum.INVOICE_SPBM_QUERY_NULL.getMessage())
.append("\r\n");*/
} else {
log.debug("{}根据物料编码在公司库或集团库匹配到了税编,开始补全明细", LOGGER_MSG);
log.info("{}根据物料编码在公司库或集团库匹配到了税编,开始补全明细", LOGGER_MSG);
// 如果找到记录,进行赋值匹配
// 判断是否推送了物料的名称、单位、规格型号信息
//如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全
@ -707,7 +707,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
}
}
}
log.debug("{}物料:{},匹配类型:{}",LOGGER_MSG,item.getZxbm(),pply);
log.info("{}物料:{},匹配类型:{}",LOGGER_MSG,item.getZxbm(),pply);
cpyList.add(cpy);
}
if (StringUtils.isNotBlank(errorStr.toString())) {
@ -715,7 +715,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_SPBM_QUERY_NULL.getKey(), errorStr.toString());
}
long end = System.currentTimeMillis();
log.debug("{}订单明细信息补全耗时:{}", LOGGER_MSG, end - start);
log.info("{}订单明细信息补全耗时:{}", LOGGER_MSG, end - start);
if(cpyList.size() == orderItemInfo.size()){
boolean allMatch = cpyList.stream().allMatch(cpy -> StringUtils.isNotBlank(cpy) && "Y".equals(cpy));
if(allMatch){
@ -779,9 +779,9 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
String xmmc = item.getXmmc();
try {
if (xmmc.getBytes(ConfigureConstant.STRING_CHARSET_GBK).length > ConfigureConstant.INT_90) {
log.debug("对明细行商品名称进行截取,截取前数据为:{}", xmmc);
log.info("对明细行商品名称进行截取,截取前数据为:{}", xmmc);
xmmc = StringUtil.subStringByByte(xmmc, ConfigureConstant.INT_90);
log.debug("对明细行商品名称进行截取,截取后数据为:{}", xmmc);
log.info("对明细行商品名称进行截取,截取后数据为:{}", xmmc);
item.setXmmc(xmmc);
}
} catch (IOException e) {
@ -829,9 +829,9 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
String ggxh = item.getGgxh();
try {
if (ggxh.getBytes(ConfigureConstant.STRING_CHARSET_GBK).length > ConfigureConstant.INT_40) {
log.debug("对明细行规格型号进行截取,截取前数据为:{}", ggxh);
log.info("对明细行规格型号进行截取,截取前数据为:{}", ggxh);
ggxh = StringUtil.subStringByByte(ggxh, ConfigureConstant.INT_40);
log.debug("对明细行规格型号进行截取,截取后数据为:{}", ggxh);
log.info("对明细行规格型号进行截取,截取后数据为:{}", ggxh);
item.setGgxh(ggxh);
}
} catch (IOException e) {

@ -439,7 +439,7 @@ public class DynamicCodeInterfaceServiceImplV3 implements DynamicCodeInterfaceSe
}
} else {
log.debug("动态码数据已经存在,直接返回,tqm:{},二维码:{}", tqm, quickResponseCodeInfo.getQuickResponseCodeUrl());
log.info("动态码数据已经存在,直接返回,tqm:{},二维码:{}", tqm, quickResponseCodeInfo.getQuickResponseCodeUrl());
EwmGzhConfig config = quickCodeInfoService.queryGzhEwmConfig(quickResponseCodeInfo.getXhfNsrsbh());
String appid = (config == null || StringUtils.isBlank(config.getAppid())) ? openApiConfig.configMyInvoiceAppId() : config.getAppid();
response.setDISABLED_TIME(DateUtil.format(quickResponseCodeInfo.getQuickResponseCodeValidTime(), ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S));

@ -990,7 +990,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
*/
@Override
public FgOrderResponseBO getUploadRedInvoice(FgGetInvoiceUploadReqBO param) {
log.debug("[{}红票申请单上传获取数据接口,参数为[{}]", LOGGER_MSG, JsonUtils.getInstance().toJsonString(param));
log.info("[{}红票申请单上传获取数据接口,参数为[{}]", LOGGER_MSG, JsonUtils.getInstance().toJsonString(param));
FgOrderResponseBO<FgRedInvoiceFormReqBO> fgOrderResponse = new FgOrderResponseBO<>();
fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.SUCCESS.getKey());
fgOrderResponse.setSTATUS_MESSAGE(OrderInfoContentEnum.SUCCESS.getMessage());
@ -1188,7 +1188,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
* 根据域名解析对应的ip地址
*/
sjdz = sjUrl.split(ConfigureConstant.STRING_COLON)[0];
log.debug("{}获取局端域名为:{}", LOGGER_MSG, sjdz);
log.info("{}获取局端域名为:{}", LOGGER_MSG, sjdz);
sjdk = sjUrl.split(ConfigureConstant.STRING_COLON)[1];
}
}
@ -1210,7 +1210,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
*/
@Override
public FgOrderResponseBO getUploadRedInvoiceStatus(FgCommonRedInvoiceUploadStatusBO paramContent) {
log.debug("[{}红票申请单上传修改状态接口,参数为[{}]", LOGGER_MSG, paramContent);
log.info("[{}红票申请单上传修改状态接口,参数为[{}]", LOGGER_MSG, paramContent);
FgOrderResponseBO fgOrderResponse = new FgOrderResponseBO();
fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.SUCCESS.getKey());
fgOrderResponse.setSTATUS_MESSAGE(OrderInfoContentEnum.SUCCESS.getMessage());
@ -1245,7 +1245,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
*/
@Override
public FgOrderResponseBO updateUploadRedInvoice(RedInvoiceFormRspBO paramContent) {
log.debug("[{}]红票申请单上传完成接口,参数为[{}]", LOGGER_MSG, JsonUtils.getInstance().toJsonString(paramContent));
log.info("[{}]红票申请单上传完成接口,参数为[{}]", LOGGER_MSG, JsonUtils.getInstance().toJsonString(paramContent));
FgOrderResponseBO fgOrderResponse = new FgOrderResponseBO();
fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.SUCCESS.getKey());
fgOrderResponse.setSTATUS_MESSAGE(OrderInfoContentEnum.SUCCESS.getMessage());
@ -1414,7 +1414,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
*/
@Override
public FgOrderResponseBO updateDownloadRedInvoiceStatus(FgRedInvoiceDownloadStatusReqBO paramContent) {
log.debug("[{}红票申请单下载修改状态接口,参数为[{}]", LOGGER_MSG, paramContent);
log.info("[{}红票申请单下载修改状态接口,参数为[{}]", LOGGER_MSG, paramContent);
FgOrderResponseBO fgOrderResponse = new FgOrderResponseBO();
fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.SUCCESS.getKey());
fgOrderResponse.setSTATUS_MESSAGE(OrderInfoContentEnum.SUCCESS.getMessage());
@ -1442,7 +1442,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
*/
@Override
public FgOrderResponseBO updateDownloadRedInvoice(FgRedInvoiceDownloadReqBO paramContent, String operatorId, String operatorName) {
log.debug("[{}红票申请单下载完成接口,参数为[{}]", LOGGER_MSG, paramContent);
log.info("[{}红票申请单下载完成接口,参数为[{}]", LOGGER_MSG, paramContent);
FgOrderResponseBO fgOrderResponse = new FgOrderResponseBO();
fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.SUCCESS.getKey());
fgOrderResponse.setSTATUS_MESSAGE(OrderInfoContentEnum.SUCCESS.getMessage());
@ -1624,7 +1624,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
*/
@Override
public FgOrderResponseBO getDeprecateInvoices(FgGetInvoiceZfReqBO paramContent) {
log.debug("[{}发票作废接口,参数为[{}]", LOGGER_MSG, JsonUtils.getInstance().toJsonString(paramContent));
log.info("[{}发票作废接口,参数为[{}]", LOGGER_MSG, JsonUtils.getInstance().toJsonString(paramContent));
FgOrderResponseBO<FgInvalidInvoiceRspBO> fgInvalidInvoiceRspfgOrderResponse = new FgOrderResponseBO<>();
fgInvalidInvoiceRspfgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.SUCCESS.getKey());
fgInvalidInvoiceRspfgOrderResponse.setSTATUS_MESSAGE(OrderInfoContentEnum.SUCCESS.getMessage());
@ -1705,7 +1705,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
*/
@Override
public FgOrderResponseBO getDeprecateInvoicesStatus(FgGetInvoiceInvalidStatusReqBO paramContent) {
log.debug("[{}发票作废更新状态接口,参数为[{}]", LOGGER_MSG, paramContent);
log.info("[{}发票作废更新状态接口,参数为[{}]", LOGGER_MSG, paramContent);
FgOrderResponseBO fgOrderResponse = new FgOrderResponseBO();
fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.SUCCESS.getKey());
fgOrderResponse.setSTATUS_MESSAGE(OrderInfoContentEnum.SUCCESS.getMessage());
@ -1779,7 +1779,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
*/
@Override
public FgOrderResponseBO updateDeprecateInvoices(FgInvalidInvoiceFinishReqBO fgInvalidInvoiceFinishReq) {
log.debug("[{}发票作废完成接口,参数为[{}]", LOGGER_MSG, fgInvalidInvoiceFinishReq);
log.info("[{}发票作废完成接口,参数为[{}]", LOGGER_MSG, fgInvalidInvoiceFinishReq);
FgOrderResponseBO fgOrderResponse = new FgOrderResponseBO();
fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.SUCCESS.getKey());
fgOrderResponse.setSTATUS_MESSAGE(OrderInfoContentEnum.SUCCESS.getMessage());
@ -1974,7 +1974,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
*/
@Override
public FgOrderResponseBO getPrintInvoices(FgInvoicePrintReqBO paramContent) {
log.debug("[{}发票待打印接口,参数为[{}]", LOGGER_MSG, JsonUtils.getInstance().toJsonString(paramContent));
log.info("[{}发票待打印接口,参数为[{}]", LOGGER_MSG, JsonUtils.getInstance().toJsonString(paramContent));
FgOrderResponseBO fgOrderResponse = new FgOrderResponseBO();
fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.SUCCESS.getKey());
fgOrderResponse.setSTATUS_MESSAGE(OrderInfoContentEnum.SUCCESS.getMessage());
@ -2038,7 +2038,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
*/
@Override
public FgOrderResponseBO getPrintInvoicesStatus(FgInvoicePrintStatusReqBO paramContent) {
log.debug("[{}发票打印更新状态接口,参数为[{}]", LOGGER_MSG, paramContent);
log.info("[{}发票打印更新状态接口,参数为[{}]", LOGGER_MSG, paramContent);
FgOrderResponseBO fgOrderResponse = new FgOrderResponseBO();
fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.SUCCESS.getKey());
fgOrderResponse.setSTATUS_MESSAGE(OrderInfoContentEnum.SUCCESS.getMessage());
@ -2066,7 +2066,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
*/
@Override
public FgOrderResponseBO updatePrintInvoices(FgInvoicePrintFinishReqBO paramContent) {
log.debug("[{}发票打印完成接口,参数为[{}]", LOGGER_MSG, paramContent);
log.info("[{}发票打印完成接口,参数为[{}]", LOGGER_MSG, paramContent);
FgOrderResponseBO fgOrderResponse = new FgOrderResponseBO();
fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.SUCCESS.getKey());
fgOrderResponse.setSTATUS_MESSAGE(OrderInfoContentEnum.SUCCESS.getMessage());
@ -2120,7 +2120,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
@Override
public FgOrderResponseBO registTaxDisk(String paramContent) {
log.debug("[{}税盘注册接口,参数为[{}]", LOGGER_MSG, paramContent);
log.info("[{}税盘注册接口,参数为[{}]", LOGGER_MSG, paramContent);
FgOrderResponseBO fgOrderResponse = new FgOrderResponseBO();
fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.SUCCESS.getKey());
fgOrderResponse.setSTATUS_MESSAGE(OrderInfoContentEnum.SUCCESS.getMessage());
@ -2232,7 +2232,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
*/
@Override
public FgOrderResponseBO updateTaxDiskInfo(String paramContent) {
log.debug("[{}税盘信息同步接口,参数为[{}]", LOGGER_MSG, paramContent);
log.info("[{}税盘信息同步接口,参数为[{}]", LOGGER_MSG, paramContent);
FgOrderResponseBO fgOrderResponse = new FgOrderResponseBO();
fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.SUCCESS.getKey());
fgOrderResponse.setSTATUS_MESSAGE(OrderInfoContentEnum.SUCCESS.getMessage());
@ -2286,7 +2286,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
for (OrderProcessInfo orderProcessInfo : orderProcessInfos) {
//调用同步接口
R r = invoiceService.syncInvoice(orderProcessInfo.getFpqqlsh(), orderProcessInfo.getXhfNsrsbh());
log.debug("{}同步税盘成功后,调用同步接口,执行结果:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(r));
log.info("{}同步税盘成功后,调用同步接口,执行结果:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(r));
}
}
@ -2304,7 +2304,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
fangGeService.saveMqttToRedis(nsrsbh, jqbh, OrderInfoEnum.FANGGE_INTERFACE_TYPE_4.getKey(), invalidInvoiceInfo.getZfpch(),false);
//消费下一条数据
fangGeService.handleRedisMsg(nsrsbh, jqbh);
log.debug("{}同步税盘成功后,调用作废同步接口,请求数据为:{}", LOGGER_MSG, invalidInvoiceInfo.getZfpch());
log.info("{}同步税盘成功后,调用作废同步接口,请求数据为:{}", LOGGER_MSG, invalidInvoiceInfo.getZfpch());
}
}
@ -2939,7 +2939,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
String fgSkKpShList = baseServiceConfig.getFgSkKpShList();
String sh = fgEnterpriseInfoBO.getNSRSBH();
String terminalCode = taxEquipmentInfo.getSksbCode();
log.debug("{}请求税控设备类型为:{}", LOGGER_MSG, terminalCode);
log.info("{}请求税控设备类型为:{}", LOGGER_MSG, terminalCode);
FgEnterpriseInfoBo fgEnterpriseInfoBo = new FgEnterpriseInfoBo();
fgEnterpriseInfoBo.setSKSBCODE(terminalCode);
fgEnterpriseInfoBo.setKPFS(CommonUtils.judgeIsFgTerminalNew(terminalCode,fgSkKpShList,sh)? FANGGE_INVOICE_TYPE_1.getKey():FANGGE_INVOICE_TYPE_0.getKey());

@ -127,7 +127,7 @@ public class InterfaceServiceImpl implements InterfaceService {
*/
@Override
public R allocateInvoices(AllocateInvoicesReq allocateInvoicesReq) {
log.debug("{},发票开具数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(allocateInvoicesReq));
log.info("{},发票开具数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(allocateInvoicesReq));
/**
* todo 后期(v2版本以后)去掉这个R返回都以实体进行返回
*/
@ -227,7 +227,7 @@ public class InterfaceServiceImpl implements InterfaceService {
*/
if (NEGATIVE_1.equals(commonInvoicesBatch.getSLDID())) {
R result = commonInterfaceService.dealWithSldStartV3("", fplb, commonInvoicesBatch.getNSRSBH(), commonInvoice1[0].getCOMMON_INVOICE_HEAD().getQD_BZ(), OrderInfoEnum.TAX_EQUIPMENT_C48.getKey());
log.debug("{}受理点查询结果:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(result));
log.info("{}受理点查询结果:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(result));
if (OrderInfoContentEnum.SUCCESS.getKey().equals(result.get(OrderManagementConstant.CODE))) {
sldid = String.valueOf(result.get(ConfigureConstant.SLD_ID));
kpjh = String.valueOf(result.get(ConfigureConstant.KPJH));
@ -266,7 +266,7 @@ public class InterfaceServiceImpl implements InterfaceService {
OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(commonInvoice.getCOMMON_INVOICE_HEAD().getFPQQLSH(), shList);
log.debug("{}查询数据库处理表校验数据是否已经存在,结果为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderProcessInfo));
log.info("{}查询数据库处理表校验数据是否已经存在,结果为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderProcessInfo));
//common_invoice[0].getCOMMON_INVOICE_HEAD().get
if (orderProcessInfo != null) {
/**
@ -508,7 +508,7 @@ public class InterfaceServiceImpl implements InterfaceService {
}
for (FpkjMqData fpkjMqData : fpkjMqDataList) {
String jsonString = JsonUtils.getInstance().toJsonString(fpkjMqData);
log.debug("{}放入mq的数据:{}", LOGGER_MSG, jsonString);
log.info("{}放入mq的数据:{}", LOGGER_MSG, jsonString);
com.dxhy.order.model.R openAnInvocie = openInvoiceService.openAnInvoice(jsonString,fpkjMqData.getEntId(), fpkjMqData.getNsrsbh(),fpkjMqData.getCreateTime(), fpkjMqData.getFpqqlsh());
if (!OrderInfoContentEnum.SUCCESS.getKey().equals(String.valueOf(openAnInvocie.get(OrderManagementConstant.CODE)))) {
r.put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey());
@ -535,7 +535,7 @@ public class InterfaceServiceImpl implements InterfaceService {
@Override
public GetAllocateInvoicesStatusRsp invoiceStatus(String jsonString) {
log.debug("{},发票状态查询数据:{}", LOGGER_MSG, jsonString);
log.info("{},发票状态查询数据:{}", LOGGER_MSG, jsonString);
GetAllocateInvoicesStatusRsp getAllocateInvoicesStatusRsp = new GetAllocateInvoicesStatusRsp();
if (StringUtils.isBlank(jsonString)) {
log.error("{}查询开票执行状态参数为空", LOGGER_MSG);
@ -632,7 +632,7 @@ public class InterfaceServiceImpl implements InterfaceService {
*/
@Override
public GetAllocatedInvoicesRsp getAllocatedInvoices(String jsonString) {
log.debug("{},发票结果查询数据:{}", LOGGER_MSG, jsonString);
log.info("{},发票结果查询数据:{}", LOGGER_MSG, jsonString);
InvoiceQueryRequest invoiceQueryRequest = JsonUtils.getInstance().parseObject(jsonString, InvoiceQueryRequest.class);
GetAllocatedInvoicesRsp getAllocatedInvoicesRsp = new GetAllocatedInvoicesRsp();
@ -788,7 +788,7 @@ public class InterfaceServiceImpl implements InterfaceService {
@Override
public ZfxxRspBO invoiceInvalid(ZfxxReqBO zfxxReq, String secretId) {
String jsonString = JsonUtils.getInstance().toJsonString(zfxxReq);
log.debug("{},已开发票作废数据:{}", LOGGER_MSG, jsonString);
log.info("{},已开发票作废数据:{}", LOGGER_MSG, jsonString);
ZfxxRspBO zfxxRsp = new ZfxxRspBO();
zfxxRsp.setZFPCH(zfxxReq.getZFPCH());
Map<String, String> checkInvParam = validateInterfaceOrderService.checkInvalidInvoice(zfxxReq, secretId);
@ -928,7 +928,7 @@ public class InterfaceServiceImpl implements InterfaceService {
@Override
public Response importOrders(List<CommonInvoiceBO> commonInvoiceBOList) {
String jsonString2 = JsonUtils.getInstance().toJsonString(commonInvoiceBOList);
log.debug("{},企业数据导入数据:{}", LOGGER_MSG, jsonString2);
log.info("{},企业数据导入数据:{}", LOGGER_MSG, jsonString2);
Response importOrdersRsp = new Response();
List<CommonOrderInfo> requestOrderList = new ArrayList<>();
@ -1013,7 +1013,7 @@ public class InterfaceServiceImpl implements InterfaceService {
importOrdersRsp.setSTATUS_MESSAGE(OrderInfoContentEnum.IMPORT_ORDERS_ERROR.getMessage());
}
String jsonString = JsonUtils.getInstance().toJsonString(importOrdersRsp);
log.debug("{},企业订单导入请求状态返回数据:{}", LOGGER_MSG, jsonString);
log.info("{},企业订单导入请求状态返回数据:{}", LOGGER_MSG, jsonString);
return importOrdersRsp;
}
@ -1026,7 +1026,7 @@ public class InterfaceServiceImpl implements InterfaceService {
@Override
public SldkcmxResponseBO queryInvoicerollplolist(SldInvoiceRequestBO sldInvoiceRollploRequest) {
String jsonString2 = JsonUtils.getInstance().toJsonString(sldInvoiceRollploRequest);
log.debug("{},受理点上下票列表管理接口数据:{}", LOGGER_MSG, jsonString2);
log.info("{},受理点上下票列表管理接口数据:{}", LOGGER_MSG, jsonString2);
SldkcmxResponseBO sldkcmxResponse = new SldkcmxResponseBO();
/**
@ -1034,9 +1034,9 @@ public class InterfaceServiceImpl implements InterfaceService {
*/
SldInvoiceRollPloRequest sldInvoiceRollPloRequest = BeanTransitionUtils.transSldInvoiceReq(sldInvoiceRollploRequest);
log.debug("{}受理点上下票列表管理接口请求数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldInvoiceRollPloRequest));
log.info("{}受理点上下票列表管理接口请求数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldInvoiceRollPloRequest));
SldKcmxResponse sldKcmxResponse = HttpInvoiceRequestUtil.queryInvoiceRollPloListC48(invoiceConfig.configQueryInvoiceRollPloListC48(), sldInvoiceRollPloRequest, OrderInfoEnum.TAX_EQUIPMENT_C48.getKey());
log.debug("{}受理点上下票列表管理接口返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldKcmxResponse));
log.info("{}受理点上下票列表管理接口返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldKcmxResponse));
if (!ConfigureConstant.STRING_0000.equals(sldKcmxResponse.getStatusCode())) {
log.error("{}受理点上下票列表管理接口失败或返回数据为空", LOGGER_MSG);
@ -1059,7 +1059,7 @@ public class InterfaceServiceImpl implements InterfaceService {
sldkcmxResponse = BeanTransitionUtils.transSldInvoiceRsp(sldKcmxResponse, sldInvoiceRollPloRequest.getNsrsbh());
String jsonString = JsonUtils.getInstance().toJsonString(sldkcmxResponse);
log.debug("{}受理点上下票列表管理接口最终返回数据:{}", jsonString, LOGGER_MSG);
log.info("{}受理点上下票列表管理接口最终返回数据:{}", jsonString, LOGGER_MSG);
return sldkcmxResponse;
}
@ -1072,7 +1072,7 @@ public class InterfaceServiceImpl implements InterfaceService {
@Override
public Response accessPointUpInvoice(SldupRequestBO sldupRequest) {
String jsonString2 = JsonUtils.getInstance().toJsonString(sldupRequest);
log.debug("{},受理点上票接口数据:{}", LOGGER_MSG, jsonString2);
log.info("{},受理点上票接口数据:{}", LOGGER_MSG, jsonString2);
Response response = new Response();
/**
@ -1080,9 +1080,9 @@ public class InterfaceServiceImpl implements InterfaceService {
*/
SldUpRequest sldUpRequest = BeanTransitionUtils.transSldUpInvoiceReq(sldupRequest);
log.debug("{}获取受理点上票接口请求数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldUpRequest));
log.info("{}获取受理点上票接口请求数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldUpRequest));
SldUpResponse sldUpResponse = HttpInvoiceRequestUtil.queryAccessPointUpInvoiceC48(invoiceConfig.configQueryAccessPointUpInvoiceC48(), sldUpRequest, OrderInfoEnum.TAX_EQUIPMENT_C48.getKey());
log.debug("{}获取受理点上票接口返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldUpResponse));
log.info("{}获取受理点上票接口返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldUpResponse));
/**
* 协议bean转换
@ -1090,7 +1090,7 @@ public class InterfaceServiceImpl implements InterfaceService {
response = BeanTransitionUtils.transSldInvoiceCommonRsp(sldUpResponse);
String jsonString = JsonUtils.getInstance().toJsonString(response);
log.debug("{}获取受理点上票接口最终返回数据:{}", jsonString, LOGGER_MSG);
log.info("{}获取受理点上票接口最终返回数据:{}", jsonString, LOGGER_MSG);
return response;
}
@ -1104,7 +1104,7 @@ public class InterfaceServiceImpl implements InterfaceService {
@Override
public Response accessPointDownInvoice(SlddownRequestBO slddownRequest) {
String jsonString2 = JsonUtils.getInstance().toJsonString(slddownRequest);
log.debug("{},受理点下票接口数据:{}", LOGGER_MSG, jsonString2);
log.info("{},受理点下票接口数据:{}", LOGGER_MSG, jsonString2);
Response response = new Response();
/**
@ -1132,9 +1132,9 @@ public class InterfaceServiceImpl implements InterfaceService {
sldInvoiceRollPloRequest.setKPDID(slddownRequest.getSLDID());
sldInvoiceRollPloRequest.setNsrsbh(slddownRequest.getNSRSBH());
log.debug("{}受理点上下票列表管理接口请求数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldInvoiceRollPloRequest));
log.info("{}受理点上下票列表管理接口请求数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldInvoiceRollPloRequest));
SldKcmxResponse sldKcmxResponse = HttpInvoiceRequestUtil.queryInvoiceRollPloListC48(invoiceConfig.configQueryInvoiceRollPloListC48(), sldInvoiceRollPloRequest, OrderInfoEnum.TAX_EQUIPMENT_C48.getKey());
log.debug("{}受理点上下票列表管理接口返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldKcmxResponse));
log.info("{}受理点上下票列表管理接口返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldKcmxResponse));
if (!ConfigureConstant.STRING_0000.equals(sldKcmxResponse.getStatusCode()) || ObjectUtil.isEmpty(sldKcmxResponse.getBILLINGPOINTSTOCKS())) {
log.error("{}受理点上下票列表管理接口失败或返回数据为空", LOGGER_MSG);
@ -1149,9 +1149,9 @@ public class InterfaceServiceImpl implements InterfaceService {
sldUpRequest.setFPZH(sldKcmxResponse.getBILLINGPOINTSTOCKS().get(0).getFPZH());
log.debug("{}获取受理点下票接口请求数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldUpRequest));
log.info("{}获取受理点下票接口请求数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldUpRequest));
SldUpResponse sldUpResponse = HttpInvoiceRequestUtil.queryAccessPointUpInvoiceC48(invoiceConfig.configQueryAccessPointUpInvoiceC48(), sldUpRequest, OrderInfoEnum.TAX_EQUIPMENT_C48.getKey());
log.debug("{}获取受理点下票接口返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldUpResponse));
log.info("{}获取受理点下票接口返回数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(sldUpResponse));
/**
* 协议bean转换
@ -1159,7 +1159,7 @@ public class InterfaceServiceImpl implements InterfaceService {
response = BeanTransitionUtils.transSldInvoiceCommonRsp(sldUpResponse);
String jsonString = JsonUtils.getInstance().toJsonString(response);
log.debug("{}获取受理点下票接口最终返回数据:{}", jsonString, LOGGER_MSG);
log.info("{}获取受理点下票接口最终返回数据:{}", jsonString, LOGGER_MSG);
return response;
}
@ -1173,7 +1173,7 @@ public class InterfaceServiceImpl implements InterfaceService {
@Override
public Response querySld(SldSearchRequestBO sldSearchRequest) {
String jsonString2 = JsonUtils.getInstance().toJsonString(sldSearchRequest);
log.debug("{},受理点列表接口数据:{}", LOGGER_MSG, jsonString2);
log.info("{},受理点列表接口数据:{}", LOGGER_MSG, jsonString2);
Response response = new Response();
/**
@ -1197,7 +1197,7 @@ public class InterfaceServiceImpl implements InterfaceService {
response = BeanTransitionUtils.transSldSearchRsp(sldList);
String jsonString = JsonUtils.getInstance().toJsonString(response);
log.debug("{}获取受理点下票接口最终返回数据:{}", jsonString, LOGGER_MSG);
log.info("{}获取受理点下票接口最终返回数据:{}", jsonString, LOGGER_MSG);
return response;
}
@ -1210,7 +1210,7 @@ public class InterfaceServiceImpl implements InterfaceService {
@Override
public OrderResponseBO getOrderInfoAndInvoiceInfo(OrderRequestBO orderRequest) {
String jsonString2 = JsonUtils.getInstance().toJsonString(orderRequest);
log.debug("{},根据订单号获取订单数据以及发票数据接口数据:{}", LOGGER_MSG, jsonString2);
log.info("{},根据订单号获取订单数据以及发票数据接口数据:{}", LOGGER_MSG, jsonString2);
OrderResponseBO orderResponse = new OrderResponseBO();
orderResponse.setSTATUS_CODE(OrderInfoContentEnum.SUCCESS.getKey());
@ -1371,7 +1371,7 @@ public class InterfaceServiceImpl implements InterfaceService {
}
String jsonString = JsonUtils.getInstance().toJsonString(orderResponse);
log.debug("{},企业订单导入请求状态返回数据:{}", LOGGER_MSG, jsonString);
log.info("{},企业订单导入请求状态返回数据:{}", LOGGER_MSG, jsonString);
return orderResponse;
}
@ -1384,7 +1384,7 @@ public class InterfaceServiceImpl implements InterfaceService {
@Override
public R specialInvoiceRushRed(String hzfpsqbscsReq) {
R r = new R();
log.debug("{},接收红字发票申请单:{}", LOGGER_MSG, hzfpsqbscsReq);
log.info("{},接收红字发票申请单:{}", LOGGER_MSG, hzfpsqbscsReq);
HzfpsqbsReq hzfpsqbsReq = new HzfpsqbsReq();
JSONObject po = JSON.parseObject(hzfpsqbscsReq);
//转换batch
@ -1435,7 +1435,7 @@ public class InterfaceServiceImpl implements InterfaceService {
}
hzfpsqbsReq.setHZFPSQBSCLIST(hzfpsqbsc);
log.debug("{},转换后数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(hzfpsqbsReq));
log.info("{},转换后数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(hzfpsqbsReq));
if (StringUtils.isBlank(hzfpsqbscsReq)) {
log.info("{}接收红字发票申请单为空", LOGGER_MSG);
return r.put(OrderManagementConstant.CODE, OrderInfoContentEnum.INVOICE_AUTO_DATA_NULL.getKey()).put(OrderManagementConstant.MESSAGE, OrderInfoContentEnum.INVOICE_AUTO_DATA_NULL.getMessage());
@ -1445,7 +1445,7 @@ public class InterfaceServiceImpl implements InterfaceService {
HzfpsqbscsRspBO hzfpsqbscsRspBO = BeanTransitionUtils.convertHzfpQbs(redInvoiceUpload);
String jsonString2 = JsonUtils.getInstance().toJsonString(hzfpsqbscsRspBO);
log.debug("红字发票申请接口研二返回数据:{},{}", jsonString2, LOGGER_MSG);
log.info("红字发票申请接口研二返回数据:{},{}", jsonString2, LOGGER_MSG);
r.put(OrderManagementConstant.DATA, hzfpsqbscsRspBO);
return r;
}
@ -1468,7 +1468,7 @@ public class InterfaceServiceImpl implements InterfaceService {
}
String jsonString = JsonUtils.getInstance().toJsonString(hpInvocieRequest);
log.debug("红字发票申请下载数据:{},{}", jsonString, LOGGER_MSG);
log.info("红字发票申请下载数据:{},{}", jsonString, LOGGER_MSG);
if (StringUtils.isBlank(jsonString)) {
log.error("红字发票申请下载数据为空{},{}", jsonString, LOGGER_MSG);
return r.put(OrderManagementConstant.CODE, OrderInfoContentEnum.INVOICE_AUTO_DATA_NULL.getKey()).put(OrderManagementConstant.MESSAGE, OrderInfoContentEnum.INVOICE_AUTO_DATA_NULL.getMessage());
@ -1487,7 +1487,7 @@ public class InterfaceServiceImpl implements InterfaceService {
GetRedInvoiceApplicationResultStatusRspBO getRedInvoiceApplicationResultStatusRspBO = BeanTransitionUtils.convertHzResponse(redInvoiceDown);
String jsonString2 = JsonUtils.getInstance().toJsonString(getRedInvoiceApplicationResultStatusRspBO);
log.debug("红字发票下载研二返回数据:{},{}", jsonString2, LOGGER_MSG);
log.info("红字发票下载研二返回数据:{},{}", jsonString2, LOGGER_MSG);
r.put(OrderManagementConstant.DATA, getRedInvoiceApplicationResultStatusRspBO);
return r;
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save