From 03d4fb34b0d99a31b6ea47bcbd4fc40a1703baca Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 11 Apr 2023 21:17:48 +0800 Subject: [PATCH] =?UTF-8?q?feature:=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=BC=96=E7=A0=81=EF=BC=8C=E6=97=A0=E5=8F=98=E6=9B=B4=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=8D=E8=BF=9B=E8=A1=8C=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CommodityCodeModifyLogServiceImpl.java | 4 +++- .../commodity/service/impl/CommodityServiceImpl.java | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java index b4d84b38..fad0994e 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java @@ -92,7 +92,9 @@ public class CommodityCodeModifyLogServiceImpl implements CommodityCodeModifyLog throw new RuntimeException(e); } } - + if(modifyLogs.isEmpty()){ + return -1; + } // 批量插入保存 return commodityCodeModifyLogDao.batchInsert(modifyLogs); } 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 c6b006e7..a532f238 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 @@ -118,9 +118,11 @@ public class CommodityServiceImpl implements CommodityService { } // 记录修改记录 Long userId = userInfoService.getUser().getUserId(); - commodityCodeModifyLogService.saveCommodityCodeDifferenceBetween2(commodityCodeEntity, codeEntity, userId); + int i = commodityCodeModifyLogService.saveCommodityCodeDifferenceBetween2(commodityCodeEntity, codeEntity, userId); + if(i != -1){ + i = commodityMapper.updateCommodity(codeEntity, shList); + } - int i = commodityMapper.updateCommodity(codeEntity, shList); flag = i >= 0; } else { @@ -652,8 +654,8 @@ public class CommodityServiceImpl implements CommodityService { /** * 数据转换 * - * @param orderItemInfo - * @param xhfMc + * @param + * @param * @param taxClassCodeEntity * @return */