Compare commits
2 Commits
f6428be044
...
48712d7d37
| Author | SHA1 | Date |
|---|---|---|
|
|
48712d7d37 | |
|
|
24e7cbb32e |
|
|
@ -660,6 +660,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
|
||||||
ImmutableMap<String, String> requestParam = ImmutableMap.of("requestId", employeeDeclareRecord.getRequestId());
|
ImmutableMap<String, String> requestParam = ImmutableMap.of("requestId", employeeDeclareRecord.getRequestId());
|
||||||
Map<String, String> header = SingnatureData.initHeader(Collections.emptyMap(), apiConfig.getAppKey(), apiConfig.getAppSecret());
|
Map<String, String> header = SingnatureData.initHeader(Collections.emptyMap(), apiConfig.getAppKey(), apiConfig.getAppSecret());
|
||||||
String res = HttpUtil.getRequest(url, header, requestParam);
|
String res = HttpUtil.getRequest(url, header, requestParam);
|
||||||
|
log.info("人员报送反馈:{}", res);
|
||||||
DeclareEmployeeFeedbackResponse declareEmployeeFeedbackResponse = JsonUtil.parseObject(res, DeclareEmployeeFeedbackResponse.class);
|
DeclareEmployeeFeedbackResponse declareEmployeeFeedbackResponse = JsonUtil.parseObject(res, DeclareEmployeeFeedbackResponse.class);
|
||||||
if (Objects.isNull(declareEmployeeFeedbackResponse) || Objects.isNull(declareEmployeeFeedbackResponse.getHead())) {
|
if (Objects.isNull(declareEmployeeFeedbackResponse) || Objects.isNull(declareEmployeeFeedbackResponse.getHead())) {
|
||||||
log.error("服务异常:" + res);
|
log.error("服务异常:" + res);
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
package com.engine.salary.service.impl;
|
package com.engine.salary.service.impl;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.NumberUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.engine.common.util.ServiceUtil;
|
import com.engine.common.util.ServiceUtil;
|
||||||
import com.engine.core.impl.Service;
|
import com.engine.core.impl.Service;
|
||||||
|
|
@ -917,7 +918,8 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
|
||||||
declareStatus.setTaxDeclareStatus(taxDeclareStatusEnum.getValue());
|
declareStatus.setTaxDeclareStatus(taxDeclareStatusEnum.getValue());
|
||||||
// 申报类型
|
// 申报类型
|
||||||
declareStatus.setTaxPayAmount(Util.null2String(declareTaxFeedbackResponse.getBody().get("ykjse")));
|
declareStatus.setTaxPayAmount(Util.null2String(declareTaxFeedbackResponse.getBody().get("ykjse")));
|
||||||
declareStatus.setPersonNum(Integer.parseInt(Optional.ofNullable(declareTaxFeedbackResponse.getBody().get("nsrc")).orElse("0").toString()));
|
String nsrc = Util.null2String(declareTaxFeedbackResponse.getBody().get("nsrc"));
|
||||||
|
declareStatus.setPersonNum(Integer.parseInt(NumberUtil.isNumber(nsrc) ? nsrc : "0"));
|
||||||
declareStatus.setDeclareRequestId(declareStatus.getRequestId());
|
declareStatus.setDeclareRequestId(declareStatus.getRequestId());
|
||||||
declareStatus.setRequestId("");
|
declareStatus.setRequestId("");
|
||||||
//实缴(不含滞纳金)
|
//实缴(不含滞纳金)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue