diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java index 68421737..a7378db2 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java @@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.text.SimpleDateFormat; @@ -85,6 +86,7 @@ public class ApplyServiceImpl extends ServiceImpl implem * 查询数据库，发送申请统计接口 */ @Override + @Transactional(rollbackFor = Exception.class) public void getDataForApply() { log.info("申请统计接口开始"); TDxHttpLog tDxHttpLog = new TDxHttpLog(); @@ -166,6 +168,7 @@ public class ApplyServiceImpl extends ServiceImpl implem * 查询数据库，获取申请统计结果 */ @Override + @Transactional(rollbackFor = Exception.class) public void getApplyStatResult() { log.info("进入申请统计结果获取执行方法--"); // 查询数据库 遍历数据源 @@ -403,6 +406,7 @@ public class ApplyServiceImpl extends ServiceImpl implem * 从数据库中查询数据发送申请确认接口 */ @Override + @Transactional(rollbackFor = Exception.class) public void getDataForConfrim() { log.info("申请确认接口开始"); TDxHttpLog tDxHttpLog = new TDxHttpLog(); @@ -490,6 +494,7 @@ public class ApplyServiceImpl extends ServiceImpl implem * 获取申请确认结果接口 */ @Override + @Transactional(rollbackFor = Exception.class) public void getApplyConfirmResult() { // 查询数据库 遍历数据源 @@ -612,6 +617,7 @@ public class ApplyServiceImpl extends ServiceImpl implem * 获取统计信息 */ @Override + @Transactional(rollbackFor = Exception.class) public void getHistoryMsg() { log.info("进入获取统计信息执行方法--"); // 查询数据库 遍历数据源 diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java index 9429d21e..0269e3dc 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java @@ -35,6 +35,7 @@ import com.dxhy.core.job.service.TDxRecordInvoiceDetailJobService; import cn.hutool.core.codec.Base64; import cn.hutool.http.HttpUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.transaction.annotation.Transactional; /** * 功能描述 @@ -101,6 +102,7 @@ public class CheckTaskServiceImpl implements CheckTaskService { * @return void */ @Override + @Transactional(rollbackFor = Exception.class) public void checkOne(CheckNoDetailInvoice checkNoDetailInvoice, String db) { // 构建请求数据 final RequestData requestData = buildRequestData(checkNoDetailInvoice); diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java index 18f79f52..f2df7952 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java @@ -37,6 +37,7 @@ import com.dxhy.core.job.service.ConfirmService; import cn.hutool.core.codec.Base64; import cn.hutool.http.HttpUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; /** @@ -88,6 +89,7 @@ public class ConfirmServiceImpl extends ServiceImpl impl private BasisSysDeptCfgDao basisSysDeptCfgDao; @Override + @Transactional(rollbackFor = Exception.class) public void getTaxCurrent() { log.info("进入属期获取执行方法"); TDxHttpLog tDxHttpLog = null; @@ -281,6 +283,7 @@ public class ConfirmServiceImpl extends ServiceImpl impl } @Override + @Transactional(rollbackFor = Exception.class) public void getLtgalizeResult() { log.info("进入认证结果获取执行方法"); TDxHttpLog tDxHttpLog = new TDxHttpLog(); @@ -492,6 +495,7 @@ public class ConfirmServiceImpl extends ServiceImpl impl } @Override + @Transactional(rollbackFor = Exception.class) public void invoiceLegalize() { log.info("进入认证申请认证执行方法"); diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java index b3f45035..44f2d4e0 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java @@ -344,6 +344,7 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService { * @param db */ @SuppressWarnings({"unused", "rawtypes"}) + @Transactional(rollbackFor = Exception.class) public void invoiceStateConsumer(String responseJson, TDxHttpLog tDxHttpLog, String db, String taxno) { String company = tDxRecordInvoiceJobDao.findCompany(taxno); String total = ""; @@ -614,6 +615,7 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService { * @param taxno 税号 * @param db 数据库 */ + @Transactional(rollbackFor = Exception.class) public void invoiceSelectConsumer(String responseJson, TDxHttpLog httpLog, String taxno, String db) { String total = ""; diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 08cec36a..430527c2 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -92,13 +92,13 @@ public class SDNYMainProcessController extends AbstractController { @PostMapping("/singleInvoiceCheck2") @ResponseBody @SysLog("发票查验") - public ResponseEntity singleInvoiceCheck(@RequestBody Map pramsMap) throws Exception { + public ResponseEntity singleInvoiceCheck2(@RequestBody Map pramsMap) throws Exception { log.info("传入的参数为:{}", pramsMap); String userid = "101833"; String dbName = "business"; JSONObject checkInvoiceResult = null; RequestRecord singleInvoiceCheckRecord = requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(pramsMap), - "/singleInvoiceCheck", pramsMap.get("invoiceCode"), pramsMap.get("invoiceNumber"), "singleInvoiceCheck"); + "/singleInvoiceCheck2", pramsMap.get("invoiceCode"), pramsMap.get("invoiceNumber"), "singleInvoiceCheck"); //挡板开关 if ("1".equals(isPresure)) { @@ -487,7 +487,7 @@ public class SDNYMainProcessController extends AbstractController { @PostMapping("/singleInvoiceCheck") @ResponseBody @SysLog("发票查验") - public ResponseEntity singleInvoiceCheck2(@RequestBody Map pramsMap) throws Exception { + public ResponseEntity singleInvoiceCheck(@RequestBody Map pramsMap) throws Exception { log.info("传入的参数为:{}", pramsMap); String dbName = "business"; JSONObject checkInvoiceResult = null; @@ -564,12 +564,7 @@ public class SDNYMainProcessController extends AbstractController { if (!checkInvoiceResult.containsKey("code")) { if (!checkInvoiceResult.containsKey("cyjg")) { - //先删除原有主数据,再查验更新主数据和明细数据 - int delete = snPushCheckRecordService.deleteRecordByWrapper(recordWrapper); - if (delete > 0) { - checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber")); - signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, "", "1", dbName); - } + snPushCheckRecordService.updateInvoice(dbName, checkInvoiceResult, recordWrapper); } else if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) { data = errorInfo(checkInvoiceResult, data); return ResponseEntity.ok(JSONObject.toJSONString(data)); @@ -597,21 +592,16 @@ public class SDNYMainProcessController extends AbstractController { if (!checkInvoiceResult.containsKey("code")) { if (!checkInvoiceResult.containsKey("cyjg")) { //先删除原有主数据,再查验更新主数据和明细数据 - int delete = snPushCheckRecordService.deleteRecordByWrapper(recordWrapper); - if (delete > 0) { - checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber")); - signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, "", "1", dbName); - if ("10104".equals(pramsMap.get("invoiceType")) || "10105".equals(pramsMap.get("invoiceType"))) { - vehicleList = snPushCheckRecordService.vihicleList(uuid); - } else { - baseTDxRecordInvoiceDetail = snPushCheckRecordService.selectRecordDetailListByWrapper(detailWrapper); - } + snPushCheckRecordService.updateInvoice(dbName, checkInvoiceResult, recordWrapper); + if ("10104".equals(pramsMap.get("invoiceType")) || "10105".equals(pramsMap.get("invoiceType"))) { + vehicleList = snPushCheckRecordService.vihicleList(uuid); + } else { + baseTDxRecordInvoiceDetail = snPushCheckRecordService.selectRecordDetailListByWrapper(detailWrapper); } } else if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) { data = errorInfo(checkInvoiceResult, data); return ResponseEntity.ok(JSONObject.toJSONString(data)); - } } } @@ -696,7 +686,7 @@ public class SDNYMainProcessController extends AbstractController { } else { //其他类发票，直接入库 R data = new R(1000, "default success"); - if (!checkInvoiceResult.isEmpty()) { + if (checkInvoiceResult != null && !checkInvoiceResult.isEmpty()) { log.info("其他类发票，不做查验,直接入库"); data.put("message", "success"); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index 5818cf18..9ae222d4 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -1240,4 +1240,13 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { return gsClientMapper.selectByGsdm(orgCode); } + public void updateInvoice(String dbName, JSONObject checkInvoiceResult, QueryWrapper recordWrapper) { + //先删除原有主数据,再查验更新主数据和明细数据 + int delete = snPushCheckRecordService.deleteRecordByWrapper(recordWrapper); + if (delete > 0) { + checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber")); + signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, "", "1", dbName); + } + } + }