Quellcode durchsuchen

feat(miniproduct): 添加商品分类查询接口并完善供应商信息处理

- 在MiniProductController中添加ProductCategoryVo导入
- 注入IProductCategoryService服务实例
- 新增getProductCategoryList接口用于查看分类列表
- 修复SupplierInfoServiceImpl中的空指针风险检查
- 添加supplierInfoTemporaryVo为空的安全检查
- 设置供应商状态更新为4L值
肖路 vor 3 Wochen
Ursprung
Commit
ba46757bb1

+ 5 - 2
ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/SupplierInfoServiceImpl.java

@@ -607,9 +607,11 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
         SupplierInfoVo supplierInfoVo1 = baseMapper.selectVoOne(new LambdaQueryWrapper<SupplierInfo>().select(SupplierInfo::getSupplyStatus)
             .eq(SupplierInfo::getId, id));
         SupplierInfoVo supplierInfoVo = new SupplierInfoVo();
-        if (supplierInfoVo1.getSupplyStatus() == SupplierStatusEnum.REVIEW_UPDATED.getCode()) {
+        if (supplierInfoVo1 != null && supplierInfoVo1.getSupplyStatus() == SupplierStatusEnum.REVIEW_UPDATED.getCode()) {
             SupplierInfoTemporaryVo supplierInfoTemporaryVo = supplierInfoTemporaryService.getVoOne(id);
-            BeanUtils.copyProperties(supplierInfoTemporaryVo, supplierInfoVo);
+            if (supplierInfoTemporaryVo != null) {
+                BeanUtils.copyProperties(supplierInfoTemporaryVo, supplierInfoVo);
+            }
         } else {
             supplierInfoVo = baseMapper.selectVoById(id);
         }
@@ -2296,6 +2298,7 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
     public int scmUpdateByBo(SupplierInfoBo bo) {
         SupplierInfo update = MapstructUtils.convert(bo, SupplierInfo.class);
         saveSupplierBusinessInfoFromJson(bo.getOtherCustomers(), bo.getId());
+        update.setSupplyStatus(4L);
         return baseMapper.updateById(update);
     }
 

+ 11 - 5
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/mini/MiniProductController.java

@@ -13,6 +13,7 @@ import org.dromara.product.domain.ProductShoppingCart;
 import org.dromara.product.domain.bo.*;
 import org.dromara.product.domain.vo.PcProductVo;
 import org.dromara.product.domain.vo.ProductBaseVo;
+import org.dromara.product.domain.vo.ProductCategoryVo;
 import org.dromara.product.service.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -33,19 +34,24 @@ public class MiniProductController {
 
     //商品
     private final IProductBaseService productBaseService;
-
     //购物车
     private final IProductShoppingCartService productShoppingCartService;
-
-
     //商品浏览记录
     private final IProductBrowsingHistoryService productBrowsingHistoryService;
-
-
     //商品收藏
     private final IProductCollectService productCollectService;
     //商品收藏夹
     private final IProductFavoritesService productFavoritesService;
+    //商品分类
+    private final IProductCategoryService productCategoryService;
+
+    /**
+     * 查看分类列表
+     * */
+    @GetMapping("getProductCategoryList")
+    public R<List<ProductCategoryVo>> getProductCategoryList(ProductCategoryBo bo) {
+        return R.ok(productCategoryService.queryList(bo));
+    }
 
     /**
      * 获取客户商品池的商品