修复

src/main/java/com/mmc/pms/controller/mall/MallGoodsController.java

@@ -4,7 +4,7 @@ import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.controller.BaseController;
 import com.mmc.pms.model.mall.MallGoodsVO;
 import com.mmc.pms.model.sale.dto.SkuUnitDTO;
-import com.mmc.pms.model.sale.qo.MallGoodsQO;
+import com.mmc.pms.model.sale.qo.MallGoodsInfoQO;
 import com.mmc.pms.service.mall.MallGoodsService;
 import io.swagger.annotations.*;
 import org.springframework.web.bind.annotation.*;
@@ -54,7 +54,7 @@ public class MallGoodsController extends BaseController {
     @ApiOperation(value = "商品列表-分页")
     @PostMapping("listPageGoodsInfo")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = MallGoodsVO.class)})
-    public ResultBody<MallGoodsVO> listPageGoodsInfo(@ApiParam("商品查询条件QO") @RequestBody MallGoodsQO param, HttpServletRequest request) {
+    public ResultBody<MallGoodsVO> listPageGoodsInfo(@ApiParam("商品查询条件QO") @RequestBody MallGoodsInfoQO param, HttpServletRequest request) {
         return ResultBody.success(mallGoodsService.listPageGoodsInfo(param, this.getUserLoginInfoFromRedis(request)));
     }
 

src/main/java/com/mmc/pms/dao/GoodsInfoDao.java

@@ -18,102 +18,102 @@ import java.util.Set;
 @Mapper
 public interface GoodsInfoDao {
 
-  int countGoodsInfoByName(GoodsAddVO goodsAddVO);
+    int countGoodsInfoByName(GoodsAddVO goodsAddVO);
 
-  void insertGoodsInfo(GoodsInfo goodsInfo);
+    void insertGoodsInfo(GoodsInfo goodsInfo);
 
-  int countGoodsInfo();
+    int countGoodsInfo();
 
-  void insertGoodsImgInfo(List<GoodsImgDO> list);
+    void insertGoodsImgInfo(List<GoodsImgDO> list);
 
-  void insertVideoInfo(GoodsVideoDO goodsVideoDO);
+    void insertVideoInfo(GoodsVideoDO goodsVideoDO);
 
-  void insertGoodsDetail(GoodsDetailDO goodsDetailDO);
+    void insertGoodsDetail(GoodsDetailDO goodsDetailDO);
 
-  void insertGoodsService(List<GoodsServiceDO> otherList);
+    void insertGoodsService(List<GoodsServiceDO> otherList);
 
-  int countGoodsInfoById(Integer id);
+    int countGoodsInfoById(Integer id);
 
-  void updateGoodsInfo(GoodsInfo goodsInfo);
+    void updateGoodsInfo(GoodsInfo goodsInfo);
 
-  void updateGoodsDetail(GoodsDetailDO goodsDetailDO);
+    void updateGoodsDetail(GoodsDetailDO goodsDetailDO);
 
-  List<GoodsImgDO> listGoodsInfoByGoodsId(Integer id);
+    List<GoodsImgDO> listGoodsInfoByGoodsId(Integer id);
 
-  void deleteImgByIds(List<Integer> deleteIds);
+    void deleteImgByIds(List<Integer> deleteIds);
 
-  void deleteGoodsVideoById(Integer id);
+    void deleteGoodsVideoById(Integer id);
 
-  void deleteGoodsServiceByGoodsId(Integer id);
+    void deleteGoodsServiceByGoodsId(Integer id);
 
-  void insertMallIndustrySkuInfo(MallIndustrySkuInfoDO mallIndustrySkuInfoDO);
+    void insertMallIndustrySkuInfo(MallIndustrySkuInfoDO mallIndustrySkuInfoDO);
 
-  void insertMallIndustrySkuInfoSpec(MallIndustrySkuInfoSpecDO mallIndustrySkuInfoSpecDO);
+    void insertMallIndustrySkuInfoSpec(MallIndustrySkuInfoSpecDO mallIndustrySkuInfoSpecDO);
 
-  List<MallProdInfoDO> getMallProSkuInfo(Integer id);
+    List<MallProdInfoDO> getMallProSkuInfo(Integer id);
 
-  void batchUpdateMallProductSku(List<Integer> delIds);
+    void batchUpdateMallProductSku(List<Integer> delIds);
 
-  void batchUpdateMallProdSkuInfo(List<MallProdInfoDO> list);
+    void batchUpdateMallProdSkuInfo(List<MallProdInfoDO> list);
 
-  List<MallIndustrySkuInfoDO> getMallIndustrySkuInfo(Integer id);
+    List<MallIndustrySkuInfoDO> getMallIndustrySkuInfo(Integer id);
 
-  GoodsInfo getGoodsSimpleInfo(Integer goodsInfoId);
+    GoodsInfo getGoodsSimpleInfo(Integer goodsInfoId);
 
-  GoodsDetailDO getGoodsDetailByGoodsId(Integer goodsInfoId);
+    GoodsDetailDO getGoodsDetailByGoodsId(Integer goodsInfoId);
 
-  List<GoodsServiceDO> listGoodsServiceByGoodsId(Integer goodsInfoId);
+    List<GoodsServiceDO> listGoodsServiceByGoodsId(Integer goodsInfoId);
 
-  List<SkuUnitDO> getSkuUnit();
+    List<SkuUnitDO> getSkuUnit();
 
-  List<GoodsInfo> listSimpleGoodsInfoByIds(@Param("ids") Set<Integer> ids);
+    List<GoodsInfo> listSimpleGoodsInfoByIds(@Param("ids") Set<Integer> ids);
 
-  void insertMallProdSkuInfoSpec(MallProdSkuInfoSpecDO mallProdSkuInfoSpecDO);
+    void insertMallProdSkuInfoSpec(MallProdSkuInfoSpecDO mallProdSkuInfoSpecDO);
 
-  void batchUpdateMallProSpec(@Param("list") List<Integer> list, @Param("id") Integer id);
+    void batchUpdateMallProSpec(@Param("list") List<Integer> list, @Param("id") Integer id);
 
-  List<MallProdSkuInfoSpecDO> listMallProdSpecInfo(List<Integer> mallSkuIds);
+    List<MallProdSkuInfoSpecDO> listMallProdSpecInfo(List<Integer> mallSkuIds);
 
-  void batchUpdateMallProdSpec(List<Integer> delSpecId);
+    void batchUpdateMallProdSpec(List<Integer> delSpecId);
 
-  List<MallGoodsSpecInfoDO> listProdSpecInfo(@Param("prodIds") Set<Integer> prodIds);
+    List<MallGoodsSpecInfoDO> listProdSpecInfo(@Param("prodIds") Set<Integer> prodIds);
 
-  List<MallGoodsSpecInfoDO> listIndstSpecInfo(@Param("indstIds") Set<Integer> indstIds);
+    List<MallGoodsSpecInfoDO> listIndstSpecInfo(@Param("indstIds") Set<Integer> indstIds);
 
-  List<GoodsServiceDO> listGoodsService(List<Integer> goodsIds);
+    List<GoodsServiceDO> listGoodsService(List<Integer> goodsIds);
 
-  List<MallGoodsInfoSimpleDO> listMallGoodsIndstSimpleInfo(
-      @Param("indstSkuSpecIds") Set<Integer> indstSkuSpecIds);
+    List<MallGoodsInfoSimpleDO> listMallGoodsIndstSimpleInfo(
+            @Param("indstSkuSpecIds") Set<Integer> indstSkuSpecIds);
 
-  List<Integer> listIndustrySpecIds(Set<Integer> mallIndstSkuSpecIds);
+    List<Integer> listIndustrySpecIds(Set<Integer> mallIndstSkuSpecIds);
 
-  List<MallGoodsProductDO> listIndustryProductList(List<Integer> industrySpecIds);
+    List<MallGoodsProductDO> listIndustryProductList(List<Integer> industrySpecIds);
 
-  List<GoodsInfo> ListGoodsInfoByCategoryId(Integer pageNo,Integer pageSize,Integer id,int type);
+    List<GoodsInfo> ListGoodsInfoByCategoryId(Integer pageNo, Integer pageSize, Integer id, int type);
 
-  List<MallProdSkuInfoSpecDO> getMallProSkuInfoSpec(Integer goodsInfoId);
+    List<MallProdSkuInfoSpecDO> getMallProSkuInfoSpec(Integer goodsInfoId);
 
-  List<MallProdSkuInfoSpecDO> listMallprodSpecById(List<Integer> goodsIds);
+    List<MallProdSkuInfoSpecDO> listMallprodSpecById(List<Integer> goodsIds);
 
-  List<SaleServiceDO> listSaleServiceInfo();
+    List<SaleServiceDO> listSaleServiceInfo();
 
-  int countListGoodsInfo(MallGoodsQO param);
+    int countListGoodsInfo(MallGoodsQO param);
 
-  List<GoodsInfo> listGoodsInfo(MallGoodsQO param);
+    List<GoodsInfo> listGoodsInfo(MallGoodsQO param);
 
-  void batchUpOrDownWare(@Param("ids") List<Integer> ids, @Param("status") Integer status);
+    void batchUpOrDownWare(@Param("ids") List<Integer> ids, @Param("status") Integer status);
 
-  void removeWareInfo(List<Integer> ids);
+    void removeWareInfo(List<Integer> ids);
 
-  List<SpecPriceVO> getPriceBySpecId(Integer productSpecId, Integer leaseTerm);
+    List<SpecPriceVO> getPriceBySpecId(Integer productSpecId, Integer leaseTerm);
 
-  int countGoodsInfoByCategoryId(Integer id);
+    int countGoodsInfoByCategoryId(Integer id);
 
-  void updateMallProdSkuInfo(MallProdInfoDO mallProdInfoDO);
+    void updateMallProdSkuInfo(MallProdInfoDO mallProdInfoDO);
 
-  List<MallProdInfoDO> getAllMallProSkuInfo(Integer goodsInfoId);
+    List<MallProdInfoDO> getAllMallProSkuInfo(Integer goodsInfoId);
 
-  int updateGoodsInfoSort(Integer id, Integer sort);
+    int updateGoodsInfoSort(Integer id, Integer sort);
 
-  int countServiceByCategoryId(Integer id);
+    int countServiceByCategoryId(Integer id);
 }

src/main/java/com/mmc/pms/dao/mall/MallGoodsDao.java

@@ -6,7 +6,7 @@ import com.mmc.pms.entity.mall.GoodsSpecValuesDO;
 import com.mmc.pms.entity.mall.MallGoodsDO;
 import com.mmc.pms.entity.mall.MallGoodsResourcesDO;
 import com.mmc.pms.model.mall.MallGoodsVO;
-import com.mmc.pms.model.sale.qo.MallGoodsQO;
+import com.mmc.pms.model.sale.qo.MallGoodsInfoQO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -52,9 +52,9 @@ public interface MallGoodsDao {
 
     List<SkuUnitDO> getSkuUnit();
 
-    int countListMallGoods(MallGoodsQO param);
+    int countListMallGoods(MallGoodsInfoQO param);
 
-    List<MallGoodsDO> listMallGoods(MallGoodsQO param);
+    List<MallGoodsDO> listMallGoods(MallGoodsInfoQO param);
 
     int updateMallGoodsSort(Integer id, Integer sort);
 

src/main/java/com/mmc/pms/model/sale/qo/MallGoodsInfoQO.java

+package com.mmc.pms.model.sale.qo;
+
+import com.mmc.pms.common.Page;
+import com.mmc.pms.model.group.Freeze;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author LW
+ * @date 2022/3/22 9:44 概要：商品列表查询QO
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MallGoodsInfoQO {
+    @ApiModelProperty(value = "商品名称", example = "商品名称")
+    private String tradeName;
+
+    @ApiModelProperty(value = "商品一级分类", example = "1")
+    private Integer categoryPrimaryId;
+
+    @ApiModelProperty(value = "用户id", hidden = true)
+    private Integer userAccountId;
+
+    @ApiModelProperty(value = "商品状态 0：下架 1：上架")
+    private Integer shelfStatus;
+
+    @ApiModelProperty(value = "页码", required = true, example = "1")
+    @NotNull(
+            message = "页码不能为空",
+            groups = {Page.class, Freeze.class})
+    @Min(value = 1, groups = Page.class)
+    private Integer pageNo;
+
+    @ApiModelProperty(value = "每页显示数", required = true, example = "10")
+    @NotNull(
+            message = "每页显示数不能为空",
+            groups = {Page.class, Freeze.class})
+    @Min(value = 1, groups = Page.class)
+    private Integer pageSize;
+
+    public void buildCurrentPage() {
+        this.pageNo = (pageNo - 1) * pageSize;
+    }
+}

src/main/java/com/mmc/pms/model/sale/qo/MallGoodsQO.java

@@ -21,16 +21,22 @@ import javax.validation.constraints.NotNull;
 @NoArgsConstructor
 public class MallGoodsQO {
     @ApiModelProperty(value = "商品名称", example = "商品名称")
-    private String tradeName;
+    private String goodsName;
 
-    @ApiModelProperty(value = "商品一级分类", example = "1")
-    private Integer categoryPrimaryId;
+    @ApiModelProperty(value = "商品类型 0:销售 1:租赁", example = "0")
+    private Integer goodsType;
 
-    @ApiModelProperty(value = "用户id", hidden = true)
-    private Integer userAccountId;
+    @ApiModelProperty(value = "开始时间", example = "2023-06-09 00:00:00")
+    private String startTime;
 
-    @ApiModelProperty(value = "商品状态 0：下架 1：上架")
-    private Integer shelfStatus;
+    @ApiModelProperty(value = "结束时间", example = "2023-06-11 23:59:59")
+    private String endTime;
+
+    @ApiModelProperty(value = "状态 0:下架（仓库中）1:上架", example = "1")
+    private Integer status;
+
+    @ApiModelProperty(value = "目录id", example = "1")
+    private Integer directoryId;
 
     @ApiModelProperty(value = "页码", required = true, example = "1")
     @NotNull(

src/main/java/com/mmc/pms/service/GoodsInfoService.java

@@ -21,31 +21,31 @@ import java.util.List;
  */
 public interface GoodsInfoService {
 
-  ResultBody addGoods(GoodsAddVO goodsAddVO, Integer userAccountId);
+    ResultBody addGoods(GoodsAddVO goodsAddVO, Integer userAccountId);
 
-  ResultBody editGoodsInfo(GoodsAddVO goodsAddVO);
+    ResultBody editGoodsInfo(GoodsAddVO goodsAddVO);
 
-  ResultBody getGoodsInfoDetail(Integer goodsInfoId, Integer type, Integer leaseTerm);
+    ResultBody getGoodsInfoDetail(Integer goodsInfoId, Integer type, Integer leaseTerm);
 
-  ResultBody getSkuUnit();
+    ResultBody getSkuUnit();
 
-  ResultBody getSaleServiceInfoToList();
+    ResultBody getSaleServiceInfoToList();
 
-  List<MallGoodsShopCarDTO> fillGoodsInfo(List<MallGoodsShopCarDTO> param);
+    List<MallGoodsShopCarDTO> fillGoodsInfo(List<MallGoodsShopCarDTO> param);
 
-  List<MallProductSpecPriceDTO> feignListProductSpecPrice(ProductSpecPriceQO productSpecPriceQO);
+    List<MallProductSpecPriceDTO> feignListProductSpecPrice(ProductSpecPriceQO productSpecPriceQO);
 
-  ProductSpecPriceDTO feignGetUnitPriceByTag(Integer specId, Integer tagId);
+    ProductSpecPriceDTO feignGetUnitPriceByTag(Integer specId, Integer tagId);
 
-  List<OrderGoodsProdDTO> feignListProdGoodsSkuInfo(MallOrderGoodsInfoQO mallOrderGoodsInfoQO);
+    List<OrderGoodsProdDTO> feignListProdGoodsSkuInfo(MallOrderGoodsInfoQO mallOrderGoodsInfoQO);
 
-  List<OrderGoodsIndstDTO> feignListIndstGoodsSkuInfo(MallOrderGoodsInfoQO mallOrderGoodsInfoQO);
+    List<OrderGoodsIndstDTO> feignListIndstGoodsSkuInfo(MallOrderGoodsInfoQO mallOrderGoodsInfoQO);
 
-  PageResult listPageGoodsInfo(MallGoodsQO param);
+    PageResult listPageGoodsInfo(MallGoodsQO param);
 
-  ResultBody batchOnShelfOrTakeDown(List<Integer> goodsIds, Integer status);
+    ResultBody batchOnShelfOrTakeDown(List<Integer> goodsIds, Integer status);
 
-  ResultBody batchRemoveWareInfo(List<Integer> ids);
+    ResultBody batchRemoveWareInfo(List<Integer> ids);
 
-  ResultBody exchangeGoodsInfo(Integer firstId, Integer secondId);
+    ResultBody exchangeGoodsInfo(Integer firstId, Integer secondId);
 }

src/main/java/com/mmc/pms/service/mall/MallGoodsService.java

@@ -3,7 +3,7 @@ package com.mmc.pms.service.mall;
 import com.mmc.pms.auth.dto.LoginSuccessDTO;
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.model.mall.MallGoodsVO;
-import com.mmc.pms.model.sale.qo.MallGoodsQO;
+import com.mmc.pms.model.sale.qo.MallGoodsInfoQO;
 import com.mmc.pms.page.PageResult;
 
 /**
@@ -19,7 +19,7 @@ public interface MallGoodsService {
 
     ResultBody getSkuUnit();
 
-    PageResult listPageGoodsInfo(MallGoodsQO param, LoginSuccessDTO loginSuccessDTO);
+    PageResult listPageGoodsInfo(MallGoodsInfoQO param, LoginSuccessDTO loginSuccessDTO);
 
     ResultBody exchange(Integer firstId, Integer secondId);
 

src/main/java/com/mmc/pms/service/mall/impl/MallGoodsServiceImpl.java

@@ -14,7 +14,7 @@ import com.mmc.pms.model.mall.GoodsSpecVO;
 import com.mmc.pms.model.mall.GoodsSpecValuesVO;
 import com.mmc.pms.model.mall.MallGoodsVO;
 import com.mmc.pms.model.sale.dto.SkuUnitDTO;
-import com.mmc.pms.model.sale.qo.MallGoodsQO;
+import com.mmc.pms.model.sale.qo.MallGoodsInfoQO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.mall.MallGoodsService;
 import com.mmc.pms.util.CodeUtil;
@@ -198,7 +198,7 @@ public class MallGoodsServiceImpl implements MallGoodsService {
 
 
     @Override
-    public PageResult listPageGoodsInfo(MallGoodsQO param, LoginSuccessDTO loginSuccessDTO) {
+    public PageResult listPageGoodsInfo(MallGoodsInfoQO param, LoginSuccessDTO loginSuccessDTO) {
         if (loginSuccessDTO.getRoleInfo().getSuperAdmin().equals(1)) {
             // 超级管理员获取所有商品信息
             return getMallGoodsInfo(param);
@@ -209,7 +209,7 @@ public class MallGoodsServiceImpl implements MallGoodsService {
         }
     }
 
-    private PageResult getMallGoodsInfo(MallGoodsQO param) {
+    private PageResult getMallGoodsInfo(MallGoodsInfoQO param) {
         int count;
         List<MallGoodsDO> mallGoodsList;
         count = mallGoodsDao.countListMallGoods(param);