BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：商品列表入参调整；

pull/1121/head
liujiang 2025-09-09 11:25:40 +08:00
parent b942af9f4f
commit ed88046bd8
6 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPageVO.java
View File

@ -7,6 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* @author liujiang
@ -27,6 +28,6 @@ public class StoreProdPageVO extends BasePageVO {
private Long storeId;
@ApiModelProperty(value = "商品状态[1未发布，2在售，3尾货，4已下架，5已删除]", required = true)
@NotNull(message = "商品状态不能为空")
private Integer prodStatus;
private List<Integer> prodStatusList;
}

1
sql/ry_20240629.sql
View File

@ -438,7 +438,6 @@ INSERT INTO `sys_menu` VALUES (1001, '商品管理', 1, 1, '', '', '', '', 1, 1,
INSERT INTO `sys_menu` VALUES (1002, '商品列表', 1001, 1, '', '', '', '', 1, 1, 'C', '0', '0', '', '', 'admin', '2025-07-15 16:01:38', 'admin', '2025-07-15 16:01:38', '', '0', 0);
INSERT INTO `sys_menu` VALUES (1003, '发布商品', 1001, 2, '', '', '', '', 1, 1, 'C', '0', '0', '', '', 'admin', '2025-07-15 16:01:50', 'admin', '2025-07-15 16:01:50', '', '0', 0);
INSERT INTO `sys_menu` VALUES (1004, '打印条码', 1001, 3, '', '', '', '', 1, 1, 'C', '0', '0', '', '', 'admin', '2025-07-15 16:02:02', 'admin', '2025-07-15 16:02:02', '', '0', 0);
INSERT INTO `sys_menu` VALUES (1005, '图片空间', 1001, 4, '', '', '', '', 1, 1, 'C', '0', '0', '', '', 'admin', '2025-07-15 16:02:16', 'admin', '2025-07-15 16:02:16', '', '0', 0);
INSERT INTO `sys_menu` VALUES (1006, '条码一键迁移', 1001, 5, '', '', '', '', 1, 1, 'C', '0', '0', '', '', 'admin', '2025-07-15 16:02:31', 'admin', '2025-07-15 16:02:31', '', '0', 0);
INSERT INTO `sys_menu` VALUES (1007, '进货车列表', 1001, 6, '', '', '', '', 1, 1, 'C', '0', '0', '', '', 'admin', '2025-07-15 16:02:46', 'admin', '2025-07-15 16:02:46', '', '0', 0);
INSERT INTO `sys_menu` VALUES (1008, '我的收藏', 1001, 7, '', '', '', '', 1, 1, 'C', '0', '0', '', '', 'admin', '2025-07-15 16:02:55', 'admin', '2025-07-15 16:02:55', '', '0', 0);

4
xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageDTO.java
View File

@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* @author liujiang
* @version v1.0
@ -23,6 +25,6 @@ public class StoreProdPageDTO extends BasePageDTO {
@ApiModelProperty(value = "档口ID")
private Long storeId;
@ApiModelProperty(value = "商品状态")
private Integer prodStatus;
private List<Integer> prodStatusList;
}

3
xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.ruoyi.common.core.page.Page;
import com.ruoyi.common.enums.AdType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.xkt.domain.*;
import com.ruoyi.xkt.dto.adminAdvertRound.*;
import com.ruoyi.xkt.dto.advertRound.AdRoundUpdateDTO;
@ -233,7 +234,7 @@ public class AdminAdvertRoundServiceImpl implements IAdminAdvertRoundService {
// 设置系统拦截的数据 并将系统拦截设置为1
advertRound.setStoreId(interceptDTO.getStoreId()).setSysIntercept(AdSysInterceptType.INTERCEPT.getValue())
.setVoucherDate(java.sql.Date.valueOf(LocalDate.now())).setBiddingStatus(AdBiddingStatus.BIDDING_SUCCESS.getValue())
.setBiddingTempStatus(AdBiddingStatus.BIDDING_SUCCESS.getValue());
.setBiddingTempStatus(AdBiddingStatus.BIDDING_SUCCESS.getValue()).setCreateBy(SecurityUtils.getUsernameSafe());
if (ObjectUtils.isNotEmpty(interceptDTO.getFile())) {
SysFile file = BeanUtil.toBean(interceptDTO.getFile(), SysFile.class);
this.fileMapper.insert(file);

2
xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java
View File

@ -695,7 +695,7 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService {
.setPicAuditStatus(this.hasPic(minPriceAdvert.getDisplayType()) ? AdPicAuditStatus.UN_AUDIT.getValue() : null)
.setPicDesignType(this.hasPic(minPriceAdvert.getDisplayType()) ? createDTO.getPicDesignType() : null)
.setPicAuditStatus(this.hasPic(minPriceAdvert.getDisplayType()) ? AdPicAuditStatus.UN_AUDIT.getValue() : null)
.setProdIdStr(createDTO.getProdIdStr());
.setProdIdStr(createDTO.getProdIdStr()).setCreateBy(SecurityUtils.getUsernameSafe());
this.advertRoundMapper.updateById(minPriceAdvert);
final String successTitle = ObjectUtils.isNotEmpty(advert) ? AdType.of(advert.getTypeId()).getLabel() : "" + position + "订购成功!";
final String successContent = ObjectUtils.isNotEmpty(store) ? store.getStoreName() : "" + " ，恭喜您!您成功订购 "

8
xkt/src/main/resources/mapper/StoreProductColorMapper.xml
View File

@ -48,7 +48,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND spf.file_type = 1 AND spf.order_num = 1 AND spf.del_flag = 0
JOIN sys_file sf ON spf.file_id = sf.id
WHERE
spc.del_flag = 0 AND spc.prod_status = #{prodStatus} AND spc.store_id = #{storeId}
spc.del_flag = 0 AND spc.store_id = #{storeId}
<if test="prodStatusList != null and prodStatusList.size() > 0">
AND spc.prod_status IN
<foreach item="item" collection="prodStatusList" separator="," open="(" close=")" index="">
#{item}
</foreach>
</if>
<if test="prodArtNum != null and prodArtNum != ''"> and sp.prod_art_num like concat('%', #{prodArtNum}, '%')</if>
<if test="prodCateId != null "> and sp.prod_cate_id = #{prodCateId}</if>
ORDER BY