From 4316a17ffe30365783dfb095c5ceca54fba0e018 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 7 Jun 2023 09:34:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E7=A8=8E?= =?UTF-8?q?=E7=8E=87=E5=AD=97=E6=AE=B5,=E8=A1=A5=E5=85=85=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseInvoiceManualCheckServiceImpl.java | 4 ++ .../controller/SDNYMainProcessController.java | 13 +++++ .../com/dxhy/erp/dao/TdxRecordInvoiceDao.java | 4 ++ .../erp/service/SNPushCheckRecordService.java | 52 +++++++++++++++++++ .../service/impl/ReceiptOutServiceImpl.java | 2 +- .../resources/mapper/TdxRecordInvoiceDao.xml | 12 +++++ 6 files changed, 86 insertions(+), 1 deletion(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java index 953def8a..fd252a35 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java @@ -106,7 +106,9 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl hjList = super.baseMapper.selectHj(pramsMap); + log.info("手工认证 查询合计信息耗时:{}",System.currentTimeMillis()-start); BaseTDxRecordInvoice hjxx = hjList.get(0); hjsl = hjxx.getSfygx(); if (!"0".equals(hjsl)) { @@ -124,7 +126,9 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.selectSggxcx(pramsMap); + log.info("手工认证 查询列表信息耗时:{}",System.currentTimeMillis()-start1); PageInfo pageInfo = new PageInfo<>(pageList); log.info("返回的列表为:{}",pageList); 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 5d092c32..886afd92 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 @@ -1253,4 +1253,17 @@ public class SDNYMainProcessController extends AbstractController { } return ZCYJG; } + + /** + * 查验发票 + */ + @PostMapping("/refresh") + @ResponseBody + @SysLog("发票查验") + public String refreshDetailData(@RequestBody Map pramsMap) throws Exception { + log.info("接口请求的参数为:{}",pramsMap); + String result = snPushCheckRecordService.getRecords(pramsMap); + return result; + } + } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxRecordInvoiceDao.java b/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxRecordInvoiceDao.java index 55649758..fb38105e 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxRecordInvoiceDao.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxRecordInvoiceDao.java @@ -185,4 +185,8 @@ public interface TdxRecordInvoiceDao extends BaseMapper { void saveInvoiceAccount(TdxInvoiceAccount invoice); void deleteByuuid(@Param("uuids") String[] uuids); + + List selectRecords(@Param("pramsMap") Map pramsMap); + + void updateTaxRate(@Param("pramsMap") Map pramsMap); } 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 6b0cd5df..6b98d2f6 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 @@ -4,7 +4,9 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.dxhy.common.constant.DbConstant; import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.common.enums.FplxEnum; @@ -40,6 +42,7 @@ import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * 与山东能源交互数据主类 @@ -88,12 +91,18 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { @Resource private TDxInvoiceReimburseDao invoiceReimburseDao; + @Resource + private TdxRecordInvoiceDao tdxRecordInvoiceDao; + @Resource private BaseTDxRecordInvoiceDao baseTDxRecordInvoiceDao; @Resource private TDxInvoiceReimburseService tDxInvoiceReimburseService; + @Resource + private BaseTDxRecordInvoiceDetailDao baseTDxRecordInvoiceDetailDao; + @Resource private SysDeptDao sysDeptDao; @@ -270,6 +279,49 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { return queryInvoiceResult; } + public String getRecords(Map pramsMap) { + + QueryWrapper recordWrapper = new QueryWrapper<>(); + List uuids = tdxRecordInvoiceDao.selectRecords(pramsMap); + log.info("获取的uuid为{}",uuids); + + for (String uuid: uuids) { + boolean flag = false; + QueryWrapper detailWrapper = new QueryWrapper<>(); + detailWrapper.eq("uuid", uuid); + DynamicContextHolder.push("business" + DbConstant.DETAIL_READ); + List details = baseTDxRecordInvoiceDetailDao.selectList(detailWrapper); + DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ); + + log.info("获取到的明细为:{}",details); + String taxRate = ""; + for(BaseTDxRecordInvoiceDetail detail : details){ + //获取明细信息 更新主表税率 + if(StringUtils.isNotEmpty(detail.getTaxRate())){ + if(flag){ + if(!taxRate.contains(detail.getTaxRate())) { + taxRate = taxRate + "," + detail.getTaxRate(); + } + }else{ + if(!taxRate.contains(detail.getTaxRate())) { + taxRate = taxRate + detail.getTaxRate(); + } + flag = true; + } + } + } + log.info("taxRate={}",taxRate); + + Map pramsUpdate = new HashMap<>(); + pramsUpdate.put("taxRate",taxRate); + pramsUpdate.put("uuid",uuid); + + tdxRecordInvoiceDao.updateTaxRate(pramsUpdate); + } + return "ok"; + } + + public JSONObject singleCheckInvoice(Map pramsMap) throws Exception { //1.封装查验参数 diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java index 3db85952..c401c8c6 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java @@ -71,7 +71,7 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl condList = setPartInvoiceByType(invoices, condVO, userInfo); List outList = new ArrayList<>(); - // fourth：对比流水明细，区分底账表list中需要update或者insert的数据 + // fourth：对比流水明细，区分底账表list中需要update或者insert数据的 invoices.forEach(invoice -> { BaseTDxRecordInvoiceOut e = new BaseTDxRecordInvoiceOut(); if (outMap.containsKey(invoice.getUuid())) { diff --git a/dxhy-erp/src/main/resources/mapper/TdxRecordInvoiceDao.xml b/dxhy-erp/src/main/resources/mapper/TdxRecordInvoiceDao.xml index d1484bce..cc88bc9a 100644 --- a/dxhy-erp/src/main/resources/mapper/TdxRecordInvoiceDao.xml +++ b/dxhy-erp/src/main/resources/mapper/TdxRecordInvoiceDao.xml @@ -688,5 +688,17 @@ + + + + update t_dx_record_invoice + set tax_rate = #{taxRate} + where uuid = #{uuid} + + From c028c31c2daf524368482c05a3aa686ae5dbe6b0 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 12 Jun 2023 14:21:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?ariesy=20=E8=A1=A5=E5=85=85=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E7=A8=8E=E7=8E=87=E5=AD=97=E6=AE=B5=20v1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/SDNYMainProcessController.java | 2 +- .../java/com/dxhy/erp/dao/TdxRecordInvoiceDao.java | 2 +- .../dxhy/erp/service/SNPushCheckRecordService.java | 11 +++++------ .../src/main/resources/mapper/TdxRecordInvoiceDao.xml | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) 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 a3d0792b..b490f750 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 @@ -1267,7 +1267,7 @@ public class SDNYMainProcessController extends AbstractController { @PostMapping("/refresh") @ResponseBody @SysLog("发票查验") - public String refreshDetailData(@RequestBody Map pramsMap) throws Exception { + public String refreshDetailData(@RequestBody Map pramsMap) throws Exception { log.info("接口请求的参数为:{}",pramsMap); String result = snPushCheckRecordService.getRecords(pramsMap); return result; diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxRecordInvoiceDao.java b/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxRecordInvoiceDao.java index fb38105e..ff548d55 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxRecordInvoiceDao.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxRecordInvoiceDao.java @@ -186,7 +186,7 @@ public interface TdxRecordInvoiceDao extends BaseMapper { void deleteByuuid(@Param("uuids") String[] uuids); - List selectRecords(@Param("pramsMap") Map pramsMap); + List selectRecords(@Param("pramsMap") Map pramsMap); void updateTaxRate(@Param("pramsMap") Map pramsMap); } 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 6b98d2f6..4bbe7bfc 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 @@ -279,8 +279,8 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { return queryInvoiceResult; } - public String getRecords(Map pramsMap) { - + public String getRecords(Map pramsMap) { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); QueryWrapper recordWrapper = new QueryWrapper<>(); List uuids = tdxRecordInvoiceDao.selectRecords(pramsMap); log.info("获取的uuid为{}",uuids); @@ -312,11 +312,10 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { } log.info("taxRate={}",taxRate); - Map pramsUpdate = new HashMap<>(); - pramsUpdate.put("taxRate",taxRate); - pramsUpdate.put("uuid",uuid); + pramsMap.put("taxRate",taxRate); + pramsMap.put("uuid",uuid); - tdxRecordInvoiceDao.updateTaxRate(pramsUpdate); + tdxRecordInvoiceDao.updateTaxRate(pramsMap); } return "ok"; } diff --git a/dxhy-erp/src/main/resources/mapper/TdxRecordInvoiceDao.xml b/dxhy-erp/src/main/resources/mapper/TdxRecordInvoiceDao.xml index cc88bc9a..6684881f 100644 --- a/dxhy-erp/src/main/resources/mapper/TdxRecordInvoiceDao.xml +++ b/dxhy-erp/src/main/resources/mapper/TdxRecordInvoiceDao.xml @@ -694,10 +694,10 @@ limit #{pramsMap.start},#{pramsMap.num} - + update t_dx_record_invoice - set tax_rate = #{taxRate} - where uuid = #{uuid} + set tax_rate = #{pramsMap.taxRate} + where uuid = #{pramsMap.uuid} From b8524ad18eaa48c00af6e979030bc2dd5371040c Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 12 Jun 2023 15:29:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ariesy=20=E8=A1=A5=E5=85=85=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E7=A8=8E=E7=8E=87=E5=AD=97=E6=AE=B5=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/SDNYMainProcessController.java | 2 +- .../java/com/dxhy/erp/dao/TdxRecordInvoiceDao.java | 2 +- .../dxhy/erp/service/SNPushCheckRecordService.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) 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 b490f750..e092e68d 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 @@ -1267,7 +1267,7 @@ public class SDNYMainProcessController extends AbstractController { @PostMapping("/refresh") @ResponseBody @SysLog("发票查验") - public String refreshDetailData(@RequestBody Map pramsMap) throws Exception { + public String refreshDetailData(@RequestBody Map pramsMap) throws Exception { log.info("接口请求的参数为:{}",pramsMap); String result = snPushCheckRecordService.getRecords(pramsMap); return result; diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxRecordInvoiceDao.java b/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxRecordInvoiceDao.java index ff548d55..953f3ec5 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxRecordInvoiceDao.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxRecordInvoiceDao.java @@ -186,7 +186,7 @@ public interface TdxRecordInvoiceDao extends BaseMapper { void deleteByuuid(@Param("uuids") String[] uuids); - List selectRecords(@Param("pramsMap") Map pramsMap); + List selectRecords(@Param("pramsMap") Map pramsMap); void updateTaxRate(@Param("pramsMap") Map pramsMap); } 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 4bbe7bfc..2661ea5f 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 @@ -279,7 +279,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { return queryInvoiceResult; } - public String getRecords(Map pramsMap) { + public String getRecords(Map pramsMap) { DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); QueryWrapper recordWrapper = new QueryWrapper<>(); List uuids = tdxRecordInvoiceDao.selectRecords(pramsMap); @@ -310,12 +310,12 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { } } } - log.info("taxRate={}",taxRate); + log.info("获取的数据明细taxRate为={}",taxRate); + Map updateParam = new HashMap<>(); + updateParam.put("taxRate",taxRate); + updateParam.put("uuid",uuid); - pramsMap.put("taxRate",taxRate); - pramsMap.put("uuid",uuid); - - tdxRecordInvoiceDao.updateTaxRate(pramsMap); + tdxRecordInvoiceDao.updateTaxRate(updateParam); } return "ok"; }