新增:租赁设备详情及其他服务接口

src/main/java/com/mmc/pms/controller/BackstageGoodsManageController.java

@@ -13,85 +13,95 @@ import com.mmc.pms.service.GoodsInfoService;
 import io.swagger.annotations.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.List;
 
 /**
  * @Author LW
- * @date 2023/3/14 13:22
- * 概要：
+ *
+ * @date 2023/3/14 13:22 概要：
  */
 @RestController
 @RequestMapping("/goods")
 @Api(tags = {"后台-商品管理-相关接口"})
 public class BackstageGoodsManageController {
-    @Resource
-    private GoodsInfoService goodsInfoService;
+  @Resource private GoodsInfoService goodsInfoService;
 
-    @ApiOperation(value = "新增(租赁/销售)商品")
-    @PostMapping("addGoodsInfo")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-    public ResultBody addGoods(@ApiParam("商品信息VO") @Validated(Create.class) @RequestBody GoodsAddVO goodsAddVO) {
-        return goodsInfoService.addGoods(goodsAddVO);
-    }
+  @ApiOperation(value = "新增(租赁/销售)商品")
+  @PostMapping("addGoodsInfo")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+  public ResultBody addGoods(
+      @ApiParam("商品信息VO") @Validated(Create.class) @RequestBody GoodsAddVO goodsAddVO) {
+    return goodsInfoService.addGoods(goodsAddVO);
+  }
 
-    @ApiOperation(value = "修改(租赁/销售)商品")
-    @PostMapping("editGoodsInfo")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-    public ResultBody editGoodsInfo(@ApiParam("商品信息VO") @Validated(Update.class) @RequestBody GoodsAddVO goodsAddVO) {
-        return goodsInfoService.editGoodsInfo(goodsAddVO);
-    }
+  @ApiOperation(value = "修改(租赁/销售)商品")
+  @PostMapping("editGoodsInfo")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+  public ResultBody editGoodsInfo(
+      @ApiParam("商品信息VO") @Validated(Update.class) @RequestBody GoodsAddVO goodsAddVO) {
+    return goodsInfoService.editGoodsInfo(goodsAddVO);
+  }
 
-    @ApiOperation(value = "PC端-商品详情")
-    @GetMapping("getGoodsInfoDetail")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = MallGoodsDetailDTO.class)})
-    public ResultBody getGoodsInfoDetail(@ApiParam("商品id") @RequestParam Integer goodsInfoId) {
-        return goodsInfoService.getGoodsInfoDetail(goodsInfoId);
-    }
+  @ApiOperation(value = "PC端-商品详情")
+  @GetMapping("getGoodsInfoDetail")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = MallGoodsDetailDTO.class)})
+  public ResultBody getGoodsInfoDetail(@ApiParam("商品id") @RequestParam Integer goodsInfoId) {
+    return goodsInfoService.getGoodsInfoDetail(goodsInfoId);
+  }
 
-    @ApiOperation(value = "单位信息")
-    @GetMapping("getSkuUnit")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = SkuUnitDTO.class)})
-    public ResultBody getSkuUnit() {
-        return goodsInfoService.getSkuUnit();
-    }
+  @ApiOperation(value = "单位信息")
+  @GetMapping("getSkuUnit")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = SkuUnitDTO.class)})
+  public ResultBody getSkuUnit() {
+    return goodsInfoService.getSkuUnit();
+  }
 
-    @ApiOperation(value = "feign根据购物车信息填充未知信息", hidden = true)
-    @PostMapping("fillGoodsInfo")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = MallGoodsShopCarDTO.class)})
-    public List<MallGoodsShopCarDTO> fillGoodsInfo(@RequestBody List<MallGoodsShopCarDTO> param) {
-        return goodsInfoService.fillGoodsInfo(param);
-    }
+  @ApiOperation(value = "PC端-其他服务-列表")
+  @GetMapping("listOtherService")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = SaleServiceDTO.class)})
+  public ResultBody listOtherService() {
+    return goodsInfoService.getSaleServiceInfoToList();
+  }
 
-    @ApiOperation(value = "feign根据渠道等级和产品规格id获取对应价格", hidden = true)
-    @PostMapping("feignListProductSpecPrice")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-    public List<MallProductSpecPriceDTO> feignListProductSpecPrice(@RequestBody ProductSpecPriceQO productSpecPriceQO) {
-        return goodsInfoService.feignListProductSpecPrice(productSpecPriceQO);
-    }
+  @ApiOperation(value = "feign根据购物车信息填充未知信息", hidden = true)
+  @PostMapping("fillGoodsInfo")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = MallGoodsShopCarDTO.class)})
+  public List<MallGoodsShopCarDTO> fillGoodsInfo(@RequestBody List<MallGoodsShopCarDTO> param) {
+    return goodsInfoService.fillGoodsInfo(param);
+  }
 
-    @ApiOperation(value = "feign根据渠道等级获取单价信息", hidden = true)
-    @GetMapping("feignGetUnitPriceByTag")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ProductSpecPriceDTO.class)})
-    public ProductSpecPriceDTO feignGetUnitPriceByTag(@RequestParam(value = "specId") Integer specId,
-                                                      @RequestParam(value = "tagId") Integer tagId) {
-        return goodsInfoService.feignGetUnitPriceByTag(specId, tagId);
-    }
+  @ApiOperation(value = "feign根据渠道等级和产品规格id获取对应价格", hidden = true)
+  @PostMapping("feignListProductSpecPrice")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+  public List<MallProductSpecPriceDTO> feignListProductSpecPrice(
+      @RequestBody ProductSpecPriceQO productSpecPriceQO) {
+    return goodsInfoService.feignListProductSpecPrice(productSpecPriceQO);
+  }
 
-    @ApiOperation(value = "feign根据商品的产品规格id查询商品信息", hidden = true)
-    @PostMapping("feignListProdGoodsSkuInfo")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderGoodsProdDTO.class)})
-    public List<OrderGoodsProdDTO> feignListProdGoodsSkuInfo(@RequestBody MallOrderGoodsInfoQO mallOrderGoodsInfoQO) {
-        return goodsInfoService.feignListProdGoodsSkuInfo(mallOrderGoodsInfoQO);
-    }
+  @ApiOperation(value = "feign根据渠道等级获取单价信息", hidden = true)
+  @GetMapping("feignGetUnitPriceByTag")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ProductSpecPriceDTO.class)})
+  public ProductSpecPriceDTO feignGetUnitPriceByTag(
+      @RequestParam(value = "specId") Integer specId,
+      @RequestParam(value = "tagId") Integer tagId) {
+    return goodsInfoService.feignGetUnitPriceByTag(specId, tagId);
+  }
 
-    @ApiOperation(value = "feign根据商品的行业规格id查询商品清单信息", hidden = true)
-    @PostMapping("feignListIndstGoodsSkuInfo")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderGoodsProdDTO.class)})
-    public List<OrderGoodsIndstDTO> feignListIndstGoodsSkuInfo(@RequestBody MallOrderGoodsInfoQO mallOrderGoodsInfoQO) {
-        return goodsInfoService.feignListIndstGoodsSkuInfo(mallOrderGoodsInfoQO);
-    }
+  @ApiOperation(value = "feign根据商品的产品规格id查询商品信息", hidden = true)
+  @PostMapping("feignListProdGoodsSkuInfo")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderGoodsProdDTO.class)})
+  public List<OrderGoodsProdDTO> feignListProdGoodsSkuInfo(
+      @RequestBody MallOrderGoodsInfoQO mallOrderGoodsInfoQO) {
+    return goodsInfoService.feignListProdGoodsSkuInfo(mallOrderGoodsInfoQO);
+  }
 
+  @ApiOperation(value = "feign根据商品的行业规格id查询商品清单信息", hidden = true)
+  @PostMapping("feignListIndstGoodsSkuInfo")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderGoodsProdDTO.class)})
+  public List<OrderGoodsIndstDTO> feignListIndstGoodsSkuInfo(
+      @RequestBody MallOrderGoodsInfoQO mallOrderGoodsInfoQO) {
+    return goodsInfoService.feignListIndstGoodsSkuInfo(mallOrderGoodsInfoQO);
+  }
 }

src/main/java/com/mmc/pms/controller/common/LeaseGoodsController.java

@@ -6,6 +6,7 @@ import com.mmc.pms.constant.TokenConstant;
 import com.mmc.pms.controller.BaseController;
 import com.mmc.pms.model.lease.dto.LeaseGoodsInfoDTO;
 import com.mmc.pms.model.qo.WareInfoQO;
+import com.mmc.pms.model.sale.dto.MallGoodsDetailDTO;
 import com.mmc.pms.service.WebDeviceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,10 +14,7 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -42,4 +40,15 @@ public class LeaseGoodsController extends BaseController {
     return webDeviceService.listWareInfoPage(
         param, request, this.getUserLoginInfoFromRedis(request).getUserAccountId());
   }
+
+  @ApiOperation(value = "设备设备详情")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = MallGoodsDetailDTO.class)})
+  @GetMapping("/getLeaseGoodsDetail")
+  public ResultBody listLeaseGoodsDetail(Integer goodsId, HttpServletRequest request) {
+    if (request.getHeader(TokenConstant.TOKEN) == null) {
+      return webDeviceService.listLeaseGoodsDetail(goodsId, null, null);
+    }
+    return webDeviceService.listLeaseGoodsDetail(
+        goodsId, this.getUserLoginInfoFromRedis(request).getUserAccountId(), request);
+  }
 }

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

@@ -11,91 +11,89 @@ import java.util.Set;
 /**
  * @author 23214
  * @description 针对表【goods_info(商品基本信息)】的数据库操作Mapper
- * @createDate 2023-05-27 14:08:45
- * @Entity com.mmc.pms.entity.GoodsInfo
+ * @createDate 2023-05-27 14:08:45 @Entity com.mmc.pms.entity.GoodsInfo
  */
 @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> mallProdSkuInfoList);
+  void batchUpdateMallProdSkuInfo(List<MallProdInfoDO> mallProdSkuInfoList);
 
-    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 insertMallProdSkuInfo(MallProdInfoDO mallProdSkuInfoDO);
+  void insertMallProdSkuInfo(MallProdInfoDO mallProdSkuInfoDO);
 
-    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<GoodsInfo> ListGoodsInfoByCategoryId(Integer id);
-
-    List<MallProdSkuInfoSpecDO> getMallProSkuInfoSpec(Integer goodsInfoId);
-
-    List<MallProdSkuInfoSpecDO> listMallprodSpecById(List<Integer> goodsIds);
-}
+  List<MallGoodsProductDO> listIndustryProductList(List<Integer> industrySpecIds);
 
+  List<GoodsInfo> ListGoodsInfoByCategoryId(Integer id);
 
+  List<MallProdSkuInfoSpecDO> getMallProSkuInfoSpec(Integer goodsInfoId);
 
+  List<MallProdSkuInfoSpecDO> listMallprodSpecById(List<Integer> goodsIds);
 
+  List<SaleServiceDO> listSaleServiceInfo();
+}

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

@@ -116,4 +116,6 @@ public interface ProductDao {
   List<MallProdSkuInfoSpecDO> listMallProductSpec(Integer id);
 
   List<ProductSpecPriceDO> getProductSpecPriceList(List<Integer> specIds);
+
+  ProductSpecPriceDO getProductSpecPriceById(Integer id);
 }

src/main/java/com/mmc/pms/entity/MallProdInfoDO.java

@@ -18,56 +18,51 @@ import java.util.Date;
 @AllArgsConstructor
 @Accessors(chain = true)
 public class MallProdInfoDO implements Serializable {
-    private static final long serialVersionUID = 3667714765929443857L;
-    private Integer id;
-    private Integer goodsInfoId;
-    private Integer prodSkuId;
-    private String prodSkuSpecName;
-    private Integer categoriesId;
-    private Integer chooseType;
-    private Integer must;
-    private Integer skuUnitId;
-    private Integer deleted;
-    private Date createTime;
-    private Date updateTime;
-    private Integer flag;
-    private String productSpecIdList;
-    private String beforeUpdateSpec;
-    /**
-     * 辅助字段 start
-     */
-    private String typeName;
-    private String goodsName;
-    private String unitName;
-    private String productSkuName;
-    private Integer brandInfoId;
+  private static final long serialVersionUID = 3667714765929443857L;
+  private Integer id;
+  private Integer goodsInfoId;
+  private Integer prodSkuId;
+  private String prodSkuSpecName;
+  private Integer categoriesId;
+  private Integer chooseType;
+  private Integer must;
+  private Integer skuUnitId;
+  private Integer deleted;
+  private Date createTime;
+  private Date updateTime;
+  private Integer flag;
+  /** 辅助字段 start */
+  private String typeName;
 
-    /**
-     * 辅助字段 end
-     */
-    public MallProdInfoDO(GoodsProdSpecVO goodsSpecVO) {
-        this.categoriesId = goodsSpecVO.getCategoryId();
-        this.prodSkuSpecName = goodsSpecVO.getGoodsSpecName();
-        this.chooseType = goodsSpecVO.getChooseType();
-        this.skuUnitId = goodsSpecVO.getSkuUnitId();
-        this.must = goodsSpecVO.getMust();
-        this.flag = goodsSpecVO.getFlag();
-    }
+  private String goodsName;
+  private String unitName;
+  private String productSkuName;
+  private Integer brandInfoId;
 
-    public GoodsSpecDTO buildGoodsSpecDTO() {
-        return GoodsSpecDTO.builder()
-                .id(this.id)
-                .goodsSpecName(this.prodSkuSpecName)
-                .categoryId(this.categoriesId)
-                .chooseType(this.chooseType)
-                .skuUnitId(skuUnitId)
-                .unitName(this.unitName)
-                .skuId(this.prodSkuId)
-                .typeName(this.typeName)
-                .must(must)
-                .skuName(this.productSkuName)
-                .brandInfoId(brandInfoId)
-                .flag(flag)
-                .build();
-    }
+  /** 辅助字段 end */
+  public MallProdInfoDO(GoodsProdSpecVO goodsSpecVO) {
+    this.categoriesId = goodsSpecVO.getCategoryId();
+    this.prodSkuSpecName = goodsSpecVO.getGoodsSpecName();
+    this.chooseType = goodsSpecVO.getChooseType();
+    this.skuUnitId = goodsSpecVO.getSkuUnitId();
+    this.must = goodsSpecVO.getMust();
+    this.flag = goodsSpecVO.getFlag();
+  }
+
+  public GoodsSpecDTO buildGoodsSpecDTO() {
+    return GoodsSpecDTO.builder()
+        .id(this.id)
+        .goodsSpecName(this.prodSkuSpecName)
+        .categoryId(this.categoriesId)
+        .chooseType(this.chooseType)
+        .skuUnitId(skuUnitId)
+        .unitName(this.unitName)
+        .skuId(this.prodSkuId)
+        .typeName(this.typeName)
+        .must(must)
+        .skuName(this.productSkuName)
+        .brandInfoId(brandInfoId)
+        .flag(flag)
+        .build();
+  }
 }

src/main/java/com/mmc/pms/entity/SaleServiceDO.java

+package com.mmc.pms.entity;
+
+import com.mmc.pms.model.sale.dto.SaleServiceDTO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author LW
+ *
+ * @date 2022/3/28 10:24 概要：
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class SaleServiceDO implements Serializable {
+  private Integer id;
+  private String serviceName;
+  private String remark;
+  private Integer deleted;
+  private Date updateTime;
+  private Date createTime;
+
+  public SaleServiceDTO buildSaleServiceDTO() {
+    return SaleServiceDTO.builder().id(this.id).saleServiceName(this.serviceName).build();
+  }
+}

src/main/java/com/mmc/pms/model/lease/dto/LeaseGoodsDetailDTO.java

-package com.mmc.pms.model.lease.dto;
-
-import com.mmc.pms.model.sale.dto.GoodsDetailInfoDTO;
-import com.mmc.pms.model.sale.dto.GoodsImgDTO;
-import com.mmc.pms.model.sale.dto.GoodsOtherServiceDTO;
-import com.mmc.pms.model.sale.dto.GoodsSpecDTO;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Author LW
- *
- * @date 2022/11/8 15:57 概要：
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Accessors(chain = true)
-public class LeaseGoodsDetailDTO implements Serializable {
-  @ApiModelProperty(value = "id")
-  private Integer id;
-
-  @ApiModelProperty(value = "pid")
-  private Integer pid;
-
-  @ApiModelProperty(value = "商品名称")
-  private String goodsName;
-
-  @ApiModelProperty(value = "云享飞服务id")
-  private Integer shareFlyServiceId;
-
-  @ApiModelProperty(value = "云仓配件id")
-  private Integer repoId;
-
-  @ApiModelProperty(value = "规格信息")
-  private List<GoodsSpecDTO> goodsSpec;
-
-  @ApiModelProperty(value = "商品图片")
-  private List<GoodsImgDTO> images;
-
-  @ApiModelProperty(value = "商品视频")
-  private String goodsVideo;
-
-  @ApiModelProperty(value = "商品视频id")
-  private Integer goodsVideoId;
-
-  @ApiModelProperty(value = "商品详情")
-  private GoodsDetailInfoDTO goodsDetail;
-
-  @ApiModelProperty(value = "所属目录")
-  private Integer sortTypeId;
-
-  @ApiModelProperty(value = "一级分类id")
-  private Integer categoryByOne;
-
-  @ApiModelProperty(value = "二级分类id")
-  private Integer categoryByTwo;
-
-  @ApiModelProperty(value = "商品标签")
-  private String tag;
-
-  @ApiModelProperty(value = "其他服务: 1:免费配送，2：专业飞手培训2日， 3：半年保修， 4：一年保修 ")
-  private List<GoodsOtherServiceDTO> otherService;
-}

src/main/java/com/mmc/pms/model/sale/dto/MallGoodsDetailDTO.java

@@ -7,43 +7,60 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
  * @Author LW
- * @date 2022/10/14 11:30
- * 概要：
+ *
+ * @date 2022/10/14 11:30 概要：
  */
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
 public class MallGoodsDetailDTO implements Serializable {
-    private static final long serialVersionUID = 7041502536618388167L;
-    @ApiModelProperty(value = "id")
-    private Integer id;
-    @ApiModelProperty(value = "商品图片")
-    private List<GoodsImgDTO> images;
-    @ApiModelProperty(value = "商品视频")
-    private String goodsVideo;
-    @ApiModelProperty(value = "商品视频id")
-    private Integer goodsVideoId;
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-    @ApiModelProperty(value = "商品详情")
-    private GoodsDetailInfoDTO goodsDetail;
-    @ApiModelProperty(value = "所属目录")
-    private Integer directoryId;
-    @ApiModelProperty(value = "一级分类id")
-    private Integer categoryByOne;
-    @ApiModelProperty(value = "二级分类id")
-    private Integer categoryByTwo;
-    @ApiModelProperty(value = "商品标签")
-    private String tag;
-    @ApiModelProperty(value = "商品状态 0:下架 1:上架")
-    private Integer shelfStatus;
-    @ApiModelProperty(value = "规格信息")
-    private List<GoodsSpecDTO> goodsSpec;
-    @ApiModelProperty(value = "其他服务: 1:免费配送，2：专业飞手培训2日， 3：半年保修， 4：一年保修 ")
-    private List<GoodsOtherServiceDTO> otherService;
+  private static final long serialVersionUID = 7041502536618388167L;
+
+  @ApiModelProperty(value = "id")
+  private Integer id;
+
+  @ApiModelProperty(value = "商品图片")
+  private List<GoodsImgDTO> images;
+
+  @ApiModelProperty(value = "商品视频")
+  private String goodsVideo;
+
+  @ApiModelProperty(value = "商品视频id")
+  private Integer goodsVideoId;
+
+  @ApiModelProperty(value = "商品名称")
+  private String goodsName;
+
+  @ApiModelProperty(value = "商品详情")
+  private GoodsDetailInfoDTO goodsDetail;
+
+  @ApiModelProperty(value = "所属目录")
+  private Integer directoryId;
+
+  @ApiModelProperty(value = "一级分类id")
+  private Integer categoryByOne;
+
+  @ApiModelProperty(value = "二级分类id")
+  private Integer categoryByTwo;
+
+  @ApiModelProperty(value = "商品标签")
+  private String tag;
+
+  @ApiModelProperty(value = "商品状态 0:下架 1:上架")
+  private Integer shelfStatus;
+
+  @ApiModelProperty(value = "规格信息")
+  private List<GoodsSpecDTO> goodsSpec;
+
+  @ApiModelProperty(value = "其他服务: 1:免费配送，2：专业飞手培训2日， 3：半年保修， 4：一年保修 ")
+  private List<GoodsOtherServiceDTO> otherService;
+
+  @ApiModelProperty(value = "price(用于租赁商品)")
+  private BigDecimal price;
 }

src/main/java/com/mmc/pms/model/sale/dto/SaleServiceDTO.java

+package com.mmc.pms.model.sale.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author LW
+ * @date 2022/3/28 10:48
+ * 概要：
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "com.mmc.csf.mall.dto.SaleServiceDTO", description = "其他服务信息DTO")
+public class SaleServiceDTO {
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @ApiModelProperty(value = "其他服务名称")
+    private String saleServiceName;
+}

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

 package com.mmc.pms.service;
 
 import com.mmc.pms.common.ResultBody;
-import com.mmc.pms.model.sale.dto.ProductSpecPriceDTO;
 import com.mmc.pms.model.order.dto.OrderGoodsIndstDTO;
 import com.mmc.pms.model.order.dto.OrderGoodsProdDTO;
 import com.mmc.pms.model.qo.MallOrderGoodsInfoQO;
 import com.mmc.pms.model.qo.ProductSpecPriceQO;
 import com.mmc.pms.model.sale.dto.MallGoodsShopCarDTO;
 import com.mmc.pms.model.sale.dto.MallProductSpecPriceDTO;
+import com.mmc.pms.model.sale.dto.ProductSpecPriceDTO;
 import com.mmc.pms.model.sale.vo.GoodsAddVO;
 
 import java.util.List;
@@ -19,21 +19,23 @@ import java.util.List;
  */
 public interface GoodsInfoService {
 
-    ResultBody addGoods(GoodsAddVO goodsAddVO);
+  ResultBody addGoods(GoodsAddVO goodsAddVO);
+
+  ResultBody editGoodsInfo(GoodsAddVO goodsAddVO);
 
-    ResultBody editGoodsInfo(GoodsAddVO goodsAddVO);
+  ResultBody getGoodsInfoDetail(Integer goodsInfoId);
 
-    ResultBody getGoodsInfoDetail(Integer goodsInfoId);
+  ResultBody getSkuUnit();
 
-    ResultBody getSkuUnit();
+  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);
 }

src/main/java/com/mmc/pms/service/Impl/WebDeviceServiceImpl.java

@@ -15,6 +15,7 @@ import com.mmc.pms.model.other.dto.AdDTO;
 import com.mmc.pms.model.other.dto.DistrictInfoDTO;
 import com.mmc.pms.model.other.dto.ModelDTO;
 import com.mmc.pms.model.qo.WareInfoQO;
+import com.mmc.pms.model.sale.dto.MallGoodsDetailDTO;
 import com.mmc.pms.model.sale.dto.SkuInfoDTO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.WebDeviceService;
@@ -40,6 +41,7 @@ public class WebDeviceServiceImpl implements WebDeviceService {
   @Autowired ProductDao productDao;
 
   @Autowired GoodsInfoDao goodsInfoDao;
+  @Autowired GoodsInfoServiceImpl goodsInfoService;
 
   @Override
   public ResultBody listSecondDistrict() {
@@ -214,6 +216,30 @@ public class WebDeviceServiceImpl implements WebDeviceService {
   }
 
   @Override
+  public ResultBody listLeaseGoodsDetail(
+      Integer goodsInfoId, Integer userAccountId, HttpServletRequest request) {
+    int count = goodsInfoDao.countGoodsInfoById(goodsInfoId);
+    if (count <= 0) {
+      return ResultBody.error(ResultEnum.GOODS_NOT_EXIST_OR_ALREADY_DOWN_SHELF);
+    }
+    // 初始化商品返回信息的对象
+    ResultBody goodsInfoDetail = goodsInfoService.getGoodsInfoDetail(goodsInfoId);
+    MallGoodsDetailDTO result = (MallGoodsDetailDTO) goodsInfoDetail.getResult();
+    if (userAccountId != null) {
+      UserAccountSimpleDTO userAccountSimpleDTO =
+          userAppApi.feignGetUserSimpleInfo(userAccountId, request.getHeader(TokenConstant.TOKEN));
+      if (userAccountSimpleDTO.getCooperationTagId() != null) {
+        if (!result.getDirectoryId().equals(2)) {
+          Integer id = result.getGoodsSpec().get(0).getProductSpecList().get(0).getProductSpec();
+          ProductSpecPriceDO price = productDao.getProductSpecPriceById(id);
+          result.setPrice(price.getPrice());
+        }
+      }
+    }
+    return ResultBody.success(result);
+  }
+
+  @Override
   public WareInfoDTO getWareInfoById(Integer id) {
     WareInfoDO wareInfoDO = webDeviceDao.getWareInfoById(id);
     WareDetailDO wareDetailDO = webDeviceDao.getWareDetailById(id);

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

@@ -14,29 +14,32 @@ import java.util.List;
  * @Author small @Date 2023/5/15 14:28 @Version 1.0
  */
 public interface WebDeviceService {
-    ResultBody listSecondDistrict();
+  ResultBody listSecondDistrict();
 
-    ResultBody category();
+  ResultBody category();
 
-    ResultBody brand();
+  ResultBody brand();
 
-    ResultBody deviceBrand();
+  ResultBody deviceBrand();
 
-    ResultBody model();
+  ResultBody model();
 
-    ResultBody deviceModel();
+  ResultBody deviceModel();
 
-    ResultBody deviceList(Integer districtId, Integer categoryId, Integer brandId, Integer modelId);
+  ResultBody deviceList(Integer districtId, Integer categoryId, Integer brandId, Integer modelId);
 
-    ResultBody update(LeaseVo param);
+  ResultBody update(LeaseVo param);
 
-    ResultBody detail(Integer id);
+  ResultBody detail(Integer id);
 
-    ResultBody listWareInfoPage(WareInfoQO param, HttpServletRequest request, Integer userAccountId);
+  ResultBody listWareInfoPage(WareInfoQO param, HttpServletRequest request, Integer userAccountId);
 
-    WareInfoDTO getWareInfoById(Integer id);
+  WareInfoDTO getWareInfoById(Integer id);
 
-    ResultBody<AdDTO> ad();
+  ResultBody<AdDTO> ad();
 
-    List<SkuInfoDTO> listWareSkuById(Integer id);
+  List<SkuInfoDTO> listWareSkuById(Integer id);
+
+  ResultBody listLeaseGoodsDetail(
+      Integer goodsId, Integer userAccountId, HttpServletRequest request);
 }

src/main/resources/mapper/GoodsInfoDao.xml

@@ -65,10 +65,10 @@
     </insert>
     <insert id="insertMallProdSkuInfo" parameterType="com.mmc.pms.entity.MallProdInfoDO" useGeneratedKeys="true"
             keyProperty="id">
-        insert into mall_prod_sku_info (goods_info_id, product_id, prod_sku_spec_name, categories_id, choose_type,
-                                        sku_unit_id, is_must, flag)
+        insert into mall_prod_info (goods_info_id, product_id, prod_spec_name, categories_id, choose_type,
+                                    sku_unit_id, is_must, flag)
         values (#{goodsInfoId}, #{prodSkuId}, #{prodSkuSpecName}, #{categoriesId}, #{chooseType}, #{skuUnitId}, #{must},
-                #{flag}) >
+                #{flag})
     </insert>
     <insert id="insertMallProdSkuInfoSpec">
         insert into mall_prod_info_spec (goods_info_id, mall_prod_info_id, product_spec_id)
@@ -179,24 +179,22 @@
     <select id="getMallProSkuInfo" resultType="com.mmc.pms.entity.MallProdInfoDO">
         SELECT mi.id,
                mi.goods_info_id,
-               mi.prod_sku_id,
-               mi.prod_spec_name,
-               mi.categories_id,
-               mi.choose_type,
-               mi.sku_unit_id,
-               mi.is_must,
-               mi.product_spec_id_list,
-               mi.before_update_spec,
-               mi.flag,
-               mi.create_time  createTime,
-               c.type_name     typeName,
-               su.id           skuUnitId,
-               su.unit_name    unitName,
-               ps.product_name productSkuName
+               mi.product_id     prodSkuId,
+               mi.prod_spec_name prodSkuSpecName,
+               mi.categories_id  categoriesId,
+               mi.choose_type    chooseType,
+               mi.sku_unit_id    skuUnitId,
+               mi.is_must        must,
+               mi.flag           flag,
+               mi.create_time    createTime,
+               c.name            typeName,
+               su.id             skuUnitId,
+               su.unit_name      unitName,
+               ps.product_name   productSkuName
         FROM mall_prod_info mi
                  INNER JOIN categories c ON c.id = mi.categories_id
                  INNER JOIN sku_unit su ON mi.sku_unit_id = su.id
-                 INNER JOIN product ps ON ps.id = mi.prod_sku_id
+                 INNER JOIN product ps ON ps.id = mi.product_id
         WHERE mi.goods_info_id = #{id}
           AND mi.is_deleted = 0
     </select>
@@ -440,7 +438,19 @@
             AND im.img_type = 0
         WHERE gi.category_by_one = #{id}
     </select>
-    <select id="getMallProSkuInfoSpec" resultType="com.mmc.pms.entity.MallProdSkuInfoSpecDO">
+    <resultMap id="resultMallProdSkuInfoSpecMap" type="com.mmc.pms.entity.MallProdSkuInfoSpecDO">
+        <id property="id" column="id"/>
+        <result property="mallProdSkuInfoId" column="mall_prod_info_id"/>
+        <result property="productSpecId" column="product_spec_id"/>
+        <association property="productSpecDO" resultMap="resultProductSpecMap"/>
+    </resultMap>
+    <resultMap id="resultProductSpecMap" type="com.mmc.pms.entity.ProductSpecDO">
+        <result property="specImage" column="spec_image"/>
+        <result property="partNo" column="part_no"/>
+        <result property="specName" column="spec_name"/>
+        <result property="versionDesc" column="version_desc"/>
+    </resultMap>
+    <select id="getMallProSkuInfoSpec" resultMap="resultMallProdSkuInfoSpecMap">
         SELECT mp.id,
                mp.mall_prod_info_id,
                mp.product_spec_id,
@@ -464,6 +474,7 @@
         LEFT JOIN product_spec_price psp ON mp.product_spec_id = psp.product_spec_id
         AND psp.cooperation_tag = 0
         AND psp.type = 0
+        and psp.lease_term = 0
         <where>
             mp.is_deleted = 0
             <foreach collection="list" separator="," open=" and mp.goods_info_id in (" close=")" index="index" item="d">
@@ -471,4 +482,9 @@
             </foreach>
         </where>
     </select>
+    <select id="listSaleServiceInfo" resultType="com.mmc.pms.entity.SaleServiceDO">
+        SELECT id, service_name
+        FROM sale_service
+        WHERE is_deleted = 0
+    </select>
 </mapper>

src/main/resources/mapper/ProductDao.xml

@@ -180,7 +180,7 @@
         from product_spec
         <where>
             is_deleted = 0
-            and product_sku_id = #{id}
+            and product_id = #{id}
             <if test="keyword != null and keyword != ''">
                 and spec_name like CONCAT('%',#{keyword},'%')
             </if>
@@ -502,4 +502,14 @@
             #{d}
         </foreach>)
     </select>
+    <select id="getProductSpecPriceById" resultType="com.mmc.pms.entity.ProductSpecPriceDO">
+        SELECT product_spec_id,
+               cooperation_tag,
+               price
+        FROM product_spec_price
+        WHERE product_spec_id = #{id}
+          AND cooperation_tag = 0
+          AND type = 1
+          and lease_term = 0
+    </select>
 </mapper>

src/main/resources/mapper/WebDeviceDao.xml

@@ -157,7 +157,7 @@
         FROM goods_info gi
         INNER JOIN goods_img img ON gi.id = img.goods_info_id
         <where>
-            gi.is_deleted = 0 and gi.shelf_status = 0
+            gi.is_deleted = 0 and gi.shelf_status = 0 and gi.goods_type = 1
             <if test="categoryIds != null and categoryIds.size != 0">
                 <foreach collection="categoryIds" item="item" index="index" open="and gi.category_by_one IN (" close=")"
                          separator=",">
@@ -180,7 +180,7 @@
         goods_info gi
         INNER JOIN goods_img img ON gi.id = img.goods_info_id and img.img_type = 0
         <where>
-            gi.is_deleted = 0 and gi.shelf_status = 0
+            gi.is_deleted = 0 and gi.shelf_status = 0 and gi.goods_type = 1
             <if test="categoryIds != null">
                 <foreach collection="categoryIds" item="item" index="index" open="and gi.category_by_one IN (" close=")"
                          separator=",">

src/main/resources/not-check.yml

@@ -9,3 +9,4 @@ data-filter:
     - /pms/product/spec/feignGetSpecLeaseUnitPrice
     - /pms//lease/goods/deviceList
     - /pms/classify/queryCategoryInfoByType
+    - /pms/lease/goods/getLeaseGoodsDetail