From 67ea1eaf343e38f214dd93c6b2c46dca4c7c4214 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 17 Apr 2023 19:31:23 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=AE=A2=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=85=A5=E3=80=81=E7=89=A9=E6=96=99=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E7=A8=8E=E7=8E=87=E5=8F=96=E5=80=BC=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseservice/module/buyer/controller/BuyerController.java | 3 +-- .../baseservice/module/buyer/model/BuyerImportExcelEnum.java | 2 +- .../commodity/service/impl/GroupCommodityCodeServiceImpl.java | 3 +++ .../consumer/modules/order/controller/BuyerController.java | 3 +-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/controller/BuyerController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/controller/BuyerController.java index 4dcfdcaa..eb04d6e0 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/controller/BuyerController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/controller/BuyerController.java @@ -227,10 +227,9 @@ public class BuyerController { buyerEntity.setGhfQylx(OrderInfoEnum.GHF_QYLX_03.getKey()); } //客户状态(0:冻结;1:非冻结) + buyerEntity.setStatus("1"); if("冻结".equals(buyerImportExcel.getKhzt())){ buyerEntity.setStatus("0"); - } else if ("非冻结".equals(buyerImportExcel.getKhzt())){ - buyerEntity.setStatus("1"); } //购方名称 带中文括号的转换成英文括号 // 购方名称 带中文括号的转换成英文括号 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 d69f3ed7..fe7e487a 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 @@ -57,7 +57,7 @@ public enum BuyerImportExcelEnum { /** * 购方编码 */ - GHF_BM("购方编码", BuyerImportExcel.class.getDeclaredFields()[7].getName()), + GHF_BM("购方编码*", BuyerImportExcel.class.getDeclaredFields()[7].getName()), /** * 购方邮箱 diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java index 3aec19c7..01c09451 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java @@ -26,6 +26,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.annotation.Resource; import java.lang.reflect.InvocationTargetException; +import java.math.BigDecimal; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -152,6 +153,8 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService newCommodityCodeEntity.setYhzcbs(StringUtils.isNotBlank(taxClassCodeEntity.getYhzcmc())?"1":"0"); newCommodityCodeEntity.setSpjc(taxClassCodeEntity.getSpjc()); newCommodityCodeEntity.setZzstsgl(StringUtils.isNotBlank(taxClassCodeEntity.getYhzcmc())?taxClassCodeEntity.getYhzcmc():""); + String sl = taxClassCodeEntity.getSl().split("%")[0]; + newCommodityCodeEntity.setSl(StringUtils.isNotBlank(sl)?new BigDecimal(sl).divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP).toString():""); }else{ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return R.error("第" + (i + 1) + "条数据商品编码为汇总项，引用失败"); 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 22cc4d00..0b0c5b30 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 @@ -272,10 +272,9 @@ public class BuyerController { buyerEntity.setGhfQylx(OrderInfoEnum.GHF_QYLX_03.getKey()); } //客户状态(0:冻结;1:非冻结) + buyerEntity.setStatus("1"); if("冻结".equals(buyerImportExcel.getKhzt())){ buyerEntity.setStatus("0"); - } else if ("非冻结".equals(buyerImportExcel.getKhzt())){ - buyerEntity.setStatus("1"); } //购方名称 带中文括号的转换成英文括号 // 购方名称 带中文括号的转换成英文括号