From fdf615b6ab8cb16a7e37235292d92d3ab57b533f Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 26 Feb 2024 15:43:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbir=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mvc/HttpServletRequestFilter.java | 8 +++++++- .../bir/mapper/BirBaseActivityMapper.java | 2 +- .../service/impl/BirRoiRateServiceImpl.java | 18 +++++++++++++----- .../erp/mapper/ErpDispatchDataMapper.java | 10 ++++++++++ .../goods/controller/GoodsSpuController.java | 8 ++++++++ .../serve/modules/goods/entity/GoodsSpu.java | 4 ++++ .../TbsCostApplyCheckController.java | 3 ++- src/main/java/com/qs/serve/task/BirTask.java | 6 ++---- src/main/java/com/qs/serve/task/BitTask.java | 1 + .../controller/TaskActivityController.java | 11 ++++------- .../mapper/erp/ErpDispatchDataMapper.xml | 13 ++++++++++++- .../resources/mapper/goods/GoodsSpuMapper.xml | 6 ++++++ 12 files changed, 70 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java b/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java index 14853780..db032b96 100644 --- a/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java +++ b/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java @@ -91,7 +91,13 @@ public class HttpServletRequestFilter implements Filter{ buffer.append(" 时间:["+ LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)+"]"); } } catch (Exception e) {} - log.debug(buffer.toString()); + if(diffTime< 1D){ + log.debug(buffer.toString()); + }else if (diffTime< 20D){ + log.warn(buffer.toString()); + }else { + log.error(buffer.toString()); + } } @Override diff --git a/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java b/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java index ffaf53f9..46eb3ac5 100644 --- a/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java +++ b/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java @@ -39,7 +39,7 @@ public interface BirBaseActivityMapper extends BaseMapper { " on bir.cost_apply_id = cost.id " + " set bir.del_flag = 1 " + " where act.cancel_flag = 1 or act.del_flag = 1 or cost.del_flag = 1 or cost.cancel_flag = 1 and bir.del_flag=0 ") - int removeActivityBirError(); + Integer removeActivityBirError(); @InterceptorIgnore(tenantLine = "true") diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java index 1385d047..82d47ba1 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java @@ -233,7 +233,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl regionSupplierList = bmsSupplierMapper.selectList(regionSupplierLqw); - List regionSupplierIds = regionSupplierList.stream().map(BmsSupplier::getId).collect(Collectors.toList()); + List regionSupplierIds = regionSupplierList.stream().map(BmsSupplier::getId).distinct().collect(Collectors.toList()); regionSupplierIds.add("-999"); //加载公司内费用 BirRoiCostDTO costDTO4Com = new BirRoiCostDTO(); @@ -322,8 +322,12 @@ public class BirRoiRateServiceImpl extends ServiceImpl=startMonthNum){ - costAmt = costAmt.add(vo.getAllCostAmt()); - dispatchAmt = dispatchAmt.add(vo.getAllDispatchAmt()); + if(vo.getAllCostAmt()!=null){ + costAmt = costAmt.add(vo.getAllCostAmt()); + } + if(vo.getAllDispatchAmt()!=null){ + dispatchAmt = dispatchAmt.add(vo.getAllDispatchAmt()); + } } } @@ -428,8 +432,12 @@ public class BirRoiRateServiceImpl extends ServiceImpl=startMonthNum){ - costAmt = costAmt.add(vo.getAllCostAmt()); - dispatchAmt = dispatchAmt.add(vo.getAllDispatchAmt()); + if(vo.getAllCostAmt()!=null){ + costAmt = costAmt.add(vo.getAllCostAmt()); + } + if(vo.getAllDispatchAmt()!=null){ + dispatchAmt = dispatchAmt.add(vo.getAllDispatchAmt()); + } } } diff --git a/src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java b/src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java index 63604a24..6fa20428 100644 --- a/src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java +++ b/src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java @@ -28,6 +28,16 @@ public interface ErpDispatchDataMapper extends BaseMapper { BigDecimal getSumCost(@Param("startNumber")Integer startNumber, @Param("endNumber")Integer endNumber); + /** + * 查询发货单合计 + * @param startNumber + * @param endNumber + * @return + */ + @InterceptorIgnore(tenantLine = "1") + BigDecimal getSumCostGroup(@Param("startNumber")Integer startNumber, + @Param("endNumber")Integer endNumber); + /** * 查询发货单合计 * @param startNumber diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java index 38e770eb..4f9c5449 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java @@ -144,6 +144,14 @@ public class GoodsSpuController { */ private void initSpuWithCustomerPrice(String cusCode, List list, List skuCodes) { List cusPriceList = this.getInventoryCusPrices(cusCode, skuCodes); + List skus = goodsSkuService.getByCodes(skuCodes); + for (GoodsSpu spu : list) { + for (GoodsSku sku : skus) { + if(sku.getSpuId().equals(spu.getId())){ + spu.setSkuAddCode(sku.getSkuAddCode()); + } + } + } if(cusPriceList!=null){ for (InventoryCusPrice cusPrice : cusPriceList) { for (GoodsSpu spu : list) { diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java index 80951b9c..8f2e0685 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java @@ -152,6 +152,10 @@ public class GoodsSpu implements Serializable { @TableField(exist = false) private String searchValue; + /** 搜索值，搜索sku标题及编码 */ + @TableField(exist = false) + private String skuAddCode; + @TableField(exist = false) private List selectIds; diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java index c43fa508..569278ea 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java @@ -65,7 +65,8 @@ public class TbsCostApplyCheckController { @GetMapping("devDoFinished") public R devDoFinished(String costApplyId){ TbsAffairCommitBo commitBo = new TbsAffairCommitBo(); - //commitBo.setTargetId(); + commitBo.setCostApplyId(Long.parseLong(costApplyId)); + //tbsCostApplyOperationServiceImpl.doFinished(commitBo); return R.ok(); } diff --git a/src/main/java/com/qs/serve/task/BirTask.java b/src/main/java/com/qs/serve/task/BirTask.java index 775bc715..6a54936f 100644 --- a/src/main/java/com/qs/serve/task/BirTask.java +++ b/src/main/java/com/qs/serve/task/BirTask.java @@ -27,11 +27,9 @@ public class BirTask { public void buildTempTable(){ AuthContextUtils.setTenant("001"); //移除取消的和删除的费用ID - - - int year = LocalDate.now().getYear(); for (int i = 1;i < 13; i++) { - birActivityCenterGoodsService.buildReport(year,i); + birActivityCenterGoodsService.buildReport(2023,i); + birActivityCenterGoodsService.buildReport(2024,i); } } diff --git a/src/main/java/com/qs/serve/task/BitTask.java b/src/main/java/com/qs/serve/task/BitTask.java index 2597baed..b2fca8e3 100644 --- a/src/main/java/com/qs/serve/task/BitTask.java +++ b/src/main/java/com/qs/serve/task/BitTask.java @@ -35,6 +35,7 @@ public class BitTask { } activityService.buildReport(2024,1); activityService.buildReport(2024,2); + activityService.buildReport(2024,3); } } diff --git a/src/main/java/com/qs/serve/task/controller/TaskActivityController.java b/src/main/java/com/qs/serve/task/controller/TaskActivityController.java index 4896fef4..e4d1f292 100644 --- a/src/main/java/com/qs/serve/task/controller/TaskActivityController.java +++ b/src/main/java/com/qs/serve/task/controller/TaskActivityController.java @@ -51,13 +51,10 @@ public class TaskActivityController { */ @GetMapping("syncActivityCenterGoods") public R taskBir(Integer month){ - Integer year = 2023; - if(month == null){ - for (int i = 1;i < 13; i++) { - birActivityCenterGoodsService.buildReport(year,i); - } - }else { - birActivityCenterGoodsService.buildReport(year,month); + //移除取消的和删除的费用ID + for (int i = 1;i < 13; i++) { + birActivityCenterGoodsService.buildReport(2023,i); + birActivityCenterGoodsService.buildReport(2024,i); } return R.ok(); } diff --git a/src/main/resources/mapper/erp/ErpDispatchDataMapper.xml b/src/main/resources/mapper/erp/ErpDispatchDataMapper.xml index be2c6dcc..c8732a35 100644 --- a/src/main/resources/mapper/erp/ErpDispatchDataMapper.xml +++ b/src/main/resources/mapper/erp/ErpDispatchDataMapper.xml @@ -85,7 +85,7 @@ - SELECT SUM(sum_money) as dispatchSumCost FROM @@ -96,5 +96,16 @@ GROUP BY DATE_FORMAT(date,'%Y%m') + + + diff --git a/src/main/resources/mapper/goods/GoodsSpuMapper.xml b/src/main/resources/mapper/goods/GoodsSpuMapper.xml index 768d4d3f..7f67789c 100644 --- a/src/main/resources/mapper/goods/GoodsSpuMapper.xml +++ b/src/main/resources/mapper/goods/GoodsSpuMapper.xml @@ -74,6 +74,9 @@ and `goods_sku`.`special_flag` = #{query.selectSpecialFlag} + + and `goods_sku`.`sku_add_code` like concat('%', #{query.skuAddCode},'%') + and (`goods_sku`.`order_flag` = #{query.orderFlag} or `goods_sku`.`special_flag` = 1) @@ -273,6 +276,9 @@ `spu`.`name` like concat('%', #{query.keywordName},'%') ) + + and `sku`.`sku_add_code` like concat('%', #{query.skuAddCode},'%') + ) UNION ALL SELECT sku.*,1 as rn FROM goods_sku sku