ariesy 去除切换数据源代码

release
yefei 2 years ago
parent 08b9ddef0a
commit b7a6609b90
  1. 1
      dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
  2. 3
      dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java
  3. 7
      dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java

@ -1410,7 +1410,6 @@ public class BaseInvoiceController extends AbstractController {
List<String> uuidList = Arrays.asList(uuidArray); List<String> uuidList = Arrays.asList(uuidArray);
//查询库中是否包含对应数据 //查询库中是否包含对应数据
DynamicContextHolder.push(getUserInfo().getDbName() + DbConstant.BUSINESS_READ);
List<String> list = baseIRzTDxRecordInvoiceService.findSuspendStatus(uuidList); List<String> list = baseIRzTDxRecordInvoiceService.findSuspendStatus(uuidList);
if (list == null || list.isEmpty()) { if (list == null || list.isEmpty()) {
return ResponseEntity.ok(R.error("没有可操作的数据")); return ResponseEntity.ok(R.error("没有可操作的数据"));

@ -733,7 +733,6 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
flag = true; flag = true;
} }
if (flag) { if (flag) {
DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE);
if (StringUtils.isBlank(entity.getInvoiceCode())) { if (StringUtils.isBlank(entity.getInvoiceCode())) {
entity.setInvoiceCode(""); entity.setInvoiceCode("");
} }
@ -741,7 +740,6 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
} }
// 艺龙推送数据 // 艺龙推送数据
if (yLcompany.equals(company)) { if (yLcompany.equals(company)) {
DynamicContextHolder.push(db + DbConstant.BUSINESS_READ);
InvoiceScanEntity selectSign = tDxRecordInvoiceJobDao InvoiceScanEntity selectSign = tDxRecordInvoiceJobDao
.selectByScan(entity.getInvoiceCode() + entity.getInvoiceNo(), dxhyAdmin); .selectByScan(entity.getInvoiceCode() + entity.getInvoiceNo(), dxhyAdmin);
if (selectSign != null && "1".equals(selectSign.getQsStatus())) { if (selectSign != null && "1".equals(selectSign.getQsStatus())) {
@ -759,7 +757,6 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
record.setCollectFrom("0"); record.setCollectFrom("0");
record.setCollectDate(new Date()); record.setCollectDate(new Date());
record.setPoolStatus("0"); record.setPoolStatus("0");
DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE);
tDxRecordInvoiceJobDao.insert(record); tDxRecordInvoiceJobDao.insert(record);
} }
InvoiceLog invoiceLog = new InvoiceLog(); InvoiceLog invoiceLog = new InvoiceLog();

@ -65,7 +65,6 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
uuidList.add(uuid); uuidList.add(uuid);
paramsInvoiceMap.put(uuid, item); paramsInvoiceMap.put(uuid, item);
}); });
DynamicContextHolder.push(DbConstant.BUSINESS_WRITE);
QueryWrapper<SdnyTDxRecordInvoice> queryWrapper = new QueryWrapper<>(); QueryWrapper<SdnyTDxRecordInvoice> queryWrapper = new QueryWrapper<>();
queryWrapper.in("uuid", uuidList); queryWrapper.in("uuid", uuidList);
List<SdnyTDxRecordInvoice> invoicesList = tdxRecordInvoiceDao.selectList(queryWrapper); List<SdnyTDxRecordInvoice> invoicesList = tdxRecordInvoiceDao.selectList(queryWrapper);
@ -85,7 +84,6 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
String errorMsg = msg.toString(); String errorMsg = msg.toString();
return R.error(500, "未查询到如下发票,请重新查验," + errorMsg); return R.error(500, "未查询到如下发票,请重新查验," + errorMsg);
} }
DynamicContextHolder.push(DbConstant.DETAIL_WRITE);
QueryWrapper<SdnyTDxRecordInvoiceDetail> detailQueryWrapper = new QueryWrapper<>(); QueryWrapper<SdnyTDxRecordInvoiceDetail> detailQueryWrapper = new QueryWrapper<>();
detailQueryWrapper.in("uuid", uuidList); detailQueryWrapper.in("uuid", uuidList);
List<SdnyTDxRecordInvoiceDetail> detailList = detailDao.selectList(detailQueryWrapper); List<SdnyTDxRecordInvoiceDetail> detailList = detailDao.selectList(detailQueryWrapper);
@ -128,7 +126,6 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
invoicesList.stream().forEach(invoice -> { invoicesList.stream().forEach(invoice -> {
DynamicContextHolder.push(DbConstant.BUSINESS_WRITE);
SdnyTDxSaleRecordInvoice saleRecordInvoice = sdnyTDxSaleRecordInvoiceDao.selectOne(new QueryWrapper<SdnyTDxSaleRecordInvoice>().eq("uuid", invoice.getUuid())); SdnyTDxSaleRecordInvoice saleRecordInvoice = sdnyTDxSaleRecordInvoiceDao.selectOne(new QueryWrapper<SdnyTDxSaleRecordInvoice>().eq("uuid", invoice.getUuid()));
List<SdnyTDxRecordInvoiceDetailSales> salesDetailList = new ArrayList<>(); List<SdnyTDxRecordInvoiceDetailSales> salesDetailList = new ArrayList<>();
detailiMap.get(invoice.getUuid()).stream().forEach(item -> { detailiMap.get(invoice.getUuid()).stream().forEach(item -> {
@ -140,9 +137,7 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
// 新增 // 新增
saleRecordInvoice = JsonUtils.getInstance().parseObject(JSONObject.toJSONString(invoice), SdnyTDxSaleRecordInvoice.class); saleRecordInvoice = JsonUtils.getInstance().parseObject(JSONObject.toJSONString(invoice), SdnyTDxSaleRecordInvoice.class);
saleRecordInvoice.setId(null); saleRecordInvoice.setId(null);
DynamicContextHolder.push(DbConstant.BUSINESS_WRITE);
sdnyTDxSaleRecordInvoiceDao.insert(saleRecordInvoice); sdnyTDxSaleRecordInvoiceDao.insert(saleRecordInvoice);
DynamicContextHolder.push(DbConstant.DETAIL_READ);
detailSalesDao.deleteByUUid(invoice.getUuid()); detailSalesDao.deleteByUUid(invoice.getUuid());
detailSalesDao.batchInsert(salesDetailList); detailSalesDao.batchInsert(salesDetailList);
} else { } else {
@ -150,7 +145,6 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
saleRecordInvoice.setImageId(invoice.getImageId()); saleRecordInvoice.setImageId(invoice.getImageId());
saleRecordInvoice.setBzdh(invoice.getBzdh()); saleRecordInvoice.setBzdh(invoice.getBzdh());
saleRecordInvoice.setBzr(invoice.getBzr()); saleRecordInvoice.setBzr(invoice.getBzr());
DynamicContextHolder.push(DbConstant.BUSINESS_WRITE);
sdnyTDxSaleRecordInvoiceDao.updateById(saleRecordInvoice); sdnyTDxSaleRecordInvoiceDao.updateById(saleRecordInvoice);
} }
saleRecordInvoice.setDetailList(salesDetailList); saleRecordInvoice.setDetailList(salesDetailList);
@ -164,7 +158,6 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
@Override @Override
public R salesInvoiceRollback(SNRequestObject params) { public R salesInvoiceRollback(SNRequestObject params) {
DynamicContextHolder.push(DbConstant.BUSINESS_WRITE);
List<SdnyTDxSaleRecordInvoice> data = sdnyTDxSaleRecordInvoiceDao.selectList(new QueryWrapper<SdnyTDxSaleRecordInvoice>().eq("image_id", params.getImageId())); List<SdnyTDxSaleRecordInvoice> data = sdnyTDxSaleRecordInvoiceDao.selectList(new QueryWrapper<SdnyTDxSaleRecordInvoice>().eq("image_id", params.getImageId()));
if (data != null && data.size() > 0) { if (data != null && data.size() > 0) {
List<String> uuidList = new ArrayList<>(); List<String> uuidList = new ArrayList<>();

Loading…
Cancel
Save