From 5632c515271943200f4b189204947632bf77ccc9 Mon Sep 17 00:00:00 2001 From: DevDengChao <2325690622@qq.com> Date: Wed, 15 May 2024 13:44:18 +0800 Subject: [PATCH 01/28] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=20DeliveryExpressDO=20=E6=97=B6=E6=8F=90=E7=A4=BA=20i?= =?UTF-8?q?d=20=E8=BF=87=E5=A4=A7=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trade/dal/dataobject/delivery/DeliveryExpressDO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressDO.java index 265066d83b..c6b7fbf33c 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressDO.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressDO.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.trade.dal.dataobject.delivery; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -20,7 +21,7 @@ public class DeliveryExpressDO extends BaseDO { /** * 编号，自增 */ - @TableId + @TableId(type = IdType.AUTO) private Long id; /** From c68f32cefeecd3afef706f9db677c38ba7c704d6 Mon Sep 17 00:00:00 2001 From: DevDengChao <2325690622@qq.com> Date: Wed, 15 May 2024 13:44:39 +0800 Subject: [PATCH 02/28] =?UTF-8?q?chore:=20=E5=A4=87=E6=B3=A8=E5=9B=A2?= =?UTF-8?q?=E9=95=BF=E7=BF=BB=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/trade/dal/dataobject/order/TradeOrderDO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java index b127004aaa..ba7e689f8f 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java @@ -322,7 +322,7 @@ public class TradeOrderDO extends BaseDO { * * 关联 CombinationRecordDO 的 headId 字段 */ - private Long combinationHeadId; + private Long combinationHeadId; // FIXME 2024/5/15: "团长" 应该译作 leader / starter 而不是 head /** * 拼团记录编号 * From 9c111acfbe8a1e81542e345d2bef59327bc9cc1c Mon Sep 17 00:00:00 2001 From: DevDengChao <2325690622@qq.com> Date: Wed, 15 May 2024 13:44:57 +0800 Subject: [PATCH 03/28] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20TradeOrderUpd?= =?UTF-8?q?ateServiceTest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/TradeOrderUpdateServiceTest.java | 50 +++- .../src/test/resources/sql/create_tables.sql | 275 ++++++++++-------- 2 files changed, 203 insertions(+), 122 deletions(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java index 3f05f55591..2f78dbe08b 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java @@ -1,33 +1,49 @@ package cn.iocoder.yudao.module.trade.service.order; +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; import cn.iocoder.yudao.module.member.api.address.MemberAddressApi; import cn.iocoder.yudao.module.member.api.user.MemberUserApi; import cn.iocoder.yudao.module.pay.api.order.PayOrderApi; import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderRespDTO; import cn.iocoder.yudao.module.pay.enums.order.PayOrderStatusEnum; +import cn.iocoder.yudao.module.product.api.comment.ProductCommentApi; import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi; import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi; import cn.iocoder.yudao.module.promotion.api.coupon.CouponApi; +import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi; +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressCreateReqVO; import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO; import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO; import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderItemMapper; import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderMapper; +import cn.iocoder.yudao.module.trade.dal.redis.no.TradeNoRedisDAO; +import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum; +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderRefundStatusEnum; import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum; import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderConfig; import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties; +import cn.iocoder.yudao.module.trade.service.cart.CartServiceImpl; +import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressService; +import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressServiceImpl; +import cn.iocoder.yudao.module.trade.service.message.TradeMessageServiceImpl; +import cn.iocoder.yudao.module.trade.service.order.handler.TradeOrderHandler; +import cn.iocoder.yudao.module.trade.service.price.TradePriceServiceImpl; +import cn.iocoder.yudao.module.trade.service.price.calculator.TradePriceCalculator; +import jakarta.annotation.Resource; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import jakarta.annotation.Resource; import java.time.Duration; +import java.util.UUID; import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; @@ -37,8 +53,10 @@ import static org.mockito.Mockito.when; * @author LeeYan9 * @since 2022-09-07 */ -@Disabled // TODO 芋艿：后续 fix 补充的单测 -@Import({TradeOrderUpdateServiceImpl.class, TradeOrderConfig.class}) +@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") +@Import({TradeOrderUpdateServiceImpl.class, TradeOrderConfig.class, CartServiceImpl.class, TradePriceServiceImpl.class, + DeliveryExpressServiceImpl.class, TradeMessageServiceImpl.class +}) public class TradeOrderUpdateServiceTest extends BaseDbUnitTest { @Resource @@ -55,7 +73,9 @@ public class TradeOrderUpdateServiceTest extends BaseDbUnitTest { private ProductSpuApi productSpuApi; @MockBean private ProductSkuApi productSkuApi; -// @MockBean + @MockBean + private ProductCommentApi productCommentApi; + // @MockBean // private PriceApi priceApi; @MockBean private PayOrderApi payOrderApi; @@ -66,11 +86,22 @@ public class TradeOrderUpdateServiceTest extends BaseDbUnitTest { @MockBean private TradeOrderProperties tradeOrderProperties; + @MockBean + private TradeNoRedisDAO tradeNoRedisDAO; + @MockBean + private TradeOrderHandler tradeOrderHandler; + @MockBean + private TradePriceCalculator tradePriceCalculator; + @MockBean + private NotifyMessageSendApi notifyMessageSendApi; + @Autowired + private DeliveryExpressService deliveryExpressService; @BeforeEach public void setUp() { when(tradeOrderProperties.getAppId()).thenReturn(888L); when(tradeOrderProperties.getPayExpireTime()).thenReturn(Duration.ofDays(1)); + when(tradeNoRedisDAO.generate(anyString())).thenReturn(UUID.randomUUID().toString()); } // @Test @@ -259,11 +290,18 @@ public class TradeOrderUpdateServiceTest extends BaseDbUnitTest { TradeOrderDO order = randomPojo(TradeOrderDO.class, o -> { o.setId(1L).setStatus(TradeOrderStatusEnum.UNDELIVERED.getStatus()); o.setLogisticsId(null).setLogisticsNo(null).setDeliveryTime(null); + o.setRefundStatus(TradeOrderRefundStatusEnum.NONE.getStatus()); + o.setDeliveryType(DeliveryTypeEnum.EXPRESS.getType()); }); tradeOrderMapper.insert(order); + + DeliveryExpressCreateReqVO expressCreateReqVO = new DeliveryExpressCreateReqVO(); + expressCreateReqVO.setCode("code").setName("Name").setLogo("logo").setSort(0).setStatus(CommonStatusEnum.ENABLE.getStatus()); + Long deliveryExpressId = deliveryExpressService.createDeliveryExpress(expressCreateReqVO); // 准备参数 TradeOrderDeliveryReqVO deliveryReqVO = new TradeOrderDeliveryReqVO().setId(1L) - .setLogisticsId(10L).setLogisticsNo("100"); + .setLogisticsId(deliveryExpressId).setLogisticsNo("100"); + // mock 方法（支付单） // 调用 diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql b/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql index d263fdfb92..f619c01de2 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql +++ b/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql @@ -1,128 +1,155 @@ -CREATE TABLE IF NOT EXISTS "trade_order" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "no" varchar NOT NULL, - "type" int NOT NULL, - "terminal" int NOT NULL, - "user_id" bigint NOT NULL, - "user_ip" varchar NOT NULL, - "user_remark" varchar, - "status" int NOT NULL, - "product_count" int NOT NULL, - "cancel_type" int, - "remark" varchar, - "pay_status" bit NOT NULL, - "pay_time" datetime, - "finish_time" datetime, - "cancel_time" datetime, - "original_price" int NOT NULL, - "order_price" int NOT NULL, - "discount_price" int NOT NULL, - "delivery_price" int NOT NULL, - "adjust_price" int NOT NULL, - "pay_price" int NOT NULL, - "pay_order_id" bigint, - "pay_channel_code" varchar, - "delivery_template_id" bigint, - "logistics_id" bigint, - "logistics_no" varchar, - "delivery_time" datetime, - "receive_time" datetime, - "receiver_name" varchar NOT NULL, - "receiver_mobile" varchar NOT NULL, - "receiver_area_id" int NOT NULL, - "receiver_post_code" int, - "receiver_detail_address" varchar NOT NULL, - "after_sale_status" int NOT NULL, - "refund_price" int NOT NULL, - "coupon_id" bigint NOT NULL, - "coupon_price" int NOT NULL, - "point_price" int NOT NULL, - "creator" varchar DEFAULT '', - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "updater" varchar DEFAULT '', - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - PRIMARY KEY ("id") +CREATE TABLE IF NOT EXISTS "trade_order" +( + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, + "no" varchar NOT NULL, + "type" int NOT NULL, + "terminal" int NOT NULL, + "user_id" bigint NOT NULL, + "user_ip" varchar NOT NULL, + "user_remark" varchar, + "status" int NOT NULL, + "product_count" int NOT NULL, + "cancel_type" int, + "remark" varchar, + "comment_status" boolean, + "brokerage_user_id" bigint, + "pay_status" bit NOT NULL, + "pay_time" datetime, + "finish_time" datetime, + "cancel_time" datetime, + "total_price" int NULL, + "order_price" int NULL, + "discount_price" int NOT NULL, + "delivery_price" int NOT NULL, + "adjust_price" int NOT NULL, + "pay_price" int NOT NULL, + "delivery_type" int NOT NULL, + "pay_order_id" bigint, + "pay_channel_code" varchar, + "delivery_template_id" bigint, + "logistics_id" bigint, + "logistics_no" varchar, + "delivery_time" datetime, + "receive_time" datetime, + "receiver_name" varchar NOT NULL, + "receiver_mobile" varchar NOT NULL, + "receiver_area_id" int NOT NULL, + "receiver_post_code" int, + "receiver_detail_address" varchar NOT NULL, + "pick_up_store_id" long NULL, + "pick_up_verify_code" varchar NULL, + "refund_status" int NULL, + "refund_price" int NULL, + "after_sale_status" int NULL, + "coupon_id" bigint NOT NULL, + "coupon_price" int NOT NULL, + "use_point" int NULL, + "point_price" int NOT NULL, + "give_point" int NULL, + "refund_point" int NULL, + "vip_price" int NULL, + "seckill_activity_id" long NULL, + "bargain_activity_id" long NULL, + "bargain_record_id" long NULL, + "combination_activity_id" long NULL, + "combination_head_id" long NULL, + "combination_record_id" long NULL, + "creator" varchar DEFAULT '', + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updater" varchar DEFAULT '', + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + "deleted" bit NOT NULL DEFAULT FALSE, + PRIMARY KEY ("id") ) COMMENT '交易订单表'; -CREATE TABLE IF NOT EXISTS "trade_order_item" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "user_id" bigint NOT NULL, - "order_id" bigint NOT NULL, - "spu_id" bigint NOT NULL, - "spu_name" varchar NOT NULL, - "sku_id" bigint NOT NULL, - "properties" varchar, - "pic_url" varchar, - "count" int NOT NULL, - "original_price" int NOT NULL, - "original_unit_price" int NOT NULL, - "discount_price" int NOT NULL, - "pay_price" int NOT NULL, - "order_part_price" int NOT NULL, - "order_divide_price" int NOT NULL, - "after_sale_status" int NOT NULL, - "creator" varchar DEFAULT '', - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "updater" varchar DEFAULT '', - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - PRIMARY KEY ("id") +CREATE TABLE IF NOT EXISTS "trade_order_item" +( + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, + "user_id" bigint NOT NULL, + "order_id" bigint NOT NULL, + "cart_id" int NULL, + "spu_id" bigint NOT NULL, + "spu_name" varchar NOT NULL, + "sku_id" bigint NOT NULL, + "properties" varchar, + "pic_url" varchar, + "count" int NOT NULL, + "comment_status" boolean NULL, + "price" int NOT NULL, + "discount_price" int NOT NULL, + "delivery_price" int NULL, + "adjust_price" int NULL, + "pay_price" int NOT NULL, + "coupon_price" int NULL, + "point_price" int NULL, + "use_point" int NULL, + "give_point" int NULL, + "vip_price" int NULL, + "after_sale_id" long NULL, + "after_sale_status" int NOT NULL, + "creator" varchar DEFAULT '', + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updater" varchar DEFAULT '', + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + "deleted" bit NOT NULL DEFAULT FALSE, + PRIMARY KEY ("id") ) COMMENT '交易订单明细表'; -CREATE TABLE IF NOT EXISTS "trade_after_sale" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "no" varchar NOT NULL, - "status" int NOT NULL, - "type" int NOT NULL, - "way" int NOT NULL, - "user_id" bigint NOT NULL, - "apply_reason" varchar NOT NULL, +CREATE TABLE IF NOT EXISTS "trade_after_sale" +( + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, + "no" varchar NOT NULL, + "status" int NOT NULL, + "type" int NOT NULL, + "way" int NOT NULL, + "user_id" bigint NOT NULL, + "apply_reason" varchar NOT NULL, "apply_description" varchar, "apply_pic_urls" varchar, - "order_id" bigint NOT NULL, - "order_no" varchar NOT NULL, - "order_item_id" bigint NOT NULL, - "spu_id" bigint NOT NULL, - "spu_name" varchar NOT NULL, - "sku_id" bigint NOT NULL, - "properties" varchar, - "pic_url" varchar, - "count" int NOT NULL, - "audit_time" varchar, - "audit_user_id" bigint, - "audit_reason" varchar, - "refund_price" int NOT NULL, - "pay_refund_id" bigint, - "refund_time" varchar, - "logistics_id" bigint, - "logistics_no" varchar, - "delivery_time" varchar, - "receive_time" varchar, + "order_id" bigint NOT NULL, + "order_no" varchar NOT NULL, + "order_item_id" bigint NOT NULL, + "spu_id" bigint NOT NULL, + "spu_name" varchar NOT NULL, + "sku_id" bigint NOT NULL, + "properties" varchar, + "pic_url" varchar, + "count" int NOT NULL, + "audit_time" varchar, + "audit_user_id" bigint, + "audit_reason" varchar, + "refund_price" int NOT NULL, + "pay_refund_id" bigint, + "refund_time" varchar, + "logistics_id" bigint, + "logistics_no" varchar, + "delivery_time" varchar, + "receive_time" varchar, "receive_reason" varchar, - "creator" varchar DEFAULT '', - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "updater" varchar DEFAULT '', - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, + "creator" varchar DEFAULT '', + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updater" varchar DEFAULT '', + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + "deleted" bit NOT NULL DEFAULT FALSE, PRIMARY KEY ("id") ) COMMENT '交易售后表'; -CREATE TABLE IF NOT EXISTS "trade_after_sale_log" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "user_id" bigint NOT NULL, - "user_type" int NOT NULL, - "after_sale_id" bigint NOT NULL, - "order_id" bigint NOT NULL, - "order_item_id" bigint NOT NULL, +CREATE TABLE IF NOT EXISTS "trade_after_sale_log" +( + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, + "user_id" bigint NOT NULL, + "user_type" int NOT NULL, + "after_sale_id" bigint NOT NULL, + "order_id" bigint NOT NULL, + "order_item_id" bigint NOT NULL, "before_status" int, - "after_status" int NOT NULL, - "content" varchar NOT NULL, - "creator" varchar DEFAULT '', - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "updater" varchar DEFAULT '', - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, + "after_status" int NOT NULL, + "content" varchar NOT NULL, + "creator" varchar DEFAULT '', + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updater" varchar DEFAULT '', + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + "deleted" bit NOT NULL DEFAULT FALSE, PRIMARY KEY ("id") ) COMMENT '交易售后日志'; @@ -161,7 +188,7 @@ CREATE TABLE IF NOT EXISTS "trade_brokerage_record" "updater" varchar DEFAULT '', "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, "deleted" bit NOT NULL DEFAULT FALSE, - "tenant_id" bigint not null default '0', + "tenant_id" bigint not null default '0', PRIMARY KEY ("id") ) COMMENT '佣金记录'; CREATE TABLE IF NOT EXISTS "trade_brokerage_withdraw" @@ -186,6 +213,22 @@ CREATE TABLE IF NOT EXISTS "trade_brokerage_withdraw" "updater" varchar DEFAULT '', "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, "deleted" bit NOT NULL DEFAULT FALSE, - "tenant_id" bigint not null default '0', + "tenant_id" bigint not null default '0', + PRIMARY KEY ("id") +) COMMENT '佣金提现'; + +CREATE TABLE IF NOT EXISTS "trade_delivery_express" +( + "id" int NOT NULL GENERATED BY DEFAULT AS IDENTITY, + "code" varchar NULL, + "name" varchar, + "logo" varchar NULL, + "sort" int NOT NULL, + "status" int NOT NULL, + "creator" varchar DEFAULT '', + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updater" varchar DEFAULT '', + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + "deleted" bit NOT NULL DEFAULT FALSE, PRIMARY KEY ("id") ) COMMENT '佣金提现'; \ No newline at end of file From 5e0a8b44c42fc47a843e054b0486e1ed0b34f27a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=AB=98?= <171376172@qq.com> Date: Thu, 6 Jun 2024 10:01:47 +0000 Subject: [PATCH 04/28] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=8C=87=E5=AE=9A=E6=9F=90?= =?UTF-8?q?=E4=B8=80=E5=B9=B4=E6=89=A7=E8=A1=8C=E6=97=B6=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E4=BC=9A=E6=89=A7=E8=A1=8C=E4=B8=80=E6=AC=A1=EF=BC=8C=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E6=9F=A5=E7=9C=8B=E4=BB=BB=E5=8A=A1=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E4=BC=9A=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 高高 <171376172@qq.com> --- .../iocoder/yudao/framework/quartz/core/util/CronUtils.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/core/util/CronUtils.java b/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/core/util/CronUtils.java index 9b5a2bff78..a97a8e1eb5 100644 --- a/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/core/util/CronUtils.java +++ b/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/core/util/CronUtils.java @@ -46,6 +46,10 @@ public class CronUtils { List nextTimes = new ArrayList<>(n); for (int i = 0; i < n; i++) { Date nextTime = cron.getNextValidTimeAfter(now); + if (nextTime == null) { + // 如果 nextTime 为 null，说明没有更多的有效时间，退出循环 + break; + } nextTimes.add(LocalDateTimeUtil.of(nextTime)); // 切换现在，为下一个触发时间； now = nextTime; From d1c6d741c3f771e1b1198ea8e731c40882f9f2cc Mon Sep 17 00:00:00 2001 From: DevDengChao <2325690622@qq.com> Date: Fri, 7 Jun 2024 10:47:28 +0800 Subject: [PATCH 05/28] =?UTF-8?q?Revert=20"fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=20DeliveryExpressDO=20=E6=97=B6=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=20id=20=E8=BF=87=E5=A4=A7=E7=9A=84=E9=97=AE=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5632c515271943200f4b189204947632bf77ccc9. --- .../trade/dal/dataobject/delivery/DeliveryExpressDO.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressDO.java index c6b7fbf33c..265066d83b 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressDO.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressDO.java @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.trade.dal.dataobject.delivery; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -21,7 +20,7 @@ public class DeliveryExpressDO extends BaseDO { /** * 编号，自增 */ - @TableId(type = IdType.AUTO) + @TableId private Long id; /** From 919066dbf0c8df937a7062c11e20c1655a1af221 Mon Sep 17 00:00:00 2001 From: DevDengChao <2325690622@qq.com> Date: Fri, 7 Jun 2024 10:49:11 +0800 Subject: [PATCH 06/28] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=20IdUtil.r?= =?UTF-8?q?andomUUID=20=E4=BB=A3=E6=9B=BF=20UUID.randomUUID()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trade/service/order/TradeOrderUpdateServiceTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java index 2f78dbe08b..108c68a2c5 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.trade.service.order; +import cn.hutool.core.util.IdUtil; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; import cn.iocoder.yudao.module.member.api.address.MemberAddressApi; @@ -38,7 +39,6 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; import java.time.Duration; -import java.util.UUID; import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; @@ -101,7 +101,7 @@ public class TradeOrderUpdateServiceTest extends BaseDbUnitTest { public void setUp() { when(tradeOrderProperties.getAppId()).thenReturn(888L); when(tradeOrderProperties.getPayExpireTime()).thenReturn(Duration.ofDays(1)); - when(tradeNoRedisDAO.generate(anyString())).thenReturn(UUID.randomUUID().toString()); + when(tradeNoRedisDAO.generate(anyString())).thenReturn(IdUtil.randomUUID()); } // @Test From 30d0b10c99fcc3c20b956fa0ebb3d49f71d7fadf Mon Sep 17 00:00:00 2001 From: DevDengChao <2325690622@qq.com> Date: Wed, 12 Jun 2024 15:20:51 +0800 Subject: [PATCH 07/28] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A2=AB?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E7=9A=84=E8=B4=A6=E6=88=B7=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E7=99=BB=E5=BD=95=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit fcfd68ac1c979374d0916ed87995030c465e9428) --- .../module/member/service/auth/MemberAuthServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java index 7fb1926ce1..6ec7287c11 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java @@ -88,6 +88,12 @@ public class MemberAuthServiceImpl implements MemberAuthService { MemberUserDO user = userService.createUserIfAbsent(reqVO.getMobile(), userIp, getTerminal()); Assert.notNull(user, "获取用户失败，结果为空"); + // 校验是否禁用 + if (ObjectUtil.notEqual(user.getStatus(), CommonStatusEnum.ENABLE.getStatus())) { + createLoginLog(user.getId(), reqVO.getMobile(), LoginLogTypeEnum.LOGIN_SMS, LoginResultEnum.USER_DISABLED); + throw exception(AUTH_LOGIN_USER_DISABLED); + } + // 如果 socialType 非空，说明需要绑定社交用户 String openid = null; if (reqVO.getSocialType() != null) { From f2b7ad5092b07db95e4b7271c0d1cf0593e06b1b Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 15 Jun 2024 17:33:54 +0800 Subject: [PATCH 08/28] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91MALL?= =?UTF-8?q?=EF=BC=9ATradeOrderUpdateService=20=E7=9A=84=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/trade/dal/dataobject/order/TradeOrderDO.java | 2 +- .../trade/service/order/TradeOrderUpdateServiceTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java index ba7e689f8f..b127004aaa 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java @@ -322,7 +322,7 @@ public class TradeOrderDO extends BaseDO { * * 关联 CombinationRecordDO 的 headId 字段 */ - private Long combinationHeadId; // FIXME 2024/5/15: "团长" 应该译作 leader / starter 而不是 head + private Long combinationHeadId; /** * 拼团记录编号 * diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java index 108c68a2c5..e9677e665c 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java @@ -33,8 +33,8 @@ import cn.iocoder.yudao.module.trade.service.price.TradePriceServiceImpl; import cn.iocoder.yudao.module.trade.service.price.calculator.TradePriceCalculator; import jakarta.annotation.Resource; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -53,7 +53,7 @@ import static org.mockito.Mockito.when; * @author LeeYan9 * @since 2022-09-07 */ -@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") +@Disabled // TODO 芋艿：后续 fix 补充的单测 @Import({TradeOrderUpdateServiceImpl.class, TradeOrderConfig.class, CartServiceImpl.class, TradePriceServiceImpl.class, DeliveryExpressServiceImpl.class, TradeMessageServiceImpl.class }) @@ -94,7 +94,7 @@ public class TradeOrderUpdateServiceTest extends BaseDbUnitTest { private TradePriceCalculator tradePriceCalculator; @MockBean private NotifyMessageSendApi notifyMessageSendApi; - @Autowired + @MockBean private DeliveryExpressService deliveryExpressService; @BeforeEach From 7eaddd16f9cec7a4eab5bf036fb56e9efd2b20f0 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 15 Jun 2024 17:57:13 +0800 Subject: [PATCH 09/28] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=8C=87=E5=AE=9A=E6=9F=90?= =?UTF-8?q?=E4=B8=80=E5=B9=B4=E6=89=A7=E8=A1=8C=E6=97=B6=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E4=BC=9A=E6=89=A7=E8=A1=8C=E4=B8=80=E6=AC=A1=EF=BC=8C=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E6=9F=A5=E7=9C=8B=E4=BB=BB=E5=8A=A1=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E4=BC=9A=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/framework/quartz/core/util/CronUtils.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/core/util/CronUtils.java b/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/core/util/CronUtils.java index a97a8e1eb5..5658fa302a 100644 --- a/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/core/util/CronUtils.java +++ b/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/core/util/CronUtils.java @@ -34,24 +34,24 @@ public class CronUtils { * @return 满足条件的执行时间 */ public static List getNextTimes(String cronExpression, int n) { - // 获得 CronExpression 对象 + // 1. 获得 CronExpression 对象 CronExpression cron; try { cron = new CronExpression(cronExpression); } catch (ParseException e) { throw new IllegalArgumentException(e.getMessage()); } - // 从当前开始计算，n 个满足条件的 + // 2. 从当前开始计算，n 个满足条件的 Date now = new Date(); List nextTimes = new ArrayList<>(n); for (int i = 0; i < n; i++) { Date nextTime = cron.getNextValidTimeAfter(now); + // 2.1 如果 nextTime 为 null，说明没有更多的有效时间，退出循环 if (nextTime == null) { - // 如果 nextTime 为 null，说明没有更多的有效时间，退出循环 break; } nextTimes.add(LocalDateTimeUtil.of(nextTime)); - // 切换现在，为下一个触发时间； + // 2.2 切换现在，为下一个触发时间； now = nextTime; } return nextTimes; From 088871d083cd03f25682e02cc2aedebefa0998d1 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 15 Jun 2024 18:00:46 +0800 Subject: [PATCH 10/28] =?UTF-8?q?bugfix:=20=E5=AF=BC=E5=85=A5=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E5=9C=B0=E5=9D=80=E7=9A=84=E6=97=B6=E5=80=99=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=8E=B7=E5=8F=96areaId=EF=BC=88=E5=8F=AA=E9=92=88?= =?UTF-8?q?=E5=AF=B9=E5=9B=9B=E4=B8=AA=E7=9B=B4=E8=BE=96=E5=B8=82=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/area.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources/area.csv b/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources/area.csv index 06954ba6ca..0dd830e22f 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources/area.csv +++ b/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources/area.csv @@ -247,15 +247,15 @@ id,name,type,parentId 246,英属印度洋领地,1,0 247,东萨摩亚,1,0 248,诺福克岛,1,0 -110000,北京,2,1 -120000,天津,2,1 +110000,北京市,2,1 +120000,天津市,2,1 130000,河北省,2,1 140000,山西省,2,1 150000,内蒙古自治区,2,1 210000,辽宁省,2,1 220000,吉林省,2,1 230000,黑龙江省,2,1 -310000,上海,2,1 +310000,上海市,2,1 320000,江苏省,2,1 330000,浙江省,2,1 340000,安徽省,2,1 @@ -268,7 +268,7 @@ id,name,type,parentId 440000,广东省,2,1 450000,广西壮族自治区,2,1 460000,海南省,2,1 -500000,重庆,2,1 +500000,重庆市,2,1 510000,四川省,2,1 520000,贵州省,2,1 530000,云南省,2,1 From 9a9d95f04527bbd51b294bf641dcb4ce6e3bfd06 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 15 Jun 2024 18:04:02 +0800 Subject: [PATCH 11/28] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=92=8C=E8=A1=A8=E5=90=8D=E7=A7=B0=E4=B8=80=E6=A0=B7=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A6=82=E2=80=9Cshop=E2=80=9D?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E2=80=9Cshop=E2=80=9D=E8=A1=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E6=97=B6shop=E9=83=BD?= =?UTF-8?q?=E8=A2=AB=E7=A7=BB=E9=99=A4=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/infra/service/codegen/inner/CodegenEngine.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java index e4b7e18c84..4e742539d5 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java @@ -342,7 +342,8 @@ public class CodegenEngine { // className 相关 // 去掉指定前缀，将 TestDictType 转换成 DictType. 因为在 create 等方法后，不需要带上 Test 前缀 - String simpleClassName = removePrefix(table.getClassName(), upperFirst(table.getModuleName())); + String simpleClassName = equalsAnyIgnoreCase(table.getClassName(), table.getModuleName()) ? table.getClassName() + : removePrefix(table.getClassName(), upperFirst(table.getModuleName())); bindingMap.put("simpleClassName", simpleClassName); bindingMap.put("simpleClassName_underlineCase", toUnderlineCase(simpleClassName)); // 将 DictType 转换成 dict_type bindingMap.put("classNameVar", lowerFirst(simpleClassName)); // 将 DictType 转换成 dictType，用于变量 From 312f7e4890a1d3b5102e54b199234c621f8e6887 Mon Sep 17 00:00:00 2001 From: "dongdong.xiang" Date: Sat, 15 Jun 2024 22:19:07 +0800 Subject: [PATCH 12/28] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=8F=9C=E5=8D=95=E7=B2=BE=E7=AE=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E7=88=B6=20ID=20=E9=9D=9E=200=20=E7=9A=84?= =?UTF-8?q?=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/auth/AuthController.java | 1 - .../admin/permission/MenuController.java | 2 +- .../service/permission/MenuServiceImpl.java | 58 +++++++++++++++++-- 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java index cb002d3a2b..8e2871e483 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java @@ -109,7 +109,6 @@ public class AuthController { // 1.3 获得菜单列表 Set menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId)); List menuList = menuService.getMenuList(menuIds); - menuList.removeIf(menu -> !CommonStatusEnum.ENABLE.getStatus().equals(menu.getStatus())); // 移除禁用的菜单 // 2. 拼接结果返回 return success(AuthConvert.INSTANCE.convert(user, roles, menuList)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java index 1041417513..1804096a1a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java @@ -71,7 +71,7 @@ public class MenuController { "在多租户的场景下，会只返回租户所在套餐有的菜单") public CommonResult> getSimpleMenuList() { List list = menuService.getMenuListByTenant( - new MenuListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus())); + new MenuListReqVO()); list.sort(Comparator.comparing(MenuDO::getSort)); return success(BeanUtils.toBean(list, MenuSimpleRespVO.class)); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java index beee296d11..88aed2a920 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.system.service.permission; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuListReqVO; import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuSaveVO; @@ -13,14 +14,15 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Collection; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; @@ -106,12 +108,60 @@ public class MenuServiceImpl implements MenuService { @Override public List getMenuListByTenant(MenuListReqVO reqVO) { - List menus = getMenuList(reqVO); + // 查询所有菜单，并过滤掉关闭的节点 + List menus = filterClosedNodes(getMenuList(reqVO)); // 开启多租户的情况下，需要过滤掉未开通的菜单 tenantService.handleTenantMenu(menuIds -> menus.removeIf(menu -> !CollUtil.contains(menuIds, menu.getId()))); return menus; } + /** + * 过滤关闭的菜单节点及其子节点 + * + * @param menuList 所有菜单列表 + * @return 过滤后的菜单列表 + */ + public List filterClosedNodes(List menuList) { + // 根据parentId快速查找子节点 + Map> childrenMap = menuList.stream() + .collect(Collectors.groupingBy(MenuDO::getParentId)); + + // 所有关闭的节点ID + Set closedNodeIds = new HashSet<>(); + + // 标记所有关闭的节点 + for (MenuDO menu : menuList) { + if (Objects.equals(menu.getStatus(), CommonStatusEnum.DISABLE.getStatus())) { + markClosedNodes(menu.getId(), childrenMap, closedNodeIds); + } + } + + // 过滤掉关闭的节点及其子节点 + return menuList.stream() + .filter(menu -> !closedNodeIds.contains(menu.getId())) + .collect(Collectors.toList()); + } + + /** + * 递归标记关闭的节点及其子节点 + * + * @param nodeId 节点ID + * @param childrenMap 子节点Map + * @param closedNodeIds 关闭节点ID集合 + */ + private void markClosedNodes(Long nodeId, Map> childrenMap, + Set closedNodeIds) { + closedNodeIds.add(nodeId); + List children = childrenMap.get(nodeId); + if (CollectionUtils.isNotEmpty(children)) { + for (MenuDO child : children) { + markClosedNodes(child.getId(), childrenMap, closedNodeIds); + } + } + } + + @Override public List getMenuList(MenuListReqVO reqVO) { return menuMapper.selectList(reqVO); @@ -135,7 +185,7 @@ public class MenuServiceImpl implements MenuService { if (CollUtil.isEmpty(ids)) { return Lists.newArrayList(); } - return menuMapper.selectBatchIds(ids); + return filterClosedNodes(menuMapper.selectBatchIds(ids)); } /** From 6419aef36c7a8496407e538bfbfae102c8e49c16 Mon Sep 17 00:00:00 2001 From: "dongdong.xiang" Date: Sun, 16 Jun 2024 21:21:55 +0800 Subject: [PATCH 13/28] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=8F=9C=E5=8D=95=E7=B2=BE=E7=AE=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E7=88=B6=20ID=20=E9=9D=9E=200=20=E7=9A=84?= =?UTF-8?q?=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/auth/AuthController.java | 2 ++ .../admin/permission/MenuController.java | 4 ++- .../service/permission/MenuService.java | 8 ++++++ .../service/permission/MenuServiceImpl.java | 28 +++++++++++-------- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java index 8e2871e483..20e9e9d6b9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java @@ -109,6 +109,8 @@ public class AuthController { // 1.3 获得菜单列表 Set menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId)); List menuList = menuService.getMenuList(menuIds); + // 过滤掉关闭的菜单及其子菜单 + menuList = menuService.filterClosedMenus(menuList); // 2. 拼接结果返回 return success(AuthConvert.INSTANCE.convert(user, roles, menuList)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java index 1804096a1a..0ec9ac8049 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java @@ -71,7 +71,9 @@ public class MenuController { "在多租户的场景下，会只返回租户所在套餐有的菜单") public CommonResult> getSimpleMenuList() { List list = menuService.getMenuListByTenant( - new MenuListReqVO()); + new MenuListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus())); + // 过滤掉关闭的菜单及其子菜单 + list = menuService.filterClosedMenus(list); list.sort(Comparator.comparing(MenuDO::getSort)); return success(BeanUtils.toBean(list, MenuSimpleRespVO.class)); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java index adc2b31518..ed21ce378b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java @@ -52,6 +52,14 @@ public interface MenuService { */ List getMenuListByTenant(MenuListReqVO reqVO); + /** + * 过滤掉关闭的菜单及其子菜单 + * + * @param menuList + * @return + */ + List filterClosedMenus(List menuList); + /** * 筛选菜单列表 * diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java index 88aed2a920..bba798f84d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java @@ -109,7 +109,7 @@ public class MenuServiceImpl implements MenuService { @Override public List getMenuListByTenant(MenuListReqVO reqVO) { // 查询所有菜单，并过滤掉关闭的节点 - List menus = filterClosedNodes(getMenuList(reqVO)); + List menus = getMenuList(reqVO); // 开启多租户的情况下，需要过滤掉未开通的菜单 tenantService.handleTenantMenu(menuIds -> menus.removeIf(menu -> !CollUtil.contains(menuIds, menu.getId()))); return menus; @@ -119,9 +119,13 @@ public class MenuServiceImpl implements MenuService { * 过滤关闭的菜单节点及其子节点 * * @param menuList 所有菜单列表 - * @return 过滤后的菜单列表 + * @return */ - public List filterClosedNodes(List menuList) { + @Override + public List filterClosedMenus(List menuList) { + if(CollectionUtils.isEmpty(menuList)){ + return Collections.emptyList(); + } // 根据parentId快速查找子节点 Map> childrenMap = menuList.stream() .collect(Collectors.groupingBy(MenuDO::getParentId)); @@ -135,8 +139,7 @@ public class MenuServiceImpl implements MenuService { markClosedNodes(menu.getId(), childrenMap, closedNodeIds); } } - - // 过滤掉关闭的节点及其子节点 + // 移除掉关闭的节点及其子节点 return menuList.stream() .filter(menu -> !closedNodeIds.contains(menu.getId())) .collect(Collectors.toList()); @@ -152,12 +155,13 @@ public class MenuServiceImpl implements MenuService { private void markClosedNodes(Long nodeId, Map> childrenMap, Set closedNodeIds) { - closedNodeIds.add(nodeId); - List children = childrenMap.get(nodeId); - if (CollectionUtils.isNotEmpty(children)) { - for (MenuDO child : children) { - markClosedNodes(child.getId(), childrenMap, closedNodeIds); - } + // 如果已经标记过，则直接返回 + if (!closedNodeIds.add(nodeId)) { + return; + } + List children = childrenMap.getOrDefault(nodeId,Collections.emptyList()); + for (MenuDO child : children) { + markClosedNodes(child.getId(), childrenMap, closedNodeIds); } } @@ -185,7 +189,7 @@ public class MenuServiceImpl implements MenuService { if (CollUtil.isEmpty(ids)) { return Lists.newArrayList(); } - return filterClosedNodes(menuMapper.selectBatchIds(ids)); + return menuMapper.selectBatchIds(ids); } /** From 1c7ba5c0d6f2dbb95e916aa45eec32a94103a96f Mon Sep 17 00:00:00 2001 From: "dongdong.xiang" Date: Sun, 16 Jun 2024 22:41:32 +0800 Subject: [PATCH 14/28] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=8F=9C=E5=8D=95=E7=B2=BE=E7=AE=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E7=88=B6=20ID=20=E9=9D=9E=200=20=E7=9A=84?= =?UTF-8?q?=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/admin/auth/AuthController.java | 3 ++- .../module/system/service/permission/MenuServiceImpl.java | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java index 20e9e9d6b9..6ebaba2123 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java @@ -109,9 +109,10 @@ public class AuthController { // 1.3 获得菜单列表 Set menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId)); List menuList = menuService.getMenuList(menuIds); - // 过滤掉关闭的菜单及其子菜单 + // 过滤掉关闭的菜单 menuList = menuService.filterClosedMenus(menuList); + menuList.removeIf(menu -> !CommonStatusEnum.ENABLE.getStatus().equals(menu.getStatus())); // 移除禁用的菜单 // 2. 拼接结果返回 return success(AuthConvert.INSTANCE.convert(user, roles, menuList)); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java index bba798f84d..104da073d0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java @@ -126,16 +126,18 @@ public class MenuServiceImpl implements MenuService { if(CollectionUtils.isEmpty(menuList)){ return Collections.emptyList(); } + List allMenuList = getMenuList(); + // 根据parentId快速查找子节点 - Map> childrenMap = menuList.stream() + Map> childrenMap = allMenuList.stream() .collect(Collectors.groupingBy(MenuDO::getParentId)); // 所有关闭的节点ID Set closedNodeIds = new HashSet<>(); // 标记所有关闭的节点 - for (MenuDO menu : menuList) { - if (Objects.equals(menu.getStatus(), CommonStatusEnum.DISABLE.getStatus())) { + for (MenuDO menu : allMenuList) { + if (!Objects.equals(menu.getStatus(), CommonStatusEnum.ENABLE.getStatus())) { markClosedNodes(menu.getId(), childrenMap, closedNodeIds); } } From 7deaf1cdbf3f59151c2a466a5d227ab627a959a4 Mon Sep 17 00:00:00 2001 From: "dongdong.xiang" Date: Sun, 16 Jun 2024 22:45:02 +0800 Subject: [PATCH 15/28] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=8F=9C=E5=8D=95=E7=B2=BE=E7=AE=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E7=88=B6=20ID=20=E9=9D=9E=200=20=E7=9A=84?= =?UTF-8?q?=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/controller/admin/auth/AuthController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java index 6ebaba2123..1192d15b0e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java @@ -112,7 +112,6 @@ public class AuthController { // 过滤掉关闭的菜单 menuList = menuService.filterClosedMenus(menuList); - menuList.removeIf(menu -> !CommonStatusEnum.ENABLE.getStatus().equals(menu.getStatus())); // 移除禁用的菜单 // 2. 拼接结果返回 return success(AuthConvert.INSTANCE.convert(user, roles, menuList)); } From fbfa1050d2d587784ae33cf229bf9fbc79c39bf5 Mon Sep 17 00:00:00 2001 From: "dongdong.xiang" Date: Mon, 17 Jun 2024 22:19:47 +0800 Subject: [PATCH 16/28] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/auth/AuthController.java | 3 +- .../admin/permission/MenuController.java | 3 +- .../service/permission/MenuService.java | 6 +- .../service/permission/MenuServiceImpl.java | 69 ++++++++++--------- 4 files changed, 40 insertions(+), 41 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java index 1192d15b0e..afdf824816 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java @@ -109,8 +109,7 @@ public class AuthController { // 1.3 获得菜单列表 Set menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId)); List menuList = menuService.getMenuList(menuIds); - // 过滤掉关闭的菜单 - menuList = menuService.filterClosedMenus(menuList); + menuList = menuService.filterDisableMenus(menuList); // 2. 拼接结果返回 return success(AuthConvert.INSTANCE.convert(user, roles, menuList)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java index 0ec9ac8049..b6d067f1fb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java @@ -72,8 +72,7 @@ public class MenuController { public CommonResult> getSimpleMenuList() { List list = menuService.getMenuListByTenant( new MenuListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus())); - // 过滤掉关闭的菜单及其子菜单 - list = menuService.filterClosedMenus(list); + list = menuService.filterDisableMenus(list); list.sort(Comparator.comparing(MenuDO::getSort)); return success(BeanUtils.toBean(list, MenuSimpleRespVO.class)); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java index ed21ce378b..5c3700db9c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java @@ -55,10 +55,10 @@ public interface MenuService { /** * 过滤掉关闭的菜单及其子菜单 * - * @param menuList - * @return + * @param list 菜单列表 + * @return List 过滤后的菜单列表 */ - List filterClosedMenus(List menuList); + List filterDisableMenus(List list); /** * 筛选菜单列表 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java index 104da073d0..7cc293258a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -119,54 +120,54 @@ public class MenuServiceImpl implements MenuService { * 过滤关闭的菜单节点及其子节点 * * @param menuList 所有菜单列表 - * @return + * @return List 过滤后的菜单列表 */ @Override - public List filterClosedMenus(List menuList) { + public List filterDisableMenus(List menuList) { if(CollectionUtils.isEmpty(menuList)){ return Collections.emptyList(); } - List allMenuList = getMenuList(); - // 根据parentId快速查找子节点 - Map> childrenMap = allMenuList.stream() - .collect(Collectors.groupingBy(MenuDO::getParentId)); + Map menuMap = new HashMap<>(); - // 所有关闭的节点ID - Set closedNodeIds = new HashSet<>(); + for (MenuDO menuDO : menuList) { + menuMap.put(menuDO.getId(),menuDO); + } - // 标记所有关闭的节点 - for (MenuDO menu : allMenuList) { - if (!Objects.equals(menu.getStatus(), CommonStatusEnum.ENABLE.getStatus())) { - markClosedNodes(menu.getId(), childrenMap, closedNodeIds); + // 存下递归搜索过被禁用的菜单，防止重复的搜索 + Set disabledMenuIds = new HashSet<>(); + + List enabledMenus = new ArrayList<>(); + for (MenuDO menu : menuList) { + if (!isMenuDisabled(menu, menuMap, disabledMenuIds)) { + enabledMenus.add(menu); } } - // 移除掉关闭的节点及其子节点 - return menuList.stream() - .filter(menu -> !closedNodeIds.contains(menu.getId())) - .collect(Collectors.toList()); + return enabledMenus; } - /** - * 递归标记关闭的节点及其子节点 - * - * @param nodeId 节点ID - * @param childrenMap 子节点Map - * @param closedNodeIds 关闭节点ID集合 - */ - private void markClosedNodes(Long nodeId, Map> childrenMap, - Set closedNodeIds) { - // 如果已经标记过，则直接返回 - if (!closedNodeIds.add(nodeId)) { - return; + private boolean isMenuDisabled(MenuDO node, Map menuMap, Set disabledMenuIds) { + if (disabledMenuIds.contains(node.getId())) { + return true; } - List children = childrenMap.getOrDefault(nodeId,Collections.emptyList()); - for (MenuDO child : children) { - markClosedNodes(child.getId(), childrenMap, closedNodeIds); - } - } + Long parentId = node.getParentId(); + if (parentId == 0) { + if (!node.getStatus().equals(CommonStatusEnum.ENABLE.getStatus())) { + disabledMenuIds.add(node.getId()); + return true; + } + return false; + } + + MenuDO parent = menuMap.get(parentId); + if (parent == null || isMenuDisabled(parent, menuMap, disabledMenuIds)) { + disabledMenuIds.add(node.getId()); + return true; + } + + return false; + } @Override public List getMenuList(MenuListReqVO reqVO) { From 3da2449a151143333985f739545b762459e5aafe Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 18 Jun 2024 09:20:49 +0800 Subject: [PATCH 17/28] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91SYSTE?= =?UTF-8?q?M=EF=BC=9A=E8=8E=B7=E5=8F=96=E8=8F=9C=E5=8D=95=E7=B2=BE?= =?UTF-8?q?=E7=AE=80=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8E=92=E9=99=A4=E7=88=B6=20ID=20=E9=9D=9E?= =?UTF-8?q?=200=20=E7=9A=84=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/permission/MenuService.java | 2 +- .../service/permission/MenuServiceImpl.java | 48 ++++++++----------- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java index 5c3700db9c..d74dc61340 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java @@ -56,7 +56,7 @@ public interface MenuService { * 过滤掉关闭的菜单及其子菜单 * * @param list 菜单列表 - * @return List 过滤后的菜单列表 + * @return 过滤后的菜单列表 */ List filterDisableMenus(List list); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java index 7cc293258a..730958f82e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.system.service.permission; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjUtil; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuListReqVO; @@ -14,7 +15,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.Lazy; @@ -22,11 +22,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; import static cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO.ID_ROOT; import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; @@ -116,56 +115,47 @@ public class MenuServiceImpl implements MenuService { return menus; } - /** - * 过滤关闭的菜单节点及其子节点 - * - * @param menuList 所有菜单列表 - * @return List 过滤后的菜单列表 - */ @Override public List filterDisableMenus(List menuList) { - if(CollectionUtils.isEmpty(menuList)){ + if (CollUtil.isEmpty(menuList)){ return Collections.emptyList(); } + Map menuMap = convertMap(menuList, MenuDO::getId); - Map menuMap = new HashMap<>(); - - for (MenuDO menuDO : menuList) { - menuMap.put(menuDO.getId(),menuDO); - } - - // 存下递归搜索过被禁用的菜单，防止重复的搜索 - Set disabledMenuIds = new HashSet<>(); - + // 遍历 menu 菜单，查找不是禁用的菜单，添加到 enabledMenus 结果 List enabledMenus = new ArrayList<>(); + Set disabledMenuCache = new HashSet<>(); // 存下递归搜索过被禁用的菜单，防止重复的搜索 for (MenuDO menu : menuList) { - if (!isMenuDisabled(menu, menuMap, disabledMenuIds)) { - enabledMenus.add(menu); + if (isMenuDisabled(menu, menuMap, disabledMenuCache)) { + continue; } + enabledMenus.add(menu); } return enabledMenus; } - private boolean isMenuDisabled(MenuDO node, Map menuMap, Set disabledMenuIds) { - if (disabledMenuIds.contains(node.getId())) { + private boolean isMenuDisabled(MenuDO node, Map menuMap, Set disabledMenuCache) { + // 如果已经判定是禁用的节点，直接结束 + if (disabledMenuCache.contains(node.getId())) { return true; } + // 1. 遍历到 parentId 为根节点，则无需判断 Long parentId = node.getParentId(); - if (parentId == 0) { - if (!node.getStatus().equals(CommonStatusEnum.ENABLE.getStatus())) { - disabledMenuIds.add(node.getId()); + if (ObjUtil.equal(parentId, ID_ROOT)) { + if (CommonStatusEnum.isDisable(node.getStatus())) { + disabledMenuCache.add(node.getId()); return true; } return false; } + // 2. 继续遍历 parent 节点 MenuDO parent = menuMap.get(parentId); - if (parent == null || isMenuDisabled(parent, menuMap, disabledMenuIds)) { - disabledMenuIds.add(node.getId()); + if (parent == null || isMenuDisabled(parent, menuMap, disabledMenuCache)) { + disabledMenuCache.add(node.getId()); return true; } - return false; } From 144bfb85a4faec1089dd7b32b52c6148d1406f81 Mon Sep 17 00:00:00 2001 From: "dongdong.xiang" Date: Tue, 18 Jun 2024 22:07:58 +0800 Subject: [PATCH 18/28] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=95=86=E5=93=81=20SPU=20=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BC=9A=E5=87=BA=E7=8E=B0=E9=94=99=E4=B9=B1=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/product/dal/mysql/spu/ProductSpuMapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java index 68f2d210f4..cf8ae64837 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java @@ -30,7 +30,8 @@ public interface ProductSpuMapper extends BaseMapperX { .likeIfPresent(ProductSpuDO::getName, reqVO.getName()) .eqIfPresent(ProductSpuDO::getCategoryId, reqVO.getCategoryId()) .betweenIfPresent(ProductSpuDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(ProductSpuDO::getSort); + .orderByDesc(ProductSpuDO::getSort) + .orderByDesc(ProductSpuDO::getId); appendTabQuery(tabType, queryWrapper); return selectPage(reqVO, queryWrapper); } From e1f98c977787ead93089ea5dd654d8265dae3252 Mon Sep 17 00:00:00 2001 From: DevDengChao <2325690622@qq.com> Date: Thu, 20 Jun 2024 09:32:51 +0800 Subject: [PATCH 19/28] =?UTF-8?q?chore:=20=E4=BD=BF=E7=94=A8=20CommonStatu?= =?UTF-8?q?sEnum.isDisable()=20=E5=88=A4=E6=96=AD=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/member/service/auth/MemberAuthServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java index 6ec7287c11..69d9252b89 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java @@ -89,7 +89,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { Assert.notNull(user, "获取用户失败，结果为空"); // 校验是否禁用 - if (ObjectUtil.notEqual(user.getStatus(), CommonStatusEnum.ENABLE.getStatus())) { + if (CommonStatusEnum.isDisable(user.getStatus())) { createLoginLog(user.getId(), reqVO.getMobile(), LoginLogTypeEnum.LOGIN_SMS, LoginResultEnum.USER_DISABLED); throw exception(AUTH_LOGIN_USER_DISABLED); } @@ -183,7 +183,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { throw exception(AUTH_LOGIN_BAD_CREDENTIALS); } // 校验是否禁用 - if (ObjectUtil.notEqual(user.getStatus(), CommonStatusEnum.ENABLE.getStatus())) { + if (CommonStatusEnum.isDisable(user.getStatus())) { createLoginLog(user.getId(), mobile, logTypeEnum, LoginResultEnum.USER_DISABLED); throw exception(AUTH_LOGIN_USER_DISABLED); } From 01b0866aa4b94483a8152be1392b263606c42d47 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 22 Jun 2024 08:37:06 +0800 Subject: [PATCH 20/28] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=90=8D=E6=8B=BC=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/system/enums/oauth2/OAuth2GrantTypeEnum.java | 2 +- .../system/controller/admin/oauth2/OAuth2OpenController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/oauth2/OAuth2GrantTypeEnum.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/oauth2/OAuth2GrantTypeEnum.java index 80ce4610bc..0b09fe5b02 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/oauth2/OAuth2GrantTypeEnum.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/oauth2/OAuth2GrantTypeEnum.java @@ -22,7 +22,7 @@ public enum OAuth2GrantTypeEnum { private final String grantType; - public static OAuth2GrantTypeEnum getByGranType(String grantType) { + public static OAuth2GrantTypeEnum getByGrantType(String grantType) { return ArrayUtil.firstMatch(o -> o.getGrantType().equals(grantType), values()); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.java index 114a156ab8..fd37be87cf 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.java @@ -105,7 +105,7 @@ public class OAuth2OpenController { @RequestParam(value = "refresh_token", required = false) String refreshToken) { // 刷新模式 List scopes = OAuth2Utils.buildScopes(scope); // 1.1 校验授权类型 - OAuth2GrantTypeEnum grantTypeEnum = OAuth2GrantTypeEnum.getByGranType(grantType); + OAuth2GrantTypeEnum grantTypeEnum = OAuth2GrantTypeEnum.getByGrantType(grantType); if (grantTypeEnum == null) { throw exception0(BAD_REQUEST.getCode(), StrUtil.format("未知授权类型({})", grantType)); } From 90ea7b951cb0468e283401c92e9de1ac428e08d7 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 22 Jun 2024 08:48:25 +0800 Subject: [PATCH 21/28] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=EF=BC=8CRemove=20duplicate?= =?UTF-8?q?=20package=20imports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/codegen/java/controller/vo/respVO.vm | 1 - 1 file changed, 1 deletion(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm index 54c16671d6..24c3519451 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm @@ -4,7 +4,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; ## 处理 BigDecimal 字段的引入 -import java.util.*; #foreach ($column in $columns) #if (${column.javaType} == "BigDecimal") import java.math.BigDecimal; From a5fbad31d1054501f99d14badbe323c7d921d8cb Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 22 Jun 2024 08:50:12 +0800 Subject: [PATCH 22/28] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91ERP?= =?UTF-8?q?=EF=BC=9A=E9=87=87=E8=B4=AD=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/erp/service/purchase/ErpPurchaseInServiceImpl.java | 2 +- .../erp/service/purchase/ErpPurchaseReturnServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java index 8a521d5acc..3f08f6c037 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java @@ -140,7 +140,7 @@ public class ErpPurchaseInServiceImpl implements ErpPurchaseInService { purchaseIn.setDiscountPercent(BigDecimal.ZERO); } purchaseIn.setDiscountPrice(MoneyUtils.priceMultiplyPercent(purchaseIn.getTotalPrice(), purchaseIn.getDiscountPercent())); - purchaseIn.setTotalPrice(purchaseIn.getTotalPrice().subtract(purchaseIn.getDiscountPrice().add(purchaseIn.getOtherPrice()))); + purchaseIn.setTotalPrice(purchaseIn.getTotalPrice().subtract(purchaseIn.getDiscountPrice()).add(purchaseIn.getOtherPrice())); } private void updatePurchaseOrderInCount(Long orderId) { diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java index 9403c0b141..e02066f5c5 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java @@ -136,7 +136,7 @@ public class ErpPurchaseReturnServiceImpl implements ErpPurchaseReturnService { purchaseReturn.setDiscountPercent(BigDecimal.ZERO); } purchaseReturn.setDiscountPrice(MoneyUtils.priceMultiplyPercent(purchaseReturn.getTotalPrice(), purchaseReturn.getDiscountPercent())); - purchaseReturn.setTotalPrice(purchaseReturn.getTotalPrice().subtract(purchaseReturn.getDiscountPrice().add(purchaseReturn.getOtherPrice()))); + purchaseReturn.setTotalPrice(purchaseReturn.getTotalPrice().subtract(purchaseReturn.getDiscountPrice()).add(purchaseReturn.getOtherPrice())); } private void updatePurchaseOrderReturnCount(Long orderId) { From e216849921166a1555a612eb94e86d5793455117 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 22 Jun 2024 10:38:59 +0800 Subject: [PATCH 23/28] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91MEMBE?= =?UTF-8?q?R=EF=BC=9A=E4=BC=9A=E5=91=98=E7=AD=BE=E5=88=B0=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=20Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/signin/MemberSignInRecordServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java index cdf32105ab..d7c3b8e9fb 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java @@ -75,11 +75,12 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService } summary.setTodaySignIn(DateUtils.isToday(lastRecord.getCreateTime())); - // 4.1 校验今天是否签到，没有签到则直接返回 - if (!summary.getTodaySignIn()) { + // 4.1 检查今天是否未签到且记录不是昨天创建的，如果是则直接返回 + if (!summary.getTodaySignIn() && !DateUtils.isYesterday(lastRecord.getCreateTime())) { return summary; } - // 4.2 连续签到天数 + + // 4.2 要么是今天签到了，要么是昨天的记录，设置连续签到天数 summary.setContinuousDay(lastRecord.getDay()); return summary; } From 7786233ae82e3fdb32ec78342ca061bc0cd36ad2 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 22 Jun 2024 14:26:50 +0800 Subject: [PATCH 24/28] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91BPM?= =?UTF-8?q?=EF=BC=9A=E5=A4=9A=E7=A7=9F=E6=88=B7=E4=BD=BF=E7=94=A8=E5=90=8C?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=B5=81=E7=A8=8B=E6=A0=87=E8=AF=86=20key=20?= =?UTF-8?q?=E6=97=B6=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/bpm/service/definition/BpmModelServiceImpl.java | 4 +++- .../service/definition/BpmProcessDefinitionServiceImpl.java | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java index abfa0d568d..7c4dae618e 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java @@ -262,7 +262,9 @@ public class BpmModelServiceImpl implements BpmModelService { } private Model getModelByKey(String key) { - return repositoryService.createModelQuery().modelKey(key).singleResult(); + return repositoryService.createModelQuery() + .modelTenantId(FlowableUtils.getTenantId()) + .modelKey(key).singleResult(); } @Override diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java index a11fdbac88..99470f6a52 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java @@ -79,7 +79,9 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ @Override public ProcessDefinition getActiveProcessDefinition(String key) { - return repositoryService.createProcessDefinitionQuery().processDefinitionKey(key).active().singleResult(); + return repositoryService.createProcessDefinitionQuery() + .processDefinitionTenantId(FlowableUtils.getTenantId()) + .processDefinitionKey(key).active().singleResult(); } @Override @@ -172,6 +174,7 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ @Override public PageResult getProcessDefinitionPage(BpmProcessDefinitionPageReqVO pageVO) { ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery(); + query.processDefinitionTenantId(FlowableUtils.getTenantId()); if (StrUtil.isNotBlank(pageVO.getKey())) { query.processDefinitionKey(pageVO.getKey()); } From 19407f6dcef2eed560d423a2dc3085603a538c70 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 6 Jul 2024 20:06:56 +0800 Subject: [PATCH 25/28] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E3=80=91AI=EF=BC=9A=E5=A4=A7=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .image/common/ai-feature.jpg | Bin 0 -> 21239 bytes README.md | 9 ++++++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .image/common/ai-feature.jpg diff --git a/.image/common/ai-feature.jpg b/.image/common/ai-feature.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b4a55f547c85650d1b34e0bf0852a40634ecc99f GIT binary patch literal 21239 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 mKhyoTgm1@ZDcM_`%s-~;|KNU 友情提示：本项目基于 RuoYi-Vue 修改，**重构优化**后端的代码，**美化**前端的界面。 > @@ -248,6 +248,12 @@ 演示地址： +### AI 大模型 + +![功能图](/.image/common/ai-feature.png) + +演示地址： + ## 🐨 技术栈 ### 模块 @@ -265,6 +271,7 @@ | `yudao-module-mall` | 商城系统的 Module 模块 | | `yudao-module-erp` | ERP 系统的 Module 模块 | | `yudao-module-crm` | CRM 系统的 Module 模块 | +| `yudao-module-ai` | AI 大模型的 Module 模块 | | `yudao-module-mp` | 微信公众号的 Module 模块 | | `yudao-module-report` | 大屏报表 Module 模块 | From 826a7e0ac0cf06cf4b259b532890aa49cf86ef43 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 6 Jul 2024 20:08:12 +0800 Subject: [PATCH 26/28] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E3=80=91AI=EF=BC=9A=E5=A4=A7=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .image/common/{ai-feature.jpg => ai-feature.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename .image/common/{ai-feature.jpg => ai-feature.png} (100%) diff --git a/.image/common/ai-feature.jpg b/.image/common/ai-feature.png similarity index 100% rename from .image/common/ai-feature.jpg rename to .image/common/ai-feature.png From 6a24025afadd7550640dfc94b672f9f531c9a191 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 7 Jul 2024 09:08:33 +0800 Subject: [PATCH 27/28] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E5=B7=A5=E5=85=B7=E7=B1=BB=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=20#585?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/iocoder/yudao/framework/ip/core/utils/AreaUtilsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtilsTest.java b/yudao-framework/yudao-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtilsTest.java index 8f5646b337..cc23819c49 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtilsTest.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtilsTest.java @@ -28,7 +28,7 @@ public class AreaUtilsTest { @Test public void testFormat() { - assertEquals(AreaUtils.format(110105), "北京 北京市 朝阳区"); + assertEquals(AreaUtils.format(110105), "北京市 北京市 朝阳区"); assertEquals(AreaUtils.format(1), "中国"); assertEquals(AreaUtils.format(2), "蒙古"); } From a0020f033980ab047e0fb37004d03327dcebbbf9 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 7 Jul 2024 09:13:42 +0800 Subject: [PATCH 28/28] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E5=AD=90?= =?UTF-8?q?=E8=A1=A8ERP=E6=A8=A1=E5=BC=8F=E4=B8=8B=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E4=B8=8D=E5=85=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20#583?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/codegen/java/dal/mapper_sub.vm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/mapper_sub.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/mapper_sub.vm index e5589e99df..6ccaea79ea 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/mapper_sub.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/mapper_sub.vm @@ -29,6 +29,12 @@ public interface ${subTable.className}Mapper extends BaseMapperX<${subTable.clas .orderByDesc(${subTable.className}DO::getId));## 大多数情况下，id 倒序 } +## 主表与子表是一对一时 + #if (!$subTable.subJoinMany) + default ${subTable.className}DO selectBy${SubJoinColumnName}(${subJoinColumn.javaType} ${subJoinColumn.javaField}) { + return selectOne(${subTable.className}DO::get${SubJoinColumnName}, ${subJoinColumn.javaField}); + } + #end ## 情况二：非 MASTER_ERP 时，需要列表查询子表 #else @@ -48,4 +54,4 @@ public interface ${subTable.className}Mapper extends BaseMapperX<${subTable.clas return delete(${subTable.className}DO::get${SubJoinColumnName}, ${subJoinColumn.javaField}); } -} \ No newline at end of file +}