Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
e6b36012f1
|
|
@ -34,4 +34,9 @@ public class ProductScreenController {
|
|||
return service.getProductDetails(product) ;
|
||||
}
|
||||
|
||||
@PostMapping("/getProductDetailsById")
|
||||
public AjaxResult getProductDetailsById(@RequestBody TbProduct product ){
|
||||
return service.getProductDetailsById(product) ;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,4 +121,6 @@ public interface ProductMapper {
|
|||
* @return
|
||||
*/
|
||||
Integer getProductOnCz(TbProduct product);
|
||||
|
||||
TbProductCase getProductDetailsById(String id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,4 +17,6 @@ public interface ProductScreenService {
|
|||
* @return
|
||||
*/
|
||||
AjaxResult getProductDetails(TbProduct product);
|
||||
|
||||
AjaxResult getProductDetailsById(TbProduct product);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ public class ProductScreenImpl implements ProductScreenService {
|
|||
|
||||
/**
|
||||
* 查看宣传物料信息
|
||||
*
|
||||
* @param product
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -105,6 +106,22 @@ public class ProductScreenImpl implements ProductScreenService {
|
|||
return AjaxResult.success(product);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AjaxResult getProductDetailsById(TbProduct product) {
|
||||
TbProductCase productCase = productMapper.getProductDetailsById(product.getId());
|
||||
//产品案例
|
||||
List<ProductCaseImage> caseImages = productMapper.getCaseImageByTable(productCase.getId(), "tb_product_case");
|
||||
if (StringUtils.isNotEmpty(caseImages)) {
|
||||
caseImages.forEach(image -> {
|
||||
String path = fileServiceUtils.getFileUrl(image.getFilePath(), image.getBucketName());
|
||||
// String path = minioUtil.getFileUrl(image.getBucketName(),image.getFilePath(), GlobalUtils.FILE_TIMES);
|
||||
image.setUrl(path);
|
||||
});
|
||||
productCase.setImageList(caseImages);
|
||||
}
|
||||
return AjaxResult.success(productCase);
|
||||
}
|
||||
|
||||
public void getProductDetails(TbProduct product, TbProduct vo, ProductMapper productMapper, MinioUtil minioUtil) {
|
||||
List<TbProductCase> productCases = productMapper.getProductCaseList(product.getId());
|
||||
for (TbProductCase productCase : productCases) {
|
||||
|
|
|
|||
|
|
@ -76,6 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
where product_id=#{id}
|
||||
|
||||
</select>
|
||||
<select id="getProductDetailsById" resultType="com.bonus.business.domain.TbProductCase">
|
||||
SELECT id,product_id productId,case_company caseCompany,case_introduction caseIntroduction,case_sort caseSort
|
||||
from tb_product_case
|
||||
where del_flag=0 and id=#{id}
|
||||
</select>
|
||||
|
||||
<insert id="addProduct" parameterType="com.bonus.business.domain.TbProduct" keyProperty="id" useGeneratedKeys="true" >
|
||||
insert into tb_product
|
||||
|
|
|
|||
Loading…
Reference in New Issue