luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
release
yishiqihuasheng 2 years ago
parent 3f2d0e4693 7281f52a03
commit 1b6ce87954
1 changed files with 97 additions and 28 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 125
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

125
dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
Unescape View File

@ -104,7 +104,7 @@ public class SDNYMainProcessController extends AbstractController {
JSONObject checkInvoiceResult = null;
//挡板开关
if("1".equals(isPresure)){
if ("1".equals(isPresure)) {
String base64 = "ewoJImNvZGUiOiAxMDAwLAoJImRhdGEiOiB7CgkJImRyYXdlZU5hbWUiOiAiIiwKCQkiYnVzaW5lc3NVbml0IjogIiIsCgkJImxlbW9uTWFya2V0VGF4Tm8iOiAiOTEzNzAxMjVNQTNRQUtDMjhBIiwKCQkiYnJhbmRNb2RlbCI6ICLliKvlhYvniYxTR002NTIxVUJBMSIsCgkJInZlaGljbGVJZGVudGlmaWNhdGlvbk5vIjogIkxTR1VBODJMN01HMDgzODcwIiwKCQkiaWRjYXJkTm8iOiAiIiwKCQkic291cmNlIjogIiIsCgkJInRyYW5zcG9ydFJvdXRlIjogIiIsCgkJInRvdGFsVGF4IjogIiIsCgkJImJ1c2luZXNzVW5pdEFkZHJlc3MiOiAiIiwKCQkibGljZW5zZVBsYXRlIjogIuS6kUFFODVTNSIsCgkJInNlbGxlclVuaXRPckluZGl2aWR1YWwiOiAi5rWO5Y2X5YyX5p6B5pif5rG96L2m5pyN5Yqh5pyJ6ZmQ5YWs5Y+45LqR5Y2X5YiG5YWs5Y+4IiwKCQkiYWRtaW5pc3RyYXRpdmVEaXZpc2lvbk5vIjogIiIsCgkJImNhcnJpZXJOYW1lIjogIiIsCgkJInRheFJlY29yZHMiOiAiIiwKCQkic2FsZXNCYW5rIjogIiIsCgkJImxlbW9uTWFya2V0IjogIuWxseS4nOa2pumAmuS6jOaJi+i9puW4guWcuuacjeWKoeaciemZkOWFrOWPuCIsCgkJImludm9pY2VUeXBlIjogIjE1IiwKCQkibGltaXRQZW9wbGUiOiAiIiwKCQkibWFjaGluZU5vIjogIjU4OTkxNjQyNDc3MiIsCgkJInB1cmNoYXNlckFkZHJlc3NQaG9uZSI6ICIiLAoJCSJzdGF0ZSI6ICIwIiwKCQkiaW52b2ljZU5vIjogIjAwMzI3OTYyIiwKCQkidmVoaWNsZVR5cGUiOiAi5bCP5Z6L5pmu6YCa5a6i6L2mIiwKCQkiZW5naW5lTm8iOiAiIiwKCQkiaW5zcGVjdGlvbk51bSI6ICIiLAoJCSJtYWNoaW5lQ29kZSI6ICIiLAoJCSJidXNpbmVzc1VuaXRQaG9uZSI6ICIiLAoJCSJzZWxsZXJQaG9uZSI6ICIxNTkxMDA4NDM4NCIsCgkJInplcm9UYXhSYXRlU2lnbiI6ICIiLAoJCSJpbnZvaWNlQ29kZSI6ICIwMzcwMDIxMDA0MTciLAoJCSJjZXJ0aWZpY2F0ZU5vIjogIiIsCgkJInB1cmNoYXNlck5hbWUiOiAiIiwKCQkiY2hlY2tDb2RlIjogIiIsCgkJImJpbGxpbmdEYXRlIjogIjIwMjMtMDMtMTciLAoJCSJ0b3RhbEFtb3VudCI6ICIiLAoJCSJ2ZWhpY2xlTm8iOiAiTFNHVUE4Mkw3TUcwODM4NzAiLAoJCSJzYWxlc0FkZHJlc3NQaG9uZSI6ICIiLAoJCSJidXllclBob25lIjogIjE1Njg4ODg1MjA1IiwKCQkic2FsZXNOYW1lIjogIiIsCgkJInB1cmNoYXNlclRheE5vIjogIiIsCgkJInNlbGxlclVuaXRDb2RlT3JJZE5vIjogIjkxNTMwMTAyTUE3SzcyWVQ1QyIsCgkJImNhcnJpZXJUYXhObyI6ICIiLAoJCSJ0YXhBdXRob3JpdHlOYW1lIjogIiIsCgkJImluc3BlY3Rpb25MaXN0Tm8iOiAiIiwKCQkiYW1vdW50VGF4IjogIiIsCgkJIm9yaWdpblBsYWNlIjogIiIsCgkJImNlcnRpZmljYXRlIjogIiIsCgkJImJ1eWVySUROdW0iOiAiIiwKCQkicGF5bWVudFZvdWNoZXJObyI6ICIiLAoJCSJsZW1vbk1hcmtldEFkZHJlc3MiOiAi5bGx5Lic55yB5rWO5Y2X5biC5rWO5YyX5byA5Y+R5Yy65Lit5bCP5LyB5Lia5a215YyW5ZutIiwKCQkiZmFjdG9yeU1vZGVsIjogIuWIq+WFi+eJjFNHTTY1MjFVQkExIiwKCQkiYnV5ZXJVbml0T3JJbmRpdmlkdWFsIjogIua1juWNl+WMl+aegeaYn+axvei9puacjeWKoeaciemZkOWFrOWPuCIsCgkJImludm9pY2VOdW1iZXIiOiAiMDAzMjc5NjIiLAoJCSJ0b2xsU2lnbiI6ICIwNyIsCgkJInRheEJ1cmVhdUNvZGUiOiAiIiwKCQkidG9ubmFnZSI6ICIiLAoJCSJ0YXhBdXRob3JpdHlObyI6ICIiLAoJCSJjb21wYW55IjogIkJJR0IiLAoJCSJsZW1vbk1hcmtldFBob25lIjogIjEzODU0MTkzMDI1IiwKCQkicHVyY2hhc2VyQmFuayI6ICIiLAoJCSJhZG1pbmlzdHJhdGl2ZURpdmlzaW9uTmFtZSI6ICIiLAoJCSJwYXNzZW5nZXJzTGltaXRlZCI6ICIiLAoJCSJidXllclVuaXRPckluZGl2aWR1YWxBZGRyZXNzIjogIuWxseS4nOecgea1juWNl+W4guWkqeahpeWMuuWMl+WFs+WMl+i3rzblj7fmuZblhYnlsbHoibLlrrblm600LTMtMTAyIiwKCQkiaW52b2ljZUxpbmVMaXN0IjogW3sKCQkJInVuaXRQcmljZSI6ICIiLAoJCQkicm93Tm8iOiAiMSIsCgkJCSJhbW91bnQiOiAiIiwKCQkJInNwZWNpZmljYXRpb25Nb2RlbCI6ICIiLAoJCQkicXVhbnRpdHkiOiAiIiwKCQkJInRheCI6ICIiLAoJCQkidHlwZSI6ICIiLAoJCQkidW5pdCI6ICIiLAoJCQkibGljZW5zZVBsYXRlTnVtIjogIiIsCgkJCSJjdXJyZW50RGF0ZUVuZCI6ICIiLAoJCQkiY29tbW9kaXR5Q29kZSI6ICIiLAoJCQkiY3VycmVudERhdGVTdGFydCI6ICIiLAoJCQkiY29tbW9kaXR5TmFtZSI6ICIiCgkJfV0sCgkJImxlbW9uTWFya2V0QmFua0FuZEFjY291bnQiOiAi5Lit5Zu96ZO26KGM5rWO6Ziz5pSv6KGM6JCl5Lia6YOoMjMyNTQwNzQ2NjQ5IiwKCQkic2FsZXNUYXhObyI6ICIiLAoJCSJzZWxsZXJVbml0T3JJbmRpdmlkdWFsQWRkcmVzcyI6ICLkupHljZfnnIHmmIbmmI7luILkupTljY7ljLrpu5Hmnpfpk7rooZfpgZPlip7kuovlpITkurrmsJHopb/ot683MjDlj7dN5qCLTS0xMOWPtyIsCgkJImJ1c2luZXNzVW5pdEJhbmtBbmRBY2NvdW50IjogIiIsCgkJInZlaGljbGVBZG1pbk9mZmljZSI6ICLmtY7ljZfluIIiLAoJCSJhbW91bnRUYXhDTiI6ICIiLAoJCSJyZWdpc3RyYXRpb25ObyI6ICIzNzAwMzc1ODUzNTciLAoJCSJwcm9kdWN0UGxhY2UiOiAiIiwKCQkicmVtYXJrcyI6ICIiLAoJCSJ0YXhCdXJlYXVOYW1lIjogIiIKCX0sCgkibWVzc2FnZSI6ICJzdWNjZXNzIgp9";
String result = Base64Encoding.decodeToString(base64);
@ -200,12 +200,22 @@ public class SDNYMainProcessController extends AbstractController {
try {
checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap);
log.info("查验结果为:{}",checkInvoiceResult);
log.info("查验结果为:{}", checkInvoiceResult);
} catch (Exception e) {
e.printStackTrace();
}
if (!checkInvoiceResult.containsKey("code")) {
if (checkInvoiceResult.containsKey("cyjg")) {
R data = new R();
data = errorInfo(checkInvoiceResult, data);
data.put("data", checkInvoiceResult);
return ResponseEntity.ok(JSONObject.toJSONString(R.error().put("data", checkInvoiceResult)));
}
R data = new R(1000, "default success");
data.put("message", "success");
data.put("data", checkInvoiceResult);
@ -241,6 +251,65 @@ public class SDNYMainProcessController extends AbstractController {
return ResponseEntity.ok(JSONObject.toJSONString(R.error().put("data", checkInvoiceResult)));
}
private R errorInfo(JSONObject checkInvoiceResult, R data) {
if ("0002".equals(checkInvoiceResult.getString("cyjg"))) {
data = new R(1002, checkInvoiceResult.getString("cyjgxx"));
}
if ("0005".equals(checkInvoiceResult.getString("cyjg"))) {
data = new R(1003, checkInvoiceResult.getString("cyjgxx"));
}
if ("0006".equals(checkInvoiceResult.getString("cyjg"))) {
data = new R(1004, checkInvoiceResult.getString("cyjgxx"));
}
if ("0009".equals(checkInvoiceResult.getString("cyjg"))) {
data = new R(1005, checkInvoiceResult.getString("cyjgxx"));
}
if ("1004".equals(checkInvoiceResult.getString("cyjg"))) {
data = new R(1006, checkInvoiceResult.getString("cyjgxx"));
}
if ("1005".equals(checkInvoiceResult.getString("cyjg"))) {
data = new R(1007, checkInvoiceResult.getString("cyjgxx"));
}
if ("1006".equals(checkInvoiceResult.getString("cyjg"))) {
data = new R(1008, checkInvoiceResult.getString("cyjgxx"));
}
if ("1008".equals(checkInvoiceResult.getString("cyjg"))) {
data = new R(1009, checkInvoiceResult.getString("cyjgxx"));
}
if ("1009".equals(checkInvoiceResult.getString("cyjg"))) {
data = new R(1010, checkInvoiceResult.getString("cyjgxx"));
}
if ("1010".equals(checkInvoiceResult.getString("cyjg"))) {
data = new R(1011, checkInvoiceResult.getString("cyjgxx"));
}
if ("1014".equals(checkInvoiceResult.getString("cyjg"))) {
data = new R(1012, checkInvoiceResult.getString("cyjgxx"));
}
if ("1015".equals(checkInvoiceResult.getString("cyjg"))) {
data = new R(1013, checkInvoiceResult.getString("cyjgxx"));
}
if ("1020".equals(checkInvoiceResult.getString("cyjg"))) {
data = new R(1014, checkInvoiceResult.getString("cyjgxx"));
}
if ("1021".equals(checkInvoiceResult.getString("cyjg"))) {
data = new R(1015, checkInvoiceResult.getString("cyjgxx"));
}
return data;
}
private void convertToResult(JSONObject checkInvoice) throws ParseException {
checkInvoice.put("totalTax", checkInvoice.getString("taxAmount"));
checkInvoice.put("amountTax", checkInvoice.getString("totalAmount"));
@ -261,12 +330,12 @@ public class SDNYMainProcessController extends AbstractController {
checkInvoice.put("invoiceCode", invoiceCode);
checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString());
String uuid = "";
if(invoiceCode != null && StringUtils.isNoneBlank(invoiceCode)){
if (invoiceCode != null && StringUtils.isNoneBlank(invoiceCode)) {
uuid = invoiceCode + checkInvoice.get("invoiceNo").toString();
checkInvoice.put("uuid",uuid);
}else{
checkInvoice.put("uuid", uuid);
} else {
uuid = checkInvoice.get("invoiceNo").toString();
checkInvoice.put("uuid",uuid);
checkInvoice.put("uuid", uuid);
}
@ -398,7 +467,7 @@ public class SDNYMainProcessController extends AbstractController {
String orgCode = snRequestObject.getCompCode();
DynamicContextHolder.push(DbConstant.BASICS_READ);
SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(orgCode);
log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode));
log.info("查询的组织信息为:{}", JSONObject.toJSONString(orgByCompCode));
String company = orgByCompCode.getCompany();
String taxno = orgByCompCode.getTaxno();
String taxname = orgByCompCode.getTaxname();
@ -430,9 +499,9 @@ public class SDNYMainProcessController extends AbstractController {
DynamicContextHolder.push(DbConstant.BASICS_READ);
List<GsClient> gsClients = gsClientMapper.selectByGsdm(orgCode);
if(gsClients != null && gsClients.size() > 0) {
if (gsClients != null && gsClients.size() > 0) {
object.setZFILED5(gsClients.get(0).getClient());
}else{
} else {
object.setZFILED5(environment);
}
// object.setZFILED5(environment);
@ -485,7 +554,7 @@ public class SDNYMainProcessController extends AbstractController {
// BaseTDxRecordInvoice baseTDxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(recordWrapper);
List<BaseTDxRecordInvoice> baseTDxRecordInvoices = baseTDxRecordInvoiceDao.selectList(recordWrapper);
// if(baseTDxRecordInvoice != null){
if(baseTDxRecordInvoices != null && baseTDxRecordInvoices.size() > 0){
if (baseTDxRecordInvoices != null && baseTDxRecordInvoices.size() > 0) {
log.info("TDxRecordInvoice表中匹配到数据");
BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice();
recordInvoice.setImageId("");
@ -495,14 +564,14 @@ public class SDNYMainProcessController extends AbstractController {
R data = new R(1000, "default success");
data.put("data", "");
return ResponseEntity.ok(JSONObject.toJSONString(data));
}else{
} else {
//删除对应的影像号
QueryWrapper<TDxInvoiceReimburse> reimburseWrapper = new QueryWrapper<>();
reimburseWrapper.eq("image_id", imageId);
// TDxInvoiceReimburse reimburse1 = mixedSignatureDao.selectOne(reimburseWrapper);
List<TDxInvoiceReimburse> tDxInvoiceReimburses = mixedSignatureDao.selectList(reimburseWrapper);
if(tDxInvoiceReimburses != null && tDxInvoiceReimburses.size() > 0){
if (tDxInvoiceReimburses != null && tDxInvoiceReimburses.size() > 0) {
log.info("TDxInvoiceReimburse表中匹配到数据");
TDxInvoiceReimburse tDxInvoiceReimburse = new TDxInvoiceReimburse();
tDxInvoiceReimburse.setImageId("");
@ -627,7 +696,7 @@ public class SDNYMainProcessController extends AbstractController {
SAPInvoiceDetail sapInvoiceDetail = new SAPInvoiceDetail();
//设置id
sapInvoiceDetail.setZHID(UUID.randomUUID().toString().replace("-",""));
sapInvoiceDetail.setZHID(UUID.randomUUID().toString().replace("-", ""));
// sapInvoiceDetail.setZZWDJ("");
sapInvoiceDetail.setIMG_ID(imageId);
@ -686,7 +755,7 @@ public class SDNYMainProcessController extends AbstractController {
//获取税率
String taxRate = snInvoice.getTaxRate();
if (taxRate != null && !taxRate.contains("%")){
if (taxRate != null && !taxRate.contains("%")) {
BigDecimal bigDecimal = new BigDecimal(taxRate);
BigDecimal multiply = bigDecimal.multiply(new BigDecimal("100"));
info.setZTAX(multiply.toString());
@ -698,10 +767,10 @@ public class SDNYMainProcessController extends AbstractController {
BigDecimal divide = bigDecimal.divide(new BigDecimal(100));
// taxRate = divide.toString();
// info.setZTAX(bigDecimal.multiply(new BigDecimal("0.01")).toString());
info.setZTAX(replace+".00");
info.setZTAX(replace + ".00");
info.setZSM(getZSM(divide.toString()));
}
if (invoiceLineList ==null || invoiceLineList.size() == 0){
if (invoiceLineList == null || invoiceLineList.size() == 0) {
if (info.getZTAX() == null || info.getZTAX() == "") {
info.setZTAX("0.00");
info.setZSM(getZSM(info.getZTAX()));
@ -738,7 +807,7 @@ public class SDNYMainProcessController extends AbstractController {
info.setZGXR("");
//认证相关
String zrzjg = getZRZJG(snInvoice.getInvoiceCode(),snInvoice.getInvoiceNumber(),info.getZFPLX());
String zrzjg = getZRZJG(snInvoice.getInvoiceCode(), snInvoice.getInvoiceNumber(), info.getZFPLX());
info.setZRZJG(zrzjg);
info.setZRZSSQ("");
// info.setZRZMS("");
@ -761,7 +830,7 @@ public class SDNYMainProcessController extends AbstractController {
info.setZCPXH(snInvoice.getBrandModel());
info.setZMHFZJJ(snInvoice.getCaacDevelopmentFund());
if (!"nullnull".equals(snInvoice.getPurchaserAddressPhone())){
if (!"nullnull".equals(snInvoice.getPurchaserAddressPhone())) {
info.setZGFDH(snInvoice.getPurchaserAddressPhone());
// info.setZGFDH("");
}
@ -770,7 +839,7 @@ public class SDNYMainProcessController extends AbstractController {
info.setZSJDH(snInvoice.getInspectionListNo());
// info.setZYGC("");
info.setZJSHJ(snInvoice.getAmountTax());
if (snInvoice.getAmountTax() == null && ("17".equals(info.getZFPLX()) || "18".equals(info.getZFPLX()))){
if (snInvoice.getAmountTax() == null && ("17".equals(info.getZFPLX()) || "18".equals(info.getZFPLX()))) {
info.setZJSHJ(snInvoice.getTotalAmount());
}
@ -789,7 +858,7 @@ public class SDNYMainProcessController extends AbstractController {
|| "08".equals(snInvoice.getInvoiceType()) || "10".equals(snInvoice.getInvoiceType()) || "11".equals(snInvoice.getInvoiceType()) || "14".equals(snInvoice.getInvoiceType())
|| "15".equals(snInvoice.getInvoiceType()) || "31".equals(snInvoice.getInvoiceType()) || "32".equals(snInvoice.getInvoiceType())) {
//可查验发票,
info.setZCYZT("1");
info.setZCYZT("1");
} else {
//不可查验发票
info.setZCYZT("3");
@ -936,9 +1005,9 @@ public class SDNYMainProcessController extends AbstractController {
return sm;
}
private String getZRZJG(String invoiceCode, String invoiceNo,String FPLX){
private String getZRZJG(String invoiceCode, String invoiceNo, String FPLX) {
String ZCYJG = "";
String uuid = invoiceCode+invoiceNo;
String uuid = invoiceCode + invoiceNo;
DynamicContextHolder.push(DbConstant.BUSINESS_READ);
//可价税分离票种
@ -958,12 +1027,12 @@ public class SDNYMainProcessController extends AbstractController {
//18：出租车发票
if ("10".equals(FPLX) || "12".equals(FPLX) || "13".equals(FPLX) || "14".equals(FPLX) || "15".equals(FPLX)
|| "24".equals(FPLX) || "25".equals(FPLX) || "26".equals(FPLX) || "27".equals(FPLX) || "22".equals(FPLX)
|| "11".equals(FPLX) || "16".equals(FPLX) || "17".equals(FPLX) || "18".equals(FPLX) ) {
|| "11".equals(FPLX) || "16".equals(FPLX) || "17".equals(FPLX) || "18".equals(FPLX)) {
QueryWrapper<TDxInvoiceReimburse> wrapper = new QueryWrapper();
wrapper.eq("uuid", uuid);
TDxInvoiceReimburse one = tDxInvoiceReimburseService.getOne(wrapper);
if (one != null){
ZCYJG = one.getRzhYesorno();
if (one != null) {
ZCYJG = one.getRzhYesorno();
}
@ -973,12 +1042,12 @@ public class SDNYMainProcessController extends AbstractController {
//21：航空运输电子客票行程单
//28：船票
//如果是可查验类型，直接更新数据库
if ( "19".equals(FPLX) || "20".equals(FPLX) || "21".equals(FPLX) || "28".equals(FPLX)) {
if ("19".equals(FPLX) || "20".equals(FPLX) || "21".equals(FPLX) || "28".equals(FPLX)) {
//其他票种
QueryWrapper<RecordInvoice> wrapper = new QueryWrapper();
wrapper.eq("uuid", uuid);
RecordInvoice recordInvoice = recordInvoiceDao.selectOne(wrapper);
if (recordInvoice != null){
if (recordInvoice != null) {
ZCYJG = recordInvoice.getRzhYesorno();
}
@ -987,7 +1056,7 @@ public class SDNYMainProcessController extends AbstractController {
QueryWrapper<TdxCustomsRecord> wrapper = new QueryWrapper();
wrapper.eq("uuid", uuid);
TdxCustomsRecord tdxCustomsRecord = customsRecordDao.selectOne(wrapper);
if (tdxCustomsRecord != null){
if (tdxCustomsRecord != null) {
ZCYJG = tdxCustomsRecord.getRzhYesorno();
}
}

Write Preview
Loading…
Cancel
Save