修改：价格回显

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

@@ -43,13 +43,20 @@ public class ProductMallController extends BaseController {
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = MallGoodsDetailDTO.class)})
   @GetMapping("/getLeaseGoodsDetail")
   public ResultBody<MallGoodsDetailDTO> getLeaseGoodsDetail(
-      Integer goodsId, HttpServletRequest request) {
+      Integer goodsId,
+      HttpServletRequest request,
+      @ApiParam(value = "租赁：1  销售商品：0") @RequestParam(value = "type") Integer type,
+      @ApiParam(value = "租赁时限：（输入0：1-7天、输入1：8-15天、输入2：16-30天、输入3：30天以上）")
+          @RequestParam(value = "leaseTerm", required = false)
+          Integer leaseTerm) {
     return webDeviceService.getLeaseGoodsDetail(
         goodsId,
         request.getHeader(TokenConstant.TOKEN) == null
             ? null
             : this.getUserLoginInfoFromRedis(request).getUserAccountId(),
-        request);
+        request,
+        type,
+        leaseTerm);
   }
 
   @ApiOperation(value = "web-首页分类数据-展示")

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

@@ -734,28 +734,27 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
                       productSpecDTO.setProductSkuId(d.getSkuId());
                       productSpecDTO.setId(e.getId());
                       productSpecDTO.setProductSpec(e.getProductSpecId());
-                      if (d.getFlag().equals(1)) {
-                        // 获取自定义sku下规格的价格配置信息
-                        ProductSpecCPQVO productSpecCPQVO = new ProductSpecCPQVO();
-                        productSpecCPQVO.setProductSpecId(e.getProductSpecId());
-                        productSpecCPQVO.setType(type);
-                        productSpecCPQVO.setLeaseTerm(leaseTerm);
-                        List<ProductSpecPriceDO> productSpecPrice =
-                            productDao.getProductSpecPrice(productSpecCPQVO);
-                        List<SpecPriceVO> collect =
-                            productSpecPrice.stream()
-                                .map(
-                                    m -> {
-                                      SpecPriceVO specPriceVO = new SpecPriceVO();
-                                      specPriceVO.setId(m.getId());
-                                      specPriceVO.setPrice(m.getPrice());
-                                      specPriceVO.setCooperationTag(m.getCooperationTag());
-                                      return specPriceVO;
-                                    })
-                                .collect(Collectors.toList());
-                        productSpecCPQVO.setSpecPrice(collect);
-                        productSpecDTO.setProductSpecCPQVO(productSpecCPQVO);
-                      }
+                      // 获取自定义sku下规格的价格配置信息
+                      ProductSpecCPQVO productSpecCPQVO = new ProductSpecCPQVO();
+                      productSpecCPQVO.setProductSpecId(e.getProductSpecId());
+                      productSpecCPQVO.setType(type);
+                      productSpecCPQVO.setLeaseTerm(leaseTerm);
+                      List<ProductSpecPriceDO> productSpecPrice =
+                          productDao.getProductSpecPrice(productSpecCPQVO);
+                      List<SpecPriceVO> collect =
+                          productSpecPrice.stream()
+                              .map(
+                                  m -> {
+                                    SpecPriceVO specPriceVO = new SpecPriceVO();
+                                    specPriceVO.setId(m.getId());
+                                    specPriceVO.setPrice(m.getPrice());
+                                    specPriceVO.setCooperationTag(m.getCooperationTag());
+                                    return specPriceVO;
+                                  })
+                              .collect(Collectors.toList());
+                      productSpecCPQVO.setSpecPrice(collect);
+                      productSpecDTO.setProductSpecCPQVO(productSpecCPQVO);
+
                       specList.add(productSpecDTO);
                     }
                   }

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

@@ -218,25 +218,31 @@ public class WebDeviceServiceImpl implements WebDeviceService {
 
   @Override
   public ResultBody getLeaseGoodsDetail(
-      Integer goodsInfoId, Integer userAccountId, HttpServletRequest request) {
+      Integer goodsInfoId,
+      Integer userAccountId,
+      HttpServletRequest request,
+      Integer type,
+      Integer leaseTerm) {
     int count = goodsInfoDao.countGoodsInfoById(goodsInfoId);
     if (count <= 0) {
       return ResultBody.error(ResultEnum.GOODS_NOT_EXIST_OR_ALREADY_DOWN_SHELF);
     }
     // 初始化商品返回信息的对象
-    ResultBody goodsInfoDetail = goodsInfoService.getGoodsInfoDetail(goodsInfoId, null, null);
+    ResultBody goodsInfoDetail = goodsInfoService.getGoodsInfoDetail(goodsInfoId, type, leaseTerm);
     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());
-        }
-      }
-    }
+    //    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);
   }
 

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

@@ -42,7 +42,11 @@ public interface WebDeviceService {
   List<SkuInfoDTO> listWareSkuById(Integer id);
 
   ResultBody getLeaseGoodsDetail(
-      Integer goodsId, Integer userAccountId, HttpServletRequest request);
+      Integer goodsId,
+      Integer userAccountId,
+      HttpServletRequest request,
+      Integer type,
+      Integer leaseTerm);
 
   ResultBody<CategoryTypeDTO> getPageHomeCategories(Integer type);
 }

src/main/resources/mapper/ProductDao.xml

@@ -510,6 +510,5 @@
         WHERE product_spec_id = #{id}
           AND cooperation_tag = 0
           AND type = 1
-          and lease_term = 0
     </select>
 </mapper>