findByPkSpecsType(@Param("pkSpecsType") Integer pkSpecsType);
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThApprovalLogMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThApprovalLogMapper.java
deleted file mode 100644
index 66a746dc..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThApprovalLogMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hzs.ground.product.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hzs.common.domain.scm.th.ThApprovalLog;
-
-/**
- *
- * 供应商产品日志 Mapper 接口
- *
- *
- * @author hzs
- * @since 2024-03-28
- */
-public interface ThApprovalLogMapper extends BaseMapper {
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductExtendMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductExtendMapper.java
deleted file mode 100644
index 82a7fba9..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductExtendMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hzs.ground.product.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hzs.common.domain.scm.th.ThProductExtend;
-
-/**
- *
- * thProduct商品拓展表 Mapper 接口
- *
- *
- * @author hzs
- * @since 2024-03-23
- */
-public interface ThProductExtendMapper extends BaseMapper {
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductMapper.java
deleted file mode 100644
index 18d03e41..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductMapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.hzs.ground.product.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hzs.common.domain.scm.th.ThProduct;
-import com.hzs.ground.product.param.ProductInfoParam;
-import com.hzs.ground.product.vo.ProductVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * Mapper 接口
- *
- * @author hzs
- * @since 2024-03-22
- */
-public interface ThProductMapper extends BaseMapper {
-
- /**
- * 查询列表
- *
- * @param productInfoParam
- * @return
- */
- List queryByList(ProductInfoParam productInfoParam);
-
- /*
- * @description: 根据产品id查询产品申请
- **/
- List queryProductApplyByProduct(List productId);
-
- /**
- * 根据id 查询详情
- *
- * @param productId
- * @return
- */
- ProductVo getProductInfoById(@Param("productId") Integer productId);
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductSpecsMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductSpecsMapper.java
deleted file mode 100644
index 56c81f2c..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductSpecsMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hzs.ground.product.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hzs.common.domain.scm.th.ThProductSpecs;
-
-/**
- *
- * thPorduct规格明细表 Mapper 接口
- *
- *
- * @author hzs
- * @since 2024-03-23
- */
-public interface ThProductSpecsMapper extends BaseMapper {
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ProductBasParams.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ProductBasParams.java
deleted file mode 100644
index 641b890e..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ProductBasParams.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.hzs.ground.product.param;/**
- * @Description:
- * @Author: yuhui
- * @Time: 2023/11/28 15:04
- * @Classname: ProductBasParams
- * @PackageName: com.hzs.scm.product.param
- */
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.scm.product.param
- *@Author: yh
- *@CreateTime: 2023-11-28 15:04
- *@Description: TODO
- *@Version: 1.0
- */
-@Data
-public class ProductBasParams implements Serializable {
-
- /**
- * 商品主键
- */
- private Integer pkId;
- /**
- * 产品编号
- */
- private String productCode;
-
- /**
- * 产品名称
- */
- private String productName;
-
-
-
- /**
- * 规格分类
- */
- private Integer pkClassify;
-
- /**
- * 单位 来源于枚举：单位
- */
- private Integer unit;
-
- /**
- * 重量 以千克作为单位
- */
- private BigDecimal weight;
-
- /**
- * 长 以厘米作为单位
- */
- private BigDecimal length;
-
- /**
- * 宽 以厘米作为单位
- */
- private BigDecimal width;
-
- /**
- * 高 以厘米作为单位
- */
- private BigDecimal height;
-
-
- /**
- * 封面图
- */
- private String cover;
-
- /**
- * 保质期
- */
- private Integer shelfLife;
-
-
- /**
- * 产品规格类型列表
- */
- private List pkSpecsType;
-
- /**
- * 排序值
- */
-
- private Integer sort;
-
- /**
- * 发货渠道 1 总仓发货 2 一件代发
- */
-
- private Integer shippingChannel;
-
-
- /**
- * 产品主键id列表
- */
- List productIds;
-
- /**
- * 海陆空运输方式筛选
- */
- private Integer shippingType;
-
- /**
- * 开始创建时间
- */
- private Date startCreateDate;
- /**
- * 结束创建时间
- */
- private Date endCreateDate;
-
-
- /**
- * 产品编号
- */
- List productCodes;
-
- private Integer pkCountry;
-
- /**
- * 复购类型
- */
-
- private Integer repurchaseType;
-
- /**
- * 是否存在规格
- */
- private Integer isExistSpecs;
-
- /**
- * 查询产品信息
- */
- private String queryInfo;
-
- /**
- * 产品基础档案主键
- */
- private Integer pkProductBas;
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ProductInfoParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ProductInfoParam.java
deleted file mode 100644
index 7899e1b3..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ProductInfoParam.java
+++ /dev/null
@@ -1,268 +0,0 @@
-package com.hzs.ground.product.param;/**
- * @Description:
- * @Author: yuhui
- * @Time: 2024/3/25 11:12
- * @Classname: ProductInfoParam
- * @PackageName: com.hzs.scm.product.param
- */
-
-import com.hzs.system.sys.dto.LoginUser;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.scm.product.param
- *@Author: yh
- *@CreateTime: 2024-03-25 11:12
- *@Description: TODO
- *@Version: 1.0
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ProductInfoParam implements Serializable {
- /**
- * 登录用户信息
- */
- private LoginUser loginUser;
- /**
- * 商品主键
- */
- private Integer pkId;
- /**
- * 产品编号
- */
- private String productCode;
-
- /**
- * 产品名称
- */
- private String productName;
-
- /**
- * 翻译key
- */
- private Integer transactionKey;
-
- /**
- * 规格分类
- */
- private Integer pkClassify;
-
- /**
- * 单位 来源于枚举：单位
- */
- private Integer unit;
-
- /**
- * 重量 以千克作为单位
- */
- private BigDecimal weight;
-
- /**
- * 长 以厘米作为单位
- */
- private BigDecimal length;
-
- /**
- * 宽 以厘米作为单位
- */
- private BigDecimal width;
-
- /**
- * 高 以厘米作为单位
- */
- private BigDecimal height;
-
- /**
- * 邮费重量 以千克作为单位
- */
- private BigDecimal postageWeight;
-
- /**
- * 建议零售价
- */
- private BigDecimal retailPrice;
-
- /**
- * 启用状态 来源于枚举：是否，默认是
- */
- private Integer enableState;
-
- /**
- * 封面图
- */
- private String cover;
-
- /**
- * 保质期
- */
- private Integer shelfLife;
-
- /**
- * 是否冷链
- */
- private Integer isFresh;
-
-
- /**
- * 是否提货 来源于枚举：是否，默认否
- */
- private Integer isPickUp;
-
- /**
- * 是否抽奖奖品 来源于枚举：是否，默认否
- */
- private Integer isPrize;
-
- /**
- * 是否条码管理 来源于枚举：是否，默认否
- */
- private Integer isBarCode;
-
- /**
- * 能否合并发货 来源于枚举：是否，默认是
- */
- private Integer isMerge;
-
- /**
- * 来源于枚举：是否，默认是
- */
- private Integer isGift;
-
- /**
- * 库存预警数量
- */
- // private Long warningQuantity;
-
- /**
- * 是否陆运
- */
- private Integer isLandTrans;
-
- /**
- * 是否空运
- */
- private Integer isAirTrans;
-
- /**
- * 是否海运
- */
- private Integer isOceanTrans;
-
- /**
- * 产品属性 枚举：商品属性,1=实物商品、2=虚拟商品
- */
- private Integer productAttr;
-
- /**
- * 产品规格类型列表
- */
- private List pkSpecsType;
-
- /**
- * 排序值
- */
-
- private Integer sort;
-
- /**
- * 发货渠道 1 总仓发货 2 一件代发
- */
- private Integer shippingChannel;
-
- /**
- * 产品主键id列表
- */
- List productIds;
-
- /**
- * 海陆空运输方式筛选
- */
- private Integer shippingType;
-
- /**
- * 开始创建时间
- */
- private Date startCreateDate;
- /**
- * 结束创建时间
- */
- private Date endCreateDate;
-
-
- /**
- * 产品编号
- */
- List productCodes;
-
- private Integer pkCountry;
-
- /**
- * 复购类型
- */
-
- private Integer repurchaseType;
-
- /**
- * 是否存在规格
- */
- private Integer isExistSpecs;
-
- /**
- * 查询产品信息
- */
- private String queryInfo;
-
- /**
- * 产品基础档案主键
- */
- private Integer pkProductBas;
-
- /**
- * 数量
- */
- private Integer quantity;
-
- /**
- * 供货价格
- */
-
- private BigDecimal supplyPrice;
-
-
-
- /**
- * 供货数量
- */
-
- private Integer supplyQuantity;
-
- /**
- * 销售模式
- */
-
- private Integer saleModel;
-
- /**
- * 供应商
- */
- private Integer pkSupplier;
- /**
- * 供应商名称
- */
- private String supplierName;
-
-
- /**
- * 供应商主键
- */
- private Integer pkCubasdoc;
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ThProductParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ThProductParam.java
deleted file mode 100644
index 7de4211f..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ThProductParam.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.hzs.ground.product.param;/**
- * @Description:
- * @Author: yuhui
- * @Time: 2024/3/22 15:14
- * @Classname: ProductParam
- * @PackageName: com.hzs.scm.product.param
- */
-
-import com.hzs.common.core.web.domain.BaseApprovalEntity;
-import com.hzs.common.domain.scm.th.ThProduct;
-import com.hzs.system.sys.dto.LoginUser;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.scm.product.param
- *@Author: yh
- *@CreateTime: 2024-03-22 15:14
- *@Description: TODO
- *@Version: 1.0
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@AllArgsConstructor
-@NoArgsConstructor
-public class ThProductParam extends BaseApprovalEntity implements Serializable {
-
-
- /**
- * 操作类型（1=新增,2=修改,3=删除）
- */
- private Integer controlType;
-
- /**
- * 国家
- */
- private Integer pkCountry;
-
- /**
- * 会员ID
- */
- private Long pkMember;
-
-
- /**
- * 登录用户信息
- */
- private LoginUser loginUser;
-
- /**
- * 供应商产品信息
- */
- private ThProduct product;
-
- /**
- * 供应商产品信息
- */
- private ProductInfoParam productInfoParam;
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/provider/IProductBasServiceProvider.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/provider/IProductBasServiceProvider.java
deleted file mode 100644
index a64922ab..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/provider/IProductBasServiceProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.hzs.ground.product.provider;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.hzs.common.core.domain.R;
-import com.hzs.common.domain.sale.product.BdProductBas;
-import com.hzs.ground.product.service.IBdProductBasService;
-import com.hzs.scm.product.IProductBasServiceApi;
-import com.hzs.scm.product.dto.ProductBasDTO;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-@Slf4j
-@DubboService
-public class IProductBasServiceProvider implements IProductBasServiceApi {
-
- @Autowired
- private IBdProductBasService productBasService;
-
- /**
- * 根据id 查询
- *
- * @return
- */
- @Override
- public R getProductBasById(Integer pkId) {
- BdProductBas productBas = productBasService.getProductBasById(pkId);
- return R.ok(BeanUtil.copyProperties(productBas, ProductBasDTO.class));
- }
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IBdProductBasService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IBdProductBasService.java
deleted file mode 100644
index 860b2bd8..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IBdProductBasService.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.hzs.ground.product.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hzs.common.domain.sale.product.BdProductBas;
-import com.hzs.common.domain.sale.product.BdProductSpecs;
-import com.hzs.common.domain.sale.product.ext.BdProductBasExt;
-import com.hzs.ground.product.param.ProductBasParams;
-import com.hzs.ground.product.vo.ProductBasVo;
-import com.hzs.ground.product.vo.ProductInfoVo;
-import com.hzs.system.sys.dto.LoginUser;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * 产品基本设置 服务类
- *
- * @author hzs
- * @since 2023-11-21
- */
-public interface IBdProductBasService extends IService {
-
- /**
- * 根据id查询
- *
- * @param productBasId
- * @return
- */
- BdProductBas getProductBasById(Integer productBasId);
-
- /*
- * @description: 查询产品id，顺道查询出国家对应的产品id
- **/
- List queryProductBasByIds(Set idList, Integer pkCountry);
-
- /**
- * 新增
- *
- * @param productBasParams
- * @return
- */
- String saveProductBas(ProductBasParams productBasParams, LoginUser loginUser);
-
- /**
- * 修改
- *
- * @param productBasParams
- * @param loginUser
- */
- void updateProductBas(ProductBasParams productBasParams, LoginUser loginUser);
-
- /**
- * 删除
- *
- * @param productBasId
- */
- void removeProductBas(Integer productBasId);
-
- /**
- * 根据产品编号查询信息
- *
- * @param productCode
- */
- ProductInfoVo getByProductCodeInfo(String productCode);
-
- /**
- * 查询列表
- *
- * @param query
- * @return
- */
- List queryProductBasList(String query, Integer pkCountry, Integer pkCubasdoc);
-
- /**
- * 根据产品编号查询
- *
- * @param productCode
- * @return
- */
- ProductBasVo findByProductCode(String productCode);
-
- /*
- * @description: 根据规格、主键查询产品
- **/
- List queryProductExtBySpecsId(List productSpecsList, Integer pkCountry);
-
- /**
- * 查询全部已关联查询
- *
- * @param query
- * @return
- */
- List queryProductBasRelevanceList(String query, Integer pkCountry);
-
- /**
- * 查询列表
- *
- * @param productBasParams
- * @return
- */
- List selectByList(ProductBasParams productBasParams);
-
- /**
- * 根据供应商查询产品基本信息
- *
- * @param pkSupplier
- * @return
- */
- List selectbypkSupplierList(Integer pkSupplier);
-
- /**
- * 查询无供应商的产品基本信息
- *
- * @return
- */
- List selectbyNotSupplierList();
-
- /**
- * 查询全部
- *
- * @param query
- * @param pkCountry
- * @return
- */
- List queryProductBasAllList(String query, Integer pkCountry);
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IBdProductBasSpecsService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IBdProductBasSpecsService.java
deleted file mode 100644
index 51b3b085..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IBdProductBasSpecsService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.hzs.ground.product.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hzs.common.domain.sale.product.BdProductBasSpecs;
-import com.hzs.ground.product.vo.BdProductBasSpecsVo;
-import com.hzs.ground.product.vo.SpecsVo;
-
-import java.util.List;
-
-/**
- *
- * 规格明细表 服务类
- *
- *
- * @author hzs
- * @since 2023-11-21
- */
-public interface IBdProductBasSpecsService extends IService {
-
- /**
- * 根据主键查询 产品规格信息
- * @param pkProductBas
- * @return
- */
- List queryListByProductBasCode(Integer pkProductBas);
-
- /**
- * 查询规格（规格类型条件）
- * @param pkSpecsType
- * @return
- */
- List findByPkSpecsType(Integer pkSpecsType);
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThApprovalLogService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThApprovalLogService.java
deleted file mode 100644
index fea746b1..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThApprovalLogService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.hzs.ground.product.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hzs.common.domain.scm.th.ThApprovalLog;
-
-/**
- * 供应商产品日志 服务类
- *
- * @author hzs
- * @since 2024-03-28
- */
-public interface IThApprovalLogService extends IService {
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductExtendService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductExtendService.java
deleted file mode 100644
index ab7e6858..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductExtendService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hzs.ground.product.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hzs.common.domain.scm.th.ThProductExtend;
-
-/**
- *
- * thProduct商品拓展表 服务类
- *
- *
- * @author hzs
- * @since 2024-03-23
- */
-public interface IThProductExtendService extends IService {
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductService.java
deleted file mode 100644
index 7e233fa0..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.hzs.ground.product.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hzs.common.domain.scm.th.ThProduct;
-import com.hzs.ground.product.param.ProductInfoParam;
-import com.hzs.ground.product.param.ThProductParam;
-
-import com.hzs.ground.product.vo.ProductVo;
-import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
-
-import java.util.List;
-
-/**
- * 服务类
- *
- * @author hzs
- * @since 2024-03-22
- */
-public interface IThProductService extends IService {
-
- /**
- * 查询列表
- *
- * @param productInfoParam
- * @return
- */
- List queryByList(ProductInfoParam productInfoParam);
-
- /**
- * 根据id 查询详情
- *
- * @param productId
- * @return
- */
- ProductVo getProductInfoById(Integer productId);
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductSpecsService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductSpecsService.java
deleted file mode 100644
index 0b109ce3..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductSpecsService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hzs.ground.product.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hzs.common.domain.scm.th.ThProductSpecs;
-
-/**
- *
- * thPorduct规格明细表 服务类
- *
- *
- * @author hzs
- * @since 2024-03-23
- */
-public interface IThProductSpecsService extends IService {
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/BdProductBasServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/BdProductBasServiceImpl.java
deleted file mode 100644
index 452eaa54..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/BdProductBasServiceImpl.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package com.hzs.ground.product.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hzs.common.core.constant.CacheConstants;
-import com.hzs.common.core.enums.EDelFlag;
-import com.hzs.common.core.service.RedisService;
-import com.hzs.common.core.utils.DateUtils;
-import com.hzs.common.domain.sale.product.BdProductBas;
-import com.hzs.common.domain.sale.product.BdProductBasSpecs;
-import com.hzs.common.domain.sale.product.BdProductSpecs;
-import com.hzs.common.domain.sale.product.ext.BdProductBasExt;
-import com.hzs.ground.product.mapper.BdProductBasMapper;
-import com.hzs.ground.product.param.ProductBasParams;
-import com.hzs.ground.product.service.IBdProductBasService;
-import com.hzs.ground.product.service.IBdProductBasSpecsService;
-import com.hzs.ground.product.vo.BdProductBasSpecsVo;
-import com.hzs.ground.product.vo.ProductBasVo;
-import com.hzs.ground.product.vo.ProductInfoVo;
-import com.hzs.ground.product.vo.SpecsVo;
-import com.hzs.system.sys.dto.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-/**
- * 产品基本设置 服务实现类
- *
- * @author hzsf
- * @since 2023-11-21
- */
-@Service
-public class BdProductBasServiceImpl extends ServiceImpl implements IBdProductBasService {
-
- @Autowired
- private IBdProductBasService productBasService;
- @Autowired
- private IBdProductBasSpecsService productBasSpecsService;
- @Autowired
- private RedisService redisService;
-
- /**
- * 根据id查询
- *
- * @param productBasId
- * @return
- */
- @Override
- public BdProductBas getProductBasById(Integer productBasId) {
- BdProductBas bdProductBas = redisService.getCacheObject(CacheConstants.BD_PRODUCT_BAS + productBasId);
- if (bdProductBas == null) {
- bdProductBas = baseMapper.selectById(productBasId);
- if (bdProductBas != null) {
- redisService.setCacheObject(CacheConstants.BD_PRODUCT_BAS + bdProductBas.getPkId(), bdProductBas);
- }
- }
- return bdProductBas;
- }
-
- @Override
- public List queryProductBasByIds(Set idList, Integer pkCountry) {
- return baseMapper.queryProductBasByIds(idList, pkCountry);
- }
-
- /**
- * 新增
- *
- * @param productBasParams
- * @return
- */
- @Override
- public String saveProductBas(ProductBasParams productBasParams, LoginUser loginUser) {
- String productCode = productBasParams.getProductCode();
- BdProductBas productBas = BeanUtil.copyProperties(productBasParams, BdProductBas.class);
- productBas.setProductCode(productCode);
- productBas.setPkCreator(loginUser.getUserId());
- productBas.setCreationTime(DateUtils.currentDateTime());
- productBas.setPkCreator(loginUser.getUserId());
- productBas.setPkCountry(loginUser.getDataCountry());
- // 删除状态 审核完毕 修改为未删除状态
- productBas.setDelFlag(EDelFlag.UN_DELETE.getValue());
- productBasService.save(productBas);
- // 生成规格明细
- if (productBasParams.getPkSpecsType() != null) {
- // List productSpecsList = new ArrayList<>();
- for (Integer id : productBasParams.getPkSpecsType()) {
- BdProductBasSpecs productBasSpecs = new BdProductBasSpecs();
- productBasSpecs.setPkProductBas(productBas.getPkId());
- productBasSpecs.setPkSpecsType(id);
- productBasSpecs.setPkCountry(loginUser.getDataCountry());
- productBasSpecs.setPkCreator(loginUser.getUserId());
- productBasSpecs.setCreationTime(DateUtils.currentDateTime());
- productBasSpecsService.save(productBasSpecs);
- }
- }
- return productCode;
- }
-
- /**
- * 修改
- *
- * @param productBasParams
- * @param loginUser
- */
- @Override
- public void updateProductBas(ProductBasParams productBasParams, LoginUser loginUser) {
- BdProductBas productBas = BeanUtil.copyProperties(productBasParams, BdProductBas.class);
- productBas.setPkId(productBasParams.getPkId());
- productBas.setPkModified(loginUser.getUserId());
- productBas.setModifiedTime(new Date());
- productBasService.updateById(productBas);
- // 生成规格明细
- if (productBasParams.getPkSpecsType() != null) {
- QueryWrapper removeWrapper = new QueryWrapper<>();
- removeWrapper.eq("PK_PRODUCT_BAS", productBasParams.getPkId());
- productBasSpecsService.remove(removeWrapper);
- for (Integer id : productBasParams.getPkSpecsType()) {
- BdProductBasSpecs productBasSpecs = new BdProductBasSpecs();
- productBasSpecs.setPkProductBas(productBasParams.getPkId());
- productBasSpecs.setPkSpecsType(id);
- productBasSpecs.setPkCountry(loginUser.getDataCountry());
- productBasSpecs.setPkCreator(loginUser.getUserId());
- productBasSpecs.setCreationTime(new Date());
- productBasSpecsService.save(productBasSpecs);
- }
- }
- }
-
- /**
- * 删除
- *
- * @param productBasId
- */
- @Override
- public void removeProductBas(Integer productBasId) {
- productBasService.removeById(productBasId);
- productBasSpecsService.remove(new QueryWrapper().eq("PK_PRODUCT_BAS", productBasId));
- }
-
- /**
- * 根据产品编号查询信息
- *
- * @param productCode
- */
- @Override
- public ProductInfoVo getByProductCodeInfo(String productCode) {
- // BdProductBas productBas = productBasService.getOne(new QueryWrapper().eq("PRODUCT_CODE", productCode));
- ProductBasVo productBas = productBasService.findByProductCode(productCode);
- ProductInfoVo productInfoVo = new ProductInfoVo();
- if (productBas != null) {
- List bdProductBasSpecsVos = productBasSpecsService.queryListByProductBasCode(productBas.getPkId());
- for (BdProductBasSpecsVo bdProductBasSpecsVo : bdProductBasSpecsVos) {
- List specsList = productBasSpecsService.findByPkSpecsType(bdProductBasSpecsVo.getPkSpecsType());
- bdProductBasSpecsVo.setSpecsList(specsList);
- }
- productInfoVo.setProductBasSpecsList(bdProductBasSpecsVos);
- productInfoVo.setPkId(productBas.getPkId());
- productInfoVo.setProductCode(productBas.getProductCode());
- productInfoVo.setProductName(productBas.getProductName());
- // 单位
- productInfoVo.setUnit(productBas.getUnit());
- productInfoVo.setUnitStr(productBas.getUnitStr());
- }
- return productInfoVo;
- }
-
- /**
- * 查询列表
- *
- * @param query
- * @return
- */
- @Override
- public List queryProductBasList(String query, Integer pkCountry, Integer pkCubasdoc) {
- return baseMapper.queryProductBasList(query, pkCountry, pkCubasdoc);
- }
-
- /**
- * 根据产品编号查询
- *
- * @param productCode
- * @return
- */
- @Override
- public ProductBasVo findByProductCode(String productCode) {
- return baseMapper.findByProductCode(productCode);
- }
-
- @Override
- public List queryProductExtBySpecsId(List productSpecsList, Integer pkCountry) {
- return baseMapper.queryProductExtBySpecsId(productSpecsList, pkCountry);
- }
-
- /**
- * 查询全部关联商品
- *
- * @param
- * @return
- */
- @Override
- public List queryProductBasRelevanceList(String query, Integer pkCountry) {
- return baseMapper.queryProductBasRelevanceList(query, pkCountry);
- }
-
- /**
- * 查询列表
- *
- * @param productBasParams
- * @return
- */
- @Override
- public List selectByList(ProductBasParams productBasParams) {
- return baseMapper.selectByList(productBasParams);
- }
-
- /**
- * 根据供应商查询产品基本信息
- *
- * @param pkSupplier
- * @return
- */
- @Override
- public List selectbypkSupplierList(Integer pkSupplier) {
- return baseMapper.selectbypkSupplierList(pkSupplier);
- }
-
- /**
- * 查询无供应商的产品基本信息
- *
- * @return
- */
- @Override
- public List selectbyNotSupplierList() {
- return baseMapper.selectbyNotSupplierList();
- }
-
- /**
- * 查询全部
- *
- * @param query
- * @param pkCountry
- * @return
- */
- @Override
- public List queryProductBasAllList(String query, Integer pkCountry) {
- return baseMapper.queryProductBasAllList(query, pkCountry);
- }
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/BdProductBasSpecsServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/BdProductBasSpecsServiceImpl.java
deleted file mode 100644
index d62c0b95..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/BdProductBasSpecsServiceImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.hzs.ground.product.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hzs.common.domain.sale.product.BdProductBasSpecs;
-import com.hzs.ground.product.mapper.BdProductBasSpecsMapper;
-import com.hzs.ground.product.service.IBdProductBasSpecsService;
-import com.hzs.ground.product.vo.BdProductBasSpecsVo;
-import com.hzs.ground.product.vo.SpecsVo;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- *
- * 规格明细表 服务实现类
- *
- *
- * @author hzs
- * @since 2023-11-21
- */
-@Service
-public class BdProductBasSpecsServiceImpl extends ServiceImpl implements IBdProductBasSpecsService {
- /**
- * 根据主键查询 产品规格信息
- * @param pkProductBas
- * @return
- */
- @Override
- public List queryListByProductBasCode(Integer pkProductBas) {
- return baseMapper.queryListByProductBasCode(pkProductBas);
- }
- /**
- * 查询规格（规格类型条件）
- * @param pkSpecsType
- * @return
- */
- @Override
- public List findByPkSpecsType(Integer pkSpecsType) {
- return baseMapper.findByPkSpecsType(pkSpecsType);
- }
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThApprovalLogServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThApprovalLogServiceImpl.java
deleted file mode 100644
index b453597a..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThApprovalLogServiceImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.hzs.ground.product.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hzs.common.domain.scm.th.ThApprovalLog;
-import com.hzs.ground.product.mapper.ThApprovalLogMapper;
-import com.hzs.ground.product.service.IThApprovalLogService;
-import org.springframework.stereotype.Service;
-
-/**
- * 供应商产品日志 服务实现类
- *
- * @author hzs
- * @since 2024-03-28
- */
-@Service
-public class ThApprovalLogServiceImpl extends ServiceImpl implements IThApprovalLogService {
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductExtendServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductExtendServiceImpl.java
deleted file mode 100644
index da019ae1..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductExtendServiceImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.hzs.ground.product.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hzs.common.domain.scm.th.ThProductExtend;
-import com.hzs.ground.product.mapper.ThProductExtendMapper;
-import com.hzs.ground.product.service.IThProductExtendService;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * thProduct商品拓展表 服务实现类
- *
- *
- * @author hzs
- * @since 2024-03-23
- */
-@Service
-public class ThProductExtendServiceImpl extends ServiceImpl implements IThProductExtendService {
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductServiceImpl.java
deleted file mode 100644
index c60ac68b..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductServiceImpl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.hzs.ground.product.service.impl;
-
-import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hzs.common.core.domain.R;
-import com.hzs.common.core.enums.*;
-import com.hzs.common.core.utils.CommonUtil;
-import com.hzs.common.domain.scm.th.ThApprovalLog;
-import com.hzs.common.domain.scm.th.ThProduct;
-import com.hzs.ground.product.mapper.ThProductMapper;
-import com.hzs.ground.product.param.ProductInfoParam;
-import com.hzs.ground.product.param.ThProductParam;
-
-import com.hzs.ground.product.service.*;
-import com.hzs.ground.product.vo.ProductVo;
-import com.hzs.system.sys.IApprovalServiceApi;
-import com.hzs.system.sys.dto.ApprovalSubmitDTO;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 服务实现类
- */
-@Service
-public class ThProductServiceImpl extends ServiceImpl implements IThProductService {
-
- @DubboReference
- IApprovalServiceApi approvalServiceApi;
-
- @Autowired
- private IThApprovalLogService approvalLogService;
-
- /**
- * 查询列表
- *
- * @param productInfoParam
- * @return
- */
- @Override
- public List queryByList(ProductInfoParam productInfoParam) {
- return baseMapper.queryByList(productInfoParam);
- }
-
- /**
- * 根据id 查询详情
- *
- * @param productId
- * @return
- */
- @Override
- public ProductVo getProductInfoById(Integer productId) {
- return baseMapper.getProductInfoById(productId);
- }
-
-
- /**
- * 提交审批
- *
- * @param productParam 抽奖参数
- */
- public Boolean submitApproval(ThProductParam productParam, EApprovalBusiness approvalBusiness) {
- //保存审批日志
- ThApprovalLog approvalLog = saveApprovalLog(productParam, approvalBusiness);
- ProductInfoParam productInfoParam = productParam.getProductInfoParam();
-
-
- ApprovalSubmitDTO approvalSubmitDTO = ApprovalSubmitDTO.builder().eApprovalBusiness(approvalBusiness)
- .businessCode(approvalLog.getBusinessCode())
- .businessData(JSONUtil.toJsonStr(productInfoParam))
- .signType(ESignType.getEnumByValue(productParam.getSignType())).userIdList(productParam.getUserIdList())
- .sendIdList(productParam.getSendIdList()).remark(productParam.getRemark()).fileList(productParam.getFileList()).build();
- R submit = approvalServiceApi.submit(approvalSubmitDTO, productParam.getLoginUser());
- if (!submit.isSuccess()) {
- throw new RuntimeException("供应商商品参数提交审批失败！");
- }
- return submit.isSuccess();
- }
-
- /**
- * 保存活动审批日志信息
- *
- * @param recommendParam 直推赠送参数
- * @param approvalBusiness 审批业务
- * @return boolean
- */
- public ThApprovalLog saveApprovalLog(ThProductParam recommendParam, EApprovalBusiness approvalBusiness) {
- Integer controlType = recommendParam.getControlType();
- String afterData = JSONUtil.toJsonStr(recommendParam.getProductInfoParam());
- String beforeData = controlType.equals(EControlType.SAVE.getValue()) ? JSONUtil.toJsonStr(recommendParam.getProductInfoParam()) : null;
- //业务单号
- String businessCode = CommonUtil.createSerialNumber(EOrderPrefix.SUPPLIER.getValue());
- ThApprovalLog approvalLog = ThApprovalLog.builder().approvalType(approvalBusiness.getValue())
- .beforeData(beforeData).businessCode(businessCode).controltype(controlType)
- .approvalStatus(EApproveRechargeStatus.WAIT.getValue()).afterData(afterData)
- .build();
- approvalLog.setPkCreator(recommendParam.getPkMember());
- approvalLog.setPkCountry(recommendParam.getPkCountry());
-
- approvalLogService.save(approvalLog);
- return approvalLog;
- }
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductSpecsServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductSpecsServiceImpl.java
deleted file mode 100644
index 58e8fdfa..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductSpecsServiceImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.hzs.ground.product.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hzs.common.domain.scm.th.ThProductSpecs;
-import com.hzs.ground.product.mapper.ThProductSpecsMapper;
-import com.hzs.ground.product.service.IThProductSpecsService;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * thPorduct规格明细表 服务实现类
- *
- *
- * @author hzs
- * @since 2024-03-23
- */
-@Service
-public class ThProductSpecsServiceImpl extends ServiceImpl implements IThProductSpecsService {
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/BdProductBasSpecsVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/BdProductBasSpecsVo.java
deleted file mode 100644
index e866b79d..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/BdProductBasSpecsVo.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.hzs.ground.product.vo;/**
- * @Description:
- * @Author: yuhui
- * @Time: 2023/12/5 17:18
- * @Classname: BdProductBasSpecsVo
- * @PackageName: com.hzs.scm.product.vo
- */
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.scm.product.vo
- *@Author: yh
- *@CreateTime: 2023-12-05 17:18
- *@Description: TODO
- *@Version: 1.0
- */
-@Data
-public class BdProductBasSpecsVo {
- /**
- * 主键
- */
-
- private Integer pkId;
-
- /**
- * 产品主键
- */
-
- private Integer pkProductBas;
-
- /**
- * 规格类型
- */
-
- private Integer pkSpecsType;
-
- /**
- * 规格类型名称
- */
- private String specsTypeName;
-
- /**
- * 产品规格表
- */
- private List specsList;
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductBasVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductBasVo.java
deleted file mode 100644
index 58a4f846..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductBasVo.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.hzs.ground.product.vo;/**
- * @Description:
- * @Author: yuhui
- * @Time: 2023/11/29 11:33
- * @Classname: ProductBasVo
- * @PackageName: com.hzs.scm.product.vo
- */
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.hzs.common.core.annotation.Excel;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.scm.product.vo
- *@Author: yh
- *@CreateTime: 2023-11-29 11:33
- *@Description: TODO
- *@Version: 1.0
- */
-@Data
-public class ProductBasVo {
-
- private Integer pkProduct;
-
- /**
- * 主键
- */
-
- private Integer pkId;
-
- /**
- * 产品编号
- */
-
- @Excel(name = "产品编号")
- private String productCode;
-
- /**
- * 产品名称
- */
-
- @Excel(name = "产品名称")
- private String productName;
-
- /**
- * 规格分类
- */
-
- private Integer pkClassify;
-
- /**
- * 单位 来源于枚举：单位
- */
-
- private Integer unit;
-
- /**
- * 单位 来源于枚举：单位
- */
-
- private String unitStr;
-
-
- /**
- * 长 以厘米作为单位
- */
-
- @Excel(name = "长(CM)")
- private BigDecimal length;
-
- /**
- * 宽 以厘米作为单位
- */
-
- @Excel(name = "宽(CM)")
- private BigDecimal width;
-
- /**
- * 高 以厘米作为单位
- */
-
- @Excel(name = "高(CM)")
- private BigDecimal height;
-
- /**
- * 重量 以千克作为单位
- */
-
- @Excel(name = "重量(KG)")
- private BigDecimal weight;
-
- /**
- * 封面图
- */
-
- private String cover;
-
- /**
- * 保质期
- */
-
- @Excel(name = "保质期(天)")
- private Integer shelfLife;
-
-
- /**
- * 创建时间
- */
- @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date creationTime;
-
- /**
- * 供应商主键
- */
- private Integer pkCubasdoc;
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductInfoVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductInfoVo.java
deleted file mode 100644
index f4d9578f..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductInfoVo.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.hzs.ground.product.vo;/**
- * @Description:
- * @Author: yuhui
- * @Time: 2023/12/5 17:13
- * @Classname: ProductInfoVo
- * @PackageName: com.hzs.scm.product.vo
- */
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.scm.product.vo
- *@Author: yh
- *@CreateTime: 2023-12-05 17:13
- *@Description: TODO
- *@Version: 1.0
- */
-@Data
-public class ProductInfoVo {
-
- /**
- * 主键
- */
-
- private Integer pkId;
-
- /**
- * 产品编号
- */
-
- private String productCode;
-
- /**
- * 产品名称
- */
-
- private String productName;
-
-
- /**
- * 单位
- */
- private Integer unit;
- /**
- * 单位字符
- */
- private String unitStr;
-
- /**
- * 产品规格明细
- */
- private List productBasSpecsList;
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductVo.java
deleted file mode 100644
index edc4a4f8..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductVo.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.hzs.ground.product.vo;/**
- * @Description:
- * @Author: yuhui
- * @Time: 2024/4/19 11:25
- * @Classname: ProductVo
- * @PackageName: com.hzs.ground.product.vo
- */
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.hzs.common.core.annotation.Excel;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.ground.product.vo
- *@Author: yh
- *@CreateTime: 2024-04-19 11:25
- *@Description: TODO
- *@Version: 1.0
- */
-@Data
-public class ProductVo {
-
-
- /**
- * 创建人ID
- */
-
- private Long pkCreator;
-
-
-
- /**
- * 修改人ID
- */
-
- private Long pkModified;
-
- /**
- * 修改时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-
- private Date modifiedTime;
-
- /**
- * 逻辑删除 (0=未删除，1已删除)
- */
- @JsonIgnore
- @TableLogic
-
- private Integer delFlag;
-
- /**
- * 国家
- */
-
- private Integer pkCountry;
-
-
- private Integer pkId;
-
-
- /**
- * 产品名称
- */
- @Excel(name = "产品名称")
- private String productName;
- /**
- * 产品编号
- */
- @Excel(name = "产品编号")
- private String productCode;
-
-
-
- /**
- * 规格分类
- */
-
- private Integer pkClassify;
-
-
-
-
- /**
- * 长 以厘米作为单位
- */
- @Excel(name = "长(CM)")
- private BigDecimal length;
-
- /**
- * 宽 以厘米作为单位
- */
- @Excel(name = "宽(CM)")
- private BigDecimal width;
-
- /**
- * 高 以厘米作为单位
- */
- @Excel(name = "高(CM)")
- private BigDecimal height;
- /**
- * 重量 以千克作为单位
- */
- @Excel(name = "重量")
- private BigDecimal weight;
- /**
- * 单位名
- */
- @Excel(name = "单位")
- private String unitVal;
- /**
- * 单位 来源于枚举：单位
- */
-
- private Integer unit;
- /**
- * 零售价格
- */
- @Excel(name = "零售价")
- private BigDecimal retailPrice;
-
- /**
- * 保质期
- */
- @Excel(name = "保质期(天)")
- private Integer shelfLife;
-
- /**
- * 产品规格
- */
- @Excel(name = "产品规格")
- private String productSpecType;
-
-
- /**
- * 创建时间
- */
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date creationTime;
- /**
- * 封面图
- */
-
- private String cover;
-
-
- /**
- * 供应商
- */
-
- private Integer pkSupplier;
-
- /**
- * 供货价格
- */
-
- private BigDecimal supplyPrice;
-
-
-
- /**
- * 供货数量
- */
-
- private Integer supplyQuantity;
-
- /**
- * 销售模式
- */
-
- private Integer saleModel;
-
-
- /**
- * 供应商名称
- */
- private String supplierName;
-
-
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/SpecsVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/SpecsVo.java
deleted file mode 100644
index a53a8cfe..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/SpecsVo.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.hzs.ground.product.vo;/**
- * @Description:
- * @Author: yuhui
- * @Time: 2023/12/6 14:42
- * @Classname: SpecsVo
- * @PackageName: com.hzs.scm.product.vo
- */
-
-import lombok.Data;
-
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.scm.product.vo
- *@Author: yh
- *@CreateTime: 2023-12-06 14:42
- *@Description: TODO
- *@Version: 1.0
- */
-@Data
-public class SpecsVo {
-
- /**
- * 规格主键
- */
- private String pkSpecs;
-
- /**
- * 规格名称
- */
- private String name;
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/controller/ThSupplierApplyController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/controller/ThSupplierApplyController.java
deleted file mode 100644
index 1a6fb338..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/controller/ThSupplierApplyController.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.hzs.ground.supplier.controller;
-
-import com.hzs.common.core.annotation.Log;
-import com.hzs.common.core.constant.msg.ConfigMsgConstants;
-import com.hzs.common.core.constant.msg.ScmMsgConstants;
-import com.hzs.common.core.domain.R;
-import com.hzs.common.core.enums.*;
-import com.hzs.common.core.utils.StringUtils;
-import com.hzs.common.core.web.controller.BaseController;
-import com.hzs.common.core.web.domain.AjaxResult;
-import com.hzs.common.core.web.page.TableDataInfo;
-import com.hzs.common.domain.ground.supplier.ThSupplierApply;
-import com.hzs.common.domain.member.ext.CuMemberExt;
-import com.hzs.common.security.service.UserTokenService;
-import com.hzs.common.security.utils.SecurityUtils;
-import com.hzs.common.util.TransactionUtils;
-import com.hzs.ground.product.service.IThApprovalLogService;
-import com.hzs.ground.supplier.service.IThSupplierApplyService;
-import com.hzs.ground.supplier.vo.ThSupplierApplyVO;
-import com.hzs.member.base.IMemberServiceApi;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 供应商申请申请 前端控制器
- *
- * @author hzs
- * @since 2024-03-21
- */
-@RestController
-@RequestMapping("/manage/th-supplier-apply")
-public class ThSupplierApplyController extends BaseController {
-
- @Autowired
- private IThSupplierApplyService iThSupplierApplyService;
- @DubboReference
- IMemberServiceApi iMemberServiceApi;
-
-
- /**
- * @description: 供应商申请列表
- * @author: zhang jing
- * @date: 2024/3/22 11:35
- * @param: [thSupplierApplyVO]
- * @return: com.hzs.common.core.web.page.TableDataInfo
- **/
- @GetMapping("/list")
- @Log(module = EOperationModule.TH_SUPPLIER_APPLY, business = EOperationBusiness.TH_SUPPLIER_APPLY, method = EOperationMethod.SELECT)
- public TableDataInfo listGeneralIn(ThSupplierApplyVO thSupplierApplyVO) {
- Long userId = SecurityUtils.getUserId();
- thSupplierApplyVO.setPkCountry(SecurityUtils.getPkCountry());
- Integer checkUser = iThSupplierApplyService.queryThSupplierApplyUserList(userId);
- if (checkUser > 0) {
- thSupplierApplyVO.setPkCreator(userId);
- }
- startPage();
- List thSupplierApplyList = iThSupplierApplyService.queryThSupplierApplyList(thSupplierApplyVO);
- return getDataTable(thSupplierApplyList);
- }
-
- /**
- * @description: 添加供应商申请信息
- * @author: zhang jing
- * @date: 2024/3/22 11:53
- * @param: [thSupplierApplyVO]
- * @return: com.hzs.common.core.web.domain.AjaxResult
- **/
- @PostMapping("/save")
- public AjaxResult save(@RequestBody ThSupplierApplyVO thSupplierApplyVO) {
- int pkCountry = SecurityUtils.getPkCountry();
- // 验证必填信息
- if (StringUtils.isEmpty(thSupplierApplyVO.getName())) {
- return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_SUPPLIER_APPLY_NAME));
- }
- if (StringUtils.isEmpty(thSupplierApplyVO.getShortName())) {
- return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_SUPPLIER_APPLY_SHORT_NAME));
- }
- if (StringUtils.isEmpty(thSupplierApplyVO.getLegalBody())) {
- return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_SUPPLIER_APPLY_LEGAL_BODY));
- }
- if (thSupplierApplyVO.getSettleType() == ESettleType.ONLINE.getValue()) {
- if (StringUtils.isEmpty(thSupplierApplyVO.getMemberCode())) {
- return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CODE_NOT_NULL));
- }
- R member = iMemberServiceApi.getMemberByCode(thSupplierApplyVO.getMemberCode());
- thSupplierApplyVO.setPkMember(member.getData().getPkId());
- }
- //默认线下
- thSupplierApplyVO.setSettleType(ESettleType.OFFLINE.getValue());
- thSupplierApplyVO.setPkCountry(pkCountry);
- thSupplierApplyVO.setPkCreator(SecurityUtils.getUserId());
- thSupplierApplyVO.setCreationTime(new Date());
- iThSupplierApplyService.saveThSupplierApply(thSupplierApplyVO);
- return AjaxResult.success();
- }
-
- /**
- * @description: 修改供应商申请信息
- * @author: zhang jing
- * @date: 2024/3/22 11:55
- * @param: [thSupplierApplyVO]
- * @return: com.hzs.common.core.web.domain.AjaxResult
- **/
- @PostMapping("/update")
- public AjaxResult update(@RequestBody ThSupplierApplyVO thSupplierApplyVO) {
- int pkCountry = SecurityUtils.getPkCountry();
- // 验证必填信息
- if (StringUtils.isEmpty(thSupplierApplyVO.getName())) {
- return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_SUPPLIER_APPLY_NAME));
- }
- if (StringUtils.isEmpty(thSupplierApplyVO.getShortName())) {
- return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_SUPPLIER_APPLY_SHORT_NAME));
- }
- if (StringUtils.isEmpty(thSupplierApplyVO.getLegalBody())) {
- return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_SUPPLIER_APPLY_LEGAL_BODY));
- }
- if (thSupplierApplyVO.getSettleType() == ESettleType.ONLINE.getValue()) {
- if (StringUtils.isEmpty(thSupplierApplyVO.getMemberCode())) {
- return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CODE_NOT_NULL));
- }
- R member = iMemberServiceApi.getMemberByCode(thSupplierApplyVO.getMemberCode());
- thSupplierApplyVO.setPkMember(member.getData().getPkId());
- }
- //默认线下
- thSupplierApplyVO.setSettleType(ESettleType.OFFLINE.getValue());
- thSupplierApplyVO.setPkCountry(pkCountry);
- thSupplierApplyVO.setPkCreator(SecurityUtils.getUserId());
- thSupplierApplyVO.setCreationTime(new Date());
- iThSupplierApplyService.updateThSupplierApply(thSupplierApplyVO);
- return AjaxResult.success();
- }
-
- /**
- * @description: 查询供应商申请信息
- * @author: zhang jing
- * @date: 2024/3/22 13:50
- * @param: [pkId]
- * @return: com.hzs.common.core.web.domain.AjaxResult
- **/
- @GetMapping("/getOne/{pkId}")
- public AjaxResult getOne(@PathVariable Long pkId) {
- ThSupplierApply tsa = iThSupplierApplyService.getById(pkId);
- return AjaxResult.success(tsa);
- }
-
- /**
- * @description: 删除供应商申请信息
- * @author: zhang jing
- * @date: 2024/3/22 13:49
- * @param: [pkId]
- * @return: com.hzs.common.core.web.domain.AjaxResult
- **/
- @DeleteMapping("/{pkId}")
- public AjaxResult delete(@PathVariable Long pkId) {
- return AjaxResult.success(iThSupplierApplyService.delThSupplierApply(pkId));
- }
-
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/mapper/ThSupplierApplyMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/mapper/ThSupplierApplyMapper.java
deleted file mode 100644
index 5dbac316..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/mapper/ThSupplierApplyMapper.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.hzs.ground.supplier.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hzs.common.core.enums.EApprovalBusiness;
-import com.hzs.common.domain.ground.supplier.ThSupplierApply;
-import com.hzs.ground.supplier.vo.ThSupplierApplyVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- *
- * 供应商申请申请 Mapper 接口
- *
- *
- * @author hzs
- * @since 2024-03-21
- */
-public interface ThSupplierApplyMapper extends BaseMapper {
-
- /**
- * @description: 供应商申请列表
- * @author: zhang jing
- * @date: 2024/3/22 11:30
- * @param: [thSupplierApplyVO]
- * @return: java.util.List
- **/
- List queryThSupplierApplyList(ThSupplierApplyVO thSupplierApplyVO);
-
- /**
- * @description: 查询登录管理员是否为供应商
- * @author: zhang jing
- * @date: 2024/4/19 16:41
- * @param: [userId]
- * @return: java.lang.Integer
- **/
- Integer queryThSupplierApplyUserList(@Param("useId") Long userId);
-
-
-
- /**
- * @description: 供应商申请审批查看
- * @author: zhang jing
- * @date: 2024/3/25 14:45
- * @param: [businessCode, pkCountry]
- * @return: java.util.List
- **/
- List queryThSupplierApplyByCode(@Param("businessCode") String businessCode,
- @Param("pkCountry") Integer pkCountry);
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/service/IThSupplierApplyService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/service/IThSupplierApplyService.java
deleted file mode 100644
index 20461d3e..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/service/IThSupplierApplyService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.hzs.ground.supplier.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hzs.common.domain.ground.supplier.ThSupplierApply;
-import com.hzs.ground.supplier.vo.ThSupplierApplyVO;
-
-import java.util.List;
-
-/**
- * 供应商申请 服务类
- *
- * @author hzs
- * @since 2024-03-21
- */
-public interface IThSupplierApplyService extends IService {
-
- /**
- * @description: 供应商列表
- * @author: zhang jing
- * @date: 2024/3/22 11:31
- * @param: [thSupplierApplyVO]
- * @return: java.util.List
- **/
- List queryThSupplierApplyList(ThSupplierApplyVO thSupplierApplyVO);
-
- /**
- * @description: 查询登录管理员是否为供应商
- * @author: zhang jing
- * @date: 2024/4/19 16:40
- * @param: [userId]
- * @return: java.lang.Integer
- **/
- Integer queryThSupplierApplyUserList(Long userId);
-
- /**
- * @description: 添加供应商申请
- * @author: zhang jing
- * @date: 2024/3/24 11:49
- * @param: [thSupplierApplyVO]
- * @return: boolean
- **/
- boolean saveThSupplierApply(ThSupplierApplyVO thSupplierApplyVO);
-
- /**
- * @description: 修改供应商申请
- * @author: zhang jing
- * @date: 2024/3/24 11:49
- * @param: [thSupplierApplyVO]
- * @return: boolean
- **/
- boolean updateThSupplierApply(ThSupplierApplyVO thSupplierApplyVO);
-
- /**
- * @description: 删除供应商申请
- * @author: zhang jing
- * @date: 2024/3/24 11:49
- * @param: [pkId]
- * @return: boolean
- **/
- boolean delThSupplierApply(Long pkId);
-
- /**
- * @description: 供应商申请审批查看
- * @author: zhang jing
- * @date: 2024/3/25 14:41
- * @param: [eApprovalBusiness, businessCode, pkCountry]
- * @return: java.util.List
- **/
- List queryThSupplierApplyByCode(String businessCode, Integer pkCountry);
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/service/impl/ThSupplierApplyServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/service/impl/ThSupplierApplyServiceImpl.java
deleted file mode 100644
index c1e9db36..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/service/impl/ThSupplierApplyServiceImpl.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.hzs.ground.supplier.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hzs.common.core.enums.*;
-import com.hzs.common.domain.ground.supplier.ThSupplierApply;
-import com.hzs.common.security.utils.SecurityUtils;
-import com.hzs.ground.supplier.mapper.ThSupplierApplyMapper;
-import com.hzs.ground.supplier.service.IThSupplierApplyService;
-import com.hzs.ground.supplier.vo.ThSupplierApplyVO;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-
-/**
- * 供应商申请 服务实现类
- *
- * @author hzs
- * @since 2024-03-21
- */
-@Service
-public class ThSupplierApplyServiceImpl extends ServiceImpl implements IThSupplierApplyService {
-
- /**
- * @description: 供应商列表
- * @author: zhang jing
- * @date: 2024/3/22 11:31
- * @param: [thSupplierApplyVO]
- * @return: java.util.List
- **/
- @Override
- public List queryThSupplierApplyList(ThSupplierApplyVO thSupplierApplyVO) {
- return baseMapper.queryThSupplierApplyList(thSupplierApplyVO);
- }
-
- /**
- * @description: 查询登录管理员是否为供应商
- * @author: zhang jing
- * @date: 2024/4/19 16:40
- * @param: [userId]
- * @return: java.lang.Integer
- **/
- @Override
- public Integer queryThSupplierApplyUserList(Long userId) {
- return baseMapper.queryThSupplierApplyUserList(userId);
- }
-
-
- /**
- * @description: 添加供应商申请
- * @author: zhang jing
- * @date: 2024/3/22 11:52
- * @param: [thSupplierApplyVO]
- * @return: boolean
- **/
- @Override
- public boolean saveThSupplierApply(ThSupplierApplyVO thSupplierApplyVO) {
- ThSupplierApply tsa = BeanUtil.copyProperties(thSupplierApplyVO, ThSupplierApply.class);
- List fileList = thSupplierApplyVO.getFileList();
- int maxAptitudeCount = Math.min(fileList.size(), 8);
- for (int i = 0; i < maxAptitudeCount; i++) {
- switch (i) {
- case 0:
- tsa.setAptitude1(fileList.get(0));
- break;
- case 1:
- tsa.setAptitude2(fileList.get(1));
- break;
- case 2:
- tsa.setAptitude3(fileList.get(2));
- break;
- case 3:
- tsa.setAptitude4(fileList.get(3));
- break;
- case 4:
- tsa.setAptitude5(fileList.get(4));
- break;
- case 5:
- tsa.setAptitude6(fileList.get(5));
- break;
- case 6:
- tsa.setAptitude7(fileList.get(6));
- break;
- case 7:
- tsa.setAptitude8(fileList.get(7));
- break;
- default:
- break;
- }
- }
- baseMapper.insert(tsa);
- return true;
- }
-
- /**
- * @description: 修改供应商申请
- * @author: zhang jing
- * @date: 2024/3/22 11:54
- * @param: [thSupplierApplyVO]
- * @return: boolean
- **/
- @Override
- public boolean updateThSupplierApply(ThSupplierApplyVO thSupplierApplyVO) {
- ThSupplierApply tsa = BeanUtil.copyProperties(thSupplierApplyVO, ThSupplierApply.class);
- List fileList = thSupplierApplyVO.getFileList();
- int maxAptitudeCount = Math.min(fileList.size(), 8);
- for (int i = 0; i < maxAptitudeCount; i++) {
- switch (i) {
- case 0:
- tsa.setAptitude1(fileList.get(0));
- break;
- case 1:
- tsa.setAptitude2(fileList.get(1));
- break;
- case 2:
- tsa.setAptitude3(fileList.get(2));
- break;
- case 3:
- tsa.setAptitude4(fileList.get(3));
- break;
- case 4:
- tsa.setAptitude5(fileList.get(4));
- break;
- case 5:
- tsa.setAptitude6(fileList.get(5));
- break;
- case 6:
- tsa.setAptitude7(fileList.get(6));
- break;
- case 7:
- tsa.setAptitude8(fileList.get(7));
- break;
- default:
- break;
- }
- }
- baseMapper.updateById(tsa);
- return true;
- }
-
- /**
- * @description: 删除供应商申请
- * @author: zhang jing
- * @date: 2024/3/22 13:49
- * @param: [pkId]
- * @return: boolean
- **/
- @Override
- public boolean delThSupplierApply(Long pkId) {
- UpdateWrapper updateWrapper = new UpdateWrapper();
- updateWrapper.eq("PK_ID", pkId);
- updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId());
- updateWrapper.set("MODIFIED_TIME", new Date());
- updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue());
- baseMapper.update(null, updateWrapper);
- return true;
- }
-
- /**
- * @description: 供应商申请审批查看
- * @author: zhang jing
- * @date: 2024/3/25 14:41
- * @param: [eApprovalBusiness, businessCode, pkCountry]
- * @return: java.util.List
- **/
- @Override
- public List queryThSupplierApplyByCode(String businessCode, Integer pkCountry) {
- return baseMapper.queryThSupplierApplyByCode(businessCode, pkCountry);
- }
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/vo/ThSupplierApplyVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/vo/ThSupplierApplyVO.java
deleted file mode 100644
index ad0b569b..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/vo/ThSupplierApplyVO.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package com.hzs.ground.supplier.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.hzs.common.core.annotation.Excel;
-import com.hzs.common.core.annotation.Transaction;
-import com.hzs.common.core.constant.EnumsPrefixConstants;
-import com.hzs.common.core.web.domain.BaseApprovalEntity;
-import com.hzs.system.sys.dto.LoginUser;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- *
- * 供应商申请VO
- *
- *
- * @author hzs
- * @since 2024-03-21
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class ThSupplierApplyVO extends BaseApprovalEntity {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- private Integer pkId;
-
- /**
- * 供应商名称
- */
- private String name;
-
- /**
- * 供应商简称
- */
- private String shortName;
-
- /**
- * 法人
- */
- private String legalBody;
-
- /**
- * 联系人
- */
- private String linkMan;
-
- /**
- * 纳税人登记号
- */
- private String taxpayerid;
-
- /**
- * 省
- */
- private Integer province;
- /**
- * 省
- */
- private String provinceName;
-
- /**
- * 市
- */
- private Integer city;
- /**
- * 市
- */
- private String cityName;
-
- /**
- * 区
- */
- private Integer county;
- /**
- * 区
- */
- private String countyName;
-
- /**
- * 地址
- */
- private String address;
-
- /**
- * 资质1
- */
- private String aptitude1;
-
- /**
- * 资质2
- */
- private String aptitude2;
-
- /**
- * 资质3
- */
- private String aptitude3;
-
- /**
- * 资质4
- */
- private String aptitude4;
-
- /**
- * 资质5
- */
- private String aptitude5;
-
- /**
- * 资质6
- */
- private String aptitude6;
-
- /**
- * 资质7
- */
- private String aptitude7;
-
- /**
- * 资质8
- */
- private String aptitude8;
- /**
- * 错误信息
- */
- private String errMsg;
-
- /**
- * 有效期
- */
- @Excel(name = "有效时间",dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date validPeriod;
-
- /**
- * 结算方式 1=线上 2=线下 ESettleType
- */
- @Transaction(transactionKey = EnumsPrefixConstants.SETTLE_TYPE)
- private Integer settleType;
- /**
- * 结算方式 1=线上 2=线下 ESettleType
- */
- private String settleTypeVal;
-
- /**
- * 会员主键
- */
- private Long pkMember;
- /**
- * 会员编号
- */
- private String memberCode;
-
- /**
- * 证书
- */
- private String certificate;
-
- /**
- * 经营范围
- */
- private String tradeScope;
-
- /**
- * 创建人ID
- */
- private Long pkCreator;
-
- /**
- * 创建时间
- */
- @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date creationTime;
-
- /**
- * 逻辑删除 (0=未删除，1已删除)
- */
- private Integer delFlag;
-
- /**
- * 国家
- */
- private Integer pkCountry;
-
- /**
- * 登录用户信息
- */
- private LoginUser loginUser;
-
- /**
- * 审批业务类型 来源枚举 EApprovalBusiness
- */
- private Integer editType;
-
- /**
- * 审核状态 来源枚举 EApproveStatus
- */
- @Transaction(transactionKey = EnumsPrefixConstants.APPROVE_STATUS)
- private Integer approveStatus;
- /**
- * 审核状态 来源枚举 EApproveStatus
- */
- private String approveStatusVal;
-
- /**
- * 修改记录单号
- */
- private String thBusinessCode;
-
- private String pkIdListStr;
- /**
- * 供应商申请id集合
- */
- private List pkIdList;
- /**
- * 供应商申请集合
- */
- @Transaction
- private List petitionList;
-
- /**
- * 附件集合
- */
- private List fileList;
-
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/listener/NacosInstancesChangeEventListener.java b/bd-business/bd-business-scm/src/main/java/com/hzs/listener/NacosInstancesChangeEventListener.java
deleted file mode 100644
index 6b33069f..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/listener/NacosInstancesChangeEventListener.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.hzs.listener;
-
-import com.alibaba.nacos.client.naming.event.InstancesChangeEvent;
-import com.alibaba.nacos.common.notify.NotifyCenter;
-import com.alibaba.nacos.common.notify.listener.Subscriber;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.cloud.loadbalancer.core.CachingServiceInstanceListSupplier;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
-@Component
-@Slf4j
-public class NacosInstancesChangeEventListener extends Subscriber {
-
- @Resource
- private CacheManager defaultLoadBalancerCacheManager;
-
- @PostConstruct
- public void registerToNotifyCenter(){
- NotifyCenter.registerSubscriber(this);
- }
-
- @Override
- public void onEvent(InstancesChangeEvent event) {
- log.info("scm 接收微服务刷新事件：{}, 开始刷新本地存储的微服务缓存", event.getServiceName());
- Cache cache = defaultLoadBalancerCacheManager.getCache(CachingServiceInstanceListSupplier.SERVICE_INSTANCE_CACHE_NAME);
- if (cache != null) {
- cache.evict(event.getServiceName());
- log.info("{} 微服务刷新", event.getServiceName());
- }
- log.info("scm 微服务缓存刷新完成");
- }
-
- @Override
- public Class subscribeType() {
- return InstancesChangeEvent.class;
- }
-
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/IcGeneralController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/IcGeneralController.java
deleted file mode 100644
index c7ade6c4..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/IcGeneralController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.hzs.scm.general.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.hzs.common.core.constant.msg.MemberMsgConstants;
-import com.hzs.common.domain.sale.classify.BdSpecs;
-import com.hzs.common.security.utils.SecurityUtils;
-import com.hzs.scm.general.param.GeneralBParam;
-import com.hzs.scm.general.param.GeneralParam;
-import com.hzs.scm.pub.controller.ScmController;
-
-import java.util.*;
-
-/**
- * @description: 出入库公共的controller
- * @author: sui q
- * @time: 2023/11/29 11:05
- * @classname: IcGeneralController
- * @package_name: com.hzs.scm.general.controller
- * version 1.0.0
- */
-public abstract class IcGeneralController extends ScmController {
-
- protected String validateGeneralParam(GeneralParam generalParam) {
- if (validateGeneralFieldParam(generalParam)) {
- return MemberMsgConstants.REQUIRED_NOT_EMPTY;
- }
- generalParam.setPkCountry(SecurityUtils.getPkCountry());
- Map specsMap = new HashMap<>();
- String message = validateProduct(generalParam.getGeneralbParamList(), specsMap);
- if(ObjectUtil.isNotEmpty(message)){
- return message;
- }
- // 验证供应商
- String msg = validateCuBasDoc(generalParam.getPkCubasdoc(), generalParam.getPkCountry());
- if(ObjectUtil.isNotEmpty(msg)){
- return msg;
- }
- // 验证客户
- msg = validateCustomer(generalParam.getPkCustomer(), generalParam.getPkCountry());
- if(ObjectUtil.isNotEmpty(msg)){
- return msg;
- }
- // 验证采购组织
- msg = validateSysCorp(generalParam.getPkCorp(), generalParam.getPkCountry());
- if(ObjectUtil.isNotEmpty(msg)){
- return msg;
- }
- // 验证批次号
- return validateProductBatchCode(generalParam.getGeneralbParamList(), specsMap);
- }
-
- protected Boolean validateGeneralFieldParam(GeneralParam generalParam) {
- if (generalParam == null || generalParam.getOrderDate() == null || generalParam.getPkWarehouse() == null ||
- generalParam.getPkCorp() == null || CollectionUtil.isEmpty(generalParam.getGeneralbParamList())) {
- return Boolean.TRUE;
- }
- // 验证 采购订单明细字段不能为空
- for (GeneralBParam generalbParam : generalParam.getGeneralbParamList()) {
- if (generalbParam.getPkUnit() == null || generalbParam.getPkProduct() == null ||
- generalbParam.getBizDate() == null || generalbParam.getNnum() == null ||
- generalbParam.getPkStorehouse() == null || CollectionUtil.isEmpty(generalbParam.getScmItemSpecsList())) {
- return Boolean.TRUE;
- }
- }
- return Boolean.FALSE;
- }
-}
diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralInHController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralInHController.java
deleted file mode 100644
index 0626d699..00000000
--- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralInHController.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.hzs.scm.general.controller.manage;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.hzs.common.core.annotation.Log;
-import com.hzs.common.core.constant.msg.ScmMsgConstants;
-import com.hzs.common.core.enums.*;
-import com.hzs.common.core.utils.poi.ExcelUtil;
-import com.hzs.common.core.web.domain.AjaxResult;
-import com.hzs.common.core.web.page.TableDataInfo;
-import com.hzs.common.domain.scm.general.ext.IcGeneralInBExt;
-import com.hzs.common.domain.scm.general.ext.IcGeneralInHExt;
-import com.hzs.common.security.utils.SecurityUtils;
-import com.hzs.common.util.TransactionUtils;
-import com.hzs.scm.general.controller.IcGeneralController;
-import com.hzs.scm.general.param.GeneralParam;
-import com.hzs.scm.general.service.IIcGeneralInBService;
-import com.hzs.scm.general.service.IIcGeneralInHService;
-import com.hzs.scm.general.vo.IcGeneralInBVO;
-import com.hzs.scm.general.vo.IcGeneralInExcelVO;
-import com.hzs.scm.general.vo.IcGeneralInVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 其他入库表头 前端控制器
- *
- * @author hzs
- * @since 2023-11-27
- */
-@RestController
-@RequestMapping("/manage/general-in")
-@Slf4j
-public class IcGeneralInHController extends IcGeneralController {
-
- @Autowired
- private IIcGeneralInHService generalInhService;
- @Autowired
- private IIcGeneralInBService generalInBiService;
-
- /**
- * 查询列表
- *
- * @return cubasdocParam 入参
- */
- @PostMapping("/list")
- @Log(module = EOperationModule.GENERAL_IN, business = EOperationBusiness.GENERAL_IN, method = EOperationMethod.SELECT)
- public TableDataInfo listGeneralIn(@RequestBody GeneralParam generalParam) {
- startPage();
- generalParam.setPkCountry(SecurityUtils.getPkCountry());
- List