From ca68b9fd963a523419e725cb7c4179a8272f42ce Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 13 Dec 2023 11:53:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E8=B0=83=E6=95=B4=EF=BC=9B?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=8F=91=E5=B8=83=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/UnifiedExceptionHandler.java | 5 ++ .../oms/service/impl/OmsOrderServiceImpl.java | 7 ++- .../service/impl/TbsActivityServiceImpl.java | 55 +++++++++---------- .../TbsCostApplyOperationServiceImpl.java | 17 ++++++ 4 files changed, 53 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java b/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java index 636234b5..e14d98a7 100644 --- a/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java +++ b/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java @@ -38,6 +38,7 @@ public class UnifiedExceptionHandler { @ResponseBody public R handleBindException(BusinessException e,HttpServletRequest request) { log.warn("自定义异常触发【{},{}】，请求地址：{}",e.getCode(),e.getMessage(),request.getRequestURI()); + e.printStackTrace(); return new R(e.getCode(),e.getMessage()); } @@ -46,6 +47,7 @@ public class UnifiedExceptionHandler { public R handleBindException(NullPointerException e,HttpServletRequest request) { e.printStackTrace(); log.error("空指针【{}】，请求地址：{}",e.getMessage(),request.getRequestURI()); + e.printStackTrace(); return R.error("数据不存在或被移除"); } @@ -104,6 +106,7 @@ public class UnifiedExceptionHandler { @ResponseBody public R handleDuplicateKeyException(DuplicateKeyException e,HttpServletRequest request) { log.error("限制重复数据【{}】，请求地址：{}",e.getMessage(),request.getRequestURI()); + e.printStackTrace(); return R.error("限制重复数据，请联系管理员"); } @@ -120,6 +123,7 @@ public class UnifiedExceptionHandler { @ResponseBody public R handleSqlIntegrityException(Exception e,HttpServletRequest request) { log.warn("数据库拦截【{}】，请求地址：{}",e.getMessage(),request.getRequestURI()); + e.printStackTrace(); return new R(500,"数据库拦截，请联系管理员"); } @@ -138,6 +142,7 @@ public class UnifiedExceptionHandler { @ResponseBody public R handleException(Exception e,HttpServletRequest request) { log.error("Servlet异常\n请求地址：{},异常类型：{}\n异常信息：{}\n异常体：",request.getRequestURI(),e.getClass().getSimpleName(),e.getMessage(),e); + e.printStackTrace(); if(DevEnvironmentConfig.isDev()){return R.error(e.getMessage());} return R.error(); } diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java index ea382f1d..2662b766 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java @@ -529,9 +529,12 @@ public class OmsOrderServiceImpl extends ServiceImpl im OmsOrder omsOrder = super.getById(id); String userId = AuthContextUtils.getSysUserId(); SysUser sysUser = sysUserService.getById(userId); - if(omsOrder==null || !omsOrder.getUserId().equals(userId)){ + if(omsOrder==null){ Assert.throwEx("订单不存在或被移除"); } + if(!omsOrder.getUserId().equals(userId)){ + Assert.throwEx("非制单人无法下单"); + } this.checkMsOrderStatus(omsOrder); if(!omsOrder.getStatus().equals(0)&&!omsOrder.getStatus().equals(6)){ Assert.throwEx("订单状态不支持下单"); @@ -630,6 +633,8 @@ public class OmsOrderServiceImpl extends ServiceImpl im seeYonRequestBaseService.postBase(ERP_ORDER_CREATE,xltOrderDTO,"创建订单："+xltOrder.getDingDanHao()); //更新订单 omsOrder.setStatus(1); + omsOrder.setCheckTime(LocalDateTime.now()); + omsOrder.setCheckUserId(AuthContextUtils.getSysUserId()); this.updateById(omsOrder); } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java index c1e27772..9c71b9c7 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java @@ -36,6 +36,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; @@ -216,9 +217,8 @@ public class TbsActivityServiceImpl extends ServiceImpl centerDtoMap = new HashMap<>(); this.initSubjectAndCenter(activityBo,subjectMap,centerDtoMap,activitySubjects,activityCenterList,costApply.getId(),activity.getId()); //产品成本配占比 - Map checkAmountMap = new HashMap<>(); List activityCenterGoodsList = new ArrayList<>(); - this.initCenterGoods(activityBo,subjectMap,centerDtoMap,checkAmountMap,activityGoodsList,activityCenterGoodsList,costApply.getId(),activity,supplier); + this.initCenterGoods(activityBo,subjectMap,centerDtoMap,activityGoodsList,activityCenterGoodsList,costApply.getId(),activity,supplier); //校验金额和比率 Map> actCenterGoodsMap = activityCenterGoodsList.stream().collect(Collectors.groupingBy(TbsActivityCenterGoods::getSubjectId)); for (Long subjectId : actCenterGoodsMap.keySet()) { @@ -232,13 +232,6 @@ public class TbsActivityServiceImpl extends ServiceImpl activityChannelPointList = new ArrayList<>(); List activityChannelList = new ArrayList<>(); @@ -407,7 +400,6 @@ public class TbsActivityServiceImpl extends ServiceImpl subjectMap, Map centerDtoMap, - Map checkAmountMap, List activityGoodsList, List activityCenterGoodsList, Long costApplyId,TbsActivity activity,BmsSupplier supplier){ @@ -442,8 +433,17 @@ public class TbsActivityServiceImpl extends ServiceImpl activitySubjects, List activityCenterList, Long costApplyId,Long activityId){ + + List existKeyList = new ArrayList<>(); + for (TbsActivitySubjectBo subjectBo : activityBo.getActivitySubjectList()) { BmsSubject subject = subjectService.getById(subjectBo.getSubjectId()); if(subject==null){ @@ -531,9 +526,18 @@ public class TbsActivityServiceImpl extends ServiceImpl