diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPageVO.java index ff5e269d2..085a50457 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPageVO.java @@ -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 prodStatusList; } diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index a74781b0e..29b4e3583 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -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); diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageDTO.java index c78942d01..51783d26e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageDTO.java @@ -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 prodStatusList; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java index 4ad33e307..cee7d5af8 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java @@ -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); diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java index be0e078a8..11f78a7d1 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java @@ -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() : "" + " ,恭喜您!您成功订购 " diff --git a/xkt/src/main/resources/mapper/StoreProductColorMapper.xml b/xkt/src/main/resources/mapper/StoreProductColorMapper.xml index d6cc117c8..24d17bf0b 100644 --- a/xkt/src/main/resources/mapper/StoreProductColorMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductColorMapper.xml @@ -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} + + AND spc.prod_status IN + + #{item} + + and sp.prod_art_num like concat('%', #{prodArtNum}, '%') and sp.prod_cate_id = #{prodCateId} ORDER BY