ariesy 联调查验接口完成

release
yefei 2 years ago
parent 9f77f03e14
commit 76441daa1e
  1. 5
      dxhy-common/src/main/java/com/dxhy/common/utils/R.java
  2. 2
      dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java
  3. 14
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
  4. 13
      dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@ -17,6 +17,11 @@ public class R extends HashMap<String, Object> {
put("msg", "success");
}
public R(int code,String msg) {
put("code", code);
put("msg", msg);
}
public static R error() {
return error(500, "未知异常,请联系管理员");
}

@ -1147,6 +1147,8 @@ public class InterfaceController extends AbstractController {
//进项税转出
}else if("FI849".equals(requestParam.getIS_INPUT().getIFYWID())){
resultString = transferOut(requestParam);
}else if("FI845".equals(requestParam.getIS_INPUT().getIFYWID())){
resultString = transferOut(requestParam);
}
return resultString;
}

@ -26,10 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.security.auth.message.config.AuthConfig;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 山东能源查验主流程控制器
@ -69,8 +66,10 @@ public class SDNYMainProcessController extends AbstractController {
pramsMap.put("invoiceNo", pramsMap.get("invoiceNumber"));
if (!pramsMap.get("billingDate").isEmpty()) {
String billingDate = pramsMap.get("billingDate").replaceAll("-","");
iu.setKprq(pramsMap.get("billingDate"));
pramsMap.put("invoiceDate", pramsMap.get("billingDate"));
pramsMap.put("invoiceDate", billingDate);
pramsMap.put("billingDate", billingDate);
if (!iu.kprqValid(null)) {
pramsMap.put("invoiceDate", "开票日期格式错误!");
}
@ -123,7 +122,10 @@ public class SDNYMainProcessController extends AbstractController {
}
if (!checkInvoiceResult.containsKey("code")) {
return ResponseEntity.ok(R.ok().put("data", checkInvoiceResult));
R data = new R(1000,"default success");
data.put("data", checkInvoiceResult);
return ResponseEntity.ok(data);
}
} else {

@ -216,7 +216,6 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
String check = JSONObject.toJSONString(request);
//2.获取token
TokenResponse token = apiUtils.getToken(appKey, appSecret);
String access_token = token.getAccess_token();
@ -227,7 +226,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
//4.封装返回参数
JSONObject jsonObject = new JSONObject();
if (StringUtils.isNoneBlank(apiResponse.getContent()))
jsonObject = convertToSnObject(apiResponse.getContent(), jsonObject, snIinvoiceType);
jsonObject = convertToSnObject(apiResponse.getContent(), jsonObject, fplxdm);
return jsonObject;
@ -239,7 +238,6 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
HashMap contentMap = JSONObject.parseObject(con, HashMap.class);
if ("0000".equals(contentMap.get("code"))) {
HashMap<String, Object> invoiceData = JSONObject.parseObject(contentMap.get("data").toString(), HashMap.class);
if("0001".equals(invoiceData.get("cyjg"))) {
jsonObject.put("invoiceType", invoiceType);
@ -262,7 +260,14 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
jsonObject.put("amountTax", invoiceData.get("jshj"));
jsonObject.put("amountTaxCN", "");
jsonObject.put("checkCode", invoiceData.get("jym"));
jsonObject.put("state", invoiceData.get("zfbz"));
if("N".equals(invoiceData.get("zfbz"))){
jsonObject.put("state", "0");
}else if("H".equals(invoiceData.get("zfbz"))){
jsonObject.put("state", "2");
}else if("Y".equals(invoiceData.get("zfbz"))){
jsonObject.put("state", "1");
}
jsonObject.put("carrierName", invoiceData.get("cyrmc"));
jsonObject.put("carrierTaxNo", invoiceData.get("cyrsbh"));
jsonObject.put("draweeName", invoiceData.get("spfmc"));

Loading…
Cancel
Save