From 69485420a1a7b1cb669f397f656addcb25e85e39 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 1 May 2023 19:18:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feature=201.=E4=BF=AE=E5=A4=8D=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=90=8E=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=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/OrderCommonServiceImpl.java | 1 + .../invoice/service/impl/OrderInvoiceInfoServiceImpl.java | 6 ++++++ 2 files changed, 7 insertions(+) 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 6391fd65..4b05edbe 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 @@ -1258,6 +1258,7 @@ public class OrderCommonServiceImpl implements OrderCommonService { orderProcessInfo.setOriginDdh(processInfo.getDdh()); orderProcessInfo.setOriginOrderId(processInfo.getOrderInfoId()); orderProcessInfo.setKb(processInfo.getKb()); + orderProcessInfo.setEntId(processInfo.getEntId()); return orderProcessInfo; } diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java index d10c78d0..f6f32a01 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java @@ -196,6 +196,12 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { OrderInvoiceInfo oderInvoiceInfo = orderInvoiceInfoMapper.selectOrderInvoiceInfo(orderInvoiceInfo1, shList); if (oderInvoiceInfo != null) { OrderInfo orderInfo = orderInfoMapper.selectOrderInfoByOrderId(oderInvoiceInfo.getOrderInfoId(), shList); + if(StringUtils.isNotBlank(oderInvoiceInfo.getFpqqlsh())){ + OrderProcessInfo processInfo = orderInfoMapper.selectProcessByFpqqlsh(oderInvoiceInfo.getFpqqlsh(), shList); + if(processInfo != null){ + orderInfo.setYhbh(processInfo.getYhbh()); + } + } List list = orderItemInfoMapper.selectOrderItemInfoByOrderId(oderInvoiceInfo.getOrderInfoId(), shList); co.setOrderInvoiceInfo(oderInvoiceInfo); co.setOrderItemList(JsonUtils.getInstance().listBeanCopy(list, OrderItemInfo.class)); From 0bf04d62da3ce09c75c97ab7a342d85e202657fe Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 1 May 2023 20:08:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feature=201.=E4=BF=AE=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=AE=BE=E7=BD=AE=E7=9A=84=E9=99=90=E9=A2=9D=E6=9C=AA?= =?UTF-8?q?=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GenerateReadyOpenOrderServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java index 3f83b034..7a3eba24 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java @@ -473,7 +473,14 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder OrderInfo orderInfo = common.getOrderInfo(); String hjbhsje = orderInfo.getHjbhsje(); if (new BigDecimal(hjbhsje).compareTo(new BigDecimal(taxDiskLimit)) > 0) { - limit = taxDiskLimit; + //如果设置的含税限额小于税盘的限额（不含税）则按照客户设置的限额来 + if(new BigDecimal(customLimit).compareTo(new BigDecimal(taxDiskLimit)) < 0){ + hsbz = OrderInfoEnum.HSBZ_1.getKey(); + limit = customLimit; + } else { + hsbz = OrderInfoEnum.HSBZ_0.getKey(); + limit = taxDiskLimit; + } } else { limit = customLimit; } From 93fcc859ff4a8fc2bf7a5cf5f9ae7dbc58eb6480 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 1 May 2023 20:39:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feature=201.=E5=8D=95=E4=BB=B7=E4=BC=A0?= =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=B8=8E?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=A1=AE=E8=AE=A4=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/PushInvoiceServiceImpl.java | 5 ++--- .../protocol/po/generateinvoicepush/sap/FpkjtsMxSap.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index 445f58fa..6ac3ce39 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -50,7 +50,6 @@ import com.dxhy.order.consumer.openapi.protocol.v5.invalid.ZffpxxV5; import com.dxhy.order.consumer.openapi.protocol.v5.order.DdfpxxV5; import com.dxhy.order.consumer.openapi.protocol.v5.order.DdfpzxxV5; import com.dxhy.order.consumer.openapi.protocol.v5.order.DdmxxxV5; -import com.dxhy.order.consumer.openapi.protocol.v5.order.JdctxxV5; import com.dxhy.order.consumer.openapi.protocol.v6.order.QdTxxBO; import com.dxhy.order.consumer.openapi.service.CommonDisposeService; import com.dxhy.order.consumer.openapi.service.InterfaceServiceV5; @@ -83,7 +82,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; -import java.math.RoundingMode; import java.security.NoSuchAlgorithmException; import java.text.DecimalFormat; import java.text.SimpleDateFormat; @@ -1368,7 +1366,8 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { if(StrUtil.isBlank(f.getDJ())){ detail.setZZDJFP(""); }else { - detail.setZZDJFP(new BigDecimal(f.getDJ()).multiply(new BigDecimal(f.getSL()).add(BigDecimal.ONE)).setScale(ConfigureConstant.INT_8,BigDecimal.ROUND_HALF_EVEN).toString()); + detail.setZZDJFP(f.getDJ()); +// detail.setZZDJFP(new BigDecimal(f.getDJ()).multiply(new BigDecimal(f.getSL()).add(BigDecimal.ONE)).setScale(ConfigureConstant.INT_8,BigDecimal.ROUND_HALF_EVEN).toString()); } detail.setINVOICEDATE(ddfpxx.getKPRQ()); detail.setINVOICETYPE(ddfpxx.getFPLXDM()); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsMxSap.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsMxSap.java index 0c4e6075..4f8cca69 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsMxSap.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsMxSap.java @@ -63,7 +63,7 @@ public class FpkjtsMxSap { */ private String ZHSJE; /** - * 单价(发票) 和成伟确认 这个单价是含税的，必传，含税金额/数量=含税单价 保留八位小数 + * 单价(发票) 和张旭龙确认（20230501） 这个单价是含税的，必传，含税金额/数量=含税单价 保留八位小数 */ private String ZZDJFP; /** From 50b759f04e5bc75c54eb1d208f806d8687db2ec5 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 1 May 2023 21:29:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feature=201.=E7=94=A8=E6=88=B7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseservice/module/thirdservice/user/model/UserEntity.java | 2 ++ .../module/thirdservice/user/model/oldusercenter/SsoUser.java | 3 +++ .../thirdservice/user/service/impl/UserInfoServiceImpl.java | 2 ++ 3 files changed, 7 insertions(+) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/UserEntity.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/UserEntity.java index 3b48502c..6baaabb9 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/UserEntity.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/UserEntity.java @@ -120,4 +120,6 @@ public class UserEntity implements Serializable { * 用户信息失效时重定向的地址 */ private String redirectUrl; + // 用户编码 + private String code; } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/oldusercenter/SsoUser.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/oldusercenter/SsoUser.java index cba60ac0..401102ca 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/oldusercenter/SsoUser.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/oldusercenter/SsoUser.java @@ -42,4 +42,7 @@ public class SsoUser implements Serializable { private Date lastLoginTime; private int boradAuth; private Integer userSource; + + // 用户编码 + private String code; } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java index e0896bd0..75623228 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java @@ -466,6 +466,8 @@ public class UserInfoServiceImpl implements UserInfoService { public UserEntity ssoUserTransUserEntity(SsoUser ssoUser) { UserEntity userEntity = new UserEntity(); + //用户编码，用于推送票夹使用 + userEntity.setCode(ssoUser.getCode()); userEntity.setUserId(ssoUser.getUserId()); userEntity.setUsername(ssoUser.getUsername()); userEntity.setPassword(ssoUser.getPassword());