From eaee5ed78dbce410eb1ffa1ffa93157391ffe088 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 8 May 2023 11:07:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E8=BD=AC=E6=8D=A2=E6=9E=9A=E4=B8=BE=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/commodity/controller/CommodityController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java index b739b5c7..2d1e955f 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java @@ -687,7 +687,7 @@ public class CommodityController { //0-集团共享；1-手工创建；2-模板导入；3-采集下级；4；MDM推送 commodityExcel.setDataSource(""); if(StringUtils.isNotBlank(commodityCodeEntity.getDataSource())){ - CommodityCodeEnum codeValue = CommodityCodeEnum.getCodeValue(commodityCodeEntity.getDataSource()); + TaxClassCodeEnum codeValue = TaxClassCodeEnum.getCodeValue(commodityCodeEntity.getDataSource()); commodityExcel.setDataSource(codeValue.getValue()); } From 156d7b0d725aeafa207cb0f2ba9e454c397425cb Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 8 May 2023 14:53:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feature=EF=BC=9Aorder=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=87=8C=E8=A1=A5=E5=85=A8=E7=A8=8E=E5=8F=B7?= =?UTF-8?q?=E6=97=B6=EF=BC=8CdeptType=20=E8=AE=BE=E7=BD=AE=E4=B8=BA10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdservice/user/service/impl/UserInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 75623228..a9cd3ae2 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 @@ -641,6 +641,7 @@ public class UserInfoServiceImpl implements UserInfoService { taxPlayerCodeDept.setTaxpayerPhone(groupManagementEntity.getXhfDh()); taxPlayerCodeDept.setTaxpayerBank(groupManagementEntity.getXhfYh()); taxPlayerCodeDept.setTaxpayerAccount(groupManagementEntity.getXhfZh()); + taxPlayerCodeDept.setDeptType(Integer.valueOf(ConfigureConstant.STRING_10)); } }); }