From fac8d1c6f76c6ffecd05c95bb67ff0e8ca371a25 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 25 May 2023 15:17:35 +0800 Subject: [PATCH 01/16] =?UTF-8?q?feature=EF=BC=9Amdm=20=E6=8B=89=E5=8F=96?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=97=B6=E8=A7=84=E6=A0=BC=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=AC=AC=E4=B8=80=E4=B8=AA=E4=B8=8B=E5=88=92?= =?UTF-8?q?=E7=BA=BF=E5=88=87=E5=89=B2=E5=8F=96=E5=85=B6=E5=90=8E=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mybatis/mapper/CommodityMapper.xml | 5 +++-- .../openapi/service/impl/SDEnregyServiceImpl.java | 10 +++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml index bb9b19cb..231ea25b 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml @@ -406,8 +406,9 @@ wlflmc = #{commodityCode.wlflmc,jdbcType=VARCHAR}, - - + + specification_model = #{commodityCode.ggxh,jdbcType=VARCHAR}, + commodity_id = #{commodityCode.commodityId,jdbcType=VARCHAR}, diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java index a2973f0c..b974788c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java @@ -213,12 +213,6 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { return AjaxResult.success("success", respStr); } - public static void main(String[] args) { - DecimalFormat g=new DecimalFormat("0000000000"); - - String code = String.format("%10s","60121A").replace(" ","0"); - System.out.println(); - } private static void structureBuyerEntity(BuyerEntity buyerEntity,MdmGmfxxtbReqBO tempMdmGmfxxtbReqBO){ buyerEntity.setTaxpayerCode(tempMdmGmfxxtbReqBO.getDESC14()); @@ -323,6 +317,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { reqBO.setCODE(code); List commodityCodeEntities = commodityMapper.queryByCommoditySpbmCompany(reqBO.getCODE()); List collect = commodityCodeEntities.stream().filter(t -> "-1".equals(t.getXhfNsrsbh())).collect(Collectors.toList()); + String ggxh = StringUtils.isNotBlank(reqBO.getDESCSHORT())&& reqBO.getDESCSHORT().contains("_")? reqBO.getDESCSHORT().substring(reqBO.getDESCSHORT().indexOf("_") + 1) : ""; if(collect != null && collect.size() > 0){ matchCommodityCode(commodityCodeEntity); commodityCodeEntity.setXmmc(reqBO.getDESC1()); @@ -330,6 +325,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { commodityCodeEntity.setXmdw(reqBO.getDESC5()); commodityCodeEntity.setCreateTime(new Date()); commodityCodeEntity.setBz(reqBO.getDESCSHORT()); + commodityCodeEntity.setGgxh(ggxh); commodityCodeEntity.setUUID(reqBO.getUUID()); commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE()); if(StringUtils.isNotBlank(reqBO.getCATEGORYNAME())){ @@ -356,6 +352,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { commodityCodeEntity.setCreateTime(new Date()); commodityCodeEntity.setBz(reqBO.getDESCSHORT()); commodityCodeEntity.setUUID(reqBO.getUUID()); + commodityCodeEntity.setGgxh(ggxh); commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE()); if(StringUtils.isNotBlank(reqBO.getCATEGORYNAME())){ commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME()); @@ -387,7 +384,6 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { } return list; } - /** * 根据规则进行物料匹配 * From fbfc0184f8aef90f2209ec51ffedf7afafc32418 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 25 May 2023 15:59:40 +0800 Subject: [PATCH 02/16] =?UTF-8?q?feature=EF=BC=9Amdm=E6=8B=89=E5=8F=96?= =?UTF-8?q?=E7=89=A9=E6=96=99=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7=E5=88=87?= =?UTF-8?q?=E5=89=B240=E4=B8=AA=E5=AD=97=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openapi/service/impl/SDEnregyServiceImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java index b974788c..c6d7f70e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java @@ -15,6 +15,7 @@ import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper; import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; import com.dxhy.order.baseservice.module.thirdservice.user.dto.AddUserRequestDto; import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; +import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper; import com.dxhy.order.consumer.modules.taxcodematch.dao.SdenergyTaxCodeMatchDao; import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch; @@ -22,7 +23,9 @@ import com.dxhy.order.consumer.openapi.protocol.AjaxResult; import com.dxhy.order.consumer.openapi.protocol.v6.sdenergy.*; import com.dxhy.order.model.R; import com.dxhy.order.utils.DistributedKeyMaker; +import com.dxhy.order.utils.GbkUtil; import com.dxhy.order.utils.JsonUtils; +import com.dxhy.order.utils.StringUtil; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -34,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; +import java.io.IOException; import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; @@ -318,6 +322,12 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { List commodityCodeEntities = commodityMapper.queryByCommoditySpbmCompany(reqBO.getCODE()); List collect = commodityCodeEntities.stream().filter(t -> "-1".equals(t.getXhfNsrsbh())).collect(Collectors.toList()); String ggxh = StringUtils.isNotBlank(reqBO.getDESCSHORT())&& reqBO.getDESCSHORT().contains("_")? reqBO.getDESCSHORT().substring(reqBO.getDESCSHORT().indexOf("_") + 1) : ""; + if(GbkUtil.getGbkLength(ggxh) > ConfigureConstant.INT_40){ + try { + ggxh = StringUtil.subStringByByte(ggxh, ConfigureConstant.INT_40); + } catch (IOException e) { + } + } if(collect != null && collect.size() > 0){ matchCommodityCode(commodityCodeEntity); commodityCodeEntity.setXmmc(reqBO.getDESC1()); From d55fc66b169fa12b40d4a683b41921db9efc5562 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 25 May 2023 16:20:36 +0800 Subject: [PATCH 03/16] =?UTF-8?q?feature=201.=E5=A6=82=E6=9E=9C=E9=83=BD?= =?UTF-8?q?=E6=98=AF=E5=90=AB=E7=A8=85=E6=95=B8=E6=93=9A=E9=80=B2=E8=A1=8C?= =?UTF-8?q?=E4=BB=B7=E7=A8=8E=E5=88=86=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/utils/BeanTransitionUtils.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index d52a6713..3c90163c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3545,13 +3545,13 @@ public class BeanTransitionUtils { if(StringUtils.isNotBlank(detail.getZZSE()) && StringUtils.isNotBlank(detail.getZBHSJE())){ String zje = DecimalCalculateUtil.bigDecimalAdd(detail.getZZSE(), detail.getZBHSJE()); if(DecimalCalculateUtil.stringCompare(zje,detail.getZHSJE()) != 0){ - ddmxxxBO.setJE(detail.getZBHSJE()); - ddmxxxBO.setHSBZ(ConfigureConstant.STRING_0); - ddmxxxBO.setSE(detail.getZZSE()); - }else { log.info("SAP推送的不含税金额+税额不相等,传入的总金额:{},计算后的XMJE:{}",detail.getZHSJE(),zje); ddmxxxBO.setJE(detail.getZHSJE()); ddmxxxBO.setHSBZ(ConfigureConstant.STRING_1); + }else { + ddmxxxBO.setJE(detail.getZBHSJE()); + ddmxxxBO.setHSBZ(ConfigureConstant.STRING_0); + ddmxxxBO.setSE(detail.getZZSE()); } } else { ddmxxxBO.setJE(detail.getZHSJE()); @@ -3577,6 +3577,11 @@ public class BeanTransitionUtils { } ddmxList.add(ddmxxxBO); } + boolean match = ddmxList.stream().allMatch(mx -> ConfigureConstant.STRING_1.equals(mx.getHSBZ())); + if(match){ + ddtxxBO.setHJJE("0"); + ddtxxBO.setHJSE("0"); + } } ddzxxBO.setDDTXX(ddtxxBO); ddzxxBO.setDDMXXX(ddmxList); @@ -3588,8 +3593,8 @@ public class BeanTransitionUtils { } public static void main(String[] args) { - String zje = DecimalCalculateUtil.bigDecimalAdd("60561.96", "465861.19"); - if(DecimalCalculateUtil.stringCompare(zje,"526423.15") != 0){ + String zje = DecimalCalculateUtil.bigDecimalAdd("2", "1"); + if(DecimalCalculateUtil.stringCompare(zje,"3") != 0){ System.out.println("00"); } System.out.println("988989"); From 13f45979fd7510205529cf1440d1be20153b82c1 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 25 May 2023 16:46:13 +0800 Subject: [PATCH 04/16] =?UTF-8?q?feature=EF=BC=9A=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=A2=84=E5=88=B6=E5=8F=91=E7=A5=A8=E6=97=B6=EF=BC=8C=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=83=A8=E5=88=86=E4=B8=BA=E7=9F=BF=E4=BA=A7=E7=9A=84?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8D=E5=85=81=E8=AE=B8=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=A2=84=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 5 +++++ 1 file changed, 5 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 a362fd01..b2568cc5 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 @@ -145,6 +145,8 @@ public class InvoiceServiceImpl implements InvoiceService { return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!"); } String cpy = ""; + String kcp = baseServiceConfig.getKcp(); + boolean kcpMark = kcp.contains(commonOrderInfo.getOrderItemInfo().get(0).getSpbm()); for(OrderItemInfo orderItemInfo: commonOrderInfo.getOrderItemInfo()){ if(StrUtil.isBlank(orderItemInfo.getSpbm())){ return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"第"+orderItemInfo.getSphxh()+"行商品税编为空,请补全!"); @@ -157,6 +159,9 @@ public class InvoiceServiceImpl implements InvoiceService { }else { cpy = taxClassCodeEntity.getCpy(); } + if(kcp.contains(orderItemInfo.getSpbm()) == kcpMark){ + return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"矿产品与非矿产品税编不能混开,请做手动拆分处理!"); + } } } if(ConfigureConstant.STRING_Y.equals(cpy) && commonOrderInfo.getOrderItemInfo().size()>ConfigureConstant.INT_8){ From e69db84900b8723b92c0be123f8d7eddc492cb61 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 25 May 2023 19:31:20 +0800 Subject: [PATCH 05/16] =?UTF-8?q?feature=EF=BC=9A=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=A2=84=E5=88=B6=E5=8F=91=E7=A5=A8=E6=A0=A1=E9=AA=8C=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=85=A8=E9=83=A8=E4=B8=BA=E7=9F=BF=E4=BA=A7=E5=93=81?= 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 b2568cc5..cf780866 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 @@ -159,7 +159,7 @@ public class InvoiceServiceImpl implements InvoiceService { }else { cpy = taxClassCodeEntity.getCpy(); } - if(kcp.contains(orderItemInfo.getSpbm()) == kcpMark){ + if(kcp.contains(orderItemInfo.getSpbm()) != kcpMark){ return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"矿产品与非矿产品税编不能混开,请做手动拆分处理!"); } } From d7dacf428ffd052674c446a9906c96644c789c0b Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 25 May 2023 19:34:34 +0800 Subject: [PATCH 06/16] =?UTF-8?q?feature=EF=BC=9A=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E5=BC=80=E5=85=B7=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E5=88=99=E6=9B=B4=E6=96=B0=E5=85=AC=E5=8F=B8=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=BA=93=EF=BC=8C=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=88=99?= =?UTF-8?q?=E6=8F=92=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/commodity/dao/CommodityMapper.java | 2 + .../service/impl/CommodityServiceImpl.java | 19 +++++-- .../mybatis/mapper/CommodityMapper.xml | 55 +++++++++++++++++++ 3 files changed, 70 insertions(+), 6 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java index 4f3bf7e9..784e77f3 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java @@ -53,6 +53,8 @@ public interface CommodityMapper { */ int updateCommodity(@Param("commodityCode") CommodityCodeEntity codeEntity, @Param("shList") List shList); + int updateCommodityByZxbm(@Param("commodityCode") CommodityCodeEntity codeEntity, @Param("map") Map map); + int batchUpdateCommodity(@Param("commodityCode") CommodityCodeEntity codeEntity, @Param("ids") List ids); /** diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java index 7a78412a..baf272eb 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java @@ -639,20 +639,27 @@ public class CommodityServiceImpl implements CommodityService { log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map); List commodityCodeEntityList = commodityMapper.queryProductList(map, null); //R r = commodityService.checkRepeat(commodityCodeCheckQuery, NsrsbhUtils.transShListByNsrsbh(receiveSpxxReq.getXhfNsrsbh()), false); - if(commodityCodeEntityList.isEmpty()){ - //if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))) { - + TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(receiveSpxxReq.getSpbm()); + CommodityCodeEntity commodityCodeEntity = null; + if (ObjectUtil.isNotEmpty(taxClassCodeEntity)) { + commodityCodeEntity = transCommodityCode(receiveSpxxReq, taxClassCodeEntity); + } + if(commodityCodeEntityList.isEmpty()) { + //if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))) { /** * 从缓存中取税编信息 * */ - TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(receiveSpxxReq.getSpbm()); - if (ObjectUtil.isNotEmpty(taxClassCodeEntity)) { - CommodityCodeEntity commodityCodeEntity = transCommodityCode(receiveSpxxReq, taxClassCodeEntity); + if (commodityCodeEntity != null){ commodityMapper.insertCommodity(commodityCodeEntity); log.debug("添加成功"); } + }else{ + // TODO 简称、商品编码、规格型号、单位、优惠政策标识、零税率标识 + if (commodityCodeEntity != null){ + commodityMapper.updateCommodityByZxbm(commodityCodeEntity, map); + } } } } diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml index 231ea25b..08a1669c 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml @@ -384,6 +384,61 @@ + + + update commodity_code + + + specification_model = #{commodityCode.ggxh,jdbcType=VARCHAR}, + + + metering_unit = #{commodityCode.xmdw,jdbcType=VARCHAR}, + + + hide_the_logo = #{commodityCode.ycbz,jdbcType=VARCHAR}, + + + preferential_policies_type = #{commodityCode.lslbs,jdbcType=VARCHAR}, + + + enjoy_preferential_policies = #{commodityCode.yhzcbs,jdbcType=VARCHAR}, + + + tax_class_code = #{commodityCode.spbm,jdbcType=VARCHAR}, + + + tax_class_abbreviation = #{commodityCode.spjc,jdbcType=VARCHAR}, + + + zzstsgl = #{commodityCode.zzstsgl,jdbcType=VARCHAR}, + + + modify_time = now(), + + + modify_time = SYSDATE, + + + modify_user_id = #{commodityCode.modifyUserId,jdbcType=CHAR}, + + + + collect_ident = #{commodityCode.collectIdent,jdbcType=VARCHAR}, + + + cpy = #{commodityCode.cpy,jdbcType=VARCHAR}, + + + + + + and encoding = #{map.zxbm,jdbcType=VARCHAR}, + + + and ent_id = #{map.entId,jdbcType=VARCHAR}, + + + update commodity_code From e2fc102e98912e1e96f07f97e8ee7a5b0cc55751 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 25 May 2023 20:22:36 +0800 Subject: [PATCH 07/16] =?UTF-8?q?feature=EF=BC=9A=E5=BC=80=E5=85=B7?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=8A=A5=E9=94=99=E7=89=A9=E6=96=99=EF=BC=8C?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A0=E9=99=A4=E9=80=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mybatis/mapper/CommodityMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml index 08a1669c..172a087b 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml @@ -432,10 +432,10 @@ - and encoding = #{map.zxbm,jdbcType=VARCHAR}, + and encoding = #{map.zxbm,jdbcType=VARCHAR} - and ent_id = #{map.entId,jdbcType=VARCHAR}, + and ent_id = #{map.entId,jdbcType=VARCHAR} From 40e844ff2b1b446ee18ec6412e8b5b3bc9e0ecf8 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 26 May 2023 10:35:00 +0800 Subject: [PATCH 08/16] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=89=8B=E5=B7=A5=E6=8B=86=E5=88=86=E3=80=81=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=8C=E6=8B=86=E5=88=86=EF=BC=8C=E5=A6=82=E6=9E=9C=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=B8=BA=E6=88=90=E5=93=81=E6=B2=B9=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=AE=8C=EF=BC=8C=E9=9C=80=E8=A6=81=E4=BF=AE=E6=94=B9=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E6=A0=87=E5=BF=97=E4=B8=BA4=EF=BC=8C=E8=B6=858?= =?UTF-8?q?=E8=A1=8C=E6=98=8E=E7=BB=86=E4=B8=BA1=EF=BC=8C=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InvoiceServiceImpl.java | 9 +++++++-- .../service/impl/OrderCommonServiceImpl.java | 17 +++++++++++++++++ .../service/impl/OrderSplitServiceImpl.java | 8 ++++++++ 3 files changed, 32 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 cf780866..1b85ab18 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 @@ -268,11 +268,15 @@ public class InvoiceServiceImpl implements InvoiceService { OrderProcessInfo processInfo = f.getProcessInfo(); processInfo.setYzfp(ConfigureConstant.STRING_1); orderProcessService.updateOrderProcessInfoByProcessId(processInfo, null); + OrderInfo orderInfo = f.getOrderInfo(); if(ObjectUtil.isNotNull(taxClassCodeEntity) && ConfigureConstant.STRING_Y.equals(taxClassCodeEntity.getCpy())){ - OrderInfo orderInfo = f.getOrderInfo(); orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_4.getKey()); - orderInfoService.updateOrderInfoByOrderId(orderInfo,null); + }else if(f.getOrderItemInfo().size() > 8){ + orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_1.getKey()); + }else{ + orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_0.getKey()); } + orderInfoService.updateOrderInfoByOrderId(orderInfo,null); } else if (orderSplit.size() > 1) { List commonOrderInfoSaveResults = new ArrayList<>(); @@ -282,6 +286,7 @@ public class InvoiceServiceImpl implements InvoiceService { OrderProcessInfo processInfo = orderProcessService.selectOrderProcessInfoByProcessId(s.getOrderInfo().getProcessId(),null); processInfo.setYzfp(ConfigureConstant.STRING_1); orderProcessService.updateOrderProcessInfoByProcessId(processInfo, null); +// }); } else { continue; diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java index 048c7661..327833f1 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java @@ -2,6 +2,8 @@ package com.dxhy.order.consumer.modules.order.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; +import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper; +import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderInfoContentEnum; import com.dxhy.order.constant.OrderInfoEnum; @@ -92,6 +94,9 @@ public class OrderCommonServiceImpl implements OrderCommonService { @Resource private BaseService baseService; + @Resource + private TaxClassCodeMapper taxClassCodeMapper; + @Override public String getGenerateShotKey() { return DistributedKeyMaker.generateShotKey(); @@ -1382,6 +1387,7 @@ public class OrderCommonServiceImpl implements OrderCommonService { } int i = 1; + int cpy = 0; for (OrderItemInfo orderItemInfo : comm.getOrderItemInfo()) { orderItemInfo.setOrderInfoId(orderInfo.getId()); if (StringUtils.isBlank(orderItemInfo.getXhfNsrsbh())) { @@ -1391,6 +1397,10 @@ public class OrderCommonServiceImpl implements OrderCommonService { orderItemInfo.setId(apiInvoiceCommonService.getGenerateShotKey()); orderItemInfo.setCreateTime(orderItemInfo.getCreateTime() == null ? new Date() : orderItemInfo.getCreateTime()); orderItemInfo.setSphxh(String.valueOf(i)); + TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(orderItemInfo.getSpbm()); + if(taxClassCodeEntity != null && "Y".contains(taxClassCodeEntity.getCpy())){ + cpy++; + } /** * 处理单价,保留非零位 */ @@ -1411,6 +1421,13 @@ public class OrderCommonServiceImpl implements OrderCommonService { } i++; } + if(cpy == comm.getOrderItemInfo().size()){ + orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_4.getKey()); + }else if(comm.getOrderItemInfo().size() > 8){ + orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_1.getKey()); + }else{ + orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_0.getKey()); + } int insert = orderProcessInfoExtMapper.insertOrderProcessExt(orderExt); if (insert <= 0) { 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 29e803c5..b81e53da 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 @@ -262,9 +262,14 @@ public class OrderSplitServiceImpl implements OrderSplitService { CommonOrderInfo commonOrder = new CommonOrderInfo(); OrderInfo orderInfo = new OrderInfo(); List orderItemList = new ArrayList<>(); + int cpy = 0; for (PageOrderItemInfo pageOrderItemInfo : pageCommonOrderInfo.getOrderItemInfo()) { OrderItemInfo orderItemInfo = new OrderItemInfo(); BeanUtils.copyProperties(pageOrderItemInfo, orderItemInfo); + TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(orderItemInfo.getSpbm()); + if(taxClassCodeEntity != null && "Y".contains(taxClassCodeEntity.getCpy())){ + cpy++; + } orderItemList.add(orderItemInfo); } @@ -281,6 +286,9 @@ public class OrderSplitServiceImpl implements OrderSplitService { CommonUtils.resetQdbz(orderInfo); //重新计算清单标志 CommonUtils.setQdbz(orderInfo, orderItemList.size()); + if(cpy == pageCommonOrderInfo.getOrderItemInfo().size()){ + orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_4.getKey()); + } CommonUtils.setQdXmmc(orderInfo); String cfDdh = oldDdh + CF + DECIMAL_FORMAT.format(i); From 9073c01da94f456f038ed73154e5c1f0ebc641d7 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 26 May 2023 11:33:57 +0800 Subject: [PATCH 09/16] =?UTF-8?q?feature=EF=BC=9A=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E8=AE=A2=E5=8D=95=E5=90=88=E5=B9=B6=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/OrderInfoController.java | 15 ++++++++ .../order/service/OrderInfoService.java | 5 ++- .../service/impl/OrderInfoServiceImpl.java | 34 ++++++++++++++++--- 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java index 1861724f..4fa4e30d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java @@ -500,4 +500,19 @@ public class OrderInfoController { } } + @ApiOperation(value = "批量订单明细合并", notes = "订单信息管理-批量订单明细合并") + @PostMapping("/batchMegerOrderItem") + @SysLog(operation = "批量订单明细合并", operationDesc = "订单明细合并", key = "批量订单明细合并") + public R batchMegerOrderItem(@RequestBody String param){ + log.info("批量订单明细合并",param); + List jsonObjects = JSONObject.parseArray(param).toJavaList(JSONObject.class); + + try { + return orderInfoService.batchMegerOrderItem(jsonObjects); + } catch (Exception e) { + log.error(e.getMessage()); + return R.error("系统异常"); + } + } + } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java index 62eb77f7..96be588f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java @@ -1,6 +1,7 @@ package com.dxhy.order.consumer.modules.order.service; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.dxhy.order.consumer.model.page.PageRequestVO; import com.dxhy.order.exception.OrderReceiveException; import com.dxhy.order.model.*; @@ -219,7 +220,9 @@ public interface OrderInfoService { R updateOrderItem(String orderInfoId,String entId,List itemList); @Transactional - R mergeOrderItem(String entId,String orderInfoId,List itemList); + R mergeOrderItem(String entId,String orderInfoId,List itemList) throws Exception; + + R batchMegerOrderItem(List jsonObjects); /** diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 671ffef0..4aed2d7e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; import com.dxhy.base.constant.OrderSeparationException; import com.dxhy.base.constant.TaxSeparateConfig; import com.dxhy.base.utils.PriceTaxSeparationUtilNew; @@ -1855,15 +1856,20 @@ public class OrderInfoServiceImpl implements OrderInfoService { } @Override - public R mergeOrderItem(String entId, String orderInfoId,List itemList){ + public R mergeOrderItem(String entId, String orderInfoId,List itemList) throws Exception{ List orderItemInfos = orderItemInfoMapper.selectAllByOrderId(Arrays.asList(orderInfoId), null); if(ObjectUtil.isNull(orderItemInfos)){ return R.error("根据订单号未查询到明细行信息"); } - List collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isNotBlank(t.getSpbm())).collect(Collectors.toList()); - if(ObjectUtil.isNull(orderItemInfos)){ - return R.error("税收编码为空的不允许合并，请先更新税收编码"); + List collect = null; + if(itemList != null){ + collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isNotBlank(t.getSpbm())).collect(Collectors.toList()); + if(ObjectUtil.isNull(orderItemInfos)){ + return R.error("税收编码为空的不允许合并，请先更新税收编码"); + } + }else{ + collect = orderItemInfos; } Map> collect1 = collect.stream().collect(Collectors.groupingBy(t -> t.getFphxz() + t.getXmmc() + t.getXmdw() + t.getGgxh() + t.getSl() + t.getSpbm())); List orderItemInfoList = new ArrayList<>(); @@ -1928,6 +1934,26 @@ public class OrderInfoServiceImpl implements OrderInfoService { return R.ok(); } + @Override + public R batchMegerOrderItem(List jsonObjects){ + for (JSONObject t : jsonObjects) { + String orderInfoId = t.getString("orderInfoId"); + String entId = t.getString("entId"); + String ddh = t.getString("ddh"); + try { + R r = mergeOrderItem(orderInfoId, entId, null); + if(!ConfigureConstant.STRING_0000.equals(r.getCode())){ + return R.error("结算单号{}明细行合并失败",ddh); + } + } catch (Exception e) { + log.error("批量合并报错orderInfoId:{},entId:{},报错信息:{}",orderInfoId,entId,e.getMessage()); + return R.error("结算单号{}明细行合并失败",ddh); + } + } + + return R.ok(); + } + @Override @Transactional(readOnly = true) public Boolean checkInvoiceRemarksFlag(String xfnsrsbh, String ghfId) { From 47f63694c97754d5e236305d18d96048ad9cf272 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 26 May 2023 11:38:40 +0800 Subject: [PATCH 10/16] =?UTF-8?q?feature=EF=BC=9A=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E3=80=81=E6=9B=B4=E6=96=B0=E7=89=A9=E6=96=99?= =?UTF-8?q?=E8=A1=A5=E5=85=A8=E5=95=86=E5=93=81=E7=BC=96=E7=A0=81=E6=97=B6?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=89=8D=E5=90=8E=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 4 ++-- .../openapi/service/impl/CommonInterfaceServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 4aed2d7e..6c702886 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -2001,9 +2001,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { StringBuilder stringBuilder = new StringBuilder(); if(StrUtil.isNotBlank(commodity.getInvoiceName())){ - spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getInvoiceName()).toString(); + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getInvoiceName().trim()).toString(); }else{ - spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString(); + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc().trim()).toString(); } item.setXmmc(spmc); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java index 3e71a90e..6b64ad4d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java @@ -839,9 +839,9 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { String spmc = item.getXmmc(); StringBuilder stringBuilder = new StringBuilder(); if (StringUtils.isBlank(spmc)) { - spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString(); + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc().trim()).toString(); } else if (StringUtil.checkStr(spmc, commodity.getSpjc())) { - spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(spmc).toString(); + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(spmc.trim()).toString(); } item.setXmmc(spmc); //如果税率为空使用查询到的税率否则使用原税率 From a13e25a388b8914807f1abfb37b68eaad813fec2 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 26 May 2023 16:39:06 +0800 Subject: [PATCH 11/16] =?UTF-8?q?feature=201.=E5=88=A4=E6=96=AD=E5=85=A8?= =?UTF-8?q?=E7=94=B5=E5=8F=91=E7=A5=A8=E4=B8=8D=E6=B7=BB=E5=8A=A0=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AllocateInvoiceInterfaceServiceImplV3.java | 2 +- .../order/consumer/utils/BeanTransitionUtils.java | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index f12bc682..bb997676 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -894,7 +894,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt insertOrder.stream().forEach(item->{ if (orderInfoService.checkInvoiceRemarksFlag(item.getXhfNsrsbh(), item.getGhfId())) { log.info("ddpcxxReq:{}", JSONObject.toJSONString(ddpcxxReq)); - item.setBz(item.getBz()+";销方公司代码:"+ddpcxxReq.getDDZXX().get(0).getDDTXX().getXHFBM()+",销方公司名称:"+item.getXhfMc()+";"); + item.setBz(StringUtils.isBlank(item.getBz())?"":item.getBz()+";销方公司代码:"+ddpcxxReq.getDDZXX().get(0).getDDTXX().getXHFBM()+",销方公司名称:"+item.getXhfMc()+";"); } }); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 3c90163c..0f0c7d7f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3481,10 +3481,17 @@ public class BeanTransitionUtils { ddtxxBO.setKPLX(req.getZSFHZ()); ddtxxBO.setXHFSBH(deptEntity.getInvoiceNsrsbh()); ddtxxBO.setXHFMC(deptEntity.getInvoiceName()); - ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress()); - ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone()); - ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank()); - ddtxxBO.setXHFZH(deptEntity.getTaxpayerAccount()); + if(OrderInfoEnum.ORDER_INVOICE_TYPE_001.getKey().equals(ddpcxxBO.getFPLXDM()) || OrderInfoEnum.ORDER_INVOICE_TYPE_002.getKey().equals(ddpcxxBO.getFPLXDM())){ + ddtxxBO.setXHFDZ(""); + ddtxxBO.setXHFDH(""); + ddtxxBO.setXHFYH(""); + ddtxxBO.setXHFZH(""); + } else { + ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress()); + ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone()); + ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank()); + ddtxxBO.setXHFZH(deptEntity.getTaxpayerAccount()); + } ddtxxBO.setGMFBM(req.getZGFBH()); ddtxxBO.setKPR(req.getZKPRXM()); ddtxxBO.setSKR(req.getZSKRXM()); From a8127afa0987448e30ada337bd80fece4889310b Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 26 May 2023 16:47:22 +0800 Subject: [PATCH 12/16] =?UTF-8?q?feature=EF=BC=9A=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdservice/user/controller/UserController.java | 8 ++++---- .../modules/order/service/impl/OrderInfoServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java index 8083bae0..a8dd2157 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java @@ -65,11 +65,11 @@ public class UserController { if(ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))){ UserEntity userEntity = (UserEntity) r.get(OrderManagementConstant.DATA); if(ObjectUtil.isNotNull(userEntity)){ - List taxplayercodeDeptList = userEntity.getTaxplayercodeDeptList(); + List taxplayercodeDeptList = userEntity.getTaxplayercodeDeptList(); if(ObjectUtil.isNotEmpty(taxplayercodeDeptList)){ - //同步大B或用户中心实体组织信息到发票组织管理表 - syncPhysicalGroupManagement(taxplayercodeDeptList); - } + //同步大B或用户中心实体组织信息到发票组织管理表 + syncPhysicalGroupManagement(taxplayercodeDeptList); + } } } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 6c702886..fb086c14 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1943,11 +1943,11 @@ public class OrderInfoServiceImpl implements OrderInfoService { try { R r = mergeOrderItem(orderInfoId, entId, null); if(!ConfigureConstant.STRING_0000.equals(r.getCode())){ - return R.error("结算单号{}明细行合并失败",ddh); + return R.error(String.format("结算单号%s明细行合并失败",ddh)); } } catch (Exception e) { log.error("批量合并报错orderInfoId:{},entId:{},报错信息:{}",orderInfoId,entId,e.getMessage()); - return R.error("结算单号{}明细行合并失败",ddh); + return R.error(String.format("结算单号%s明细行合并失败",ddh)); } } From 2c25c323dca1006ea803d23f814434e058bd82b4 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 26 May 2023 17:03:55 +0800 Subject: [PATCH 13/16] =?UTF-8?q?feature=EF=BC=9A=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index fb086c14..9629b95d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1941,7 +1941,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { String entId = t.getString("entId"); String ddh = t.getString("ddh"); try { - R r = mergeOrderItem(orderInfoId, entId, null); + R r = mergeOrderItem(entId,orderInfoId, null); if(!ConfigureConstant.STRING_0000.equals(r.getCode())){ return R.error(String.format("结算单号%s明细行合并失败",ddh)); } From f97e5676328a421aee1e0f600d341507eb0f7411 Mon Sep 17 00:00:00 2001 From: gaorl Date: Sat, 27 May 2023 11:35:53 +0800 Subject: [PATCH 14/16] =?UTF-8?q?feature=EF=BC=9A=E8=8E=B7=E5=8F=96getUser?= =?UTF-8?q?Info=20=E6=97=B6=EF=BC=8C=E5=BC=80=E7=A5=A8=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=AE=BE=E7=BD=AE=E4=B8=BA=E9=9D=9E=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=EF=BC=8C=E6=89=8B=E5=B7=A5=E8=AE=BE=E7=BD=AE=E9=BB=98?= =?UTF-8?q?=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/thirdservice/user/controller/UserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java index a8dd2157..230cc292 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java @@ -158,7 +158,7 @@ public class UserController { groupManagementEntity.setXhfZh(taxPlayerCodeDept.getTaxpayerAccount()); groupManagementEntity.setDataSource(OrderInfoEnum.ORDER_KPZZGL_SJLY_1.getKey()); groupManagementEntity.setDataStatus(OrderInfoEnum.ORDER_KPZZGL_SJZT_0.getKey()); - groupManagementEntity.setDefaultItem(OrderInfoEnum.ORDER_KPZZGL_SFMRX_0.getKey()); + groupManagementEntity.setDefaultItem(OrderInfoEnum.ORDER_KPZZGL_SFMRX_1.getKey()); groupManagementEntity.setDelFlag(OrderInfoEnum.ORDER_KPZZGL_SCBJ_0.getKey()); groupManagementEntity.setEntId(taxPlayerCodeDept.getDeptId()); groupManagementEntity.setUsingEntId(taxPlayerCodeDept.getDeptId()); From 2647d9ad6e649f6b8aabf2179f50302d19b83136 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 29 May 2023 09:40:09 +0800 Subject: [PATCH 15/16] =?UTF-8?q?feature=EF=BC=9A=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=88=90=E5=93=81=E6=B2=B9=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E4=B8=BA4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 9629b95d..544dd9c4 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1841,7 +1841,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { Map map = new HashMap(2); map.put("cpy","Y"); Integer integer = taxClassCodeMapper.countTaxClassCodeBySpbm(collect1, map); - if(orderItemInfoList.size()==integer.intValue()){ + if(orderItemInfos.size()==integer.intValue()){ //更新order_info 清单标志为4 OrderInfo orderInfo = new OrderInfo(); orderInfo.setId(orderInfoId); @@ -1892,7 +1892,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { //重算税额 String hsbz = orderItemInfo.getHsbz(); BigDecimal taxRate = new BigDecimal(orderItemInfo.getSl()); - BigDecimal taxAmout = new BigDecimal(orderItemInfo.getSl()); + BigDecimal taxAmout = new BigDecimal(orderItemInfo.getXmje()); if (OrderInfoEnum.HSBZ_1.getKey().equals(hsbz)) { taxAmout = xmje.divide(new BigDecimal("1").add(taxRate),0).multiply(taxRate).setScale(2,RoundingMode.HALF_UP); } else if (OrderInfoEnum.HSBZ_0.getKey().equals(hsbz)) { From 2f9083526efea853d28a4f54d570034fcff72977 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 29 May 2023 14:31:58 +0800 Subject: [PATCH 16/16] =?UTF-8?q?feature=201.=E5=A4=84=E7=90=86=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E5=90=8E=E7=9A=84=E8=A7=84=E6=A0=BC=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E8=B6=85=E9=95=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CommonInterfaceServiceImpl.java | 16 ++++++++++++++++ .../consumer/utils/BeanTransitionUtils.java | 14 +++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java index 6b64ad4d..5f4b3ac4 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java @@ -823,6 +823,22 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { if (StringUtils.isBlank(item.getSe())) { item.setSe(""); } + //判断规格信号是否大于40位，大于则截取 + if(StringUtils.isNotBlank(item.getGgxh())){ + String ggxh = item.getGgxh(); + try { + if (ggxh.getBytes(ConfigureConstant.STRING_CHARSET_GBK).length > ConfigureConstant.INT_40) { + log.debug("对明细行规格型号进行截取,截取前数据为:{}", ggxh); + ggxh = StringUtil.subStringByByte(ggxh, ConfigureConstant.INT_40); + log.debug("对明细行规格型号进行截取,截取后数据为:{}", ggxh); + item.setXmmc(ggxh); + } + } catch (IOException e) { + //编码格式错误 + log.error("处理商品名称异常：{}", e); + throw new RuntimeException(e); + } + } } /** diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 0f0c7d7f..6e4e20f7 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3481,17 +3481,17 @@ public class BeanTransitionUtils { ddtxxBO.setKPLX(req.getZSFHZ()); ddtxxBO.setXHFSBH(deptEntity.getInvoiceNsrsbh()); ddtxxBO.setXHFMC(deptEntity.getInvoiceName()); - if(OrderInfoEnum.ORDER_INVOICE_TYPE_001.getKey().equals(ddpcxxBO.getFPLXDM()) || OrderInfoEnum.ORDER_INVOICE_TYPE_002.getKey().equals(ddpcxxBO.getFPLXDM())){ - ddtxxBO.setXHFDZ(""); - ddtxxBO.setXHFDH(""); - ddtxxBO.setXHFYH(""); - ddtxxBO.setXHFZH(""); - } else { +// if(OrderInfoEnum.ORDER_INVOICE_TYPE_001.getKey().equals(ddpcxxBO.getFPLXDM()) || OrderInfoEnum.ORDER_INVOICE_TYPE_002.getKey().equals(ddpcxxBO.getFPLXDM())){ +// ddtxxBO.setXHFDZ(""); +// ddtxxBO.setXHFDH(""); +// ddtxxBO.setXHFYH(""); +// ddtxxBO.setXHFZH(""); +// } else { ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress()); ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone()); ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank()); ddtxxBO.setXHFZH(deptEntity.getTaxpayerAccount()); - } +// } ddtxxBO.setGMFBM(req.getZGFBH()); ddtxxBO.setKPR(req.getZKPRXM()); ddtxxBO.setSKR(req.getZSKRXM());