Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/BrandMapper.java

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/CraftController.java

@@ -0,0 +1,59 @@
+package org.dromara.commodityManagement.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.bo.CraftBo;
+import org.dromara.commodityManagement.domain.vo.CraftVo;
+import org.dromara.commodityManagement.service.CraftService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.dromara.common.mybatis.core.page.PageQuery;
+/**
+ * 工艺管理接口
+ */
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/commodityManagement/craft")
+public class CraftController extends BaseController {
+    private final CraftService craftService;
+
+    /**
+     * 查询工艺管理列表
+     * @param craft 工艺Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping()
+    public TableDataInfo<CraftVo> selectPageCraftList(CraftBo craft, PageQuery pageQuery) {
+        return craftService.selectPageCraftList(craft, pageQuery);
+    }
+    /**
+     * 新增工艺
+     * @param craft 工艺Bo对象
+     * @return 新增结果
+     */
+    @PostMapping()
+    public R<Void> insertCraft(@Validated @RequestBody CraftBo craft) {
+        return toAjax(craftService.insertCraft(craft));
+    }
+    /**
+     * 修改工艺
+     * @param craft 工艺Bo对象
+     * @return 修改结果
+     */
+    @PutMapping()
+    public R<Void> updateCraft(@RequestBody CraftBo craft) {
+        return toAjax(craftService.updateCraft(craft));
+    }
+    /**
+     * 删除工艺
+     * @param craftIds 工艺id数组
+     * @return 删除结果
+     */
+    @DeleteMapping("/{craftIds}")
+    public R<Void> deleteCraftByIds(@PathVariable Long[] craftIds) {
+        return toAjax(craftService.deleteCraftByIds(craftIds));
+    }
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/OemController.java

@@ -1,6 +1,5 @@
 package org.dromara.commodityManagement.controller;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.commodityManagement.domain.bo.OemBo;
 import org.dromara.commodityManagement.domain.vo.OemVo;
@@ -9,6 +8,7 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -26,7 +26,6 @@ public class OemController extends BaseController {
      * @param pageQuery 分页信息
      * @return 查询结果
      */
-    @SaIgnore
     @GetMapping()
     public TableDataInfo<OemVo> selectPageOemList(OemBo oem, PageQuery pageQuery) {
         return oemService.selectPageOemList(oem, pageQuery);
@@ -36,9 +35,8 @@ public class OemController extends BaseController {
      * @param oem 花型号Bo对象
      * @return 新增结果
      */
-    @SaIgnore
     @PostMapping()
-    public R<Void> insertOem(@RequestBody OemBo oem) {
+    public R<Void> insertOem(@Validated @RequestBody OemBo oem) {
         return toAjax(oemService.insertOem(oem));
     }
     /**
@@ -46,7 +44,6 @@ public class OemController extends BaseController {
      * @param oem 花型号Bo对象
      * @return 修改结果
      */
-    @SaIgnore
     @PutMapping()
     public R<Void> updateOem(@RequestBody OemBo oem) {
         return toAjax(oemService.updateOem(oem));
@@ -56,9 +53,8 @@ public class OemController extends BaseController {
      * @param oemIds 花型号Id
      * @return 删除结果
      */
-    @SaIgnore
     @DeleteMapping("/{oemIds}")
     public R<Void> deleteOemByIds(@PathVariable Long[] oemIds) {
-        return toAjax(oemService.deleteOemById(oemIds));
+        return toAjax(oemService.deleteOemByIds(oemIds));
     }
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/Craft.java

@@ -0,0 +1,70 @@
+package org.dromara.commodityManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("fa_kuyou_goods_type_extend")
+public class Craft {
+    /**
+     * 工艺ID
+     */
+    @TableId("id")
+    private Long id;
+    /**
+     * 管理员ID
+     */
+    private int adminId;
+    /**
+     * 工艺类型
+     */
+    @TableField("goods_type_extend_type")
+    private int goodsTypeExtendType;
+    /**
+     * 工艺名称
+     */
+    @TableField("goods_type_extend_name")
+    private String goodsTypeExtendName;
+    /**
+     * 工艺价格
+     */
+    private String price;
+    /**
+     * 工艺图片
+     */
+    private String goodsTypeExtendImage;
+    /**
+     * pid
+     */
+    private int pid;
+    /**
+     * 路径
+     */
+    private String path;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 重量
+     */
+    private String weigh;
+    /**
+     * 订单状态
+     */
+    private String orderStatus;
+    /**
+     * 创建时间
+     */
+    private int createTime;
+    /**
+     * 更新时间
+     */
+    private int updateTime;
+    /**
+     * 租户ID
+     */
+    private Long tenantId;
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/Oem.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.math.BigInteger;
-
 @Data
 @TableName("fa_oem")
 public class Oem {
@@ -17,7 +15,7 @@ public class Oem {
     /**
      * 租户ID
      */
-    private BigInteger tenant_id;
+    private Long tenant_id;
     /**
      * 花型号名称
      */

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/bo/CraftBo.java

@@ -0,0 +1,71 @@
+package org.dromara.commodityManagement.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.dromara.commodityManagement.domain.Craft;
+
+/**
+ * 工艺对象
+ */
+@Data
+@AutoMapper(target = Craft.class, reverseConvertGenerate = false)
+public class CraftBo {
+    /**
+     * 工艺ID
+     */
+    private Long id;
+    /**
+     * 管理员ID
+     */
+    private int adminId;
+    /**
+     * 工艺类型
+     */
+    private int goodsTypeExtendType;
+    /**
+     * 工艺名称
+     */
+    @NotBlank(message = "工艺名称不能为空")
+    private String goodsTypeExtendName;
+    /**
+     * 工艺价格
+     */
+    private String price;
+    /**
+     * 工艺图片
+     */
+    private String goodsTypeExtendImage;
+    /**
+     * pid
+     */
+    private int pid;
+    /**
+     * 路径
+     */
+    private String path;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 重量
+     */
+    private String weigh;
+    /**
+     * 订单状态
+     */
+    private String orderStatus;
+    /**
+     * 创建时间
+     */
+    private int createTime;
+    /**
+     * 更新时间
+     */
+    private int updateTime;
+    /**
+     * 租户ID
+     */
+    private Long tenantId;
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/bo/OemBo.java

@@ -2,12 +2,9 @@ package org.dromara.commodityManagement.domain.bo;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import org.dromara.commodityManagement.domain.Oem;
 
-import java.math.BigInteger;
-
 /**
  * 花型号对象
  */
@@ -22,16 +19,13 @@ public class OemBo {
     /**
      *租户ID
      */
-    private BigInteger tenant_id;
+    private Long tenant_id;
     /**
      * 花型号名称
      */
-    @NotBlank(message = "名称不能为空")
     private String name;
-
     /**
      * 花型号图片
      */
-    @NotBlank(message = "图片不能为空")
     private String image;
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/vo/CraftVo.java

@@ -0,0 +1,69 @@
+package org.dromara.commodityManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.commodityManagement.domain.Craft;
+
+/**
+ * 工艺值对象
+ */
+@Data
+@AutoMapper(target = Craft.class)
+public class CraftVo {
+    /**
+     * 工艺ID
+     */
+    private Long id;
+    /**
+     * 管理员ID
+     */
+    private int adminId;
+    /**
+     * 工艺类型
+     */
+    private int goodsTypeExtendType;
+    /**
+     * 工艺名称
+     */
+    private String goodsTypeExtendName;
+    /**
+     * 工艺价格
+     */
+    private String price;
+    /**
+     * 工艺图片
+     */
+    private String goodsTypeExtendImage;
+    /**
+     * pid
+     */
+    private int pid;
+    /**
+     * 路径
+     */
+    private String path;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 重量
+     */
+    private String weigh;
+    /**
+     * 订单状态
+     */
+    private String orderStatus;
+    /**
+     * 创建时间
+     */
+    private int createTime;
+    /**
+     * 更新时间
+     */
+    private int updateTime;
+    /**
+     * 租户ID
+     */
+    private Long tenantId;
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/vo/OemVo.java

@@ -5,8 +5,6 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.commodityManagement.domain.Oem;
 
-import java.math.BigInteger;
-
 /**
  * 花型号值对象
  */
@@ -14,20 +12,20 @@ import java.math.BigInteger;
 @AutoMapper(target = Oem.class)
 public class OemVo {
     /**
-     * 花类型ID
+     * 花型号ID
      */
     @TableId("id")
     private Long id;
     /**
      *租户ID
      */
-    private BigInteger tenant_id;
+    private Long tenant_id;
     /**
-     * 花类型名称
+     * 花型号名称
      */
     private String name;
     /**
-     * 花类型图片
+     * 花型号图片
      */
     private String image;
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/BrandMapper.java

@@ -1,12 +1,11 @@
 package org.dromara.commodityManagement.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.dromara.commodityManagement.domain.Brand;
 import org.dromara.commodityManagement.domain.vo.BrandVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
-/**
- * 品牌Mapper
- */
+@Mapper
 public interface BrandMapper extends BaseMapperPlus<Brand, BrandVo> {
 
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/CraftMapper.java

@@ -0,0 +1,11 @@
+package org.dromara.commodityManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.commodityManagement.domain.Craft;
+import org.dromara.commodityManagement.domain.vo.CraftVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+@Mapper
+public interface CraftMapper extends BaseMapperPlus<Craft, CraftVo> {
+
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/OemMapper.java

@@ -1,11 +1,12 @@
 package org.dromara.commodityManagement.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import org.apache.ibatis.annotations.Mapper;
 import org.dromara.commodityManagement.domain.Oem;
 import org.dromara.commodityManagement.domain.vo.OemVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+@Mapper
 public interface OemMapper extends BaseMapperPlus<Oem, OemVo> {
 
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/CraftService.java

@@ -0,0 +1,16 @@
+package org.dromara.commodityManagement.service;
+
+import org.dromara.commodityManagement.domain.bo.CraftBo;
+import org.dromara.commodityManagement.domain.vo.CraftVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+public interface CraftService {
+    TableDataInfo<CraftVo> selectPageCraftList(CraftBo craft, PageQuery pageQuery);
+
+    int insertCraft(CraftBo craftBo);
+
+    int updateCraft(CraftBo craftBo);
+
+    int deleteCraftByIds(Long[] craftIds);
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/OemService.java

@@ -12,5 +12,5 @@ public interface OemService {
 
     int updateOem(OemBo oemBo);
 
-    int deleteOemById(Long[] oemId);
+    int deleteOemByIds(Long[] oemId);
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/impl/CraftServiceImpl.java

@@ -0,0 +1,90 @@
+package org.dromara.commodityManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.Craft;
+import org.dromara.commodityManagement.domain.bo.CraftBo;
+import org.dromara.commodityManagement.domain.vo.CraftVo;
+import org.dromara.commodityManagement.mapper.CraftMapper;
+import org.dromara.commodityManagement.service.CraftService;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.Arrays;
+
+@RequiredArgsConstructor
+@Service
+public class CraftServiceImpl implements CraftService {
+    private final CraftMapper craftMapper;
+
+    /**
+     * 查询工艺对象分页查询工艺数据
+     *
+     * @param craftBo   工艺Bo对象
+     * @param pageQuery 查询条件
+     * @return 分页结果
+     */
+    @Override
+    public TableDataInfo<CraftVo> selectPageCraftList(CraftBo craftBo, PageQuery pageQuery) {
+        QueryWrapper<Craft> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(craftBo.getGoodsTypeExtendName()), "goods_type_extend_name", craftBo.getGoodsTypeExtendName());
+        Page<CraftVo> page = craftMapper.selectVoPage(pageQuery.build(), queryWrapper);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 新增工艺
+     *
+     * @param craftBo CraftBo对象
+     * @return 结果
+     */
+    @Override
+    public int insertCraft(CraftBo craftBo) {
+        Craft craft = MapstructUtils.convert(craftBo, Craft.class);
+        validEntityBeforeSave(craft);
+        return craftMapper.insert(craft);
+    }
+
+    /**
+     * 修改工艺
+     *
+     * @param craftBo CraftBo对象
+     * @return 结果
+     */
+    @Override
+    public int updateCraft(CraftBo craftBo) {
+        Craft craft = MapstructUtils.convert(craftBo, Craft.class);
+        validEntityBeforeSave(craft);
+        QueryWrapper<Craft> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", craft.getId());
+        return craftMapper.updateById(craft);
+    }
+
+    /**
+     * 批量删除工艺
+     *
+     * @param craftIds CraftIds
+     * @return 结果
+     */
+    @Override
+    public int deleteCraftByIds(Long[] craftIds) {
+        return craftMapper.deleteByIds(Arrays.asList(craftIds));
+    }
+
+    /**
+     * 保存前检验
+     *
+     * @param entity 实体对象
+     */
+    private void validEntityBeforeSave(Craft entity) {
+        if (!StringUtils.isNotEmpty(entity.getGoodsTypeExtendName())) {
+            throw new ServiceException("名称不能为空！");
+        }
+    }
+}
+

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/impl/OemSeviceImpl.java → ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/impl/OemServiceImpl.java

@@ -19,27 +19,39 @@ import java.util.Arrays;
 
 @RequiredArgsConstructor
 @Service
-public class OemSeviceImpl implements OemService {
+public class OemServiceImpl implements OemService {
     private final OemMapper oemMapper;
     /**
-     * 查询花型号列表
-     * @param oem 花型号Bo对象
+     * 查询花型号对象分页查询花型号数据
+     * @param oemBo 花型号Bo对象
      * @param pageQuery 查询条件
      * @return 分页结果
      */
     @Override
-    public TableDataInfo<OemVo> selectPageOemList(OemBo oem, PageQuery pageQuery) {
+    public TableDataInfo<OemVo> selectPageOemList(OemBo oemBo, PageQuery pageQuery) {
         QueryWrapper<Oem> lqw =new QueryWrapper<>();
-        lqw.eq(StringUtils.isNotBlank(oem.getName()), "name", oem.getName());
+        lqw.eq(StringUtils.isNotBlank(oemBo.getName()), "name", oemBo.getName());
         Page<OemVo> page = oemMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(page);
     }
+
+    /**
+     * 新增花型号
+     * @param oemBo OemBo对象
+     * @return 结果
+     */
     @Override
     public int insertOem(OemBo oemBo) {
         Oem oem = MapstructUtils.convert(oemBo, Oem.class);
         validEntityBeforeSave(oem);
         return oemMapper.insert(oem);
     }
+
+    /**
+     * 修改花型号
+     * @param oemBo OemBo对象
+     * @return 结果
+     */
     @Override
     public int updateOem(OemBo oemBo) {
         Oem oem = MapstructUtils.convert(oemBo, Oem.class);
@@ -48,8 +60,14 @@ public class OemSeviceImpl implements OemService {
         lqw.eq("id", oem.getId());
         return oemMapper.updateById(oem);
     }
+
+    /**
+     * 批量删除品牌
+     * @param oemIds OemIds
+     * @return 结果
+     */
     @Override
-    public int deleteOemById(Long[] oemIds) {
+    public int deleteOemByIds(Long[] oemIds) {
         return oemMapper.deleteByIds(Arrays.asList(oemIds));
     }
     /**
@@ -59,8 +77,6 @@ public class OemSeviceImpl implements OemService {
     private void validEntityBeforeSave(Oem entity) {
         if(!StringUtils.isNotEmpty(entity.getName())){
             throw new ServiceException("名称不能为空！");
-        } else if (!StringUtils.isNotBlank(entity.getImage())) {
-            throw new ServiceException("图片不能为空！");
         }
     }
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/resources/mapper/CraftMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.commodityManagement.mapper.CraftMapper">
+
+</mapper>