From 609816eb2fb5e38f99a1605f2e9b8d77e9b7a9b9 Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 24 Jul 2024 16:29:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0=E6=97=A0=E9=9C=80=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E8=81=94=E5=90=88=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=89=8D=E8=83=BD=E8=BF=9B=E8=A1=8C=E6=9F=A5=E8=AF=A2;=20opt:?= =?UTF-8?q?=E8=BF=87=E6=BB=A4SKU=E5=90=8C=E6=AD=A5=E5=B8=A6=E4=BA=A7?= =?UTF-8?q?=E7=9A=84=E5=9C=B0=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bir/mapper/BirTbsVtbPayJoinMapper.java | 9 ++++++ .../goods/controller/GoodsSkuController.java | 6 ++++ .../service/impl/GoodsSkuServiceImpl.java | 4 +++ src/main/java/com/qs/serve/task/BirTask.java | 1 + src/main/java/com/qs/serve/task/TbsTask.java | 5 +++ .../mapper/bir/BirTbsVtbPayJoinMapper.xml | 31 +++++++++---------- 6 files changed, 40 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bir/mapper/BirTbsVtbPayJoinMapper.java b/src/main/java/com/qs/serve/modules/bir/mapper/BirTbsVtbPayJoinMapper.java index 5648485a..201f7c08 100644 --- a/src/main/java/com/qs/serve/modules/bir/mapper/BirTbsVtbPayJoinMapper.java +++ b/src/main/java/com/qs/serve/modules/bir/mapper/BirTbsVtbPayJoinMapper.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.bir.mapper; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.modules.bir.entity.BirBaseActivity; import com.qs.serve.modules.bir.entity.dto.BirTbsVtbPayJoinDTO; @@ -17,6 +18,14 @@ import java.util.List; */ public interface BirTbsVtbPayJoinMapper extends BaseMapper { + /** + * 更新维护综合查询的成本中心 + * @param maxCostId + * @return + */ + @InterceptorIgnore(tenantLine = "1") + int updateActivityAllCenters(@Param("maxCostId") Long maxCostId); + List selectBirTbsVtbPayJoinDTO(@Param("query") BirTbsVtbPayJoinSo so); List selectSumVtbAmount(@Param("actIds") List actIds); diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java index 522444ba..b6d8a030 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java @@ -243,7 +243,13 @@ public class GoodsSkuController { param.setId(null); param.setSpuId(null); GoodsSku sku = goodsSkuService.getByCode(param.getSkuCode()); + if(sku==null){ + return R.errorNotFound(); + } param.setId(sku.getId()); + if(param.getBelong().contains("产")){ + param.setBelong(param.getBelong().replace("产","")); + } goodsSkuService.updateById(param); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java index a97cc956..3cd84d2f 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java @@ -241,6 +241,10 @@ public class GoodsSkuServiceImpl extends ServiceImpl im @Override public void editSku2(GoodsSkuBo goodSkuVo) { + // 过滤产字 + if(goodSkuVo.getBelong().contains("产")){ + goodSkuVo.setBelong(goodSkuVo.getBelong().replace("产","")); + } GoodsSku dbGoodSku = null; if(goodSkuVo.getSkuId()!=null){ dbGoodSku = this.getById(goodSkuVo.getSkuId()); diff --git a/src/main/java/com/qs/serve/task/BirTask.java b/src/main/java/com/qs/serve/task/BirTask.java index 122ef861..d8bc304d 100644 --- a/src/main/java/com/qs/serve/task/BirTask.java +++ b/src/main/java/com/qs/serve/task/BirTask.java @@ -7,6 +7,7 @@ import com.qs.serve.common.model.AmountDTO; import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.HttpUtil; import com.qs.serve.modules.bir.controller.BirActivityCenterGoodsController; +import com.qs.serve.modules.bir.mapper.BirTbsVtbPayJoinMapper; import com.qs.serve.modules.pay.mapper.PayPaymentItemMapper; import com.qs.serve.modules.pay.mapper.PayPaymentMapper; import com.qs.serve.modules.tbs.entity.TbsCostApply; diff --git a/src/main/java/com/qs/serve/task/TbsTask.java b/src/main/java/com/qs/serve/task/TbsTask.java index f2777716..808cff91 100644 --- a/src/main/java/com/qs/serve/task/TbsTask.java +++ b/src/main/java/com/qs/serve/task/TbsTask.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.CollectionUtil; +import com.qs.serve.modules.bir.mapper.BirTbsVtbPayJoinMapper; import com.qs.serve.modules.tbs.common.TbsActivityState; import com.qs.serve.modules.tbs.common.TbsCostApplyState; import com.qs.serve.modules.tbs.entity.TbsActivity; @@ -32,6 +33,7 @@ import java.util.stream.Collectors; @ConditionalOnProperty(value = "project.task", havingValue = "true") public class TbsTask { + private final BirTbsVtbPayJoinMapper birTbsVtbPayJoinMapper; private final TbsActivityService activityService; private final TbsCostApplyService tbsCostApplyService; private final TbsActivityTemplateService activityTemplateService; @@ -95,6 +97,9 @@ public class TbsTask { public void updateCheckState(){ AuthContextUtils.setTenant("001"); tbsCostApplyService.updateCheckState(); + //间隔几个月换一次即可 + Long maxCostId = 313000L; + birTbsVtbPayJoinMapper.updateActivityAllCenters(maxCostId); } diff --git a/src/main/resources/mapper/bir/BirTbsVtbPayJoinMapper.xml b/src/main/resources/mapper/bir/BirTbsVtbPayJoinMapper.xml index e39d76e6..6689aec7 100644 --- a/src/main/resources/mapper/bir/BirTbsVtbPayJoinMapper.xml +++ b/src/main/resources/mapper/bir/BirTbsVtbPayJoinMapper.xml @@ -4,6 +4,18 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + update tbs_activity + left join ( + select activity_id, + GROUP_CONCAT(DISTINCT center_name SEPARATOR ', ') AS center_name + from tbs_activity_center where del_flag = 0 and cost_apply_id > #{maxCostId} + GROUP BY activity_id + ) tmp on tmp.activity_id = tbs_activity.id + set all_center_names = tmp.center_name + where cost_apply_id > #{maxCostId} + +