abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
fxh 2025-08-14 14:52:55 +08:00
parent 02eb7ceeeb
commit 9d4e42de60
11 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/resources/application.yml
View File

@ -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

11
ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java
View File

@ -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<BrandVO>> list(@RequestBody BrandBo query) {
List<Brand> productCategoryList = service.list(query.toWrapper());
return R.ok(convert.toVO(productCategoryList));
}
@Tag(name ="导出品牌管理列表")
@Log(title = "品牌管理", businessType = BusinessType.EXPORT)
@PostMapping("export")

10
ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java
View File

@ -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<ProductVO>> page(@RequestBody ProductBo query, Page<Product> page) {
Page<Product> productCategoryPage = service.page(page,query.toWrapper());
return R.ok(convert.toVO(productCategoryPage));
}
@Tag(name ="查询商品信息列表")
@PostMapping("list")
public R<IPage<ProductVO>> list(@RequestBody ProductBo query, @RequestBody Page<Product> page) {

1
ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductBo.java
View File

@ -28,7 +28,6 @@ public class ProductBo {
@Schema(description = "上架状态：0->下架；1->上架 精确匹配")
private Integer publishStatus;
@Schema(description = "PRICE 精确匹配")
private BigDecimal price;

3
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml
View File

@ -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
<if test="tenantId != '000000'">
AND s.tenant_id = #{tenantId}
</if>
<if test="query.nameLike != null and query.nameLike != ''">
AND p.name LIKE CONCAT('%', #{query.nameLike}, '%')
</if>

2
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/RedPacket.java
View File

@ -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")

3
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/RedPacketReceive.java
View File

@ -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")

3
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/query/SendRedPacketRequest.java
View File

@ -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;

2
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/RedPacketMapper.java
View File

@ -10,6 +10,6 @@ import java.util.List;
@Mapper
public interface RedPacketMapper extends BaseMapper<RedPacket> {
@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<RedPacket> selectExpiredRedPackets();
}

2
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/RedPacketReceiveMapper.java
View File

@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Select;
public interface RedPacketReceiveMapper extends BaseMapper<RedPacketReceive> {
@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);

2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml
View File

@ -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
<where>