From ef576fd4b3cb8ab98dab42d53d8cd180fd46c76a Mon Sep 17 00:00:00 2001
From: WangQi <1021674882@qq.com>
Date: Mon, 19 Jun 2023 16:48:57 +0800
Subject: [PATCH 1/3] bugfix:3491
---
.../modules/order/service/impl/OrderInfoServiceImpl.java | 3 +++
1 file changed, 3 insertions(+)
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 f21c7dea..c675be5b 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
@@ -1931,6 +1931,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
OrderItemInfo item = new OrderItemInfo();
item.setId(itemInfo.getId());
item.setZnfm(ConfigureConstant.STRING_0);
+ if (StringUtils.isBlank(itemInfo.getZxbm())) {
+ item.setZxbm(commodityCodeEntity.getZxbm());
+ }
items.add(item);
}
From ad36b5ea6846c23feda74ae167de2229b84cc013 Mon Sep 17 00:00:00 2001
From: WangQi <1021674882@qq.com>
Date: Mon, 19 Jun 2023 17:17:45 +0800
Subject: [PATCH 2/3] bugfix:3491
---
.../src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml b/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml
index 5b18ea24..2b92c0d5 100644
--- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml
+++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml
@@ -320,6 +320,9 @@
tswl = #{item.tswl,jdbcType=VARCHAR},
+
+ zxbm = #{item.zxbm},
+
id = #{item.id,jdbcType=VARCHAR}
From 67cf6050d3ac434524f1af32ee1f1f1c3c5bea00 Mon Sep 17 00:00:00 2001
From: gaorl
Date: Tue, 20 Jun 2023 11:24:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feature=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=BC=98?=
=?UTF-8?q?=E6=83=A0=E6=94=BF=E7=AD=96=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../commodity/service/impl/CommodityServiceImpl.java | 3 +++
.../src/main/resources/mybatis/mapper/CommodityMapper.xml | 2 +-
.../commodity/controller/GroupCommodityCodeController.java | 7 ++++++-
3 files changed, 10 insertions(+), 2 deletions(-)
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 e63c793e..199b2490 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
@@ -132,6 +132,9 @@ public class CommodityServiceImpl implements CommodityService {
if(commodityCodeModifyLogService.saveCommodityCodeDifferenceBetween2(commodityCodeEntities.get(0), codeEntity, userId) == -1){
return R.error().put(OrderManagementConstant.DATA, "数据未进行修改,无需保存");
}
+ if(StringUtils.isBlank(codeEntity.getYhzcbs())|| "0".equals(codeEntity.getYhzcbs())){
+ codeEntity.setZzstsgl("");
+ }
codeEntity.setXhfNsrsbh(null);//不更新税号
codeEntity.setModifyTime(new Date());
codeEntity.setCreateTime(null);
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 a066ab80..c00360d4 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
@@ -300,7 +300,7 @@
preferential_policies_type = #{commodityCode.lslbs,jdbcType=VARCHAR},
-
+
zzstsgl = #{commodityCode.zzstsgl,jdbcType=VARCHAR},
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java
index 0522be48..2736b3d4 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java
@@ -81,7 +81,12 @@ public class GroupCommodityCodeController {
@PostMapping("/sync")
public R sync(@RequestBody @Validated SyncGroupCommodityDTO dto) {
- return groupCommodityCodeService.syncGroupCommodityDTO(dto);
+ try {
+ return groupCommodityCodeService.syncGroupCommodityDTO(dto);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.error("系统异常，请联系管理员");
+ }
}
@RequestMapping("/uploadGroupCommodityDTO")