From 8367545f1d4e82e5b2e36cbaa6bd3ef47052c797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Tue, 27 Aug 2024 10:43:59 +0800 Subject: [PATCH] =?UTF-8?q?release:=E6=97=B6=E7=A9=BA=E5=92=8C=E7=94=A8?= =?UTF-8?q?=E5=8F=8B=E5=B1=95=E7=A4=BA=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/modules/bespoke/model/yy/YyOrderInfo.java | 5 +++++ .../modules/bespoke/service/impl/SkOrderServiceImpl.java | 8 +++++++- .../modules/bespoke/service/impl/YyOrderServiceImpl.java | 6 ++++++ .../main/resources/mybatis/mapper/YyOrderInfoMapper.xml | 9 ++++++++- .../src/main/resources/mybatis/mapper/YyOrderMapper.xml | 6 +++--- 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/yy/YyOrderInfo.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/yy/YyOrderInfo.java index 08be6dc..ddf7519 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/yy/YyOrderInfo.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/yy/YyOrderInfo.java @@ -89,4 +89,9 @@ public class YyOrderInfo { * 红字订单号 */ private String yscdlcode; + + /** + * 备注 + */ + private String bz; } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java index c3b150d..01f05c8 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java @@ -41,6 +41,7 @@ import com.github.pagehelper.PageInfo; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -261,6 +262,7 @@ public class SkOrderServiceImpl implements OrderService { BigDecimal hsje = new BigDecimal(ConfigureConstant.STRING_0); BigDecimal se = new BigDecimal(ConfigureConstant.STRING_0); + StringBuilder bz = new StringBuilder(); for (SkOrderItemInfo skOrderItemInfo : skOrderItemInfoList) { hsje = hsje.add(new BigDecimal(skOrderItemInfo.getHsje())); se = se.add(new BigDecimal(skOrderItemInfo.getSe())); @@ -269,6 +271,10 @@ public class SkOrderServiceImpl implements OrderService { skOrderItemInfo.setCreateTime(now); skOrderItemInfo.setUpdateTime(now); skOrderItemInfoMapper.insertSkOrderItemInfo(skOrderItemInfo); + if (StringUtils.isNotBlank(skOrderItemInfo.getBeizhu())){ + bz.append(" ").append(skOrderItemInfo.getBeizhu()); + } + } skOrderInfo.setId(orderId); @@ -279,7 +285,7 @@ public class SkOrderServiceImpl implements OrderService { skOrderInfo.setCreateTime(now); skOrderInfo.setHsje(hsje.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString()); skOrderInfo.setSe(se.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString()); - + skOrderInfo.setBz(bz.toString()); String fplx = ConfigureConstant.STRING_002; if ("增值税专用发票".equals(skOrderInfo.getFplx())) { fplx = ConfigureConstant.STRING_001; diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java index d7d6363..dc10fe0 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java @@ -42,6 +42,7 @@ import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -295,6 +296,7 @@ public class YyOrderServiceImpl implements OrderService { BigDecimal hsje = new BigDecimal(ConfigureConstant.STRING_0); BigDecimal se = new BigDecimal(ConfigureConstant.STRING_0); + StringBuilder bz = new StringBuilder(); for (YyOrderItemInfo yyOrderItemInfo : yyOrderItemInfoList) { hsje = hsje.add(new BigDecimal(yyOrderItemInfo.getIsum())); se = se.add(new BigDecimal(yyOrderItemInfo.getItax())); @@ -303,6 +305,9 @@ public class YyOrderServiceImpl implements OrderService { yyOrderItemInfo.setCreateTime(now); yyOrderItemInfo.setUpdateTime(now); yyOrderItemInfoMapper.insertYyOrderItemInfo(yyOrderItemInfo); + if (StringUtils.isNotBlank(yyOrderItemInfo.getRemark())){ + bz.append(" ").append(yyOrderItemInfo.getRemark()); + } } yyOrderInfo.setId(orderId); yyOrderInfo.setNsrsbh(reqParam.getNsrsbh()); @@ -313,6 +318,7 @@ public class YyOrderServiceImpl implements OrderService { yyOrderInfo.setDetailCount(String.valueOf(yyOrderItemInfoList.size())); yyOrderInfo.setHsje(hsje.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString()); yyOrderInfo.setSe(se.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString()); + yyOrderInfo.setBz(bz.toString()); if (yyOrderInfo.getCvouchtype().equals(ConfigureConstant.STRING_26)) { yyOrderInfo.setCvouchtype(ConfigureConstant.STRING_001); } diff --git a/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml b/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml index 8b4b963..2f170c5 100644 --- a/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml +++ b/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml @@ -19,10 +19,11 @@ + - select id, nsrsbh, ent_id, status, detail_count, hsje, se, cvouchtype, ccusregcode, ccusname, ccusaddress, branchaccount, cdlcode, cpznum, create_time, update_time, cdldate from yy_order_info + select id, nsrsbh, ent_id, status, detail_count, hsje, se, cvouchtype, ccusregcode, ccusname, ccusaddress, branchaccount, cdlcode, cpznum, create_time, update_time, cdldate,bz from yy_order_info @@ -85,6 +86,9 @@ yscdlcode, + + bz, + @@ -144,6 +148,9 @@ #{yscdlcode}, + + #{bz}, + diff --git a/order-management-order/src/main/resources/mybatis/mapper/YyOrderMapper.xml b/order-management-order/src/main/resources/mybatis/mapper/YyOrderMapper.xml index 219b464..ce0b3de 100644 --- a/order-management-order/src/main/resources/mybatis/mapper/YyOrderMapper.xml +++ b/order-management-order/src/main/resources/mybatis/mapper/YyOrderMapper.xml @@ -13,7 +13,7 @@ cpznum, sbvid, yscdlcode - from v_invoice_head + from v_invoice_head_sd and cdlcode = #{ddh} @@ -40,7 +40,7 @@ itax, sbvid as yyItemId, remark - from v_invoice_detail + from v_invoice_detail_sd where sbvid = #{sbvid} @@ -57,7 +57,7 @@