From 4c6974414c6f5673f6228f2d13e6fc5ab730bccd Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Thu, 8 Jun 2023 20:56:00 +0800 Subject: [PATCH 01/14] =?UTF-8?q?OFD=E8=BD=ACPNG=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/invoice/controller/InvoiceDetailsController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceDetailsController.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceDetailsController.java index 0edb7648..70e072ca 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceDetailsController.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceDetailsController.java @@ -97,8 +97,8 @@ public class InvoiceDetailsController { private String yxisuse; @GetMapping("priviewOfd") - public R priviewOfd() throws IOException { - File file = new File("C:\\Users\\10216\\Desktop\\042002200113_04440777.ofd"); + public R priviewOfd(@RequestParam("path") String path) throws IOException { + File file = new File(path); FileInputStream fis = null; ByteArrayOutputStream bos = new ByteArrayOutputStream(1000); From b58e6acc4cdb76c71ac5a3b6daae7c76d3df53af Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 8 Jun 2023 20:57:41 +0800 Subject: [PATCH 02/14] =?UTF-8?q?feature=201.=E4=BF=AE=E5=A4=8DOFD?= =?UTF-8?q?=E8=BD=ACpng=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoice/service/impl/OfdToPngSDEnergyServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OfdToPngSDEnergyServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OfdToPngSDEnergyServiceImpl.java index 92dc933a..b4f5ae44 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OfdToPngSDEnergyServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OfdToPngSDEnergyServiceImpl.java @@ -3,6 +3,7 @@ package com.dxhy.order.invoice.module.invoice.service.impl; import cn.hutool.core.util.IdUtil; import cn.hutool.crypto.digest.DigestUtil; import com.alibaba.fastjson.JSONObject; +import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderInfoEnum; import com.dxhy.order.invoice.module.invoice.service.OfdToPngSDEnergyService; import com.dxhy.order.model.ofd.OfdToPngResponse; @@ -11,11 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.io.IOException; -import java.lang.reflect.Array; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; import java.util.List; @Service @@ -31,11 +28,12 @@ public class OfdToPngSDEnergyServiceImpl implements OfdToPngSDEnergyService { @Override public OfdToPngResponse getOfdPngBySDenergy(byte[] bytes) { - Long timestamp = new Date().getTime(); + Long timestamp = System.currentTimeMillis(); String md5Str = DigestUtil.md5Hex(timestamp + simsSalt); String url = yxurl + "/yxSims/ofdToImage?timestamp="+timestamp+"&md5Str="+md5Str; OfdToPngResponse ofdToPngResponse = new OfdToPngResponse(); + ofdToPngResponse.setZTDM(ConfigureConstant.STRING_0000); try { log.info("调用影像接口ofd转png，url:{}",url); String rs = HttpUtils.doPostUpload(url, bytes, IdUtil.fastSimpleUUID()+".ofd"); From 1ec9780df5106fbcbc94e0a462e8bf85ec2a995b Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Mon, 12 Jun 2023 08:28:40 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=93=81?= =?UTF-8?q?=E6=B2=B9=E5=92=8C=E9=9D=9E=E6=88=90=E5=93=81=E6=B2=B9=E6=B7=B7?= =?UTF-8?q?=E5=90=88=E9=A2=84=E5=88=B6=E5=8F=91=E7=A5=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InvoiceServiceImpl.java | 98 +++++++++++-------- 1 file changed, 58 insertions(+), 40 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index 053da0e2..a824225c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -22,6 +22,9 @@ import com.dxhy.order.baseservice.module.thirdservice.redis.service.RedisService import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService; import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; import com.dxhy.order.constant.*; +import com.dxhy.order.consumer.model.page.PageCommonOrderInfo; +import com.dxhy.order.consumer.model.page.PageOrderInfo; +import com.dxhy.order.consumer.model.page.PageOrderItemInfo; import com.dxhy.order.consumer.modules.manager.service.InvoiceService; import com.dxhy.order.consumer.modules.order.model.PageInvoiceItem; import com.dxhy.order.consumer.modules.order.model.PageInvoiceReq; @@ -135,8 +138,8 @@ public class InvoiceServiceImpl implements InvoiceService { @Resource private TaxClassCodeMapper taxClassCodeMapper; - private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#0000"); - private static final String CF = "cf"; + @Resource + private OrderSplitService orderSplitService; @Override @@ -146,13 +149,15 @@ public class InvoiceServiceImpl implements InvoiceService { //查询数据列表 List commonOrderInfos = orderInfoService.batchQueryOrderInfoByOrderIdsAndNsrsbh(pageInvoiceItemList); log.info("commonOrderInfos---->batch query order info"+JSON.toJSONString(commonOrderInfos)); + //存储成品油和非成品油不是混开的结算单 List commonOrderInfoList=new ArrayList(); + //存储成品油和非成品油混开的结算单 + List mixCommonOrderInfoList=new ArrayList<>(); //购方是否为空、税编是否为空校验、成品油校验 for(CommonOrderInfo commonOrderInfo:commonOrderInfos){ if(StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh()) || StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfMc()) ){ return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!"); } -// String cpy = ""; String kcp = baseServiceConfig.getKcp(); boolean kcpMark = kcp.contains(commonOrderInfo.getOrderItemInfo().get(0).getSpbm()); List cpyOrderItems = new ArrayList(); @@ -162,14 +167,6 @@ public class InvoiceServiceImpl implements InvoiceService { return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"第"+orderItemInfo.getSphxh()+"行商品税编为空,请补全!"); }else { TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(orderItemInfo.getSpbm()); -// if(StrUtil.isNotBlank(cpy)){ -// if(!cpy.equals(taxClassCodeEntity.getCpy())){ -// return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"成品油和非成品油税编不能混开,请做手动拆分处理!"); -// } -// }else { -// cpy = taxClassCodeEntity.getCpy(); -// } -// if(ConfigureConstant.STRING_Y.equals(taxClassCodeEntity.getCpy())){ //成品油明细 cpyOrderItems.add(orderItemInfo); @@ -187,41 +184,58 @@ public class InvoiceServiceImpl implements InvoiceService { commonOrderInfo.setOrderItemInfo(CollectionUtils.isEmpty(cpyOrderItems)?nocpyOrderItems:nocpyOrderItems); commonOrderInfoList.add(commonOrderInfo); }else { + //封装成品油 + PageCommonOrderInfo cpyPageCommonOrderInfo = new PageCommonOrderInfo(); + //拼接自动按照明细行拆分所需要的数据 log.info("cpyOrderItems》》》》》》》》"+JSON.toJSONString(cpyOrderItems)); log.info("nocpyOrderItems》》》》》》》》"+JSON.toJSONString(nocpyOrderItems)); //成品油和非成品油混合 - OrderInfo cpyOrderInfo = new OrderInfo(); - BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),cpyOrderInfo); - cpyOrderInfo.setHjbhsje(cpyOrderItems.stream().map(m->new BigDecimal(m.getXmje())).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); - cpyOrderInfo.setHjse(cpyOrderItems.stream().map(m->new BigDecimal(m.getSe())).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); - cpyOrderInfo.setDdh(commonOrderInfo.getOrderInfo().getDdh() + CF + DECIMAL_FORMAT.format(1)); - CommonOrderInfo cpyCommonOrderInfo = new CommonOrderInfo(); - BeanUtils.copyProperties(commonOrderInfo,cpyCommonOrderInfo); - cpyCommonOrderInfo.setOrderItemInfo(cpyOrderItems); - cpyCommonOrderInfo.setOrderInfo(cpyOrderInfo); - commonOrderInfoList.add(cpyCommonOrderInfo); - - - OrderInfo nocpyOrderInfo = new OrderInfo(); - BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),nocpyOrderInfo); - nocpyOrderInfo.setHjbhsje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getXmje())).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); - nocpyOrderInfo.setHjse(nocpyOrderItems.stream().map(m->new BigDecimal(m.getSe())).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); - nocpyOrderInfo.setDdh(commonOrderInfo.getOrderInfo().getDdh() + CF + DECIMAL_FORMAT.format(2)); - CommonOrderInfo nocpyCommonOrderInfo = new CommonOrderInfo(); - BeanUtils.copyProperties(commonOrderInfo,nocpyCommonOrderInfo); - nocpyCommonOrderInfo.setOrderItemInfo(nocpyOrderItems); - nocpyCommonOrderInfo.setOrderInfo(nocpyOrderInfo); - commonOrderInfoList.add(nocpyCommonOrderInfo); + PageOrderInfo cpyPageOrderInfo = new PageOrderInfo(); + BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),cpyPageOrderInfo); + cpyPageOrderInfo.setKphjje(cpyOrderItems.stream().map(m->new BigDecimal(m.getJshj())).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + List cpyOrderItemInfo = new ArrayList(); + for (OrderItemInfo cpyOrderItem : cpyOrderItems) { + PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo(); + BeanUtils.copyProperties(cpyOrderItem,cpyOrderItemInfo); + cpyOrderItemInfo.add(pageOrderItemInfo); + } + cpyPageCommonOrderInfo.setOrderInfo(cpyPageOrderInfo); + cpyPageCommonOrderInfo.setOrderItemInfo(cpyOrderItemInfo); + mixCommonOrderInfoList.add(cpyPageCommonOrderInfo); + //封装非成品油 + PageCommonOrderInfo nocpyPageCommonOrderInfo = new PageCommonOrderInfo(); + //成品油和非成品油混合 + PageOrderInfo nocpyPageOrderInfo = new PageOrderInfo(); + BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),nocpyPageOrderInfo); + nocpyPageOrderInfo.setKphjje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getJshj())).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + List nocpyOrderItemInfo = new ArrayList(); + for (OrderItemInfo nocpyOrderItem : nocpyOrderItems) { + PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo(); + BeanUtils.copyProperties(nocpyOrderItem,nocpyOrderItemInfo); + nocpyOrderItemInfo.add(pageOrderItemInfo); + } + nocpyPageCommonOrderInfo.setOrderInfo(nocpyPageOrderInfo); + nocpyPageCommonOrderInfo.setOrderItemInfo(nocpyOrderItemInfo); + mixCommonOrderInfoList.add(nocpyPageCommonOrderInfo); } if(cpyOrderItems.size()>ConfigureConstant.INT_8){ return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"是成品油发票,明细行数不能超过8行,请先进行手动拆分!"); } -// if(ConfigureConstant.STRING_Y.equals(cpy) && commonOrderInfo.getOrderItemInfo().size()>ConfigureConstant.INT_8){ -// return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"是成品油发票,明细行数不能超过8行,请先进行手动拆分!"); -// } } + //如果是混开的 走明细拆分 + if(!CollectionUtils.isEmpty(mixCommonOrderInfoList)){ + try { + orderSplitService.saveOrderSplitOrder(mixCommonOrderInfoList); + } catch (Exception e) { + throw new RuntimeException(e.getMessage()); + } + } + //如果不是混开的 走原来的逻辑 + if(CollectionUtils.isEmpty(commonOrderInfoList)){ + return R.ok("生成预制发票成功,请到【发票处理中心】页面查看"); + } //客户冻结状态校验、确认智能赋码、单价误差校验 List> consumerList = new ArrayList<>(); List> confirmList = new ArrayList<>(); @@ -294,17 +308,21 @@ public class InvoiceServiceImpl implements InvoiceService { } } else { log.error("{}校验单价容差范围发生错误:在原结算单中未匹配到唯一明细,找到了{}条", LOGGER_MSG, collect.size()); - R.error("校验单价容差范围发生错误:在原结算单中未匹配到唯一明细"); +// R.error("校验单价容差范围发生错误:在原结算单中未匹配到唯一明细"); + throw new RuntimeException("校验单价容差范围发生错误:在原结算单中未匹配到唯一明细"); } }); }); } if(consumerList.size()>0){ - return R.error(ConfigureConstant.STRING_9001, "以下结算单中客户的状态为“冻结”状态，不能进行开票。",consumerList); +// return R.error(ConfigureConstant.STRING_9001, "以下结算单中客户的状态为“冻结”状态，不能进行开票。",consumerList); + throw new RuntimeException(String.format("以下结算单中%s客户的状态为“冻结”状态，不能进行开票。",consumerList)); }else if((StrUtil.isBlank(pageInvoiceReq.getConfirmZnfm()) || !ConfigureConstant.STRING_0.equals(pageInvoiceReq.getConfirmZnfm())) && confirmList.size()>0){ - return R.error(ConfigureConstant.STRING_9002,"请确认以下物料税收分类编码是否准确",confirmList); +// return R.error(ConfigureConstant.STRING_9002,"请确认以下物料税收分类编码是否准确",confirmList); + throw new RuntimeException(String.format("请确认以下物料税收分类编码是否准确",confirmList)); }else if(djOverflowList.size() > 0){ - return R.error(ConfigureConstant.STRING_9003, "以下订单自动拆分时单价超过设定范围,请手动拆分",djOverflowList); +// return R.error(ConfigureConstant.STRING_9003, "以下订单自动拆分时单价超过设定范围,请手动拆分",djOverflowList); + throw new RuntimeException(String.format("以下订单自动拆分时单价超过设定范围,请手动拆分",djOverflowList)); }else { for (CommonOrderInfo f : commonOrderInfoList) { TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(f.getOrderItemInfo().get(0).getSpbm()); From 5551a34f673a888162adf688a32b8ff93c6fb6bf Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Mon, 12 Jun 2023 08:50:41 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E5=90=88=E8=AE=A1=E9=87=91=E9=A2=9D=E4=B8=BA=E4=BB=B7=E7=A8=8E?= =?UTF-8?q?=E7=9A=84=E5=90=88=E8=AE=A1=E7=9B=B8=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index c3dade9a..b705cadb 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -192,7 +192,7 @@ public class InvoiceServiceImpl implements InvoiceService { //成品油和非成品油混合 PageOrderInfo cpyPageOrderInfo = new PageOrderInfo(); BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),cpyPageOrderInfo); - cpyPageOrderInfo.setKphjje(cpyOrderItems.stream().map(m->new BigDecimal(m.getJshj())).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + cpyPageOrderInfo.setKphjje(cpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); List cpyOrderItemInfo = new ArrayList(); for (OrderItemInfo cpyOrderItem : cpyOrderItems) { PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo(); @@ -207,7 +207,7 @@ public class InvoiceServiceImpl implements InvoiceService { //成品油和非成品油混合 PageOrderInfo nocpyPageOrderInfo = new PageOrderInfo(); BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),nocpyPageOrderInfo); - nocpyPageOrderInfo.setKphjje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getJshj())).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + nocpyPageOrderInfo.setKphjje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); List nocpyOrderItemInfo = new ArrayList(); for (OrderItemInfo nocpyOrderItem : nocpyOrderItems) { PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo(); From 0bdf819f0262885c118de3e48cf0022a4e0cee4e Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Mon, 12 Jun 2023 08:52:09 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E5=90=88=E8=AE=A1=E9=87=91=E9=A2=9D=E4=B8=BA=E4=BB=B7=E7=A8=8E?= =?UTF-8?q?=E7=9A=84=E5=90=88=E8=AE=A1=E7=9B=B8=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index a824225c..636bbe4a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -192,8 +192,7 @@ public class InvoiceServiceImpl implements InvoiceService { //成品油和非成品油混合 PageOrderInfo cpyPageOrderInfo = new PageOrderInfo(); BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),cpyPageOrderInfo); - cpyPageOrderInfo.setKphjje(cpyOrderItems.stream().map(m->new BigDecimal(m.getJshj())).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); - List cpyOrderItemInfo = new ArrayList(); + cpyPageOrderInfo.setKphjje(cpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); List cpyOrderItemInfo = new ArrayList(); for (OrderItemInfo cpyOrderItem : cpyOrderItems) { PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo(); BeanUtils.copyProperties(cpyOrderItem,cpyOrderItemInfo); @@ -207,8 +206,7 @@ public class InvoiceServiceImpl implements InvoiceService { //成品油和非成品油混合 PageOrderInfo nocpyPageOrderInfo = new PageOrderInfo(); BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),nocpyPageOrderInfo); - nocpyPageOrderInfo.setKphjje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getJshj())).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); - List nocpyOrderItemInfo = new ArrayList(); + nocpyPageOrderInfo.setKphjje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); List nocpyOrderItemInfo = new ArrayList(); for (OrderItemInfo nocpyOrderItem : nocpyOrderItems) { PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo(); BeanUtils.copyProperties(nocpyOrderItem,nocpyOrderItemInfo); From 5d465d2d03a902003f5089327536d0cc1b448580 Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Mon, 12 Jun 2023 09:22:49 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 1 + .../modules/order/service/impl/OrderSplitServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index b705cadb..556c5b03 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -226,6 +226,7 @@ public class InvoiceServiceImpl implements InvoiceService { //如果是混开的 走明细拆分 if(!CollectionUtils.isEmpty(mixCommonOrderInfoList)){ + log.info("mixCommonOrderInfoList="+JSON.toJSONString(mixCommonOrderInfoList)); try { orderSplitService.saveOrderSplitOrder(mixCommonOrderInfoList); } catch (Exception e) { diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java index b81e53da..bc047abc 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java @@ -267,6 +267,8 @@ public class OrderSplitServiceImpl implements OrderSplitService { OrderItemInfo orderItemInfo = new OrderItemInfo(); BeanUtils.copyProperties(pageOrderItemInfo, orderItemInfo); TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(orderItemInfo.getSpbm()); + log.info("OrderItemInfo.getSpbm() = " + orderItemInfo.getSpbm()); + log.info("taxClassCodeEntity = " + taxClassCodeEntity); if(taxClassCodeEntity != null && "Y".contains(taxClassCodeEntity.getCpy())){ cpy++; } From b893957fe1ee14b10b0fc6934b34ac16d4815afd Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Mon, 12 Jun 2023 09:35:48 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=8B=E5=80=BC?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index 636bbe4a..9b2b1a46 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -195,7 +195,7 @@ public class InvoiceServiceImpl implements InvoiceService { cpyPageOrderInfo.setKphjje(cpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); List cpyOrderItemInfo = new ArrayList(); for (OrderItemInfo cpyOrderItem : cpyOrderItems) { PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo(); - BeanUtils.copyProperties(cpyOrderItem,cpyOrderItemInfo); + BeanUtils.copyProperties(cpyOrderItem,pageOrderItemInfo); cpyOrderItemInfo.add(pageOrderItemInfo); } cpyPageCommonOrderInfo.setOrderInfo(cpyPageOrderInfo); @@ -209,7 +209,7 @@ public class InvoiceServiceImpl implements InvoiceService { nocpyPageOrderInfo.setKphjje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); List nocpyOrderItemInfo = new ArrayList(); for (OrderItemInfo nocpyOrderItem : nocpyOrderItems) { PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo(); - BeanUtils.copyProperties(nocpyOrderItem,nocpyOrderItemInfo); + BeanUtils.copyProperties(nocpyOrderItem,pageOrderItemInfo); nocpyOrderItemInfo.add(pageOrderItemInfo); } nocpyPageCommonOrderInfo.setOrderInfo(nocpyPageOrderInfo); From 38314a527f1f3bf56953fa06f0a2f1a277345c5c Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Mon, 12 Jun 2023 09:38:53 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index 9b2b1a46..e34cc222 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -192,7 +192,8 @@ public class InvoiceServiceImpl implements InvoiceService { //成品油和非成品油混合 PageOrderInfo cpyPageOrderInfo = new PageOrderInfo(); BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),cpyPageOrderInfo); - cpyPageOrderInfo.setKphjje(cpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); List cpyOrderItemInfo = new ArrayList(); + cpyPageOrderInfo.setKphjje(cpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + List cpyOrderItemInfo = new ArrayList(); for (OrderItemInfo cpyOrderItem : cpyOrderItems) { PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo(); BeanUtils.copyProperties(cpyOrderItem,pageOrderItemInfo); @@ -206,7 +207,8 @@ public class InvoiceServiceImpl implements InvoiceService { //成品油和非成品油混合 PageOrderInfo nocpyPageOrderInfo = new PageOrderInfo(); BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),nocpyPageOrderInfo); - nocpyPageOrderInfo.setKphjje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); List nocpyOrderItemInfo = new ArrayList(); + nocpyPageOrderInfo.setKphjje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + List nocpyOrderItemInfo = new ArrayList(); for (OrderItemInfo nocpyOrderItem : nocpyOrderItems) { PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo(); BeanUtils.copyProperties(nocpyOrderItem,pageOrderItemInfo); From ee636693f1429a9eac41ec722dbf593d987432a9 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Mon, 12 Jun 2023 10:15:05 +0800 Subject: [PATCH 09/14] =?UTF-8?q?task4631=20=E5=AE=A2=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E6=A0=87=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/buyer/model/BuyerEntity.java | 5 ++++ .../module/buyer/model/BuyerImportExcel.java | 5 ++++ .../buyer/model/BuyerImportExcelEnum.java | 5 ++++ .../resources/mybatis/mapper/BuyerMapper.xml | 27 ++++++++++++++---- .../order/controller/BuyerController.java | 5 ++++ .../main/resources/download/BuyerExcel.xlsx | Bin 9367 -> 9406 bytes 升级sql/V1.0.5.sql | 3 ++ 7 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 升级sql/V1.0.5.sql diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java index b823a723..7446dcef 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java @@ -140,4 +140,9 @@ public class BuyerEntity implements Serializable { private String entId; private String deptId; + + /** + * 开票是否校验银行账号信息 0否 1是 + */ + private String checkBankFlag; } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcel.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcel.java index e28a2658..502fe583 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcel.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcel.java @@ -66,4 +66,9 @@ public class BuyerImportExcel { private String ghfSjh; private String khzt; + /** + * 开票是否校验银行账号信息 0否 1是 + */ + private String checkBankFlag; + } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcelEnum.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcelEnum.java index fe7e487a..438d553e 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcelEnum.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcelEnum.java @@ -75,6 +75,11 @@ public enum BuyerImportExcelEnum { // private String status; KH_ZT("客户状态", BuyerImportExcel.class.getDeclaredFields()[10].getName()), + /** + * 开票是否校验银行账号信息 0否 1是 + */ + CHECK_BANK_FLAG("开票是否校验银行账号信息", BuyerImportExcel.class.getDeclaredFields()[11].getName()), + ; diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml index ab704b04..df9a1026 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml @@ -27,6 +27,7 @@ + @@ -149,7 +150,8 @@ bmid.phone as bmid_phone, bmid.default_mark, bmid.create_user, - bmid.update_user + bmid.update_user, + bmi.check_bank_flag FROM buyer_manage_info bmi left join buyer_manage_info_detail bmid on bmi.id = bmid.buyer_manage_id @@ -181,7 +183,8 @@ rownum as rowno, status, sync_order, - ent_id + ent_id, + check_bank_flag FROM buyer_manage_info @@ -312,6 +315,9 @@ ent_id = #{buyer.deptId,jdbcType=VARCHAR}, + + check_bank_flag = #{buyer.checkBankFlag,jdbcType=VARCHAR}, + id = #{buyer.id,jdbcType=VARCHAR} @@ -406,6 +412,9 @@ ent_id = #{buyer.deptId,jdbcType=VARCHAR}, + + check_bank_flag = #{buyer.checkBankFlag,jdbcType=VARCHAR}, + id in @@ -535,7 +544,9 @@ ent_id, - + + check_bank_flag, + @@ -614,6 +625,10 @@ #{deptId,jdbcType=VARCHAR}, + + #{checkBankFlag,jdbcType=VARCHAR}, + + @@ -834,7 +849,8 @@ mdm_multicode_json, status, sync_order, - ent_id + ent_id, + check_bank_flag ) values diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java index bab3c16b..d7df8567 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java @@ -304,6 +304,11 @@ public class BuyerController { if("冻结".equals(buyerImportExcel.getKhzt())){ buyerEntity.setStatus("0"); } + // 开票是否校验银行账号信息 0否 1是 + buyerEntity.setCheckBankFlag("0"); + if ("是".equals(buyerImportExcel.getCheckBankFlag())) { + buyerEntity.setCheckBankFlag("1"); + } //购方名称 带中文括号的转换成英文括号 // 购方名称 带中文括号的转换成英文括号 buyerEntity.setPurchaseName(StringUtil.replaceStr(buyerEntity.getPurchaseName(), true)); diff --git a/order-management-consumer/src/main/resources/download/BuyerExcel.xlsx b/order-management-consumer/src/main/resources/download/BuyerExcel.xlsx index 6b8fa9d1b1bd4690ad479a18d3a56652831c6002..1dd3e8c2e49c0e479a919f8f2393a75c93f37ded 100644 GIT binary patch literal 9406 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 literal 9367 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œwGgq*uEJK9*$s7KrLv}|EFT#XSHeA)RD60#Z_5rY*+_mL70>y@e@=ssocKQ3qT#B> z48=SqW1+ypYv49}jsn7DI!NadUi5Y*>wV%V<(h^ZfxB5&6Mb`B=iu1nz2(q>B%`1g zyp!k`f7vmACg(1vJi$29QXv{dL}su4rnQSN?`mkTljG7xx+Ggzd)td;*ge*7G+6CUMRYqrc1S_ zk&Nw?G zPNFZL2&%NL*UsTKIA|X0g!yQMv7ITA??@|?$vT_zI`iZ8g^gT+Ge>CFQ9x{o zL&y-U%vPgDKA|smf+1REkgRyG$zm-1mIWEyJ}mJE%@7bD!cFCW-of$bsQ&)$ANF&o ztNb;i^Sq`#H|f&6htTp<(>374tLrXQ%y7 zurAhb;J^9qKS%i46aF*85%zBpes+j|4)C+V@MnN6!ry Date: Mon, 12 Jun 2023 14:11:56 +0800 Subject: [PATCH 10/14] =?UTF-8?q?task4631=E6=A0=A1=E9=AA=8C=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E5=AE=8C=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/buyer/dao/BuyerMapper.java | 2 ++ .../resources/mybatis/mapper/BuyerMapper.xml | 7 ++++ .../dxhy/order/constant/OrderInfoEnum.java | 6 ++++ .../service/impl/InvoiceServiceImpl.java | 32 ++++++++++++++++++- 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java index 70490bb2..e6900618 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java @@ -106,4 +106,6 @@ public interface BuyerMapper { * @return */ int insertBuyerByList(@Param("list") List buyerEntityList); + + BuyerEntity queryBuyerInfoByGhfIdAndEntId(@Param("ghfId") String ghfId, @Param("entId") String entId); } diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml index df9a1026..598ad172 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml @@ -1155,4 +1155,11 @@ + diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java index ca98b7b9..c59d0c83 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java @@ -1283,6 +1283,12 @@ public enum OrderInfoEnum { INVOICE_REMARK_SET_BZDH("BZDH","报账单号"), INVOICE_REMARK_SET_KB("KB","矿别"), + /** + * + * 开票是否校验银行账号信息 0否 1是 + */ + CHECK_BANK_FLAG_YES("1", "是"), + CHECK_BANK_FLAG_NO("0", "否"), ; diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index 1b85ab18..7dc29cfc 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -14,6 +14,7 @@ import com.dxhy.order.baseservice.module.base.model.RuleSplitEntity; import com.dxhy.order.baseservice.module.base.service.BaseService; import com.dxhy.order.baseservice.module.base.service.DrawerInfoService; import com.dxhy.order.baseservice.module.base.service.RuleSplitService; +import com.dxhy.order.baseservice.module.buyer.dao.BuyerMapper; import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity; import com.dxhy.order.baseservice.module.buyer.service.BuyerService; import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper; @@ -46,6 +47,7 @@ import com.dxhy.order.utils.JsonUtils; import com.dxhy.order.utils.NsrsbhUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -132,6 +134,9 @@ public class InvoiceServiceImpl implements InvoiceService { @Resource private TaxClassCodeMapper taxClassCodeMapper; + @Autowired + private BuyerMapper buyerMapper; + @Override @Transactional @@ -141,9 +146,34 @@ public class InvoiceServiceImpl implements InvoiceService { List commonOrderInfos = orderInfoService.batchQueryOrderInfoByOrderIdsAndNsrsbh(pageInvoiceItemList); //购方是否为空、税编是否为空校验、成品油校验 for(CommonOrderInfo commonOrderInfo:commonOrderInfos){ - if(StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh()) || StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfMc()) ){ + if (StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfMc())) { + return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!"); + } + BuyerEntity buyerEntity = buyerMapper.queryBuyerInfoByGhfIdAndEntId(commonOrderInfo.getOrderInfo().getGhfId(), commonOrderInfo.getOrderInfo().getEntId()); + if (buyerEntity == null) { return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!"); } + + if (OrderInfoEnum.CHECK_BANK_FLAG_YES.equals(buyerEntity.getCheckBankFlag())) { + if (StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh())) { + return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方纳税人识别号为空,请补全!"); + } + if (StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfDz())) { + return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方地址为空,请补全!"); + } + if (StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfDh())) { + return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方电话为空,请补全!"); + } + if (StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfYh())) { + return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方开户行为空,请补全!"); + } + if (StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfZh())) { + return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方银行账号为空,请补全!"); + } + } +// if(StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh()) || StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfMc()) ){ +// return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!"); +// } String cpy = ""; String kcp = baseServiceConfig.getKcp(); boolean kcpMark = kcp.contains(commonOrderInfo.getOrderItemInfo().get(0).getSpbm()); From bce3a2f3c080b85847529fa5b3929b08ed3a1100 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Mon, 12 Jun 2023 14:36:18 +0800 Subject: [PATCH 11/14] =?UTF-8?q?task4631=E6=A0=A1=E9=AA=8C=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E5=AE=8C=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index 7dc29cfc..42b078fa 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -154,7 +154,7 @@ public class InvoiceServiceImpl implements InvoiceService { return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!"); } - if (OrderInfoEnum.CHECK_BANK_FLAG_YES.equals(buyerEntity.getCheckBankFlag())) { + if (OrderInfoEnum.CHECK_BANK_FLAG_YES.getKey().equals(buyerEntity.getCheckBankFlag())) { if (StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh())) { return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方纳税人识别号为空,请补全!"); } From b1b4c1cf7cc8823fbc23e35acc9961971570b3f3 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Mon, 12 Jun 2023 14:55:07 +0800 Subject: [PATCH 12/14] =?UTF-8?q?task4631=E6=A0=A1=E9=AA=8C=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E5=AE=8C=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mybatis/mapper/BuyerMapper.xml | 2 +- .../modules/manager/service/impl/InvoiceServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml index 598ad172..63e2bd2a 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml @@ -1156,7 +1156,7 @@