编辑修复

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

@@ -48,8 +48,12 @@ public class BackstageGoodsManageController {
   @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);
+  public ResultBody getGoodsInfoDetail(
+      @ApiParam("商品id") @RequestParam Integer goodsInfoId,
+      @RequestParam Integer type,
+      @RequestParam(required = false) @ApiParam("租赁时限：（输入0：1-7天、输入1：8-15天、输入2：16-30天、输入3：30天以上）")
+          Integer leaseTerm) {
+    return goodsInfoService.getGoodsInfoDetail(goodsInfoId, type, leaseTerm);
   }
 
   @ApiOperation(value = "商品列表-分页")

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

@@ -43,12 +43,12 @@ public class ProductMallController extends BaseController {
   @ApiOperation(value = "设备设备详情")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = MallGoodsDetailDTO.class)})
   @GetMapping("/getLeaseGoodsDetail")
-  public ResultBody<MallGoodsDetailDTO> listLeaseGoodsDetail(
+  public ResultBody<MallGoodsDetailDTO> getLeaseGoodsDetail(
       Integer goodsId, HttpServletRequest request) {
     if (request.getHeader(TokenConstant.TOKEN) == null) {
-      return webDeviceService.listLeaseGoodsDetail(goodsId, null, null);
+      return webDeviceService.getLeaseGoodsDetail(goodsId, null, null);
     }
-    return webDeviceService.listLeaseGoodsDetail(
+    return webDeviceService.getLeaseGoodsDetail(
         goodsId, this.getUserLoginInfoFromRedis(request).getUserAccountId(), request);
   }
 }

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

@@ -5,6 +5,8 @@ import com.mmc.pms.model.categories.vo.DirectoryInfoVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -19,52 +21,41 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 public class DirectoryDO implements Serializable {
-    private static final long serialVersionUID = 713939370607409336L;
-    /**
-     * 主键id
-     */
-    private Integer id;
-    /**
-     * 目录名称
-     */
-    private String directoryName;
-    /**
-     * 其他目录关联id
-     */
-    private Integer pid;
-    /**
-     * 类型：（0：通用目录 1：作业服务目录 2：设备目录 3：飞手目录 4：商城目录）
-     */
-    private Integer type;
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-    /**
-     * 是否删除
-     */
-    private Integer deleted;
-
-    private String relevanceName;
-
-    public DirectoryDO(DirectoryInfoVO param) {
-        this.id = param.getId();
-        this.directoryName = param.getDirectoryName();
-        this.pid = param.getPid();
-        this.type = param.getType();
-    }
-
-    public DirectoryInfoVO buildDirectoryInfoVO() {
-        return DirectoryInfoVO.builder().id(id).directoryName(directoryName).pid(pid).relevanceName(relevanceName).type(type).build();
+  private static final long serialVersionUID = 713939370607409336L;
+  /** 主键id */
+  private Integer id;
+  /** 目录名称 */
+  private String directoryName;
+  /** 其他目录关联id */
+  private Integer pid;
+  /** 类型：（0：通用目录 1：作业服务目录 2：设备目录 3：飞手目录 4：商城目录） */
+  private Integer type;
+  /** 创建时间 */
+  private Date createTime;
+  /** 修改时间 */
+  private Date updateTime;
+  /** 是否删除 */
+  private Integer deleted;
+
+  private String show;
+
+  private String relevanceName;
+
+  public DirectoryDO(DirectoryInfoVO param) {
+    if (CollectionUtils.isNotEmpty(param.getShow())) {
+      String show = StringUtils.join(param.getShow(), ",");
+      this.show = show;
     }
-
-    public AllCategoryDTO buildAllCategoryDTO() {
-        return AllCategoryDTO.builder().directoryId(id).name(directoryName).build();
-    }
-
+    this.id = param.getId();
+    this.directoryName = param.getDirectoryName();
+    this.type = param.getType();
+  }
+
+  public DirectoryInfoVO buildDirectoryInfoVO() {
+    return DirectoryInfoVO.builder().id(id).directoryName(directoryName).type(type).build();
+  }
+
+  public AllCategoryDTO buildAllCategoryDTO() {
+    return AllCategoryDTO.builder().directoryId(id).name(directoryName).build();
+  }
 }
-

src/main/java/com/mmc/pms/model/categories/vo/DirectoryInfoVO.java

@@ -6,25 +6,27 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
 
 /**
  * @Author LW
- * @date 2023/5/24 11:06
- * 概要：
+ *
+ * @date 2023/5/24 11:06 概要：
  */
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
 public class DirectoryInfoVO {
-    @ApiModelProperty(value = "目录id")
-    private Integer id;
-    @ApiModelProperty(value = "目录名称")
-    private String directoryName;
-    @ApiModelProperty(value = "关联目录的id")
-    private Integer pid;
-    @ApiModelProperty(value = "关联目录名称")
-    private String relevanceName;
-    @ApiModelProperty(value = "分类模块：（0：通用分类 1：作业服务分类 2：设备分类 3：飞手分类 4：商城分类）")
-    private Integer type;
+  @ApiModelProperty(value = "目录id")
+  private Integer id;
+
+  @ApiModelProperty(value = "目录名称")
+  private String directoryName;
+
+  @ApiModelProperty(value = "分类模块：（0：通用分类 1：作业服务分类 2：设备分类 3：飞手分类 4：商城分类）")
+  private Integer type;
+
+  @ApiModelProperty(value = "显示:1：作业服务分类 2：设备分类 3：飞手分类 4：商城分类")
+  private List<Integer> show;
 }

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

@@ -37,6 +37,9 @@ public class MallGoodsDetailDTO implements Serializable {
   @ApiModelProperty(value = "商品名称")
   private String goodsName;
 
+  @ApiModelProperty(value = "商品编号")
+  private String goodsNo;
+
   @ApiModelProperty(value = "商品详情")
   private GoodsDetailInfoDTO goodsDetail;
 

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

@@ -25,7 +25,7 @@ public interface GoodsInfoService {
 
   ResultBody editGoodsInfo(GoodsAddVO goodsAddVO);
 
-  ResultBody getGoodsInfoDetail(Integer goodsInfoId);
+  ResultBody getGoodsInfoDetail(Integer goodsInfoId, Integer type, Integer leaseTerm);
 
   ResultBody getSkuUnit();
 

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

@@ -638,7 +638,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
   }
 
   @Override
-  public ResultBody getGoodsInfoDetail(Integer goodsInfoId) {
+  public ResultBody getGoodsInfoDetail(Integer goodsInfoId, Integer type, Integer leaseTerm) {
     // 判断此商品是否还存在
     int count = goodsInfoDao.countGoodsInfoById(goodsInfoId);
     if (count <= 0) {
@@ -650,6 +650,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
     GoodsInfo goodsInfo = goodsInfoDao.getGoodsSimpleInfo(goodsInfoId);
     mallGoodsDetail
         .setId(goodsInfo.getId())
+        .setGoodsNo(goodsInfo.getGoodsNo())
         .setGoodsName(goodsInfo.getGoodsName())
         .setCategoryByOne(goodsInfo.getCategoryByOne())
         .setGoodsVideo(goodsInfo.getVideoUrl())
@@ -667,7 +668,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
     // 获取规格信息
     if (!goodsInfo.getDirectoryId().equals(2)) {
       // 获取产品规格信息
-      mallGoodsDetail.setGoodsSpec(getProductSpecInfo(goodsInfoId));
+      mallGoodsDetail.setGoodsSpec(getProductSpecInfo(goodsInfoId, type, leaseTerm));
     } else {
       // 获取行业规格信息
       mallGoodsDetail.setGoodsSpec(getIndustrySpecInfo(goodsInfoId));
@@ -708,7 +709,8 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
     return list;
   }
 
-  private List<GoodsSpecDTO> getProductSpecInfo(Integer goodsInfoId) {
+  private List<GoodsSpecDTO> getProductSpecInfo(
+      Integer goodsInfoId, Integer type, Integer leaseTerm) {
     // 获取商品对应绑定sku的信息
     List<MallProdInfoDO> mallProdSkuInfoList = goodsInfoDao.getMallProSkuInfo(goodsInfoId);
     List<GoodsSpecDTO> list =
@@ -736,6 +738,8 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
                         // 获取自定义sku下规格的价格配置信息
                         ProductSpecCPQVO productSpecCPQVO = new ProductSpecCPQVO();
                         productSpecCPQVO.setProductSpecId(e.getProductSpecId());
+                        productSpecCPQVO.setType(type);
+                        productSpecCPQVO.setLeaseTerm(leaseTerm);
                         List<ProductSpecPriceDO> productSpecPrice =
                             productDao.getProductSpecPrice(productSpecCPQVO);
                         List<SpecPriceVO> collect =

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

@@ -212,14 +212,14 @@ public class WebDeviceServiceImpl implements WebDeviceService {
   }
 
   @Override
-  public ResultBody listLeaseGoodsDetail(
+  public ResultBody getLeaseGoodsDetail(
       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);
+    ResultBody goodsInfoDetail = goodsInfoService.getGoodsInfoDetail(goodsInfoId, null, null);
     MallGoodsDetailDTO result = (MallGoodsDetailDTO) goodsInfoDetail.getResult();
     if (userAccountId != null) {
       UserAccountSimpleDTO userAccountSimpleDTO =

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

@@ -40,6 +40,6 @@ public interface WebDeviceService {
 
   List<SkuInfoDTO> listWareSkuById(Integer id);
 
-  ResultBody listLeaseGoodsDetail(
+  ResultBody getLeaseGoodsDetail(
       Integer goodsId, Integer userAccountId, HttpServletRequest request);
 }

src/main/resources/mapper/GoodsInfoDao.xml

@@ -128,7 +128,7 @@
     </update>
     <update id="batchUpdateMallProSpec">
         <foreach collection="list" separator=";" item="d">
-            update mall_prod_sku_info_spec
+            update mall_prod_info_spec
             set is_deleted = 1
             where mall_prod_info_id = #{d}
             and goods_info_id =#{id}