后端接口调整

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/CertificateController.java

@@ -0,0 +1,94 @@
+package cn.iocoder.yudao.module.supplier.controller.admin.product;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.CertificatePageReqVO;
+import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.CertificateRespVO;
+import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.CertificateSaveReqVO;
+import cn.iocoder.yudao.module.supplier.dal.dataobject.product.CertificateDO;
+import cn.iocoder.yudao.module.supplier.service.product.CertificateService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+
+@Tag(name = "管理后台 - 供应商证件资质")
+@RestController
+@RequestMapping("/supplier/certificate")
+@Validated
+public class CertificateController {
+
+    @Resource
+    private CertificateService certificateService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建供应商证件资质")
+    @PreAuthorize("@ss.hasPermission('supplier:certificate:create')")
+    public CommonResult<Long> createCertificate(@Valid @RequestBody CertificateSaveReqVO createReqVO) {
+        return success(certificateService.createCertificate(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新供应商证件资质")
+    @PreAuthorize("@ss.hasPermission('supplier:certificate:update')")
+    public CommonResult<Boolean> updateCertificate(@Valid @RequestBody CertificateSaveReqVO updateReqVO) {
+        certificateService.updateCertificate(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除供应商证件资质")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('supplier:certificate:delete')")
+    public CommonResult<Boolean> deleteCertificate(@RequestParam("id") Long id) {
+        certificateService.deleteCertificate(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得供应商证件资质")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('supplier:certificate:query')")
+    public CommonResult<CertificateRespVO> getCertificate(@RequestParam("id") Long id) {
+        CertificateDO certificate = certificateService.getCertificate(id);
+        return success(BeanUtils.toBean(certificate, CertificateRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得供应商证件资质分页")
+    @PreAuthorize("@ss.hasPermission('supplier:certificate:query')")
+    public CommonResult<PageResult<CertificateRespVO>> getCertificatePage(@Valid CertificatePageReqVO pageReqVO) {
+        PageResult<CertificateDO> pageResult = certificateService.getCertificatePage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, CertificateRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出供应商证件资质 Excel")
+    @PreAuthorize("@ss.hasPermission('supplier:certificate:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportCertificateExcel(@Valid CertificatePageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<CertificateDO> list = certificateService.getCertificatePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "供应商证件资质.xls", "数据", CertificateRespVO.class,
+                        BeanUtils.toBean(list, CertificateRespVO.class));
+    }
+
+}

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/ProductController.java

@@ -9,14 +9,11 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.ProductPageReqVO;
 import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.ProductRespVO;
 import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.ProductSaveReqVO;
-import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.SupplierRespVO;
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.ProductDO;
-import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
 import cn.iocoder.yudao.module.supplier.service.product.ProductService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.commons.math3.stat.descriptive.summary.Product;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/SupplierController.java

@@ -99,4 +99,12 @@ public class SupplierController {
         List<SupplierRespVO> bean = BeanUtils.toBean(all, SupplierRespVO.class);
         return success(bean);
     }
+
+    @PostMapping("/status/{id}/{status}")
+    @Operation(summary = "修改状态")
+    @PreAuthorize("@ss.hasPermission('supplier:base:changestatus')")
+    public CommonResult<Boolean> changeStatus(@PathVariable("id") Long id, @PathVariable("status") Integer status) {
+        supplierService.changeStatus(id, status);
+        return success(true);
+    }
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/CertificatePageReqVO.java

@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.supplier.controller.admin.product.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 供应商证件资质分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class CertificatePageReqVO extends PageParam {
+
+    @Schema(description = "供应商id", example = "24640")
+    private Long supplierId;
+    @Schema(description = "供应商名称")
+    private String supplierName;
+    @Schema(description = "证件类型 字典表", example = "2")
+    private String type;
+
+    @Schema(description = "证件名称", example = "芋艿")
+    private String name;
+
+    @Schema(description = "附件 多个附件逗号分隔")
+    private String urls;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/CertificateRespVO.java

@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.supplier.controller.admin.product.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 供应商证件资质 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class CertificateRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "10663")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "供应商id", example = "24640")
+    @ExcelProperty("供应商id")
+    private Long supplierId;
+    @Schema(description = "供应商名称")
+    @ExcelProperty("供应商名称")
+    private String supplierName;
+    @Schema(description = "证件类型 字典表", example = "2")
+    @ExcelProperty("证件类型 字典表")
+    private String type;
+
+    @Schema(description = "证件名称", example = "芋艿")
+    @ExcelProperty("证件名称")
+    private String name;
+
+    @Schema(description = "附件 多个附件逗号分隔")
+    @ExcelProperty("附件 多个附件逗号分隔")
+    private String urls;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/CertificateSaveReqVO.java

@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.supplier.controller.admin.product.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 供应商证件资质新增/修改 Request VO")
+@Data
+public class CertificateSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "10663")
+    private Long id;
+
+    @Schema(description = "供应商id", example = "24640")
+    private Long supplierId;
+    @Schema(description = "供应商名称")
+    private String supplierName;
+    @Schema(description = "证件类型 字典表", example = "2")
+    private String type;
+
+    @Schema(description = "证件名称", example = "芋艿")
+    private String name;
+
+    @Schema(description = "附件 多个附件逗号分隔")
+    private String urls;
+}

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/SupplierSaveReqVO.java

@@ -57,7 +57,7 @@ public class SupplierSaveReqVO {
     private String size;
 
     @Schema(description = "商品状态: 1 草稿 2活动 3 关闭", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "商品状态: 1 草稿 2活动 3 关闭不能为空")
+    //@NotNull(message = "商品状态: 1 草稿 2活动 3 关闭不能为空")
     private Integer status;
 
     @Schema(description = "备注", example = "随便")

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/dal/dataobject/product/CertificateDO.java

@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.supplier.dal.dataobject.product;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 供应商证件资质 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("supplier_certificate")
+@KeySequence("supplier_certificate_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CertificateDO extends BaseDO {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * 供应商id
+     */
+    private Long supplierId;
+
+    private String supplierName;
+    /**
+     * 证件类型 字典表
+     */
+    private String type;
+    /**
+     * 证件名称
+     */
+    private String name;
+    /**
+     * 附件 多个附件逗号分隔
+     */
+    private String urls;
+
+}

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/dal/mysql/product/CertificateMapper.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.supplier.dal.mysql.product;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.CertificatePageReqVO;
+import cn.iocoder.yudao.module.supplier.dal.dataobject.product.CertificateDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 供应商证件资质 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface CertificateMapper extends BaseMapperX<CertificateDO> {
+
+    default PageResult<CertificateDO> selectPage(CertificatePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<CertificateDO>()
+                .eqIfPresent(CertificateDO::getSupplierId, reqVO.getSupplierId())
+                .eqIfPresent(CertificateDO::getSupplierName, reqVO.getSupplierName())
+                .eqIfPresent(CertificateDO::getType, reqVO.getType())
+                .likeIfPresent(CertificateDO::getName, reqVO.getName())
+                .eqIfPresent(CertificateDO::getUrls, reqVO.getUrls())
+                .betweenIfPresent(CertificateDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(CertificateDO::getId));
+    }
+
+}

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/service/product/CertificateService.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.supplier.service.product;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.CertificatePageReqVO;
+import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.CertificateSaveReqVO;
+import cn.iocoder.yudao.module.supplier.dal.dataobject.product.CertificateDO;
+
+import javax.validation.Valid;
+
+/**
+ * 供应商证件资质 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface CertificateService {
+
+    /**
+     * 创建供应商证件资质
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createCertificate(@Valid CertificateSaveReqVO createReqVO);
+
+    /**
+     * 更新供应商证件资质
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateCertificate(@Valid CertificateSaveReqVO updateReqVO);
+
+    /**
+     * 删除供应商证件资质
+     *
+     * @param id 编号
+     */
+    void deleteCertificate(Long id);
+
+    /**
+     * 获得供应商证件资质
+     *
+     * @param id 编号
+     * @return 供应商证件资质
+     */
+    CertificateDO getCertificate(Long id);
+
+    /**
+     * 获得供应商证件资质分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 供应商证件资质分页
+     */
+    PageResult<CertificateDO> getCertificatePage(CertificatePageReqVO pageReqVO);
+
+}

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/service/product/CertificateServiceImpl.java

@@ -0,0 +1,75 @@
+package cn.iocoder.yudao.module.supplier.service.product;
+
+import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.CertificatePageReqVO;
+import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.CertificateSaveReqVO;
+import cn.iocoder.yudao.module.supplier.dal.dataobject.product.CertificateDO;
+import cn.iocoder.yudao.module.supplier.dal.mysql.product.CertificateMapper;
+import cn.iocoder.yudao.module.supplier.enums.ErrorCodeConstant;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+
+/**
+ * 供应商证件资质 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class CertificateServiceImpl implements CertificateService {
+
+    @Resource
+    private CertificateMapper certificateMapper;
+
+    @Override
+    public Long createCertificate(CertificateSaveReqVO createReqVO) {
+        // 插入
+        CertificateDO certificate = BeanUtils.toBean(createReqVO, CertificateDO.class);
+        certificateMapper.insert(certificate);
+        // 返回
+        return certificate.getId();
+    }
+
+    @Override
+    public void updateCertificate(CertificateSaveReqVO updateReqVO) {
+        // 校验存在
+        validateCertificateExists(updateReqVO.getId());
+        // 更新
+        CertificateDO updateObj = BeanUtils.toBean(updateReqVO, CertificateDO.class);
+        certificateMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteCertificate(Long id) {
+        // 校验存在
+        validateCertificateExists(id);
+        // 删除
+        certificateMapper.deleteById(id);
+    }
+
+    private void validateCertificateExists(Long id) {
+        if (certificateMapper.selectById(id) == null) {
+            throw exception(ErrorCodeConstant.NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public CertificateDO getCertificate(Long id) {
+        return certificateMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<CertificateDO> getCertificatePage(CertificatePageReqVO pageReqVO) {
+        return certificateMapper.selectPage(pageReqVO);
+    }
+
+}

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/service/product/SupplierService.java

@@ -54,4 +54,5 @@ public interface SupplierService {
     PageResult<SupplierDO> getPage(SupplierPageReqVO pageReqVO);
 
     List<SupplierDO> getAll();
+    void changeStatus(Long id, Integer status);
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/service/product/SupplierServiceImpl.java

@@ -1,10 +1,13 @@
 package cn.iocoder.yudao.module.supplier.service.product;
 
+import cn.iocoder.yudao.framework.common.exception.ServerException;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.SupplierPageReqVO;
 import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.SupplierSaveReqVO;
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
 import cn.iocoder.yudao.module.supplier.dal.mysql.product.SupplierMapper;
 import cn.iocoder.yudao.module.supplier.enums.ErrorCodeConstant;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -15,6 +18,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -33,9 +37,15 @@ public class SupplierServiceImpl implements SupplierService {
 
     @Override
     public Long create(SupplierSaveReqVO createReqVO) {
+        List<SupplierDO> name = supplierMapper.selectList("name", createReqVO.getName());
+        if (!CollectionUtils.isEmpty(name)){
+            throw new ServiceException();
+        }
         // 插入
         SupplierDO supplierDO = BeanUtils.toBean(createReqVO, SupplierDO.class);
         supplierDO.setCode(UUID.randomUUID().toString());
+        //设置草稿状态
+        supplierDO.setStatus(1);
         supplierMapper.insert(supplierDO);
         // 返回
         return supplierDO.getId();
@@ -79,4 +89,12 @@ public class SupplierServiceImpl implements SupplierService {
         return supplierMapper.selectList();
     }
 
+    @Override
+    public void changeStatus(Long id, Integer status) {
+        SupplierDO supplierDO = supplierMapper.selectById(id);
+        assert Objects.nonNull(supplierDO);
+        supplierDO.setStatus(status);
+        supplierMapper.insertOrUpdate(supplierDO);
+    }
+
 }