From 60b4b0bd4996dc0c058bea54bab79153e3031f91 Mon Sep 17 00:00:00 2001 From: irving Date: Sat, 1 Nov 2025 23:55:41 -0400 Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E4=BC=98=E5=8C=96=E5=95=86?= =?UTF-8?q?=E5=93=81=E4=B8=8E=E4=BC=98=E6=83=A0=E5=88=B8=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E5=A4=8D=E7=A4=BC=E5=93=81=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=98=A0=E5=B0=84=EF=BC=9B=E8=A1=A5=E5=85=85=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/mapper/PlayCustomGiftInfoMapper.java | 5 +++++ .../modules/shop/mapper/PlayClerkGiftInfoMapper.java | 5 +++++ .../service/impl/PlayCommodityInfoServiceImpl.java | 6 +++++- .../service/impl/PlayCouponDetailsServiceImpl.java | 11 ++++++----- .../starry/admin/api/PlayCommodityInfoApiTest.java | 2 ++ 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomGiftInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomGiftInfoMapper.java index 0518f2d..c8df042 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomGiftInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomGiftInfoMapper.java @@ -29,4 +29,9 @@ public interface PlayCustomGiftInfoMapper extends MPJBaseMapper selectByType() { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(PlayCommodityInfoEntity::getItemType, "服务类型"); + String tenantId = SecurityUtils.getTenantId(); + if (StrUtil.isNotBlank(tenantId)) { + lambdaQueryWrapper.eq(PlayCommodityInfoEntity::getTenantId, tenantId); + } + lambdaQueryWrapper.eq(PlayCommodityInfoEntity::getPId, "00"); lambdaQueryWrapper.orderByDesc(PlayCommodityInfoEntity::getSort); return this.baseMapper.selectList(lambdaQueryWrapper); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCouponDetailsServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCouponDetailsServiceImpl.java index ca1e726..a7ca136 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCouponDetailsServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCouponDetailsServiceImpl.java @@ -3,6 +3,7 @@ package com.starry.admin.modules.shop.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -158,12 +159,12 @@ public class PlayCouponDetailsServiceImpl extends ServiceImpl ids, String useState) { + LocalDateTime useTime = CouponUseState.USED.getCode().equals(useState) ? LocalDateTime.now() : null; for (String id : ids) { - PlayCouponDetailsEntity entity = new PlayCouponDetailsEntity(); - entity.setId(id); - entity.setUseState(useState); - entity.setUseTime(LocalDateTime.now()); - baseMapper.updateById(entity); + baseMapper.update(null, com.baomidou.mybatisplus.core.toolkit.Wrappers.lambdaUpdate() + .eq(PlayCouponDetailsEntity::getId, id) + .set(PlayCouponDetailsEntity::getUseState, useState) + .set(PlayCouponDetailsEntity::getUseTime, useTime)); } } diff --git a/play-admin/src/test/java/com/starry/admin/api/PlayCommodityInfoApiTest.java b/play-admin/src/test/java/com/starry/admin/api/PlayCommodityInfoApiTest.java index 467458b..d89caee 100644 --- a/play-admin/src/test/java/com/starry/admin/api/PlayCommodityInfoApiTest.java +++ b/play-admin/src/test/java/com/starry/admin/api/PlayCommodityInfoApiTest.java @@ -210,6 +210,7 @@ class PlayCommodityInfoApiTest extends WxCustomOrderApiTestSupport { .andExpect(status().isOk()) .andExpect(jsonPath("$.code").value(200)); + ensureTenantContext(); PlayCommodityAndLevelInfoEntity pricing = commodityAndLevelInfoService.lambdaQuery() .eq(PlayCommodityAndLevelInfoEntity::getCommodityId, child.getId()) .eq(PlayCommodityAndLevelInfoEntity::getLevelId, ApiTestDataSeeder.DEFAULT_CLERK_LEVEL_ID) @@ -266,6 +267,7 @@ class PlayCommodityInfoApiTest extends WxCustomOrderApiTestSupport { .andExpect(status().isOk()) .andExpect(jsonPath("$.code").value(200)); + ensureTenantContext(); PlayCommodityInfoEntity updated = commodityInfoService.getById(child.getId()); assertThat(updated.getAutomaticSettlementDuration()) .isEqualTo(AutomaticSettlementPolicy.TEN_MINUTES.getSeconds());