From d71994cdaa75dd737940094da63d1648c866cec7 Mon Sep 17 00:00:00 2001 From: fxh <1763817137@qq.com> Date: Wed, 13 Aug 2025 17:35:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/goods/ProductMapper.xml | 2 +- .../main/resources/mapper/goods/SkuMapper.xml | 32 +++++------ .../impl/VerificationCodeServiceImpl.java | 8 +-- .../main/resources/mapper/AftersaleMapper.xml | 25 ++++----- .../src/main/resources/mapper/OrderMapper.xml | 10 ++-- .../system/domain/SysTenantExtend.java | 2 +- .../system/domain/bo/SysTenantExtendBo.java | 2 +- .../dromara/system/domain/dto/TenantDTO.java | 2 +- .../system/domain/vo/SysTenantExtendVo.java | 2 +- .../dromara/system/domain/vo/SysTenantVo.java | 2 +- .../service/impl/SysTenantServiceImpl.java | 53 +++++++++++++++---- .../mapper/system/SysTenantMapper.xml | 2 +- 12 files changed, 89 insertions(+), 53 deletions(-) diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml index e7a86ae89..e0cfee95b 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml +++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml @@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN oms_order o ON oi.order_id = o.id LEFT JOIN pms_product_category pc ON p.category_id = pc.id LEFT JOIN pms_sku s ON p.id = s.product_id - WHERE p.tenant_id = #{tenantId} + WHERE 1=1 AND p.name LIKE CONCAT('%', #{query.nameLike}, '%') diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml index d5936fdfd..36ddb8588 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml +++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml @@ -46,7 +46,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java index 57349c61c..5b3dbb303 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java @@ -222,14 +222,14 @@ public class VerificationCodeServiceImpl extends ServiceImpl resultMap = codeMapper.getProduvtNameAndMemberId(code); - String productName = (String) resultMap.get("productName"); +// String productName = (String) resultMap.get("productName"); Long memberId = (Long) resultMap.get("memberId"); LocalDateTime verificationTime = codeMapper.verificationTime(code); String formattedTime = verificationTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); // 核销成功模板ID // 改为新版模板类型调用 Map params = new HashMap<>(); - params.put("productName", productName); +// params.put("productName", productName); params.put("verificationTime", formattedTime); SysMessageBo messageBo = new SysMessageBo(); // 核销成功类型编号 @@ -245,13 +245,13 @@ public class VerificationCodeServiceImpl extends ServiceImpl resultMap = codeMapper.getProduvtNameAndMemberId(code); - String productName = (String) resultMap.get("productName"); +// String productName = (String) resultMap.get("productName"); Long memberId = (Long) resultMap.get("memberId"); String reason = codeMapper.getReason(code); // 核销失败模板ID // 改为新版模板类型调用 Map params = new HashMap<>(); - params.put("productName", productName); +// params.put("productName", productName); params.put("reason", reason); SysMessageBo messageBo = new SysMessageBo(); // 核销失败类型编号 diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/AftersaleMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/AftersaleMapper.xml index 182ef0a85..d4e3442f4 100644 --- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/AftersaleMapper.xml +++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/AftersaleMapper.xml @@ -108,18 +108,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/OrderMapper.xml index f56abe7fb..731f256e5 100644 --- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/OrderMapper.xml +++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/OrderMapper.xml @@ -264,7 +264,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantExtend.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantExtend.java index 7cb678775..be7f479fa 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantExtend.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantExtend.java @@ -84,7 +84,7 @@ public class SysTenantExtend extends BaseAudit { @Schema(description = "签约附件") private String contractAttachment; - @Schema(description = "签约状态") + @Schema(description = "签约状态(0.待审核1.有效 2.无效 3.编辑 4.过期)") private String signStatus; @Schema(description = "收款方名称") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java index 8219e8fbe..2cbb656af 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java @@ -138,7 +138,7 @@ public class SysTenantExtendBo { @Schema(description = "签约附件") private String contractAttachment; - @Schema(description = "签约状态") + @Schema(description = "签约状态(0.待审核1.有效 2.无效 3.编辑 4.过期)") private String signStatus; @Schema(description = "签约日期(模糊查询)") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/dto/TenantDTO.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/dto/TenantDTO.java index c15bab57d..3f172caf4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/dto/TenantDTO.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/dto/TenantDTO.java @@ -143,7 +143,7 @@ public class TenantDTO { @Schema(description = "签约附件") private String contractAttachment; - @Schema(description = "签约状态") + @Schema(description = "签约状态(0.待审核1.有效 2.无效 3.编辑 4.过期)") private String signStatus; @Schema(description = "邀请人名称") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantExtendVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantExtendVo.java index a902fcd2a..db97f6fc3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantExtendVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantExtendVo.java @@ -136,7 +136,7 @@ public class SysTenantExtendVo { @Schema(description = "签约附件") private String contractAttachment; - @Schema(description = "签约状态") + @Schema(description = "签约状态(0.待审核1.有效 2.无效 3.编辑 4.过期)") private String signStatus; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java index ece9a111e..447897044 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java @@ -154,7 +154,7 @@ public class SysTenantVo implements Serializable { @Schema(description = "签约附件") private String contractAttachment; - @Schema(description = "签约状态") + @Schema(description = "签约状态(0.待审核1.有效 2.无效 3.编辑 4.过期)") private String signStatus; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java index 08f425b9b..ae57f5aa7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java @@ -8,6 +8,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; @@ -54,6 +55,7 @@ public class SysTenantServiceImpl implements ISysTenantService { private final SysTenantMapper baseMapper; private final SysTenantExtendMapper tenantExtendMapper; private final SysTenantPackageMapper tenantPackageMapper; + private final SysTenantAccountMapper tenantAccountMapper;; private final SysUserMapper userMapper; private final SysDeptMapper deptMapper; private final SysRoleMapper roleMapper; @@ -125,26 +127,37 @@ public class SysTenantServiceImpl implements ISysTenantService { @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(SysTenantExtendBo bo) { + if (bo.getType() == null){ + throw new ServiceException("租户类型不能为空"); + } // 处理sys_tenant表数据 SysTenant tenant = new SysTenant(); Long belongId = Long.valueOf(LoginHelper.getTenantId()); - SysTenant sysTenant = baseMapper.selectByBelongId(belongId); - if (bo.getExpiryDate() != null && sysTenant.getType() != 1){ - - } if (bo.getExpiryDate() != null) { - + SysTenant sysTenant = baseMapper.selectByBelongId(belongId); if (sysTenant != null) { Integer type = sysTenant.getType(); - if (type != 1) { + if (type != 1 && type != 3) { throw new RuntimeException("只有代理能添加推广人"); } } else { - throw new RuntimeException("未查询到对应 belongId 的租户信息"); + throw new RuntimeException("未查询到对应的租户信息"); + } + } + + if (bo.getStoreName() != null) { + SysTenant sysTenant = baseMapper.selectByBelongId(belongId); + if (sysTenant != null) { + Integer type = sysTenant.getType(); + if (type != 2 && type != 3) { + throw new RuntimeException("只有推广人能添加店铺"); + } + } else { + throw new RuntimeException("未查询到对应的租户信息"); } } @@ -234,7 +247,9 @@ public class SysTenantServiceImpl implements ISysTenantService { tenantExtend.setSigner(bo.getSigner()); tenantExtend.setContractYear(bo.getContractYear()); tenantExtend.setContractAttachment(bo.getContractAttachment()); - tenantExtend.setSignStatus(bo.getSignStatus()); + if (bo.getSignStatus() == null) { + tenantExtend.setSignStatus("0"); + } tenantExtend.setPayeeName(bo.getPayeeName()); tenantExtend.setEmergencyContact(bo.getEmergencyContact()); tenantExtend.setEmergencyContactPhone(bo.getEmergencyContactPhone()); @@ -263,6 +278,7 @@ public class SysTenantServiceImpl implements ISysTenantService { tenantAccount.setMoneyBalance(BigDecimal.ZERO); tenantAccount.setWallet(BigDecimal.ZERO); tenantAccount.setRevenue(BigDecimal.ZERO); + tenantAccountMapper.insert(tenantAccount); // 创建部门 @@ -287,6 +303,7 @@ public class SysTenantServiceImpl implements ISysTenantService { user.setNickName(bo.getUsername()); user.setPassword(BCrypt.hashpw(bo.getPassword())); user.setDeptId(deptId); + user.setPhonenumber(bo.getContactPhone()); userMapper.insert(user); // 设置部门负责人 @@ -746,9 +763,23 @@ public class SysTenantServiceImpl implements ISysTenantService { @Override @Transactional(rollbackFor = Exception.class) public Boolean batchRemoveByIds(List ids) { - for (Long id : ids) { - if (TenantConstants.SUPER_ADMIN_ROLE_KEY.equals(id.toString())) { - throw new ServiceException("超级管理员租户不能删除"); + if (CollectionUtils.isEmpty(ids)) { + throw new ServiceException("删除ID列表不能为空"); + } + + // 查询所有待删除租户的tenant_id + List tenants = baseMapper.selectBatchIds(ids); + if (CollectionUtils.isEmpty(tenants)) { + throw new ServiceException("未找到对应的租户信息"); + } + + // 检查是否存在不允许删除的租户 + for (SysTenant tenant : tenants) { + if (TenantConstants.DEFAULT_TENANT_ID.equals(tenant.getTenantId())) { + throw new ServiceException("超级管理员租户(" + tenant.getTenantId() + ")不能删除"); + } + if (TenantConstants.SUPER_ADMIN_ROLE_KEY.equals(tenant.getId().toString())) { + throw new ServiceException("超级管理员租户(" + tenant.getId() + ")不能删除"); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml index f4b2b1831..29bfa3dea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN commission_template ct ON e.split_ratio = ct.id LEFT JOIN - sys_tenant agency ON t.agency_id = agency.id + sys_tenant agency ON t.agency_tenant_id = agency.tenant_id AND t.tenant_id LIKE CONCAT('%', #{query.tenantId}, '%') From 9d4e42de6034710c99eec75a9bff7d495b877561 Mon Sep 17 00:00:00 2001 From: fxh <1763817137@qq.com> Date: Thu, 14 Aug 2025 14:52:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application.yml | 4 ++-- .../wzj/soopin/goods/controller/BrandController.java | 11 +++++++++++ .../soopin/goods/controller/ProductController.java | 10 ++++++++++ .../com/wzj/soopin/goods/domain/bo/ProductBo.java | 1 - .../src/main/resources/mapper/goods/ProductMapper.xml | 3 +++ .../com/wzj/soopin/order/domain/entity/RedPacket.java | 2 ++ .../soopin/order/domain/entity/RedPacketReceive.java | 3 +++ .../order/domain/query/SendRedPacketRequest.java | 3 +-- .../com/wzj/soopin/order/mapper/RedPacketMapper.java | 2 +- .../soopin/order/mapper/RedPacketReceiveMapper.java | 2 +- .../main/resources/mapper/system/SysTenantMapper.xml | 2 +- 11 files changed, 35 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index a9a34119c..b16385a44 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -181,8 +181,8 @@ tenant: - sys_version - ums_member_wechat - sys_tenant_extend - - red_packet - - red_packet_receive + - oms_red_packet + - oms_red_packet_receive - commission_template - commission_rate_range diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java index 374e2728e..d4733da28 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java @@ -4,8 +4,11 @@ package com.wzj.soopin.goods.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.goods.convert.BrandConvert; import com.wzj.soopin.goods.domain.bo.BrandBo; +import com.wzj.soopin.goods.domain.bo.ProductCategoryBo; import com.wzj.soopin.goods.domain.entity.Brand; +import com.wzj.soopin.goods.domain.entity.ProductCategory; import com.wzj.soopin.goods.domain.vo.BrandVO; +import com.wzj.soopin.goods.domain.vo.ProductCategoryVO; import com.wzj.soopin.goods.service.impl.BrandServiceImpl; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -40,6 +43,14 @@ public class BrandController extends BaseController { return R.ok(convert.toVO(brandPage)); } + @Tag(name ="所有品牌管理列表") + @PostMapping("page") + public R> list(@RequestBody BrandBo query) { + List productCategoryList = service.list(query.toWrapper()); + return R.ok(convert.toVO(productCategoryList)); + } + + @Tag(name ="导出品牌管理列表") @Log(title = "品牌管理", businessType = BusinessType.EXPORT) @PostMapping("export") diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java index 1f8340a78..3e5c26f92 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java @@ -6,12 +6,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.goods.convert.ProductConvert; import com.wzj.soopin.goods.domain.bo.BrandBo; import com.wzj.soopin.goods.domain.bo.ProductBo; +import com.wzj.soopin.goods.domain.bo.ProductCategoryBo; import com.wzj.soopin.goods.domain.bo.SkuBo; import com.wzj.soopin.goods.domain.dto.ProductDTO; import com.wzj.soopin.goods.domain.entity.Brand; import com.wzj.soopin.goods.domain.entity.Product; +import com.wzj.soopin.goods.domain.entity.ProductCategory; import com.wzj.soopin.goods.domain.entity.Sku; import com.wzj.soopin.goods.domain.vo.BrandVO; +import com.wzj.soopin.goods.domain.vo.ProductCategoryVO; import com.wzj.soopin.goods.domain.vo.ProductVO; import com.wzj.soopin.goods.domain.vo.SkuVO; import com.wzj.soopin.goods.service.ProductService; @@ -43,6 +46,13 @@ public class ProductController extends BaseController { private final ProductService productService; + @Tag(name ="查询商品信息列表app") + @PostMapping("page") + public R> page(@RequestBody ProductBo query, Page page) { + Page productCategoryPage = service.page(page,query.toWrapper()); + return R.ok(convert.toVO(productCategoryPage)); + } + @Tag(name ="查询商品信息列表") @PostMapping("list") public R> list(@RequestBody ProductBo query, @RequestBody Page page) { diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductBo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductBo.java index 74fb0e979..670afdd24 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductBo.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductBo.java @@ -28,7 +28,6 @@ public class ProductBo { @Schema(description = "上架状态：0->下架；1->上架 精确匹配") private Integer publishStatus; - @Schema(description = "PRICE 精确匹配") private BigDecimal price; diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml index e0cfee95b..35321e25f 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml +++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml @@ -81,6 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN pms_product_category pc ON p.category_id = pc.id LEFT JOIN pms_sku s ON p.id = s.product_id WHERE 1=1 + + AND s.tenant_id = #{tenantId} + AND p.name LIKE CONCAT('%', #{query.nameLike}, '%') diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/RedPacket.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/RedPacket.java index ac8cef722..a30901618 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/RedPacket.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/RedPacket.java @@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.annotation.TableField; import java.math.BigDecimal; import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; import org.dromara.common.core.domain.model.BaseAudit; @Data @Schema(description = "红包实体") +@TableName("oms_red_packet") public class RedPacket extends BaseAudit { @TableId(type = IdType.ASSIGN_ID) @Schema(description = "红包id") diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/RedPacketReceive.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/RedPacketReceive.java index 626e71754..c860251ec 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/RedPacketReceive.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/RedPacketReceive.java @@ -5,11 +5,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @Data @Schema(description = "红包领取记录实体") +@TableName("oms_red_packet_receive") public class RedPacketReceive { @TableId(type = IdType.ASSIGN_ID) @Schema(description = "主键ID") diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/query/SendRedPacketRequest.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/query/SendRedPacketRequest.java index b6c2d6f0f..c87989c7f 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/query/SendRedPacketRequest.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/query/SendRedPacketRequest.java @@ -1,10 +1,9 @@ package com.wzj.soopin.order.domain.query; -import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import org.hibernate.validator.constraints.Range; diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/RedPacketMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/RedPacketMapper.java index eb142a98a..2313beec2 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/RedPacketMapper.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/RedPacketMapper.java @@ -10,6 +10,6 @@ import java.util.List; @Mapper public interface RedPacketMapper extends BaseMapper { - @Select("SELECT * FROM red_packet WHERE expire_time < NOW() AND status IN (0, 1)") + @Select("SELECT * FROM oms_red_packet WHERE expire_time < NOW() AND status IN (0, 1)") List selectExpiredRedPackets(); } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/RedPacketReceiveMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/RedPacketReceiveMapper.java index 4dbaf0f87..2a6b76912 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/RedPacketReceiveMapper.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/RedPacketReceiveMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Select; public interface RedPacketReceiveMapper extends BaseMapper { - @Select("SELECT COUNT(1) FROM red_packet_receive " + + @Select("SELECT COUNT(1) FROM oms_red_packet_receive " + "WHERE packet_id = #{packetId} " + "AND receiver_id = #{memberId} ") Integer checkReceived(Long packetId, Long memberId); diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml index 29bfa3dea..30a633031 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ums_member m ON e.invite_user_id = m.id LEFT JOIN - commission_template ct ON e.split_ratio = ct.id + sys_commission_template ct ON e.split_ratio = ct.id LEFT JOIN sys_tenant agency ON t.agency_tenant_id = agency.tenant_id