diff --git a/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfo.java b/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfo.java deleted file mode 100644 index 9cf396f..0000000 --- a/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.yxt.goods.biz.base.basebrandinfo; - -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:36 - */ -@Data -public class BaseBrandInfo extends BaseEntity { - - private String brandName;//品牌代码 - private String brandCode;//品牌名称 - private String image;//品牌图片url地址 - private String letter;//品牌的首字母大写 - private String useOrgSid;//使用组织sid - private String createOrgSid;//创建组织sid - - -} diff --git a/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoDto.java b/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoDto.java deleted file mode 100644 index 250c12c..0000000 --- a/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.yxt.goods.biz.base.basebrandinfo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.dto.Dto; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:38 - */ -@Data -public class BaseBrandInfoDto implements Dto { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - private String brandName;//品牌代码 - private String brandCode;//品牌名称 - private String image;//品牌图片url地址 - private String letter;//品牌的首字母大写 - private String useOrgSid;//使用组织sid - private String createOrgSid;//创建组织sid -} diff --git a/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoMapper.java b/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoMapper.java deleted file mode 100644 index 37330ac..0000000 --- a/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yxt.goods.biz.base.basebrandinfo; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface BaseBrandInfoMapper extends BaseMapper { - - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); -} diff --git a/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoMapper.xml b/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoMapper.xml deleted file mode 100644 index 53b13f0..0000000 --- a/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoQuery.java b/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoQuery.java deleted file mode 100644 index 3f607c4..0000000 --- a/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.goods.biz.base.basebrandinfo; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseBrandInfoQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoService.java b/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoService.java deleted file mode 100644 index 0830b66..0000000 --- a/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoService.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.yxt.goods.biz.base.basebrandinfo; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.config.component.FileUploadComponent; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.text.SimpleDateFormat; -import java.util.Collections; -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Service -public class BaseBrandInfoService extends MybatisBaseService { - @Autowired - private FileUploadComponent fileUploadComponent; - - public ResultBean> listPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - BaseBrandInfoQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - - if(StringUtils.isNotBlank(query.getName())){ - qw.like("brandName",query.getName()); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); - records.removeAll(Collections.singleton(null)); -// if (!records.isEmpty()) { -// for (BaseBrandInfoVo record : records) { -// if (StringUtils.isNotBlank(record.getBigPic())) { -// record.setBigPic(fileUploadComponent.getUrlPrefix() + record.getBigPic()); -// } -// } -// } - return rb.success().setData(p); - } - public ResultBean> listAll() { - ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); - return rb.success().setData(pagging); -} - public ResultBean saveOrUpdate(BaseBrandInfoDto dto) { - ResultBean rb = ResultBean.fireFail(); - String sid = ""; - if (StringUtils.isNotBlank(dto.getSid())) { - sid = dto.getSid(); - BaseBrandInfo wmsGoodsBrand = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, wmsGoodsBrand, "id", "sid"); -// if (StringUtils.isNotBlank(dto.getBigPic())) { -// String urlPrefix = fileUploadComponent.getUrlPrefix(); -// String path = dto.getBigPic().substring(urlPrefix.length()); -// wmsGoodsBrand.setBigPic(path); -// } - wmsGoodsBrand.setModifyTime(new Date()); - baseMapper.updateById(wmsGoodsBrand); - } else { - BaseBrandInfo goods=baseMapper.selectOne(new QueryWrapper().eq("name",dto.getBrandName())); - if(null!=goods){ - return rb.setMsg("商品名不能重复"); - } - BaseBrandInfo wmsGoodsBrand = new BaseBrandInfo(); - sid = wmsGoodsBrand.getSid(); - BeanUtil.copyProperties(dto, wmsGoodsBrand, "id", "sid"); - wmsGoodsBrand.setCreateTime(new DateTime()); -// if (StringUtils.isNotBlank(dto.getBigPic())) { -// String urlPrefix = fileUploadComponent.getUrlPrefix(); -// String path = dto.getBigPic().substring(urlPrefix.length()); -// wmsGoodsBrand.setBigPic(path); -// } - baseMapper.insert(wmsGoodsBrand); - } - return rb.success().setMsg("成功"); - } - - public ResultBean initialization(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseBrandInfoVo vo = new BaseBrandInfoVo(); - BaseBrandInfo wmsGoodsBrand = fetchBySid(sid); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - BeanUtil.copyProperties(wmsGoodsBrand, vo); -// if (null != wmsGoodsBrand) { -// -// if (StringUtils.isNotBlank(wmsGoodsBrand.getBigPic())) { -// vo.setBigPic(fileUploadComponent.getUrlPrefix() + wmsGoodsBrand.getBigPic()); -// } -//// vo.setCreateTime(sdf.format(lpkGoods.getCreateTime())); -// } - return rb.success().setData(vo); - } - - - - public ResultBean delete(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseBrandInfo wmsGoodsBrand = fetchBySid(sid); - if (null != wmsGoodsBrand) { - baseMapper.deleteById(wmsGoodsBrand.getId()); - } - return rb.success().setMsg("成功"); - } - public ResultBean updateIsEnable(String sid,String isEnable) { - ResultBean rb = ResultBean.fireFail(); - BaseBrandInfo wmsGoodsBrand = fetchBySid(sid); - if (null != wmsGoodsBrand) { - wmsGoodsBrand.setIsEnable(Integer.parseInt(isEnable)); - baseMapper.updateById(wmsGoodsBrand); - } - return rb.success().setMsg("成功"); - } - -} diff --git a/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoVo.java b/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoVo.java deleted file mode 100644 index a211845..0000000 --- a/src/main/java/com/yxt/user/biz/base/basebrandinfo/BaseBrandInfoVo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.goods.biz.base.basebrandinfo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.vo.Vo; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseBrandInfoVo implements Vo { - private String id; - private String sid; - private String lockVersion; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date modifyTime; - private String remarks; - private String isEnable; - private String state; - private String isDelete; - private String brandName;//品牌代码 - private String brandCode;//品牌名称 - private String image;//品牌图片url地址 - private String letter;//品牌的首字母大写 - private String useOrgSid;//使用组织sid - private String createOrgSid;//创建组织sid -} diff --git a/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrand.java b/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrand.java deleted file mode 100644 index 98f65fe..0000000 --- a/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrand.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yxt.goods.biz.base.basecategorybrand; - -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/4/8 9:34 - */ -@Data -public class BaseCategoryBrand extends BaseEntity { - private String categorySid;//商品分类sid - private String brandSid;//品牌sid - -} diff --git a/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandDto.java b/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandDto.java deleted file mode 100644 index 1b43086..0000000 --- a/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandDto.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yxt.goods.biz.base.basecategorybrand; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/4/8 9:34 - */ -@Data -public class BaseCategoryBrandDto { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - private String categorySid;//商品分类sid - private String brandSid;//品牌sid -} diff --git a/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandMapper.java b/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandMapper.java deleted file mode 100644 index e688995..0000000 --- a/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yxt.goods.biz.base.basecategorybrand; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface BaseCategoryBrandMapper extends BaseMapper { - - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List getSkusBySpuSid(@Param("spuSid")String spuSid); - BaseCategoryBrandVo getVoBySid(@Param("sid")String sid); - -} diff --git a/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandMapper.xml b/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandMapper.xml deleted file mode 100644 index 09033d9..0000000 --- a/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandQuery.java b/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandQuery.java deleted file mode 100644 index 77c83a9..0000000 --- a/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.goods.biz.base.basecategorybrand; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/4/8 9:34 - */ -@Data -public class BaseCategoryBrandQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandService.java b/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandService.java deleted file mode 100644 index f251d36..0000000 --- a/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandService.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.yxt.goods.biz.base.basecategorybrand; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.config.component.FileUploadComponent; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Service -public class BaseCategoryBrandService extends MybatisBaseService { - @Autowired - private FileUploadComponent fileUploadComponent; - - - public ResultBean> listPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - BaseCategoryBrandQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getName())) { - qw.like("goodsName", query.getName()); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return rb.success().setData(p); - } - @Transactional - public ResultBean saveOrUpdate(BaseCategoryBrandDto dto) { - ResultBean rb = ResultBean.fireFail(); - String sid = ""; - if (StringUtils.isNotBlank(dto.getSid())) { - sid = dto.getSid(); - BaseCategoryBrand wmsGoods = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); - wmsGoods.setModifyTime(new Date()); - baseMapper.updateById(wmsGoods); - } else { - BaseCategoryBrand wmsGoods = new BaseCategoryBrand(); - BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); - wmsGoods.setCreateTime(new DateTime()); - baseMapper.insert(wmsGoods); - } - return rb.success().setMsg("成功"); - } - @Transactional - public ResultBean saveOrUpdate(List dtos) { - ResultBean rb = ResultBean.fireFail(); - for (BaseCategoryBrandDto dto : dtos) { - BaseCategoryBrand sku=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); - String sid = ""; - if (null!=sku) { - sid = dto.getSid(); - BaseCategoryBrand wmsGoods = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, wmsGoods); - wmsGoods.setModifyTime(new Date()); - baseMapper.updateById(wmsGoods); - } else { - BaseCategoryBrand wmsGoods = new BaseCategoryBrand(); - BeanUtil.copyProperties(dto, wmsGoods); - wmsGoods.setCreateTime(new DateTime()); - baseMapper.insert(wmsGoods); - } - } - - return rb.success().setMsg("成功"); - } - - public ResultBean initialization(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseCategoryBrandVo vo = baseMapper.getVoBySid(sid); - return rb.success().setData(vo); - } - - public ResultBean> getSkusBySpuSid(String sid) { - ResultBean rb = ResultBean.fireFail(); - List vo = baseMapper.getSkusBySpuSid(sid); - return rb.success().setData(vo); - } - - - public ResultBean delete(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseCategoryBrand wmsGoods = fetchBySid(sid); - if (null != wmsGoods) { - baseMapper.deleteById(wmsGoods.getId()); - } - return rb.success(); - } - - public ResultBean updateIsEnable(String sid, String isEnable) { - ResultBean rb = ResultBean.fireFail(); - BaseCategoryBrand wmsGoods = fetchBySid(sid); - if (null != wmsGoods) { - wmsGoods.setIsEnable(Integer.parseInt(isEnable)); - baseMapper.updateById(wmsGoods); - } - return rb.success().setMsg("成功"); - } -} diff --git a/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandVo.java b/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandVo.java deleted file mode 100644 index b15e116..0000000 --- a/src/main/java/com/yxt/user/biz/base/basecategorybrand/BaseCategoryBrandVo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.yxt.goods.biz.base.basecategorybrand; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/4/8 9:34 - */ -@Data -public class BaseCategoryBrandVo { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - private String categorySid;//商品分类sid - private String brandSid;//品牌sid - private String categoryName;//分类名 - private String brandName;//品牌名 -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSku.java b/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSku.java deleted file mode 100644 index 2f8ffec..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSku.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.yxt.goods.biz.base.basegoodssku; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:36 - */ -@Data -public class BaseGoodsSku extends BaseEntity { - private String goodsSkuCode;//商品Sku代码 - private String title;//商品标题 - private String goodsSpuSid;//商品基础信息Sid - private String externalCode;//外部编码 - private String indexes;//特有规格属性在spu表中special_spec字段对应每个参数值数组下标的组合，如0_0_0,1_0_0，相当于SKU这条记录的编码。 - @TableField(value = "own_spec") - private String ownSpec;//sku的特有规格参数键值对，json格式，反序列化时请使用linkedHashMap，保证有序 - -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuDetailsVo.java b/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuDetailsVo.java deleted file mode 100644 index 5217aeb..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuDetailsVo.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.yxt.goods.biz.base.basegoodssku; - -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/3/19 - **/ -@Data -public class BaseGoodsSkuDetailsVo { - - @ApiModelProperty("商品代码") - private String goodsCode; - @ApiModelProperty("条形码") - private String barCode; - @ApiModelProperty("商品名称") - private String goodsName; - @ApiModelProperty("副标题") - private String subTitle; - @ApiModelProperty("拼音缩写") - private String goodsPY; - @ApiModelProperty("商品简称") - private String goodsShortName; - @ApiModelProperty("商品分类sid") - private String goodsTypeSid; - @ApiModelProperty("品牌sid") - private String brandSid; - @ApiModelProperty("厂家sid") - private String manufacturersid; - @ApiModelProperty("商品单位sid") - private String goodsUnitSid; - @ApiModelProperty("商品单位名称") - private String goodsUnitName; - - @ApiModelProperty("商品Sku代码") - private String goodsSkuCode; - @ApiModelProperty("商品标题") - private String title; - @ApiModelProperty("是否一品一码（goodID），0否，1是") - @JsonProperty("isGoodsID") - private int isGoodsID; - - //================================= - - //商品名称 - //零件号 - //拼音 - //条形码 - //计量单位 - //商品类别 - private String goodsTypeName;//商品类别名称 - //厂家 - //规格 - //品牌 - //车型 - //原厂标志 - //产地 - //锁定售价 - //备注 - //上限数量 - //下限数量 - //积分商品 - //所需积分 - - -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuDto.java b/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuDto.java deleted file mode 100644 index 4bf00c8..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuDto.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.yxt.goods.biz.base.basegoodssku; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendDto; -import com.yxt.common.core.dto.Dto; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:38 - */ -@Data -public class BaseGoodsSkuDto implements Dto { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - private String goodsSkuCode;//商品Sku代码 - private String title;//商品标题 - private String goodsSpuSid;//商品基础信息Sid - private String externalCode;//外部编码 - private String indexes;//特有规格属性在spu表中special_spec字段对应每个参数值数组下标的组合，如0_0_0,1_0_0，相当于SKU这条记录的编码。 - @TableField(value = "own_spec") - private String ownSpec;//sku的特有规格参数键值对，json格式，反序列化时请使用linkedHashMap，保证有序 - private BaseGoodsSkuExtendDto baseGoodsSkuExtend;//sku扩展 -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuMapper.java b/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuMapper.java deleted file mode 100644 index 8f6e02b..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.yxt.goods.biz.base.basegoodssku; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface BaseGoodsSkuMapper extends BaseMapper { - - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List getSkusBySpuSid(@Param("spuSid")String spuSid); - BaseGoodsSkuVo getSkuBySid(@Param("sid")String sid); - - IPage getSelectList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); - - IPage purGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuMapper.xml b/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuMapper.xml deleted file mode 100644 index d8ce8e4..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuMapper.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuPurSelectList.java b/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuPurSelectList.java deleted file mode 100644 index ca465ef..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuPurSelectList.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.yxt.goods.biz.base.basegoodssku; - -import lombok.Data; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/3/21 - **/ -@Data -public class BaseGoodsSkuPurSelectList { - - //sid - private String sid; - //零件号 - private String goodsSkuCode; - //规格 - private String title; - //商品名称 - private String goodsName; - //商品拼音 - private String goodsPY; - //商品简称 - private String goodsShortName; - //商品类别sid - private String goodsTypeSid; - //品牌sid - private String brandSid; - //厂家sid - private String manufacturerSid; - //商品单位名称 - private String goodsUnitName; - //sku特有规格参数键值对 - private String ownSpec; -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuPurSelectQuery.java b/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuPurSelectQuery.java deleted file mode 100644 index adbae98..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuPurSelectQuery.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.yxt.goods.biz.base.basegoodssku; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/3/21 - **/ -@Data -public class BaseGoodsSkuPurSelectQuery implements Query { - - //组织sid - private String orgSid; - //商品名称 - private String goodsName; - //商品类别sid - private String goodsTypeSid; - //商品拼音 - private String goodsPY; - //品牌sid - private String brandSid; - //零件号 - private String goodsSkuCode; - //规格 - private String title; - //其他查询条件 - private String otherQuery; -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuQuery.java b/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuQuery.java deleted file mode 100644 index 455f291..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.goods.biz.base.basegoodssku; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseGoodsSkuQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuSelectList.java b/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuSelectList.java deleted file mode 100644 index c438eba..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuSelectList.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.yxt.goods.biz.base.basegoodssku; - -import lombok.Data; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/3/21 - **/ -@Data -public class BaseGoodsSkuSelectList { - - //商品名称 - private String goodsSpuSid; - private String goodsSpuName; - //商品sid - private String goodsSkuSid; - //商品编码 - private String goodsSkuCode; - //规格/型号 - private String goodsSkuTitle; - //计量单位 - private String goodsUnitSid; - private String goodsUnitName; - //仓库名称 - //货位 - //单位成本（进货价） - //数量 - //税额 - //含税价 - //金额 - //销售价1 - //销售价2 - //操作时间 - //操作人 -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuSelectQuery.java b/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuSelectQuery.java deleted file mode 100644 index 513efa7..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuSelectQuery.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yxt.goods.biz.base.basegoodssku; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/3/21 - **/ -@Data -public class BaseGoodsSkuSelectQuery implements Query { - - private String goodsSkuCode; -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuService.java b/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuService.java deleted file mode 100644 index 7e54fc2..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuService.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.yxt.goods.biz.base.basegoodssku; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendService; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendVo; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpu; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpuService; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailService; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsType; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsTypeService; -import com.yxt.common.base.config.component.FileUploadComponent; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Service -public class BaseGoodsSkuService extends MybatisBaseService { - @Autowired - private FileUploadComponent fileUploadComponent; - @Autowired - BaseGoodsSpuDetailService baseGoodsSpuDetailService; - @Autowired - BaseGoodsSkuExtendService baseGoodsSkuExtendService; - @Autowired - private BaseGoodsSpuService baseGoodsSpuService; - @Autowired - BaseGoodsTypeService baseGoodsTypeService; - - public ResultBean> listPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getName())) { - qw.like("goodsName", query.getName()); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return rb.success().setData(p); - } - @Transactional - public ResultBean saveOrUpdate(BaseGoodsSkuDto dto) { - ResultBean rb = ResultBean.fireFail(); - String sid = ""; - if (StringUtils.isNotBlank(dto.getSid())) { - sid = dto.getSid(); - BaseGoodsSku wmsGoods = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); - wmsGoods.setModifyTime(new Date()); - baseMapper.updateById(wmsGoods); - dto.getBaseGoodsSkuExtend().setGoodsSkuSid(wmsGoods.getSid()); - baseGoodsSkuExtendService.saveOrUpdate(dto.getBaseGoodsSkuExtend()); - } else { - BaseGoodsSku wmsGoods = new BaseGoodsSku(); - BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); - wmsGoods.setCreateTime(new DateTime()); - baseMapper.insert(wmsGoods); - dto.getBaseGoodsSkuExtend().setGoodsSkuSid(wmsGoods.getSid()); - baseGoodsSkuExtendService.saveOrUpdate(dto.getBaseGoodsSkuExtend()); - } - return rb.success().setMsg("成功"); - } - @Transactional - public ResultBean saveOrUpdate(List dtos) { - ResultBean rb = ResultBean.fireFail(); - for (BaseGoodsSkuDto dto : dtos) { - BaseGoodsSku sku=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); - String sid = ""; - if (null!=sku) { - sid = dto.getSid(); - BaseGoodsSku wmsGoods = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, wmsGoods); - wmsGoods.setModifyTime(new Date()); - baseMapper.updateById(wmsGoods); - dto.getBaseGoodsSkuExtend().setGoodsSkuSid(wmsGoods.getSid()); - baseGoodsSkuExtendService.saveOrUpdate(dto.getBaseGoodsSkuExtend()); - } else { - BaseGoodsSku wmsGoods = new BaseGoodsSku(); - BeanUtil.copyProperties(dto, wmsGoods); - wmsGoods.setCreateTime(new DateTime()); - baseMapper.insert(wmsGoods); - dto.getBaseGoodsSkuExtend().setGoodsSkuSid(wmsGoods.getSid()); - baseGoodsSkuExtendService.saveOrUpdate(dto.getBaseGoodsSkuExtend()); - } - } - - return rb.success().setMsg("成功"); - } - - public ResultBean initialization(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuVo vo = baseMapper.getSkuBySid(sid); - BaseGoodsSkuExtendVo vo1=baseGoodsSkuExtendService.getExtendBySkuSid(vo.getSid()).getData(); - if(vo1==null){ - vo.setBaseGoodsSkuExtend(new BaseGoodsSkuExtendVo()); - } - vo.setBaseGoodsSkuExtend(vo1); - return rb.success().setData(vo); - } - - public ResultBean> getSkusBySpuSid(String sid) { - ResultBean rb = ResultBean.fireFail(); - List vo = baseMapper.getSkusBySpuSid(sid); - return rb.success().setData(vo); - } - - - public ResultBean delete(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSku wmsGoods = fetchBySid(sid); - if (null != wmsGoods) { - baseMapper.deleteById(wmsGoods.getId()); - } - return rb.success(); - } - - public ResultBean updateIsEnable(String sid, String isEnable) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSku wmsGoods = fetchBySid(sid); - if (null != wmsGoods) { - wmsGoods.setIsEnable(Integer.parseInt(isEnable)); - baseMapper.updateById(wmsGoods); - } - return rb.success().setMsg("成功"); - } - - public ResultBean getDetails(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuDetailsVo baseGoodsSkuDetailsVo = new BaseGoodsSkuDetailsVo(); - BaseGoodsSku baseGoodsSku = fetchBySid(sid); - BaseGoodsSpu baseGoodsSpu = baseGoodsSpuService.fetchBySid(baseGoodsSku.getGoodsSpuSid()); - BeanUtil.copyProperties(baseGoodsSku, baseGoodsSkuDetailsVo); - BeanUtil.copyProperties(baseGoodsSpu, baseGoodsSkuDetailsVo); - BaseGoodsType baseGoodsType = baseGoodsTypeService.fetchBySid(baseGoodsSpu.getGoodsTypeSid()); - if (baseGoodsType != null && StringUtils.isNotBlank(baseGoodsType.getIsGoodsID())) { - baseGoodsSkuDetailsVo.setIsGoodsID(Integer.parseInt(baseGoodsType.getIsGoodsID())); - baseGoodsSkuDetailsVo.setGoodsTypeName(baseGoodsType.getGoodsTypeName()); - } else { - baseGoodsSkuDetailsVo.setIsGoodsID(0); - } - return rb.success().setData(baseGoodsSkuDetailsVo); - } - - public PagerVo getSelectList(PagerQuery pagerQuery) { - BaseGoodsSkuSelectQuery query = pagerQuery.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (query != null) { - //商品编码 - if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { - qw.like("sku.goodsSkuCode", query.getGoodsSkuCode()); - } - } - IPage page = PagerUtil.queryToPage(pagerQuery); - IPage pagging = baseMapper.getSelectList(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public ResultBean> purGoodsListPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuPurSelectQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getOrgSid())){ - qw.eq("s.createOrgSid",query.getOrgSid()); - } - if (StringUtils.isNotBlank(query.getGoodsName())) { - qw.like("a.goodsName", query.getGoodsName()); - } - if (StringUtils.isNotBlank(query.getGoodsTypeSid())) { - qw.eq("a.goodsTypeSid", query.getGoodsTypeSid()); - } - if (StringUtils.isNotBlank(query.getGoodsPY())) { - qw.like("a.goodsPY", query.getGoodsPY()); - } - if (StringUtils.isNotBlank(query.getBrandSid())) { - qw.like("a.brandSid", query.getBrandSid()); - } - if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { - qw.like("s.goodsSkuCode", query.getGoodsSkuCode()); - } - if (StringUtils.isNotBlank(query.getTitle())) { - qw.like("s.title", query.getTitle()); - } - if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getOtherQuery())){ - qw.and(wrapper -> wrapper.like("a.goodsName", query.getOtherQuery()).or().like("s.goodsSkuCode", query.getOtherQuery()).or().like("a.goodsPY",query.getOtherQuery())); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.purGoodsListPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return rb.success().setData(p); - } -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuVo.java b/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuVo.java deleted file mode 100644 index 92efb31..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodssku/BaseGoodsSkuVo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.yxt.goods.biz.base.basegoodssku; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendVo; -import com.yxt.common.core.vo.Vo; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseGoodsSkuVo implements Vo { - private String id; - private String sid; - private String lockVersion; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date modifyTime; - private String remarks; - private String isEnable; - private String state; - private String isDelete; - private String goodsSkuCode;//商品Sku代码 - private String title;//商品标题 - private String goodsSpuSid;//商品基础信息Sid - private String externalCode;//外部编码 - private String indexes;//特有规格属性在spu表中special_spec字段对应每个参数值数组下标的组合，如0_0_0,1_0_0，相当于SKU这条记录的编码。 - @TableField(value = "own_spec") - private String ownSpec;//sku的特有规格参数键值对，json格式，反序列化时请使用linkedHashMap，保证有序 - private String goodsName; - private BaseGoodsSkuExtendVo baseGoodsSkuExtend; - -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java b/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java deleted file mode 100644 index c768b21..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsskuextend; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:36 - */ -@Data -public class BaseGoodsSkuExtend extends BaseEntity { - private String goodsSkuSid;//商品Sku代码 - private String finalPurchasePrice;//最后采购价 - private String safetyStockDays;//安全库存天数 - private String isOriginalFactory;//是否原厂 - private String isInventoryAlert;//是否库存警戒 - @TableField(value = "InventoryAlertUpperLimit") - private String inventoryAlertUpperLimit;//库存警戒上线 - @TableField(value = "InventoryAlertLowerLimit") - private String inventoryAlertLowerLimit;//库存警戒下线 - private String costPrice;//成本价 - private String tagPrice;//吊牌价 - private String salesPrice;//销售单价 - private String standardPurchasePrice;//标准进价 - private String agencyPrice;//代理价 - private String discount;//折扣 - private String minimumSalesPrice;//最低零售价 - private String isLockingSalesPrice;//是否锁定销售价 - private String isIntegralExchange;//是否可以积分兑换 - private String integralAmount;//积分数量 - private String sortNo;//排序 - private String picUrl;//商品的图片，多个图片以‘,’分割 -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendDto.java b/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendDto.java deleted file mode 100644 index 8cae2a1..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendDto.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsskuextend; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.dto.Dto; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:38 - */ -@Data -public class BaseGoodsSkuExtendDto implements Dto { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - private String goodsSkuSid;//商品Sku代码 - private String finalPurchasePrice;//最后采购价 - private String safetyStockDays;//安全库存天数 - private String isOriginalFactory;//是否原厂 - private String isInventoryAlert;//是否库存警戒 - @TableField(value = "InventoryAlertUpperLimit") - private String inventoryAlertUpperLimit;//库存警戒上线 - @TableField(value = "InventoryAlertLowerLimit") - private String inventoryAlertLowerLimit;//库存警戒下线 - private String costPrice;//成本价 - private String tagPrice;//吊牌价 - private String salesPrice;//销售单价 - private String standardPurchasePrice;//标准进价 - private String agencyPrice;//代理价 - private String discount;//折扣 - private String minimumSalesPrice;//最低零售价 - private String isLockingSalesPrice;//是否锁定销售价 - private String isIntegralExchange;//是否可以积分兑换 - private String integralAmount;//积分数量 - private String sortNo;//排序 - private String picUrl;//商品的图片，多个图片以‘,’分割 -// private String [] Urls={};//图片数组 - private List urls;//图片数组 -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendMapper.java b/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendMapper.java deleted file mode 100644 index 9db05ab..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsskuextend; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface BaseGoodsSkuExtendMapper extends BaseMapper { - - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - BaseGoodsSkuExtendVo getExtendBySkuSid(@Param("skuSid")String skuSid); - BaseGoodsSkuExtendVo getExtendBySid(@Param("sid")String sid); -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml b/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml deleted file mode 100644 index 41c9db6..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendQuery.java b/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendQuery.java deleted file mode 100644 index 435f217..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsskuextend; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseGoodsSkuExtendQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendService.java b/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendService.java deleted file mode 100644 index 1a9c270..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendService.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsskuextend; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.goods.biz.base.basebrandinfo.BaseBrandInfoService; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailService; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsTypeService; -import com.yxt.goods.biz.base.basemanufacturer.BaseManufacturerService; -import com.yxt.common.base.config.component.FileUploadComponent; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Collections; -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Service -public class BaseGoodsSkuExtendService extends MybatisBaseService { - @Autowired - private FileUploadComponent fileUploadComponent; - @Autowired - private BaseBrandInfoService baseBrandInfoService; - @Autowired - private BaseGoodsTypeService baseGoodsTypeService; - @Autowired - private BaseManufacturerService baseManufacturerService; - @Autowired - BaseGoodsSpuDetailService baseGoodsSpuDetailService; - - public ResultBean> listPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuExtendQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if(StringUtils.isNotBlank(query.getName())){ - qw.like("goodsName",query.getName()); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); - records.removeAll(Collections.singleton(null)); -// if (!records.isEmpty()) { -// for (BaseGoodsSpuVo record : records) { -// if (StringUtils.isNotBlank(record.getPicUrl())) { -// record.setPicUrl(fileUploadComponent.getUrlPrefix() + record.getPicUrl()); -// } -// } -// } - return rb.success().setData(p); - } - @Transactional - public ResultBean saveOrUpdate(BaseGoodsSkuExtendDto dto) { - ResultBean rb = ResultBean.fireFail(); - String sid = ""; - BaseGoodsSkuExtend extend=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); - if (null!=extend) { - sid = dto.getSid(); - BaseGoodsSkuExtend wmsGoods = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, wmsGoods); - wmsGoods.setModifyTime(new Date()); - for (UrlsVo url : dto.getUrls()) { - String urlPrefix = fileUploadComponent.getUrlPrefix(); - String path = url.getUrl().substring(urlPrefix.length()); - if(StringUtils.isBlank(dto.getPicUrl())){ - wmsGoods.setPicUrl(path); - }else{ - wmsGoods.setPicUrl(wmsGoods.getPicUrl()+","+path); - } - } - if (StringUtils.isNotBlank(dto.getPicUrl())) { - String urlPrefix = fileUploadComponent.getUrlPrefix(); - String path = dto.getPicUrl().substring(urlPrefix.length()); - wmsGoods.setPicUrl(path); - } - baseMapper.updateById(wmsGoods); - - } else { - BaseGoodsSkuExtend wmsGoods = new BaseGoodsSkuExtend(); - sid = wmsGoods.getSid(); - BeanUtil.copyProperties(dto, wmsGoods); - wmsGoods.setCreateTime(new DateTime()); - for (UrlsVo url : dto.getUrls()) { - String urlPrefix = fileUploadComponent.getUrlPrefix(); - String path = url.getUrl().substring(urlPrefix.length()); - if(StringUtils.isBlank(dto.getPicUrl())){ - wmsGoods.setPicUrl(path); - }else{ - wmsGoods.setPicUrl(wmsGoods.getPicUrl()+","+path); - } - } - baseMapper.insert(wmsGoods); - } - return rb.success().setMsg("成功"); - } - - public ResultBean initialization(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuExtendVo vo = baseMapper.getExtendBySid(sid); - return rb.success().setData(vo); - } - - public ResultBean getExtendBySkuSid(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuExtendVo vo = baseMapper.getExtendBySkuSid(sid); - return rb.success().setData(vo); - } - - public ResultBean delete(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuExtend wmsGoods = fetchBySid(sid); - if (null != wmsGoods) { - baseMapper.deleteById(wmsGoods.getId()); - } - return rb.success(); - } - - public ResultBean updateIsEnable(String sid,String isEnable) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuExtend wmsGoods = fetchBySid(sid); - if (null != wmsGoods) { - wmsGoods.setIsEnable(Integer.parseInt(isEnable)); - baseMapper.updateById(wmsGoods); - } - return rb.success().setMsg("成功"); - } -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendVo.java b/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendVo.java deleted file mode 100644 index 347ce66..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/BaseGoodsSkuExtendVo.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsskuextend; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.vo.Vo; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseGoodsSkuExtendVo implements Vo { - private String id; - private String sid; - private String lockVersion; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date modifyTime; - private String remarks; - private String isEnable; - private String state; - private String isDelete; - private String goodsSkuSid;//商品Skusid - private String finalPurchasePrice;//最后采购价 - private String safetyStockDays;//安全库存天数 - private String isOriginalFactory;//是否原厂 - private String isInventoryAlert;//是否库存警戒 - @TableField(value = "InventoryAlertUpperLimit") - private String inventoryAlertUpperLimit;//库存警戒上线 - @TableField(value = "InventoryAlertLowerLimit") - private String inventoryAlertLowerLimit;//库存警戒下线 - private String costPrice;//成本价 - private String tagPrice;//吊牌价 - private String salesPrice;//销售单价 - private String standardPurchasePrice;//标准进价 - private String agencyPrice;//代理价 - private String discount;//折扣 - private String minimumSalesPrice;//最低零售价 - private String isLockingSalesPrice;//是否锁定销售价 - private String isIntegralExchange;//是否可以积分兑换 - private String integralAmount;//积分数量 - private String sortNo;//排序 - private String picUrl;//商品的图片，多个图片以‘,’分割 -// private String [] Urls={};//图片数组 - private List urls;//图片数组 - private String title;//sku标题 - -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/UrlsVo.java b/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/UrlsVo.java deleted file mode 100644 index 24ff8b4..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsskuextend/UrlsVo.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsskuextend; - -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/3/22 10:20 - */ -@Data -public class UrlsVo { - private String url; -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpu.java b/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpu.java deleted file mode 100644 index 1b54ce9..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpu.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsspu; - -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:36 - */ -@Data -public class BaseGoodsSpu extends BaseEntity { - private String goodsCode;//商品代码 - private String barCode;//条形码 - private String goodsName;//商品名称 - private String subTitle;//商品名称 - private String goodsPY;//拼音缩写 - private String goodsShortName;//商品简称 - private String goodsTypeSid;//商品分类sid - private String brandSid;//品牌sid - private String manufacturerSid;//厂家sid - private String goodsUnitSid;//商品单位sid - private String goodsUnitName;//商品单位名称 - private String taxRate;//税率 - private String shelfLife;//保质期天 - private String nationalStandardCode;//国标码 - private String sortNo;//排序 - private String externalCode;//外部编码 - private String factoryCode;//厂家货号 - private String isListed;//是否上架 - private String useOrgSid;//使用组织sid - private String createOrgSid;//创建组织sid -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuDto.java b/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuDto.java deleted file mode 100644 index f9ac0b9..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuDto.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsspu; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.goods.biz.base.basegoodssku.BaseGoodsSkuDto; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailDto; -import com.yxt.common.core.dto.Dto; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:38 - */ -@Data -public class BaseGoodsSpuDto implements Dto { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - private String goodsCode;//商品代码 - private String barCode;//条形码 - private String goodsName;//商品名称 - private String subTitle;//副标题 - private String goodsPY;//拼音缩写 - private String goodsShortName;//商品简称 - private String goodsTypeSid;//商品分类sid - private String brandSid;//品牌sid - private String manufacturerSid;//厂家sid - private String goodsUnitSid;//商品单位sid - private String goodsUnitName;//商品单位名称 - private String taxRate;//税率 - private String shelfLife;//保质期天 - private String nationalStandardCode;//国标码 - private String sortNo;//排序 - private String externalCode;//外部编码 - private String factoryCode;//厂家货号 - private String isListed;//是否上架 - private String useOrgSid;//使用组织sid - private String createOrgSid;//创建组织sid - private BaseGoodsSpuDetailDto baseGoodsSpuDetail;//商品spu详情 - private List baseGoodsSkus;//商品sku - -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuMapper.java b/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuMapper.java deleted file mode 100644 index 24f7a44..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsspu; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface BaseGoodsSpuMapper extends BaseMapper { - - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - BaseGoodsSpuVo initialization(@Param("sid")String sid); -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml b/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml deleted file mode 100644 index 3f59686..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuQuery.java b/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuQuery.java deleted file mode 100644 index 4b2b959..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsspu; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseGoodsSpuQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuService.java b/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuService.java deleted file mode 100644 index 7a058c0..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuService.java +++ /dev/null @@ -1,165 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsspu; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.goods.biz.base.basegoodssku.BaseGoodsSkuService; -import com.yxt.goods.biz.base.basegoodssku.BaseGoodsSkuVo; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendService; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendVo; -import com.yxt.goods.biz.base.basegoodsskuextend.UrlsVo; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailService; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailVo; -import com.yxt.goods.biz.base.basegoodsunit.BaseGoodsUnit; -import com.yxt.goods.biz.base.basegoodsunit.BaseGoodsUnitService; -import com.yxt.goods.utils.PinYinUtils; -import com.yxt.common.base.config.component.FileUploadComponent; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Service -public class BaseGoodsSpuService extends MybatisBaseService { - @Autowired - private FileUploadComponent fileUploadComponent; - @Autowired - BaseGoodsSpuDetailService baseGoodsSpuDetailService; - @Autowired - BaseGoodsSkuService baseGoodsSkuService; - @Autowired - BaseGoodsUnitService baseGoodsUnitService; - @Autowired - BaseGoodsSkuExtendService baseGoodsSkuExtendService; - - - public ResultBean> listPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSpuQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if(StringUtils.isNotBlank(query.getName())){ - qw.like("goodsName",query.getName()); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); - records.removeAll(Collections.singleton(null)); -// if (!records.isEmpty()) { -// for (BaseGoodsSpuVo record : records) { -// if (StringUtils.isNotBlank(record.getPicUrl())) { -// record.setPicUrl(fileUploadComponent.getUrlPrefix() + record.getPicUrl()); -// } -// } -// } - return rb.success().setData(p); - } - @Transactional - public ResultBean saveOrUpdate(BaseGoodsSpuDto dto) { - ResultBean rb = ResultBean.fireFail(); - String sid = ""; - BaseGoodsSpu spun= baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); - BaseGoodsUnit baseGoodsUnit=baseGoodsUnitService.getOne(new QueryWrapper().eq("sid",dto.getGoodsUnitSid())); - if(null!=baseGoodsUnit){ - dto.setGoodsUnitName(baseGoodsUnit.getUnitName()); - } - - if (spun!=null) { - if(!spun.getSid().equals(dto.getSid())){ - return rb.setMsg("商品编码重复"); - } - sid = dto.getSid(); - BaseGoodsSpu wmsGoods = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, wmsGoods); - wmsGoods.setModifyTime(new Date()); - wmsGoods.setGoodsPY(PinYinUtils.getPinYinName(wmsGoods.getGoodsName()));; - baseMapper.updateById(wmsGoods); - //spu详情 - dto.getBaseGoodsSpuDetail().setGoodSpuSid(wmsGoods.getSid()); - baseGoodsSpuDetailService.saveOrUpdate(dto.getBaseGoodsSpuDetail()); - //商品sku - dto.getBaseGoodsSkus().forEach(s->{ - s.setGoodsSpuSid(wmsGoods.getSid()); - }); - baseGoodsSkuService.saveOrUpdate(dto.getBaseGoodsSkus()); - } else { - BaseGoodsSpu spu=baseMapper.selectOne(new QueryWrapper().eq("goodsCode",dto.getGoodsCode())); - if(spu!=null){ - return rb.setMsg("商品编码重复"); - } - BaseGoodsSpu wmsGoods = new BaseGoodsSpu(); - sid = wmsGoods.getSid(); - BeanUtil.copyProperties(dto, wmsGoods); - wmsGoods.setCreateTime(new DateTime()); - baseMapper.insert(wmsGoods); - //spu详情 - dto.getBaseGoodsSpuDetail().setGoodSpuSid(wmsGoods.getSid()); - baseGoodsSpuDetailService.saveOrUpdate(dto.getBaseGoodsSpuDetail()); - //商品sku - dto.getBaseGoodsSkus().forEach(s->{ - s.setGoodsSpuSid(wmsGoods.getSid()); - }); - baseGoodsSkuService.saveOrUpdate(dto.getBaseGoodsSkus()); - } - return rb.success().setMsg("成功"); - } - - public ResultBean initialization(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSpuVo vo = baseMapper.initialization(sid); - BaseGoodsSpuDetailVo vo1=baseGoodsSpuDetailService.getSpuDetailsBySpuSid(vo.getSid()).getData(); - vo.setBaseGoodsSpuDetail(vo1); - List vos=baseGoodsSkuService.getSkusBySpuSid(vo.getSid()).getData(); - for (BaseGoodsSkuVo baseGoodsSkuVo : vos) { - List ur=new ArrayList<>(); - BaseGoodsSkuExtendVo vo2=baseGoodsSkuExtendService.getExtendBySkuSid(baseGoodsSkuVo.getSid()).getData(); - if(StringUtils.isNotBlank(vo2.getPicUrl())){ - for (String url : vo2.getPicUrl().split(",")) { - url=fileUploadComponent.getUrlPrefix()+url; - UrlsVo vo3=new UrlsVo();vo3.setUrl(url); - ur.add(vo3); - } - } - vo2.setUrls(ur); - baseGoodsSkuVo.setBaseGoodsSkuExtend(vo2); - } - vo.setBaseGoodsSkus(vos); - return rb.success().setData(vo); - } - - - - public ResultBean delete(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSpu wmsGoods = fetchBySid(sid); - if (null != wmsGoods) { - baseMapper.deleteById(wmsGoods.getId()); - } - return rb.success(); - } - - public ResultBean updateIsEnable(String sid,String isEnable) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSpu wmsGoods = fetchBySid(sid); - if (null != wmsGoods) { - wmsGoods.setIsEnable(Integer.parseInt(isEnable)); - baseMapper.updateById(wmsGoods); - } - return rb.success().setMsg("成功"); - } -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuVo.java b/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuVo.java deleted file mode 100644 index be99e8c..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsspu/BaseGoodsSpuVo.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsspu; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.goods.biz.base.basegoodssku.BaseGoodsSkuVo; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailVo; -import com.yxt.common.core.vo.Vo; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseGoodsSpuVo implements Vo { - private String id; - private String sid; - private String lockVersion; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date modifyTime; - private String remarks; - private String isEnable; - private String state; - private String isDelete; - private String goodsCode;//商品代码 - private String barCode;//条形码 - private String goodsName;//商品名称 - private String subTitle;//商品名称 - private String goodsPY;//拼音缩写 - private String goodsShortName;//商品简称 - private String goodsTypeSid;//商品分类sid - private String brandSid;//品牌sid - private String manufacturerSid;//厂家sid - private String goodsUnitSid;//商品单位sid - private String goodsUnitName;//商品单位名称 - private String taxRate;//税率 - private String shelfLife;//保质期天 - private String nationalStandardCode;//国标码 - private String sortNo;//排序 - private String externalCode;//外部编码 - private String factoryCode;//厂家货号 - private String isListed;//是否上架 - private String useOrgSid;//使用组织sid - private String createOrgSid;//创建组织sid - private BaseGoodsSpuDetailVo baseGoodsSpuDetail; - private List baseGoodsSkus; -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetail.java b/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetail.java deleted file mode 100644 index 51a15b0..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetail.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsspudetail; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:36 - */ -@Data -public class BaseGoodsSpuDetail extends BaseEntity { - private String goodSpuSid;//商品基础信息Sid - private String goodsExplain;//商品详细说明 - private String goodsDescription;//商品描述 - @TableField(value = "generic_spec") - private String genericSpec;//通用规格参数及数据，json格式（规格参数id,规格参数值的键值对） - @TableField(value = "special_spec") - private String specialSpec;//特有规格参数及可选值信息，json格式（特有规格参数id,[可选参数值]） -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailDto.java b/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailDto.java deleted file mode 100644 index be06414..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailDto.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsspudetail; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.dto.Dto; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:38 - */ -@Data -public class BaseGoodsSpuDetailDto implements Dto { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - private String goodSpuSid;//商品基础信息Sid - private String goodsExplain;//商品详细说明 - private String goodsDescription;//商品描述 - @TableField(value = "generic_spec") - private String genericSpec;//通用规格参数及数据，json格式（规格参数id,规格参数值的键值对） - @TableField(value = "special_spec") - private String specialSpec;//特有规格参数及可选值信息，json格式（特有规格参数id,[可选参数值]） -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailMapper.java b/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailMapper.java deleted file mode 100644 index 12ce544..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsspudetail; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface BaseGoodsSpuDetailMapper extends BaseMapper { - - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - BaseGoodsSpuDetailVo getSpuDetailsBySpuSid (@Param("skuSid")String skuSid); -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml b/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml deleted file mode 100644 index 69b2042..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailQuery.java b/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailQuery.java deleted file mode 100644 index 5b3f188..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsspudetail; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseGoodsSpuDetailQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailService.java b/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailService.java deleted file mode 100644 index 8689e15..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailService.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsspudetail; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.goods.biz.base.basebrandinfo.BaseBrandInfoService; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsTypeService; -import com.yxt.goods.biz.base.basemanufacturer.BaseManufacturerService; -import com.yxt.common.base.config.component.FileUploadComponent; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.text.SimpleDateFormat; -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Service -public class BaseGoodsSpuDetailService extends MybatisBaseService { - @Autowired - private FileUploadComponent fileUploadComponent; - @Autowired - private BaseBrandInfoService baseBrandInfoService; - @Autowired - private BaseGoodsTypeService baseGoodsTypeService; - @Autowired - private BaseManufacturerService wmsManufacturerService; - public ResultBean> listPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSpuDetailQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if(StringUtils.isNotBlank(query.getName())){ - qw.like("goodsName",query.getName()); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return rb.success().setData(p); - } - - public ResultBean saveOrUpdate(BaseGoodsSpuDetailDto dto) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSpuDetail detail=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); - String sid = ""; - if (null!=detail) { - sid = dto.getSid(); - BaseGoodsSpuDetail baseGoodsSpuDetail = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, baseGoodsSpuDetail); - baseGoodsSpuDetail.setModifyTime(new Date()); - baseMapper.updateById(baseGoodsSpuDetail); - } else { - - BaseGoodsSpuDetail baseGoodsSpuDetail = new BaseGoodsSpuDetail(); - sid = baseGoodsSpuDetail.getSid(); - BeanUtil.copyProperties(dto, baseGoodsSpuDetail); - baseGoodsSpuDetail.setCreateTime(new DateTime()); - - baseMapper.insert(baseGoodsSpuDetail); - } - return rb.success().setMsg("成功"); - } - - public ResultBean initialization(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSpuDetailVo vo = new BaseGoodsSpuDetailVo(); - BaseGoodsSpuDetail wmsGoods = fetchBySid(sid); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - BeanUtil.copyProperties(wmsGoods, vo); - return rb.success().setData(vo); - } - public ResultBean getSpuDetailsBySpuSid(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSpuDetailVo vo = baseMapper.getSpuDetailsBySpuSid(sid); - return rb.success().setData(vo); - } - - - public ResultBean delete(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSpuDetail wmsGoods = fetchBySid(sid); - if (null != wmsGoods) { - baseMapper.deleteById(wmsGoods.getId()); - } - return rb.success(); - } - - public ResultBean updateIsEnable(String sid,String isEnable) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSpuDetail wmsGoods = fetchBySid(sid); - if (null != wmsGoods) { - wmsGoods.setIsEnable(Integer.parseInt(isEnable)); - baseMapper.updateById(wmsGoods); - } - return rb.success().setMsg("成功"); - } -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailVo.java b/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailVo.java deleted file mode 100644 index 4fc1419..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsspudetail/BaseGoodsSpuDetailVo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsspudetail; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.vo.Vo; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseGoodsSpuDetailVo implements Vo { - private String id; - private String sid; - private String lockVersion; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date modifyTime; - private String remarks; - private String isEnable; - private String state; - private String isDelete; - private String goodSpuSid;//商品基础信息Sid - private String goodsExplain;//商品详细说明 - private String goodsDescription;//商品描述 - @TableField(value = "generic_spec") - private String genericSpec;//通用规格参数及数据，json格式（规格参数id,规格参数值的键值对） - @TableField(value = "special_spec") - private String specialSpec;//特有规格参数及可选值信息，json格式（特有规格参数id,[可选参数值]） - private String goodsName; -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsType.java b/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsType.java deleted file mode 100644 index 301f73e..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsType.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yxt.goods.biz.base.basegoodstype; - -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:36 - */ -@Data -public class BaseGoodsType extends BaseEntity { - private String goodsTypeName;//商品类别名称 - private String goodsTypeCode;//类别编码 - private String percentageRate;//提成比例 - private String percentageAmount;//提成金额 - private String pSid;//父级sid - private String isParent;//是否为父节点，0为否，1为是，0标识为叶子节点 - private String isGoodsID;//是否一品一码 0 否 1是 - private String sortNo;//排序 - private String useOrgSid;//使用组织sid - private String createOrgSid;//创建组织sid -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeDto.java b/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeDto.java deleted file mode 100644 index efcd862..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeDto.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.yxt.goods.biz.base.basegoodstype; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.dto.Dto; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:38 - */ -@Data -public class BaseGoodsTypeDto implements Dto { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - private String goodsTypeName;//商品类别名称 - private String goodsTypeCode;//类别编码 - private String percentageRate;//提成比例 - private String percentageAmount;//提成金额 - private String pSid;//父级sid - private String isParent;//是否为父节点，0为否，1为是，0标识为叶子节点 - private String isGoodsID;//是否一品一码 0 否 1是 - private String sortNo;//排序 - private String useOrgSid;//使用组织sid - private String createOrgSid;//创建组织sid - private String pName;//创建组织sid - private String sids;//父级sid -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeMapper.java b/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeMapper.java deleted file mode 100644 index 0e636cc..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.yxt.goods.biz.base.basegoodstype; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface BaseGoodsTypeMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeMapper.xml b/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeMapper.xml deleted file mode 100644 index 8cf55d1..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeQuery.java b/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeQuery.java deleted file mode 100644 index fa45143..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.goods.biz.base.basegoodstype; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseGoodsTypeQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeService.java b/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeService.java deleted file mode 100644 index 2ca0bb3..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeService.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.yxt.goods.biz.base.basegoodstype; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.stereotype.Service; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Service -public class BaseGoodsTypeService extends MybatisBaseService { - - - public ResultBean> listPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsTypeQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if(StringUtils.isNotBlank(query.getName())){ - qw.like("goodsTypeName",query.getName()); - } - - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); - for (BaseGoodsTypeVo record : records) { - if(StringUtils.isNotBlank(record.getPSid())){ - BaseGoodsType wmsGoodsType1 = fetchBySid(record.getPSid()); - record.setPName(wmsGoodsType1.getGoodsTypeName()); - record.setSids(record.getPSid()); - } - } - return rb.success().setData(p); - } public ResultBean> listAll() { - ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); - return rb.success().setData(pagging); - } - - public ResultBean saveOrUpdate(BaseGoodsTypeDto dto) { - ResultBean rb = ResultBean.fireFail(); - String sid = ""; - dto.setPSid(dto.getSids()); - if (StringUtils.isNotBlank(dto.getSid())) { - sid = dto.getSid(); - BaseGoodsType wmsGoodsType = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, wmsGoodsType, "id", "sid"); - wmsGoodsType.setModifyTime(new Date()); - wmsGoodsType.setIsParent("0"); - if(StringUtils.isBlank(wmsGoodsType.getPSid())){ - wmsGoodsType.setIsParent("1"); - } - baseMapper.updateById(wmsGoodsType); - } else { - BaseGoodsType wmsGoods = new BaseGoodsType(); - sid = wmsGoods.getSid(); - BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); - wmsGoods.setCreateTime(new DateTime()); - wmsGoods.setIsParent("0"); - if(StringUtils.isBlank(wmsGoods.getPSid())){ - wmsGoods.setIsParent("1"); - } - baseMapper.insert(wmsGoods); - } - return rb.success().setMsg("成功"); - } - - public ResultBean initialization(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsTypeVo vo = new BaseGoodsTypeVo(); - BaseGoodsType wmsGoodsType = fetchBySid(sid); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - if (null != wmsGoodsType) { - BeanUtil.copyProperties(wmsGoodsType, vo); -// if (StringUtils.isNotBlank(wmsGoods.getPicUrl())) { -// vo.setPicUrl(fileUploadComponent.getUrlPrefix() + wmsGoods.getPicUrl()); -// } -// vo.setCreateTime(sdf.format(lpkGoods.getCreateTime())); - if(StringUtils.isNotBlank(wmsGoodsType.getPSid())){ - BaseGoodsType wmsGoodsType1 = fetchBySid(wmsGoodsType.getPSid()); - vo.setPName(wmsGoodsType1.getGoodsTypeName()); - } - vo.setSids(wmsGoodsType.getPSid()); - } - return rb.success().setData(vo); - } - - - - public ResultBean delete(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsType wmsGoodsType = fetchBySid(sid); - if (null != wmsGoodsType) { - baseMapper.deleteById(wmsGoodsType.getId()); - } - return rb.success(); - } - public ResultBean updateIsEnable(String sid,String isEnable) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsType wmsGoodsType = fetchBySid(sid); - if (null != wmsGoodsType) { - wmsGoodsType.setIsEnable(Integer.parseInt(isEnable)); - baseMapper.updateById(wmsGoodsType); - } - return rb.success().setMsg("成功"); - } -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeVo.java b/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeVo.java deleted file mode 100644 index 08d9644..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodstype/BaseGoodsTypeVo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.yxt.goods.biz.base.basegoodstype; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.vo.Vo; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseGoodsTypeVo implements Vo { - private String id; - private String sid; - private String lockVersion; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date modifyTime; - private String remarks; - private String isEnable; - private String state; - private String isDelete; - private String goodsTypeName;//商品类别名称 - private String goodsTypeCode;//类别编码 - private String percentageRate;//提成比例 - private String percentageAmount;//提成金额 - private String pSid;//父级sid - private String pName;//父级sid - private String isParent;//是否为父节点，0为否，1为是，0标识为叶子节点 - private String isGoodsID;//是否一品一码 0 否 1是 - private String sortNo;//排序 - private String useOrgSid;//使用组织sid - private String createOrgSid;//创建组织sid - private String sids;//创建组织sid -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnit.java b/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnit.java deleted file mode 100644 index 639239a..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnit.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsunit; - -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:36 - */ -@Data -public class BaseGoodsUnit extends BaseEntity { - - private String unitName;//单位名称 -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitDto.java b/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitDto.java deleted file mode 100644 index 4cc71eb..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsunit; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.dto.Dto; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:38 - */ -@Data -public class BaseGoodsUnitDto implements Dto { - private String id; - private String sid; - private String lockVersion; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date modifyTime; - private String remarks; - private String isEnable; - private String state; - private String isDelete; - private String unitName;//单位名称 -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitMapper.java b/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitMapper.java deleted file mode 100644 index 737a308..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsunit; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface BaseGoodsUnitMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml b/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml deleted file mode 100644 index 09c8848..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitQuery.java b/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitQuery.java deleted file mode 100644 index 8db9151..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsunit; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseGoodsUnitQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitService.java b/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitService.java deleted file mode 100644 index f298d68..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitService.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsunit; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.stereotype.Service; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Service -public class BaseGoodsUnitService extends MybatisBaseService { - - - public ResultBean> listPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsUnitQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if(StringUtils.isNotBlank(query.getName())){ - qw.like("unitName",query.getName()); - } - - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); - return rb.success().setData(p); - } public ResultBean> listAll() { - ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); - return rb.success().setData(pagging); - } - - public ResultBean saveOrUpdate(BaseGoodsUnitDto dto) { - ResultBean rb = ResultBean.fireFail(); - String sid = ""; - if (StringUtils.isNotBlank(dto.getSid())) { - sid = dto.getSid(); - BaseGoodsUnit wmsGoodsType = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, wmsGoodsType, "id", "sid"); - wmsGoodsType.setModifyTime(new Date()); - baseMapper.updateById(wmsGoodsType); - } else { - BaseGoodsUnit wmsGoods = new BaseGoodsUnit(); - sid = wmsGoods.getSid(); - BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); - wmsGoods.setCreateTime(new DateTime()); -// if (StringUtils.isNotBlank(dto.getPicUrl())) { -// String urlPrefix = fileUploadComponent.getUrlPrefix(); -// String path = dto.getPicUrl().substring(urlPrefix.length()); -// lpkGoods.setPicUrl(path); -// } - baseMapper.insert(wmsGoods); - } - return rb.success().setMsg("成功"); - } - - public ResultBean initialization(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsUnitVo vo = new BaseGoodsUnitVo(); - BaseGoodsUnit wmsGoodsType = fetchBySid(sid); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - BeanUtil.copyProperties(wmsGoodsType, vo); - if (null != wmsGoodsType) { -// BeanUtil.copyProperties(wmsGoodsType, vo); -// if (StringUtils.isNotBlank(wmsGoods.getPicUrl())) { -// vo.setPicUrl(fileUploadComponent.getUrlPrefix() + wmsGoods.getPicUrl()); -// } -// vo.setCreateTime(sdf.format(lpkGoods.getCreateTime())); -// BaseGoodsUnit wmsGoodsType1 = fetchBySid(wmsGoodsType.getPSid()); -// vo.setPName(wmsGoodsType1.getGoodsTypeName()); - } - return rb.success().setData(vo); - } - - - - public ResultBean delete(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsUnit wmsGoodsType = fetchBySid(sid); - if (null != wmsGoodsType) { - baseMapper.deleteById(wmsGoodsType.getId()); - } - return rb.success(); - } - public ResultBean updateIsEnable(String sid,String isEnable) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsUnit wmsGoodsType = fetchBySid(sid); - if (null != wmsGoodsType) { - wmsGoodsType.setIsEnable(Integer.parseInt(isEnable)); - baseMapper.updateById(wmsGoodsType); - } - return rb.success().setMsg("成功"); - } -} diff --git a/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitVo.java b/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitVo.java deleted file mode 100644 index bc062b8..0000000 --- a/src/main/java/com/yxt/user/biz/base/basegoodsunit/BaseGoodsUnitVo.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsunit; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.vo.Vo; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseGoodsUnitVo implements Vo { - private String id; - private String sid; - private String lockVersion; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date modifyTime; - private String remarks; - private String isEnable; - private String state; - private String isDelete; - private String unitName;//单位名称 -} diff --git a/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturer.java b/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturer.java deleted file mode 100644 index 2eda4ee..0000000 --- a/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturer.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.yxt.goods.biz.base.basemanufacturer; - -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:36 - */ -@Data -public class BaseManufacturer extends BaseEntity { - private String manufacturerName;//厂家名称 - private String manufacturerCode;//厂家编码 - private String address;//地址 - private String telephone;//电话 - private String contacts;//联系人 - private String sortNo;//排序 - private String useOrgSid;//使用组织sid - private String createOrgSid;//创建组织sid -} diff --git a/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerDto.java b/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerDto.java deleted file mode 100644 index 97c6608..0000000 --- a/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerDto.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.yxt.goods.biz.base.basemanufacturer; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.dto.Dto; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:38 - */ -@Data -public class BaseManufacturerDto implements Dto { - private String id; - private String sid; - private String lockVersion; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date modifyTime; - private String remarks; - private String isEnable; - private String state; - private String isDelete; - - private String manufacturerName;//厂家名称 - private String manufacturerCode;//厂家编码 - private String address;//地址 - private String telephone;//电话 - private String contacts;//联系人 - private String sortNo;//排序 - private String useOrgSid;//使用组织sid - private String createOrgSid;//创建组织sid -} diff --git a/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerMapper.java b/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerMapper.java deleted file mode 100644 index fd27fab..0000000 --- a/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.yxt.goods.biz.base.basemanufacturer; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface BaseManufacturerMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - List getAllTypeByUseOrgSid(@Param("useOrgSid") String useOrgSid); -} diff --git a/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerMapper.xml b/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerMapper.xml deleted file mode 100644 index d5ea849..0000000 --- a/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerQuery.java b/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerQuery.java deleted file mode 100644 index 91a686d..0000000 --- a/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.goods.biz.base.basemanufacturer; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseManufacturerQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerService.java b/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerService.java deleted file mode 100644 index e05fa4c..0000000 --- a/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerService.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.yxt.goods.biz.base.basemanufacturer; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.stereotype.Service; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Service -public class BaseManufacturerService extends MybatisBaseService { - - - public ResultBean> listPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - BaseManufacturerQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if(StringUtils.isNotBlank(query.getName())){ - qw.like("goodsTypeName",query.getName()); - } - - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); - return rb.success().setData(p); - } - public ResultBean> listAll() { - ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); - return rb.success().setData(pagging); - } - - public ResultBean saveOrUpdate(BaseManufacturerDto dto) { - ResultBean rb = ResultBean.fireFail(); - String sid = ""; - if (StringUtils.isNotBlank(dto.getSid())) { - sid = dto.getSid(); - BaseManufacturer wmsManufacturer = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, wmsManufacturer, "id", "sid"); - wmsManufacturer.setModifyTime(new Date()); - baseMapper.updateById(wmsManufacturer); - } else { - BaseManufacturer wmsManufacturer = new BaseManufacturer(); - sid = wmsManufacturer.getSid(); - BeanUtil.copyProperties(dto, wmsManufacturer, "id", "sid"); - wmsManufacturer.setCreateTime(new DateTime()); -// if (StringUtils.isNotBlank(dto.getPicUrl())) { -// String urlPrefix = fileUploadComponent.getUrlPrefix(); -// String path = dto.getPicUrl().substring(urlPrefix.length()); -// lpkGoods.setPicUrl(path); -// } - baseMapper.insert(wmsManufacturer); - } - return rb.success().setMsg("成功"); - } - - public ResultBean initialization(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseManufacturerVo vo = new BaseManufacturerVo(); - BaseManufacturer wmsManufacturer = fetchBySid(sid); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - if (null != wmsManufacturer) { - BeanUtil.copyProperties(wmsManufacturer, vo); -// if (StringUtils.isNotBlank(wmsGoods.getPicUrl())) { -// vo.setPicUrl(fileUploadComponent.getUrlPrefix() + wmsGoods.getPicUrl()); -// } -// vo.setCreateTime(sdf.format(lpkGoods.getCreateTime())); - } - return rb.success().setData(vo); - } - - - - public ResultBean delete(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseManufacturer wmsManufacturer = fetchBySid(sid); - if (null != wmsManufacturer) { - baseMapper.deleteById(wmsManufacturer.getId()); - } - return rb.success(); - } - public ResultBean updateIsEnable(String sid,String isEnable) { - ResultBean rb = ResultBean.fireFail(); - BaseManufacturer wmsManufacturer = fetchBySid(sid); - if (null != wmsManufacturer) { - wmsManufacturer.setIsEnable(Integer.parseInt(isEnable)); - baseMapper.updateById(wmsManufacturer); - } - return rb.success().setMsg("成功"); - } - - public ResultBean> getAllTypeByUseOrgSid(String useOrgSid) { - ResultBean rb = ResultBean.fireFail(); - List list = baseMapper.getAllTypeByUseOrgSid(useOrgSid); - return rb.success().setData(list); - } -} diff --git a/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerVo.java b/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerVo.java deleted file mode 100644 index d1428dd..0000000 --- a/src/main/java/com/yxt/user/biz/base/basemanufacturer/BaseManufacturerVo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.yxt.goods.biz.base.basemanufacturer; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.vo.Vo; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseManufacturerVo implements Vo { - private String id; - private String sid; - private String lockVersion; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date modifyTime; - private String remarks; - private String isEnable; - private String state; - private String isDelete; - private String createBySid; - private String updateBySid; - private String manufacturerName;//厂家名称 - private String manufacturerCode;//厂家编码 - private String address;//地址 - private String telephone;//电话 - private String contacts;//联系人 - private String sortNo;//排序 - private String useOrgSid;//使用组织sid - private String createOrgSid;//创建组织sid -} diff --git a/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroup.java b/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroup.java deleted file mode 100644 index e39d87a..0000000 --- a/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroup.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yxt.goods.biz.base.basespecgroup; - -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/4/8 9:34 - */ -@Data -public class BaseSpecGroup extends BaseEntity { - private String categorySid;//商品分类sid - private String groupName;//组名 - -} diff --git a/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupDto.java b/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupDto.java deleted file mode 100644 index 8bbb9ad..0000000 --- a/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupDto.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yxt.goods.biz.base.basespecgroup; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/4/8 9:34 - */ -@Data -public class BaseSpecGroupDto { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - private String categorySid;//商品分类sid - private String groupName;//组名 -} diff --git a/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupMapper.java b/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupMapper.java deleted file mode 100644 index ad166e6..0000000 --- a/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yxt.goods.biz.base.basespecgroup; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface BaseSpecGroupMapper extends BaseMapper { - - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List getSkusBySpuSid(@Param("spuSid")String spuSid); - BaseSpecGroupVo getVoBySid(@Param("sid")String sid); - -} diff --git a/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupMapper.xml b/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupMapper.xml deleted file mode 100644 index 9077f7b..0000000 --- a/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupQuery.java b/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupQuery.java deleted file mode 100644 index 39c0bb1..0000000 --- a/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.goods.biz.base.basespecgroup; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/4/8 9:34 - */ -@Data -public class BaseSpecGroupQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupService.java b/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupService.java deleted file mode 100644 index 3e9a0d1..0000000 --- a/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupService.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.yxt.goods.biz.base.basespecgroup; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.config.component.FileUploadComponent; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Service -public class BaseSpecGroupService extends MybatisBaseService { - @Autowired - private FileUploadComponent fileUploadComponent; - - - public ResultBean> listPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - BaseSpecGroupQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getName())) { - qw.like("goodsName", query.getName()); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return rb.success().setData(p); - } - @Transactional - public ResultBean saveOrUpdate(BaseSpecGroupDto dto) { - ResultBean rb = ResultBean.fireFail(); - String sid = ""; - if (StringUtils.isNotBlank(dto.getSid())) { - sid = dto.getSid(); - BaseSpecGroup wmsGoods = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); - wmsGoods.setModifyTime(new Date()); - baseMapper.updateById(wmsGoods); - } else { - BaseSpecGroup wmsGoods = new BaseSpecGroup(); - BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); - wmsGoods.setCreateTime(new DateTime()); - baseMapper.insert(wmsGoods); - } - return rb.success().setMsg("成功"); - } - @Transactional - public ResultBean saveOrUpdate(List dtos) { - ResultBean rb = ResultBean.fireFail(); - for (BaseSpecGroupDto dto : dtos) { - BaseSpecGroup sku=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); - String sid = ""; - if (null!=sku) { - sid = dto.getSid(); - BaseSpecGroup wmsGoods = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, wmsGoods); - wmsGoods.setModifyTime(new Date()); - baseMapper.updateById(wmsGoods); - } else { - BaseSpecGroup wmsGoods = new BaseSpecGroup(); - BeanUtil.copyProperties(dto, wmsGoods); - wmsGoods.setCreateTime(new DateTime()); - baseMapper.insert(wmsGoods); - } - } - - return rb.success().setMsg("成功"); - } - - public ResultBean initialization(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseSpecGroupVo vo = baseMapper.getVoBySid(sid); - return rb.success().setData(vo); - } - - public ResultBean> getSkusBySpuSid(String sid) { - ResultBean rb = ResultBean.fireFail(); - List vo = baseMapper.getSkusBySpuSid(sid); - return rb.success().setData(vo); - } - - - public ResultBean delete(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseSpecGroup wmsGoods = fetchBySid(sid); - if (null != wmsGoods) { - baseMapper.deleteById(wmsGoods.getId()); - } - return rb.success(); - } - - public ResultBean updateIsEnable(String sid, String isEnable) { - ResultBean rb = ResultBean.fireFail(); - BaseSpecGroup wmsGoods = fetchBySid(sid); - if (null != wmsGoods) { - wmsGoods.setIsEnable(Integer.parseInt(isEnable)); - baseMapper.updateById(wmsGoods); - } - return rb.success().setMsg("成功"); - } -} diff --git a/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupVo.java b/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupVo.java deleted file mode 100644 index 6cac4c5..0000000 --- a/src/main/java/com/yxt/user/biz/base/basespecgroup/BaseSpecGroupVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yxt.goods.biz.base.basespecgroup; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/4/8 9:34 - */ -@Data -public class BaseSpecGroupVo { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - private String categorySid;//商品分类sid - private String categoryName;//商品分类名 - private String groupName;//组名 -} diff --git a/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParam.java b/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParam.java deleted file mode 100644 index fd1174e..0000000 --- a/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParam.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yxt.goods.biz.base.basespecparam; - -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/4/8 9:34 - */ -@Data -public class BaseSpecParam extends BaseEntity { - private String categorySid;//商品分类sid - private String groupSid;//参数组sid - private String paramName;//参数名 - private String numeric;//是否数字类型 1 true 2false - private String unit;//数字类型的单位 非数字行可为空 - private String generic;//是否sku通用属性1true 2 false - private String searching;//是否用于搜索过滤 1true 2 false - private String segments;//数值类型参数，如果需要搜索。则添加分段间隔值 - - -} diff --git a/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamDto.java b/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamDto.java deleted file mode 100644 index 1191592..0000000 --- a/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamDto.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.yxt.goods.biz.base.basespecparam; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/4/8 9:34 - */ -@Data -public class BaseSpecParamDto { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - private String categorySid;//商品分类sid - private String groupSid;//参数组sid - private String paramName;//参数名 - private String numeric;//是否数字类型 1 true 2false - private String unit;//数字类型的单位 非数字行可为空 - private String generic;//是否sku通用属性1true 2 false - private String searching;//是否用于搜索过滤 1true 2 false - private String segments;//数值类型参数，如果需要搜索。则添加分段间隔值 -} diff --git a/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamMapper.java b/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamMapper.java deleted file mode 100644 index ef91b64..0000000 --- a/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yxt.goods.biz.base.basespecparam; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface BaseSpecParamMapper extends BaseMapper { - - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List getSkusBySpuSid(@Param("spuSid")String spuSid); - BaseSpecParamVo getVoBySid(@Param("sid")String sid); - -} diff --git a/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamMapper.xml b/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamMapper.xml deleted file mode 100644 index a9b51e8..0000000 --- a/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamQuery.java b/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamQuery.java deleted file mode 100644 index 74f753a..0000000 --- a/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.goods.biz.base.basespecparam; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/4/8 9:34 - */ -@Data -public class BaseSpecParamQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamService.java b/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamService.java deleted file mode 100644 index da1b926..0000000 --- a/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamService.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.yxt.goods.biz.base.basespecparam; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.config.component.FileUploadComponent; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Service -public class BaseSpecParamService extends MybatisBaseService { - @Autowired - private FileUploadComponent fileUploadComponent; - - - public ResultBean> listPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - BaseSpecParamQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getName())) { - qw.like("goodsName", query.getName()); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return rb.success().setData(p); - } - @Transactional - public ResultBean saveOrUpdate(BaseSpecParamDto dto) { - ResultBean rb = ResultBean.fireFail(); - String sid = ""; - if (StringUtils.isNotBlank(dto.getSid())) { - sid = dto.getSid(); - BaseSpecParam wmsGoods = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, wmsGoods); - wmsGoods.setModifyTime(new Date()); - baseMapper.updateById(wmsGoods); - } else { - BaseSpecParam wmsGoods = new BaseSpecParam(); - BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); - wmsGoods.setCreateTime(new DateTime()); - baseMapper.insert(wmsGoods); - } - return rb.success().setMsg("成功"); - } - - - @Transactional - public ResultBean saveOrUpdate(List dtos) { - ResultBean rb = ResultBean.fireFail(); - for (BaseSpecParamDto dto : dtos) { - BaseSpecParam sku=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); - String sid = ""; - if (null!=sku) { - sid = dto.getSid(); - BaseSpecParam wmsGoods = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, wmsGoods); - wmsGoods.setModifyTime(new Date()); - baseMapper.updateById(wmsGoods); - } else { - BaseSpecParam wmsGoods = new BaseSpecParam(); - BeanUtil.copyProperties(dto, wmsGoods); - wmsGoods.setCreateTime(new DateTime()); - baseMapper.insert(wmsGoods); - } - } - - return rb.success().setMsg("成功"); - } - - public ResultBean initialization(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseSpecParamVo vo = baseMapper.getVoBySid(sid); - return rb.success().setData(vo); - } - - public ResultBean> getSkusBySpuSid(String sid) { - ResultBean rb = ResultBean.fireFail(); - List vo = baseMapper.getSkusBySpuSid(sid); - return rb.success().setData(vo); - } - - - public ResultBean delete(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseSpecParam wmsGoods = fetchBySid(sid); - if (null != wmsGoods) { - baseMapper.deleteById(wmsGoods.getId()); - } - return rb.success(); - } - - public ResultBean updateIsEnable(String sid, String isEnable) { - ResultBean rb = ResultBean.fireFail(); - BaseSpecParam wmsGoods = fetchBySid(sid); - if (null != wmsGoods) { - wmsGoods.setIsEnable(Integer.parseInt(isEnable)); - baseMapper.updateById(wmsGoods); - } - return rb.success().setMsg("成功"); - } -} diff --git a/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamVo.java b/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamVo.java deleted file mode 100644 index 4d0acc4..0000000 --- a/src/main/java/com/yxt/user/biz/base/basespecparam/BaseSpecParamVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.yxt.goods.biz.base.basespecparam; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/4/8 9:34 - */ -@Data -public class BaseSpecParamVo { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - private String categorySid;//商品分类sid - private String groupSid;//参数组sid - private String paramName;//参数名 - private String numeric;//是否数字类型 1 true 2false - private String unit;//数字类型的单位 非数字行可为空 - private String generic;//是否sku通用属性1true 2 false - private String searching;//是否用于搜索过滤 1true 2 false - private String segments;//数值类型参数，如果需要搜索。则添加分段间隔值 - private String groupName;//参数组名 - private String categoryName;//分类名 -} diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBank.java b/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBank.java deleted file mode 100644 index 041d855..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBank.java +++ /dev/null @@ -1,76 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierBank; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBank.java
- * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBank
- * Description: 供应商开户行信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商开户行信息", description = "供应商开户行信息") -@TableName("base_supplier_bank") -public class BaseSupplierBank extends BaseEntity { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("供应商sid") - private String supplierSid; // 供应商sid - @ApiModelProperty("开户行") - private String bankName; // 开户行 - @ApiModelProperty("开户行帐号") - private String bankAccount; // 开户行帐号 - @ApiModelProperty("账户名称") - private String accountName; // 账户名称 - @ApiModelProperty("账户类型key") - private String dueBankKey; // 账户类型key - @ApiModelProperty("账户类型value") - private String dueBankValue; // 账户类型value - @ApiModelProperty("银行网点") - private String bankingOutlets; // 银行网点 - @ApiModelProperty("开户行地址") - private String bankAddress; // 开户行地址 - @ApiModelProperty("联行号") - private String paymentLines; // 联行号 - @ApiModelProperty("银行代码") - private String swiftCode; // 银行代码 - @ApiModelProperty("币种") - private String currency; // 币种 - -} diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankDetailsVo.java b/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankDetailsVo.java deleted file mode 100644 index 3141dad..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankDetailsVo.java +++ /dev/null @@ -1,76 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierBank; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBankVo.java
- * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBankVo
- * Description: 供应商开户行信息 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商开户行信息 视图数据详情", description = "供应商开户行信息 视图数据详情") -public class BaseSupplierBankDetailsVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("供应商sid") - private String supplierSid; // 供应商sid - @ApiModelProperty("开户行") - private String bankName; // 开户行 - @ApiModelProperty("开户行帐号") - private String bankAccount; // 开户行帐号 - @ApiModelProperty("账户名称") - private String accountName; // 账户名称 - @ApiModelProperty("账户类型key") - private String dueBankKey; // 账户类型key - @ApiModelProperty("账户类型value") - private String dueBankValue; // 账户类型value - @ApiModelProperty("银行网点") - private String bankingOutlets; // 银行网点 - @ApiModelProperty("开户行地址") - private String bankAddress; // 开户行地址 - @ApiModelProperty("联行号") - private String paymentLines; // 联行号 - @ApiModelProperty("银行代码") - private String swiftCode; // 银行代码 - @ApiModelProperty("币种") - private String currency; // 币种 - -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankDto.java b/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankDto.java deleted file mode 100644 index eb321cc..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankDto.java +++ /dev/null @@ -1,76 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierBank; - - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBankDto.java
- * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBankDto
- * Description: 供应商开户行信息 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商开户行信息 数据传输对象", description = "供应商开户行信息 数据传输对象") -public class BaseSupplierBankDto implements Dto { - - private String sid; // sid - - @ApiModelProperty("供应商sid") - private String supplierSid; // 供应商sid - @ApiModelProperty("开户行") - private String bankName; // 开户行 - @ApiModelProperty("开户行帐号") - private String bankAccount; // 开户行帐号 - @ApiModelProperty("账户名称") - private String accountName; // 账户名称 - @ApiModelProperty("账户类型key") - private String dueBankKey; // 账户类型key - @ApiModelProperty("账户类型value") - private String dueBankValue; // 账户类型value - @ApiModelProperty("银行网点") - private String bankingOutlets; // 银行网点 - @ApiModelProperty("开户行地址") - private String bankAddress; // 开户行地址 - @ApiModelProperty("联行号") - private String paymentLines; // 联行号 - @ApiModelProperty("银行代码") - private String swiftCode; // 银行代码 - @ApiModelProperty("币种") - private String currency; // 币种 - -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankMapper.java b/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankMapper.java deleted file mode 100644 index 92dd389..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankMapper.java +++ /dev/null @@ -1,67 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierBank; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Delete; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBankMapper.java
- * Class: com.yxt.base.biz.basesupplierbank.BaseSupplierBankMapper
- * Description: 供应商开户行信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Mapper -public interface BaseSupplierBankMapper extends BaseMapper { - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from base_supplier_bank") - List selectListVo(); - - @Delete("delete from base_supplier_bank where supplierSid = #{supplierSid}") - int deleteBySupplierSid(String supplierSid); - - @Select("select * from base_supplier_bank where supplierSid = #{supplierSid}") - List selectBySupplierSid(String supplierSid); -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankMapper.xml b/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankMapper.xml deleted file mode 100644 index cf4cbab..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankQuery.java b/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankQuery.java deleted file mode 100644 index 49ab190..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankQuery.java +++ /dev/null @@ -1,74 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierBank; - - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBankQuery.java
- * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBankQuery
- * Description: 供应商开户行信息 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商开户行信息 查询条件", description = "供应商开户行信息 查询条件") -public class BaseSupplierBankQuery implements Query { - - @ApiModelProperty("供应商sid") - private String supplierSid; // 供应商sid - @ApiModelProperty("开户行") - private String bankName; // 开户行 - @ApiModelProperty("开户行帐号") - private String bankAccount; // 开户行帐号 - @ApiModelProperty("账户名称") - private String accountName; // 账户名称 - @ApiModelProperty("账户类型key") - private String dueBankKey; // 账户类型key - @ApiModelProperty("账户类型value") - private String dueBankValue; // 账户类型value - @ApiModelProperty("银行网点") - private String bankingOutlets; // 银行网点 - @ApiModelProperty("开户行地址") - private String bankAddress; // 开户行地址 - @ApiModelProperty("联行号") - private String paymentLines; // 联行号 - @ApiModelProperty("银行代码") - private String swiftCode; // 银行代码 - @ApiModelProperty("币种") - private String currency; // 币种 - -} diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankService.java b/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankService.java deleted file mode 100644 index b94c87a..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankService.java +++ /dev/null @@ -1,104 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierBank; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.vo.PagerVo; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBankService.java
- * Class: com.yxt.base.biz.basesupplierbank.BaseSupplierBankService
- * Description: 供应商开户行信息 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Service -public class BaseSupplierBankService extends MybatisBaseService { - - public PagerVo listPageVo(PagerQuery pq) { - BaseSupplierBankQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(BaseSupplierBankDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(BaseSupplierBankDto dto){ - BaseSupplierBank entity = new BaseSupplierBank(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(BaseSupplierBankDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - BaseSupplierBank entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public BaseSupplierBankDetailsVo fetchDetailsVoBySid(String sid){ - BaseSupplierBank entity = fetchBySid(sid); - BaseSupplierBankDetailsVo vo = new BaseSupplierBankDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - - public int deleteBySupplierSid(String supplierSid) { - return baseMapper.deleteBySupplierSid(supplierSid); - } - - public List selectBySupplierSid(String supplierSid) { - return baseMapper.selectBySupplierSid(supplierSid); - } -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankVo.java b/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankVo.java deleted file mode 100644 index c7f4a6b..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierBank/BaseSupplierBankVo.java +++ /dev/null @@ -1,76 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierBank; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBankVo.java
- * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBankVo
- * Description: 供应商开户行信息 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商开户行信息 视图数据对象", description = "供应商开户行信息 视图数据对象") -public class BaseSupplierBankVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("供应商sid") - private String supplierSid; // 供应商sid - @ApiModelProperty("开户行") - private String bankName; // 开户行 - @ApiModelProperty("开户行帐号") - private String bankAccount; // 开户行帐号 - @ApiModelProperty("账户名称") - private String accountName; // 账户名称 - @ApiModelProperty("账户类型key") - private String dueBankKey; // 账户类型key - @ApiModelProperty("账户类型value") - private String dueBankValue; // 账户类型value - @ApiModelProperty("银行网点") - private String bankingOutlets; // 银行网点 - @ApiModelProperty("开户行地址") - private String bankAddress; // 开户行地址 - @ApiModelProperty("联行号") - private String paymentLines; // 联行号 - @ApiModelProperty("银行代码") - private String swiftCode; // 银行代码 - @ApiModelProperty("币种") - private String currency; // 币种 - -} diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFile.java b/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFile.java deleted file mode 100644 index 2de0646..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFile.java +++ /dev/null @@ -1,66 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierfile; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFile.java
- * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFile
- * Description: 供应商附件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商附件", description = "供应商附件") -@TableName("base_supplier_file") -public class BaseSupplierFile extends BaseEntity { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("文件名") - private String fileName; // 文件名 - @ApiModelProperty("文件类型") - private String fileType; // 文件类型 - @ApiModelProperty("关联业务对象sid") - private String linkSid; // 关联业务对象sid - @ApiModelProperty("附件类型") - private String attachType; // 附件类型 - @ApiModelProperty("文件大小") - private String fileSize; // 文件大小 - @ApiModelProperty("文件的路径") - private String filePath; // 文件的路径 - -} diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileDetailsVo.java b/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileDetailsVo.java deleted file mode 100644 index 06b33ab..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileDetailsVo.java +++ /dev/null @@ -1,66 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierfile; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFileVo.java
- * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileVo
- * Description: 供应商附件 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商附件 视图数据详情", description = "供应商附件 视图数据详情") -public class BaseSupplierFileDetailsVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("文件名") - private String fileName; // 文件名 - @ApiModelProperty("文件类型") - private String fileType; // 文件类型 - @ApiModelProperty("关联业务对象sid") - private String linkSid; // 关联业务对象sid - @ApiModelProperty("附件类型") - private String attachType; // 附件类型 - @ApiModelProperty("文件大小") - private String fileSize; // 文件大小 - @ApiModelProperty("文件的路径") - private String filePath; // 文件的路径 - -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileDto.java b/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileDto.java deleted file mode 100644 index 0e4926c..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileDto.java +++ /dev/null @@ -1,66 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierfile; - - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFileDto.java
- * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileDto
- * Description: 供应商附件 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商附件 数据传输对象", description = "供应商附件 数据传输对象") -public class BaseSupplierFileDto implements Dto { - - private String sid; // sid - - @ApiModelProperty("文件名") - private String fileName; // 文件名 - @ApiModelProperty("文件类型") - private String fileType; // 文件类型 - @ApiModelProperty("关联业务对象sid") - private String linkSid; // 关联业务对象sid - @ApiModelProperty("附件类型") - private String attachType; // 附件类型 - @ApiModelProperty("文件大小") - private String fileSize; // 文件大小 - @ApiModelProperty("文件的路径") - private String filePath; // 文件的路径 - -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileMapper.java b/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileMapper.java deleted file mode 100644 index d707216..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileMapper.java +++ /dev/null @@ -1,60 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierfile; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFileMapper.java
- * Class: com.yxt.anrui.as.biz.basesupplierfile.BaseSupplierFileMapper
- * Description: 供应商附件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Mapper -public interface BaseSupplierFileMapper extends BaseMapper { - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from base_supplier_file") - List selectListVo(); -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileMapper.xml b/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileMapper.xml deleted file mode 100644 index 832de50..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileQuery.java b/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileQuery.java deleted file mode 100644 index b53b30e..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileQuery.java +++ /dev/null @@ -1,64 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierfile; - - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFileQuery.java
- * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileQuery
- * Description: 供应商附件 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商附件 查询条件", description = "供应商附件 查询条件") -public class BaseSupplierFileQuery implements Query { - - @ApiModelProperty("文件名") - private String fileName; // 文件名 - @ApiModelProperty("文件类型") - private String fileType; // 文件类型 - @ApiModelProperty("关联业务对象sid") - private String linkSid; // 关联业务对象sid - @ApiModelProperty("附件类型") - private String attachType; // 附件类型 - @ApiModelProperty("文件大小") - private String fileSize; // 文件大小 - @ApiModelProperty("文件的路径") - private String filePath; // 文件的路径 - -} diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileService.java b/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileService.java deleted file mode 100644 index 9dd7826..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileService.java +++ /dev/null @@ -1,94 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierfile; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.vo.PagerVo; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFileService.java
- * Class: com.yxt.anrui.as.biz.basesupplierfile.BaseSupplierFileService
- * Description: 供应商附件 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Service -public class BaseSupplierFileService extends MybatisBaseService { - - public PagerVo listPageVo(PagerQuery pq) { - BaseSupplierFileQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(BaseSupplierFileDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(BaseSupplierFileDto dto){ - BaseSupplierFile entity = new BaseSupplierFile(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(BaseSupplierFileDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - BaseSupplierFile entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public BaseSupplierFileDetailsVo fetchDetailsVoBySid(String sid){ - BaseSupplierFile entity = fetchBySid(sid); - BaseSupplierFileDetailsVo vo = new BaseSupplierFileDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileVo.java b/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileVo.java deleted file mode 100644 index f65497a..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierfile/BaseSupplierFileVo.java +++ /dev/null @@ -1,66 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierfile; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFileVo.java
- * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileVo
- * Description: 供应商附件 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商附件 视图数据对象", description = "供应商附件 视图数据对象") -public class BaseSupplierFileVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("文件名") - private String fileName; // 文件名 - @ApiModelProperty("文件类型") - private String fileType; // 文件类型 - @ApiModelProperty("关联业务对象sid") - private String linkSid; // 关联业务对象sid - @ApiModelProperty("附件类型") - private String attachType; // 附件类型 - @ApiModelProperty("文件大小") - private String fileSize; // 文件大小 - @ApiModelProperty("文件的路径") - private String filePath; // 文件的路径 - -} diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfo.java b/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfo.java deleted file mode 100644 index 4710296..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfo.java +++ /dev/null @@ -1,112 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfo.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfo
- * Description: 供应商信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息", description = "供应商信息") -@TableName("base_supplier_info") -public class BaseSupplierInfo extends BaseEntity { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("编码") - private String supplierCode; // 编码 - @ApiModelProperty("供应商名称") - private String supplierName; // 供应商名称 - @ApiModelProperty("供应商名称拼音") - private String supplierPY; // 供应商名称拼音 - @ApiModelProperty("供应商类型sid") - private String supplierTypeSid; // 供应商类型sid - @ApiModelProperty("供应商类型") - private String supplierTypeName; // 供应商类型 - @ApiModelProperty("省sid") - private String provinceSid; // 省sid - @ApiModelProperty("province") - private String province; // - @ApiModelProperty("市sid") - private String citySid; // 市sid - @ApiModelProperty("city") - private String city; // - @ApiModelProperty("收货县区sid") - private String countySid; // 收货县区sid - @ApiModelProperty("county") - private String county; // - @ApiModelProperty("详细地址") - private String address; // 详细地址 - @ApiModelProperty("手机") - private String contactMobile; // 手机 - @ApiModelProperty("电话") - private String contactTelePhone; // 电话 - @ApiModelProperty("联系人") - private String contactName; // 联系人 - @ApiModelProperty("传真") - private String fax; // 传真 - @ApiModelProperty("邮编") - private String zipCode; // 邮编 - @ApiModelProperty("电子邮件") - private String email; // 电子邮件 - @ApiModelProperty("网址") - private String website; // 网址 - @ApiModelProperty("开票公司名称") - private String billingCompanyName; // 开票公司名称 - @ApiModelProperty("税号") - private String registNum; // 税号 - @ApiModelProperty("法人") - private String legalName; // 法人 - @ApiModelProperty("采购员") - private String purchaser; // 采购员 - @ApiModelProperty("排序") - private Integer sortNo; // 排序 - @ApiModelProperty("开票类型key") - private String billingTypeKey; // 开票类型key - @ApiModelProperty("开票类型value") - private String billingTypeValue; // 开票类型value - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - -} diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoChoice.java b/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoChoice.java deleted file mode 100644 index eab7096..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoChoice.java +++ /dev/null @@ -1,54 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoVo.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo
- * Description: 供应商信息 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象") -public class BaseSupplierInfoChoice implements Vo { - - private String sid; - @ApiModelProperty("供应商名称") - private String supplierName; -} diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoDetailsVo.java b/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoDetailsVo.java deleted file mode 100644 index 006ecaf..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoDetailsVo.java +++ /dev/null @@ -1,116 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - - -import com.yxt.goods.biz.base.basesupplierBank.BaseSupplierBankDetailsVo; -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoVo.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo
- * Description: 供应商信息 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息 视图数据详情", description = "供应商信息 视图数据详情") -public class BaseSupplierInfoDetailsVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("编码") - private String supplierCode; // 编码 - @ApiModelProperty("供应商名称") - private String supplierName; // 供应商名称 - @ApiModelProperty("供应商名称拼音") - private String supplierPY; // 供应商名称拼音 - @ApiModelProperty("供应商类型sid") - private String supplierTypeSid; // 供应商类型sid - @ApiModelProperty("供应商类型") - private String supplierTypeName; // 供应商类型 - @ApiModelProperty("省sid") - private String provinceSid; // 省sid - @ApiModelProperty("province") - private String province; // - @ApiModelProperty("市sid") - private String citySid; // 市sid - @ApiModelProperty("city") - private String city; // - @ApiModelProperty("收货县区sid") - private String countySid; // 收货县区sid - @ApiModelProperty("county") - private String county; // - @ApiModelProperty("详细地址") - private String address; // 详细地址 - @ApiModelProperty("手机") - private String contactMobile; // 手机 - @ApiModelProperty("电话") - private String contactTelePhone; // 电话 - @ApiModelProperty("联系人") - private String contactName; // 联系人 - @ApiModelProperty("传真") - private String fax; // 传真 - @ApiModelProperty("邮编") - private String zipCode; // 邮编 - @ApiModelProperty("电子邮件") - private String email; // 电子邮件 - @ApiModelProperty("网址") - private String website; // 网址 - @ApiModelProperty("开票公司名称") - private String billingCompanyName; // 开票公司名称 - @ApiModelProperty("税号") - private String registNum; // 税号 - @ApiModelProperty("法人") - private String legalName; // 法人 - @ApiModelProperty("采购员") - private String purchaser; // 采购员 - @ApiModelProperty("排序") - private Integer sortNo; // 排序 - @ApiModelProperty("开票类型key") - private String billingTypeKey; // 开票类型key - @ApiModelProperty("开票类型value") - private String billingTypeValue; // 开票类型value - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - @ApiModelProperty("供应商开户行") - private List baseSupplierBankList; -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoDto.java b/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoDto.java deleted file mode 100644 index c103986..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoDto.java +++ /dev/null @@ -1,116 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - - -import com.yxt.goods.biz.base.basesupplierBank.BaseSupplierBankDto; -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoDto.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoDto
- * Description: 供应商信息 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息 数据传输对象", description = "供应商信息 数据传输对象") -public class BaseSupplierInfoDto implements Dto { - - private String sid; // sid - - @ApiModelProperty("编码") - private String supplierCode; // 编码 - @ApiModelProperty("供应商名称") - private String supplierName; // 供应商名称 - @ApiModelProperty("供应商名称拼音") - private String supplierPY; // 供应商名称拼音 - @ApiModelProperty("供应商类型sid") - private String supplierTypeSid; // 供应商类型sid - @ApiModelProperty("供应商类型") - private String supplierTypeName; // 供应商类型 - @ApiModelProperty("省sid") - private String provinceSid; // 省sid - @ApiModelProperty("province") - private String province; // - @ApiModelProperty("市sid") - private String citySid; // 市sid - @ApiModelProperty("city") - private String city; // - @ApiModelProperty("收货县区sid") - private String countySid; // 收货县区sid - @ApiModelProperty("county") - private String county; // - @ApiModelProperty("详细地址") - private String address; // 详细地址 - @ApiModelProperty("手机") - private String contactMobile; // 手机 - @ApiModelProperty("电话") - private String contactTelePhone; // 电话 - @ApiModelProperty("联系人") - private String contactName; // 联系人 - @ApiModelProperty("传真") - private String fax; // 传真 - @ApiModelProperty("邮编") - private String zipCode; // 邮编 - @ApiModelProperty("电子邮件") - private String email; // 电子邮件 - @ApiModelProperty("网址") - private String website; // 网址 - @ApiModelProperty("开票公司名称") - private String billingCompanyName; // 开票公司名称 - @ApiModelProperty("税号") - private String registNum; // 税号 - @ApiModelProperty("法人") - private String legalName; // 法人 - @ApiModelProperty("采购员") - private String purchaser; // 采购员 - @ApiModelProperty("排序") - private Integer sortNo; // 排序 - @ApiModelProperty("开票类型key") - private String billingTypeKey; // 开票类型key - @ApiModelProperty("开票类型value") - private String billingTypeValue; // 开票类型value - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - @ApiModelProperty("开户行信息") - private List baseSupplierBankList; -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java b/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java deleted file mode 100644 index 277a5ca..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java +++ /dev/null @@ -1,67 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; - -import java.util.List; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierInfoMapper.java
- * Class: com.yxt.anrui.as.biz.basesupplierinfo.BaseSupplierInfoMapper
- * Description: 供应商信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Mapper -public interface BaseSupplierInfoMapper extends BaseMapper { - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from base_supplier_info") - List selectListVo(); - - @Update("update base_supplier_info set isDelete = '1' where sid = #{sid}") - int updateBySidIsDelete(String sid); - - @Select("select * from base_supplier_info") - List choiceSupplierInfo(String createOrgSid); -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoMapper.xml b/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoMapper.xml deleted file mode 100644 index 6c3550c..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoQuery.java b/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoQuery.java deleted file mode 100644 index ad495fb..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoQuery.java +++ /dev/null @@ -1,62 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoQuery.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoQuery
- * Description: 供应商信息 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息 查询条件", description = "供应商信息 查询条件") -public class BaseSupplierInfoQuery implements Query { - - @ApiModelProperty("供应商名称") - private String supplierName; - @ApiModelProperty("供应商类型") - private String supplierTypeName; - @ApiModelProperty("电话") - private String contactTelePhone; - @ApiModelProperty("联系人") - private String contactName; - - @ApiModelProperty("其他查询条件") - private String otherQuery; -} diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoService.java b/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoService.java deleted file mode 100644 index 77c7570..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoService.java +++ /dev/null @@ -1,168 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.goods.biz.base.basesupplierBank.BaseSupplierBank; -import com.yxt.goods.biz.base.basesupplierBank.BaseSupplierBankDetailsVo; -import com.yxt.goods.biz.base.basesupplierBank.BaseSupplierBankDto; -import com.yxt.goods.biz.base.basesupplierBank.BaseSupplierBankService; -import com.yxt.goods.feign.portal.sysorganization.SysOrganizationFeign; -import com.yxt.goods.feign.portal.sysstafforg.SysStaffOrgFeign; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierInfoService.java
- * Class: com.yxt.anrui.as.biz.basesupplierinfo.BaseSupplierInfoService
- * Description: 供应商信息 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Service -public class BaseSupplierInfoService extends MybatisBaseService { - - @Autowired - private SysStaffOrgFeign sysStaffOrgFeign; - @Autowired - private SysOrganizationFeign sysOrganizationFeign; - @Autowired - private BaseSupplierBankService baseSupplierBankService; - - public PagerVo listPageVo(PagerQuery pq) { - BaseSupplierInfoQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper(); - if (StringUtils.isNotBlank(query.getSupplierName())){ - qw.like("supplierName",query.getSupplierName()); - } - if (StringUtils.isNotBlank(query.getSupplierTypeName())){ - qw.like("supplierTypeName",query.getSupplierTypeName()); - } - if (StringUtils.isNotBlank(query.getContactTelePhone())){ - qw.like("contactTelePhone",query.getContactTelePhone()); - } - if (StringUtils.isNotBlank(query.getContactName())){ - qw.like("contactName",query.getContactName()); - } - if (StringUtils.isNotBlank(query.getOtherQuery())){ - qw.and(wrapper -> wrapper.like("supplierName", query.getOtherQuery()).or().like("supplierPY", query.getOtherQuery()).or().like("contactTelePhone",query.getOtherQuery())); - } - qw.eq("isDelete",0); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public ResultBean saveOrUpdateDto(BaseSupplierInfoDto dto){ - ResultBean rb = ResultBean.fireFail(); - String dtoSid = dto.getSid(); - List baseSupplierBankDtoList = dto.getBaseSupplierBankList(); - if (baseSupplierBankDtoList == null || baseSupplierBankDtoList.size() == 0){ - return rb.setMsg("开户行信息不能为空"); - } - if (StringUtils.isBlank(dtoSid)) { - String sid = this.insertByDto(dto); - for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) { - baseSupplierBankDto.setSupplierSid(sid); - baseSupplierBankService.saveOrUpdateDto(baseSupplierBankDto); - } - return rb.success(); - } - this.updateByDto(dto); - for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) { - String bankSid = baseSupplierBankDto.getSid(); - if(StringUtils.isNotBlank(bankSid)){ - BaseSupplierBank baseSupplierBank = baseSupplierBankService.fetchBySid(bankSid); - BeanUtil.copyProperties(baseSupplierBankDto,baseSupplierBank,"sid"); - baseSupplierBank.setSupplierSid(dtoSid); - baseSupplierBankService.updateById(baseSupplierBank); - }else{ - BaseSupplierBank baseSupplierBank = new BaseSupplierBank(); - BeanUtil.copyProperties(baseSupplierBankDto,baseSupplierBank,"sid"); - baseSupplierBank.setSupplierSid(dtoSid); - baseSupplierBankService.insert(baseSupplierBank); - } - } - return rb.success(); - } - - public String insertByDto(BaseSupplierInfoDto dto){ - BaseSupplierInfo entity = new BaseSupplierInfo(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - return entity.getSid(); - } - - public void updateByDto(BaseSupplierInfoDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - BaseSupplierInfo entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public BaseSupplierInfoDetailsVo fetchDetailsVoBySid(String sid){ - BaseSupplierInfo entity = fetchBySid(sid); - BaseSupplierInfoDetailsVo vo = new BaseSupplierInfoDetailsVo(); - BeanUtil.copyProperties(entity, vo); - List baseSupplierBankDetailsVos = baseSupplierBankService.selectBySupplierSid(sid); - vo.setBaseSupplierBankList(baseSupplierBankDetailsVos); - return vo; - } - - public void delAll(String[] sids) { - for (String sid : sids) { - //删除厂商基础信息 - int count = baseMapper.updateBySidIsDelete(sid); - //删除厂商开户行信息 - int i = baseSupplierBankService.deleteBySupplierSid(sid); - } - } - - public List choiceSupplierInfo(String createOrgSid) { - List baseSupplierInfoChoiceList = baseMapper.choiceSupplierInfo(createOrgSid); - return baseSupplierInfoChoiceList; - } -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoVo.java b/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoVo.java deleted file mode 100644 index 6ae8783..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesupplierinfo/BaseSupplierInfoVo.java +++ /dev/null @@ -1,65 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoVo.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo
- * Description: 供应商信息 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象") -public class BaseSupplierInfoVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("供应商名称") - private String supplierName; - @ApiModelProperty("供应商类型") - private String supplierTypeName; - @ApiModelProperty("详细地址") - private String address; - @ApiModelProperty("电话") - private String contactTelePhone; - @ApiModelProperty("联系人") - private String contactName; - @ApiModelProperty("手机") - private String contactMobile; -} diff --git a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierType.java b/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierType.java deleted file mode 100644 index b1bf3dc..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierType.java +++ /dev/null @@ -1,62 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesuppliertype; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierType.java
- * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierType
- * Description: 供应商类型.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商类型", description = "供应商类型") -@TableName("base_supplier_type") -public class BaseSupplierType extends BaseEntity { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("供应商类型名称") - private String supplierTypeName; // 供应商类型名称 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - -} diff --git a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeDetailsVo.java b/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeDetailsVo.java deleted file mode 100644 index 322a9c4..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeDetailsVo.java +++ /dev/null @@ -1,62 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesuppliertype; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierTypeVo.java
- * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeVo
- * Description: 供应商类型 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商类型 视图数据详情", description = "供应商类型 视图数据详情") -public class BaseSupplierTypeDetailsVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("供应商类型名称") - private String supplierTypeName; // 供应商类型名称 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeDto.java b/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeDto.java deleted file mode 100644 index 1b74e6d..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeDto.java +++ /dev/null @@ -1,62 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesuppliertype; - - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierTypeDto.java
- * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeDto
- * Description: 供应商类型 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商类型 数据传输对象", description = "供应商类型 数据传输对象") -public class BaseSupplierTypeDto implements Dto { - - private String sid; // sid - - @ApiModelProperty("供应商类型名称") - private String supplierTypeName; // 供应商类型名称 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeMapper.java b/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeMapper.java deleted file mode 100644 index 823612e..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeMapper.java +++ /dev/null @@ -1,60 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesuppliertype; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierTypeMapper.java
- * Class: com.yxt.anrui.as.biz.basesuppliertype.BaseSupplierTypeMapper
- * Description: 供应商类型.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Mapper -public interface BaseSupplierTypeMapper extends BaseMapper { - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from base_supplier_type") - List selectListVo(); -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeMapper.xml b/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeMapper.xml deleted file mode 100644 index 769f010..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeQuery.java b/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeQuery.java deleted file mode 100644 index e908a60..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeQuery.java +++ /dev/null @@ -1,60 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesuppliertype; - - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierTypeQuery.java
- * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeQuery
- * Description: 供应商类型 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商类型 查询条件", description = "供应商类型 查询条件") -public class BaseSupplierTypeQuery implements Query { - - @ApiModelProperty("供应商类型名称") - private String supplierTypeName; // 供应商类型名称 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - -} diff --git a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeService.java b/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeService.java deleted file mode 100644 index 8518f66..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeService.java +++ /dev/null @@ -1,94 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesuppliertype; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.vo.PagerVo; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierTypeService.java
- * Class: com.yxt.anrui.as.biz.basesuppliertype.BaseSupplierTypeService
- * Description: 供应商类型 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Service -public class BaseSupplierTypeService extends MybatisBaseService { - - public PagerVo listPageVo(PagerQuery pq) { - BaseSupplierTypeQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(BaseSupplierTypeDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(BaseSupplierTypeDto dto){ - BaseSupplierType entity = new BaseSupplierType(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(BaseSupplierTypeDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - BaseSupplierType entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public BaseSupplierTypeDetailsVo fetchDetailsVoBySid(String sid){ - BaseSupplierType entity = fetchBySid(sid); - BaseSupplierTypeDetailsVo vo = new BaseSupplierTypeDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeVo.java b/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeVo.java deleted file mode 100644 index 3ae2dea..0000000 --- a/src/main/java/com/yxt/user/biz/base/basesuppliertype/BaseSupplierTypeVo.java +++ /dev/null @@ -1,62 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesuppliertype; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierTypeVo.java
- * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeVo
- * Description: 供应商类型 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商类型 视图数据对象", description = "供应商类型 视图数据对象") -public class BaseSupplierTypeVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("供应商类型名称") - private String supplierTypeName; // 供应商类型名称 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - -} diff --git a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCart.java b/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCart.java deleted file mode 100644 index af72f31..0000000 --- a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCart.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.yxt.goods.biz.base.shoppingcart; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; -import java.util.UUID; - -/** - * @author wangpengfei - * @date 2023/12/8 9:10 - */ -@Data -public class ShoppingCart { - private String id; - private String sid= UUID.randomUUID().toString(); - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String isEnable; - private String goodsSid; - private String goodsName; - private String goodsNumber; - private String affiliation; - private String price; - private String customerSid; - private String weight; //每份重量 - - -} diff --git a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartDto.java b/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartDto.java deleted file mode 100644 index 38dd430..0000000 --- a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartDto.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.yxt.goods.biz.base.shoppingcart; - -import com.yxt.common.core.dto.Dto; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2023/12/8 9:11 - */ -@Data -public class ShoppingCartDto implements Dto { - - - - private String id; - private String sid; - private String createTime; - private String remarks; - private String isEnable; - private String goodsSid;//商品sid - private String goodsName;//商品名称 - private String goodsNumber;//商品数量 - private String affiliation;//所属菜窖 1百姓菜窖 2 精品菜窖 3企业菜窖 - private String price;//价格 - private String customerSid; //客户sid - private String weight; //每份重量 - -} diff --git a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartMapper.java b/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartMapper.java deleted file mode 100644 index d5878bd..0000000 --- a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yxt.goods.biz.base.shoppingcart; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2023/12/8 9:19 - */ -@Mapper -public interface ShoppingCartMapper extends BaseMapper { - List ShoppingCartList(@Param("customerSid")String customerSid, - @Param("brandId")String brandId, - @Param("periodValidity")String periodValidity); -} diff --git a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartMapper.xml b/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartMapper.xml deleted file mode 100644 index a20a439..0000000 --- a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartQuery.java b/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartQuery.java deleted file mode 100644 index bc3be86..0000000 --- a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartQuery.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.yxt.goods.biz.base.shoppingcart; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2023/12/8 9:11 - */ -@Data -public class ShoppingCartQuery implements Query { - private String customerSid; //客户 - private String affiliation; //类型 - private String brandId; - private String periodValidity; -} diff --git a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartService.java b/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartService.java deleted file mode 100644 index 44ebe17..0000000 --- a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartService.java +++ /dev/null @@ -1,253 +0,0 @@ -package com.yxt.goods.biz.base.shoppingcart; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.yxt.common.base.config.component.FileUploadComponent; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.result.ResultBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -/** - * @author wangpengfei - * @date 2023/12/8 9:19 - */ -@Service -public class ShoppingCartService extends MybatisBaseService { - @Autowired - private FileUploadComponent fileUploadComponent; - - public ResultBean save(ShoppingCartDto dto) { - ResultBean rb = ResultBean.fireFail(); - ShoppingCart entity = new ShoppingCart(); - if(StringUtils.isBlank(dto.getCustomerSid())){ - return rb.setMsg("参数不全"); - } - if(StringUtils.isBlank(dto.getGoodsSid())){ - return rb.setMsg("参数不全"); - } - List list = baseMapper.selectList(new QueryWrapper().eq("customerSid", dto.getCustomerSid()) - .eq("goodsSid", dto.getGoodsSid()) - .eq("affiliation", dto.getAffiliation())); - if (list.size() > 0) { -// list.get(0).setGoodsNumber(String.valueOf(Double.valueOf(dto.getGoodsNumber())+Double.valueOf(list.get(0).getGoodsNumber()))); - if (dto.getGoodsNumber().equals("0")) { - baseMapper.delete(new QueryWrapper().eq("customerSid", dto.getCustomerSid()) - .eq("goodsSid", dto.getGoodsSid()) - .eq("affiliation", dto.getAffiliation())); - } else { - list.get(0).setGoodsNumber(dto.getGoodsNumber()); - baseMapper.updateById(list.get(0)); - } - return rb.success().setMsg("成功"); - } - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - return rb.success().setMsg("成功"); - } - - public ResultBean> shoppingCartList(ShoppingCartQuery query) { - ResultBean rb = ResultBean.fireFail(); - ShoppingCart entity = new ShoppingCart(); - if(StringUtils.isBlank(query.getCustomerSid())){ - return rb.setMsg("参数不全"); - } - if(StringUtils.isBlank(query.getBrandId())){ - return rb.setMsg("参数不全"); - } - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - Date date=new Date(); - String periodValidity=sdf.format(date); - List list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId(),periodValidity); - list.forEach(s -> { - s.setTotalPrice(removeZeros(String.valueOf((Double.valueOf(s.getJPrice()) * Double.valueOf(s.getGoodsNumber()))))); - s.setIconUrl(fileUploadComponent.getUrlPrefix() + s.getIconUrl()); - }); - - return rb.success().setData(list).setMsg("成功"); - } - - public ResultBean minusShoppingCart(ShoppingCartDto dto) { - ResultBean rb = ResultBean.fireFail(); - ShoppingCart entity = new ShoppingCart(); -// List list= baseMapper.selectList(new QueryWrapper().eq("sid",dto.getSid())); - List list = baseMapper.selectList(new QueryWrapper().eq("customerSid", dto.getCustomerSid()) - .eq("goodsSid", dto.getGoodsSid()) - .eq("affiliation", dto.getAffiliation())); - if (list.size() > 0) { - list.get(0).setGoodsNumber(String.valueOf(Double.valueOf(list.get(0).getGoodsNumber()) - Double.valueOf(dto.getGoodsNumber()))); - baseMapper.updateById(list.get(0)); - return rb.success().setMsg("成功"); - } -// BeanUtil.copyProperties(dto, entity, "id", "sid"); -// baseMapper.insert(entity); - return rb.success().setMsg("成功"); - } - public ResultBean updateShoppingCart(ShoppingCartDto dto) { - ResultBean rb = ResultBean.fireFail(); - ShoppingCart entity = new ShoppingCart(); -// List list= baseMapper.selectList(new QueryWrapper().eq("sid",dto.getSid())); - List list = baseMapper.selectList(new QueryWrapper().eq("customerSid", dto.getCustomerSid()) - .eq("goodsSid", dto.getGoodsSid()) - .eq("affiliation", dto.getAffiliation())); - if (list.size() > 0) { - list.get(0).setGoodsNumber(dto.getGoodsNumber()); - baseMapper.updateById(list.get(0)); - return rb.success().setMsg("成功"); - } - return rb.success().setMsg("成功"); - } - - public ResultBean delShoppingCart(String sid) { - ResultBean rb = ResultBean.fireFail(); - ShoppingCart entity = new ShoppingCart(); - baseMapper.delete(new QueryWrapper().eq("sid ", sid)); - return rb.success().setMsg("成功"); - } - - public ResultBean getGoodsWeight(ShoppingCartQuery query) { - ResultBean rb = new ResultBean().fail(); - if(StringUtils.isBlank(query.getCustomerSid())){ - return rb.setMsg("参数不全"); - } - if(StringUtils.isBlank(query.getBrandId())){ - return rb.setMsg("参数不全"); - } - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - Date date=new Date(); - String periodValidity=sdf.format(date); - List list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId(),periodValidity); - double price = 0; - double standbyPrice =0; - double weight = 0; -// for (ShoppingCartVo vo : list) { -// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(vo.getGoodsSid()); -// String stepWeight = lpkGoods.getStepWeight(); -// String stepPrice = lpkGoods.getStepPrice(); -// String a =DoubleUtils.removeZeros(String.valueOf(Double.valueOf(vo.getWeight())*Double.valueOf(vo.getGoodsNumber()))); -// BigDecimal weightW = new BigDecimal(a); -// if(StringUtils.isNotBlank(stepPrice)){ -// System.out.println(weightW.compareTo(new BigDecimal(stepWeight))); -// if(weightW.compareTo(new BigDecimal(stepWeight)) == -1){ -// stepPrice = DoubleUtils.removeZeros(String.valueOf(Double.valueOf(vo.getJPrice())*Double.valueOf(vo.getWeight()))); ///份价格 -// }else{ -// stepPrice = DoubleUtils.removeZeros(String.valueOf(Double.valueOf(stepPrice)*Double.valueOf(vo.getWeight()))); ///份价格 -// } -// }else{ -// stepPrice = DoubleUtils.removeZeros(String.valueOf(Double.valueOf(vo.getJPrice())*Double.valueOf(vo.getWeight()))); -// } -// -// if ("北京3号白菜".equals(vo.getGoodsName()) -// || "玲珑黄白菜".equals(vo.getGoodsName()) -// || "V7土豆".equals(vo.getGoodsName()) -// || "黄金薯土豆".equals(vo.getGoodsName())) { -// -// price = Double.valueOf(stepPrice)* Double.valueOf(vo.getGoodsNumber()) + price; -// standbyPrice=Double.valueOf(vo.getPrice())*Double.valueOf(vo.getGoodsNumber())+standbyPrice; -// weight = Double.valueOf(vo.getWeight()) * Double.valueOf(vo.getGoodsNumber()) + weight; -//// } -// } else { -// price = Double.valueOf(vo.getPrice()) * Double.valueOf(vo.getGoodsNumber()) + price; -// standbyPrice=Double.valueOf(vo.getPrice())*Double.valueOf(vo.getGoodsNumber())+standbyPrice; -// weight = Double.valueOf(vo.getWeight()) * Double.valueOf(vo.getGoodsNumber()) + weight; -// } -// } - ShoppingCartVo vo = new ShoppingCartVo(); -// 1.20斤起订量。 -// 2.0-99斤加10%附加额。 -// 3.100斤-199斤加5%附加额。 - vo.setCustomerSid(query.getCustomerSid()); - vo.setTotalPrice(removeZeros(String.valueOf(aa(price)))); - vo.setStandbyPrice(removeZeros(String.valueOf(aa(standbyPrice)))); - vo.setTotalWeight(removeZeros(String.valueOf(aa(weight)))); - vo.setAffiliation(query.getBrandId()); -// vo = price(vo); - return rb.success().setData(vo); - } - -// private ShoppingCartVo price(ShoppingCartVo vo) { -// double weight = Double.valueOf(vo.getTotalWeight()); -// LpkCustomer lpkCustomer = lpkCustomerService.getOne(new QueryWrapper().eq("sid", vo.getCustomerSid())); -// PmsBrand one=pmsBrandService.getOne(new QueryWrapper().eq("id",vo.getAffiliation())); -// if(vo.getAffiliation().equals("1001045")){ -// if (weight < one.getQssl()) { -// vo.setRemarks("不足"+one.getQssl()+"斤"); -// }else { -// String c = String.valueOf(Double.valueOf(vo.getStandbyPrice())-Double.valueOf(vo.getTotalPrice())); -// if(DoubleUtils.removeZeros(c).equals("0")){ -// vo.setRemarks(""); -// }else{ -// vo.setRemarks("已优惠" + removeZeros(c) + "元"); -// } -// } -// return vo; -// }else if(vo.getAffiliation().equals("1001020")){ -// return vo; -// }; -// vo.setRemarks("已减免附加额"); -// if (weight <= 99) { -// if (weight < one.getQssl()) { -// double a = 1.1; -// double d = Double.valueOf(vo.getTotalPrice()); -// double t = Double.valueOf(vo.getTotalPrice()) * a; -// BigDecimal bg = new BigDecimal(t); -// vo.setTotalPrice(removeZeros(String.valueOf(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()))); -//// String c =String.valueOf(Double.valueOf(vo.getTotalPrice())-d); -// double f = Double.valueOf(vo.getTotalPrice()) - d; -// BigDecimal bgd = new BigDecimal(f); -// String c = String.valueOf(bgd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); -// vo.setRemarks("不足"+one.getQssl()+"斤"); -// } else { -// double a = 1.1; -// double d = Double.valueOf(vo.getTotalPrice()); -// double t = Double.valueOf(vo.getTotalPrice()) * a; -// BigDecimal bg = new BigDecimal(t); -// vo.setTotalPrice(removeZeros(String.valueOf(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()))); -//// String c =String.valueOf(Double.valueOf(vo.getTotalPrice())-d); -// double f = Double.valueOf(vo.getTotalPrice()) - d; -// BigDecimal bgd = new BigDecimal(f); -// String c = String.valueOf(bgd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); -// vo.setRemarks("含附加额" + removeZeros(c) + "元"); -// } -// } else if (weight >= 100 && weight <= 199) { -// double a = 1.05; -// double d = Double.valueOf(vo.getTotalPrice()); -// double t = Double.valueOf(vo.getTotalPrice()) * a; -// BigDecimal bg = new BigDecimal(t); -// vo.setTotalPrice(removeZeros(String.valueOf(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()))); -//// String c =String.valueOf(Double.valueOf(vo.getTotalPrice())-d); -// double f = Double.valueOf(vo.getTotalPrice()) - d; -// BigDecimal bgd = new BigDecimal(f); -// String c = String.valueOf(bgd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); -// vo.setRemarks("含附加额" + removeZeros(c) + "元"); -// } -// return vo; -// } - - /** - * 去除多余.0 - * - * @param num - * @return - */ - public static String removeZeros(String num) { - if (num.indexOf(".") > 0) { - // 去掉多余的0 - num = num.replaceAll("0+?$", ""); - // 如果最后一位是. 则去掉 - num = num.replaceAll("[.]$", ""); - } - return num; - } - public String aa(double a){ - BigDecimal d=new BigDecimal(a); - double c= d.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue(); - return String.valueOf(c); - } -} diff --git a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartVo.java b/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartVo.java deleted file mode 100644 index b6d1969..0000000 --- a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingCartVo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.yxt.goods.biz.base.shoppingcart; - -import com.yxt.common.core.vo.Vo; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2023/12/8 9:11 - */ -@Data -public class ShoppingCartVo implements Vo { - private String id; - private String sid; - private String createTime; - private String remarks; - private String isEnable; - private String goodsSid;//商品sid - private String goodsName;//商品名称 - private String goodsNumber;//商品数量 - private String affiliation;//所属菜窖 1百姓菜窖 2 精品菜窖 3企业菜窖 - private String price;//价格 - private String jPrice;//价格 - private String customerSid; //客户sid - - private String weight; //每份重量 - private String totalPrice; - private String standbyPrice;//没有折扣的总价格 - private String totalWeight; - - private String unitName; - private String iconUrl; - private String specificationUnit; -// private String text; - - -} diff --git a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingGoodsVo.java b/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingGoodsVo.java deleted file mode 100644 index 778f7a4..0000000 --- a/src/main/java/com/yxt/user/biz/base/shoppingcart/ShoppingGoodsVo.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.yxt.goods.biz.base.shoppingcart; - -/** - * @author wangpengfei - * @date 2024/1/17 14:03 - */ -public class ShoppingGoodsVo { -} diff --git a/src/main/java/com/yxt/user/feign/portal/sysorganization/SysOrganizationFeign.java b/src/main/java/com/yxt/user/feign/sysorganization/SysOrganizationFeign.java similarity index 95% rename from src/main/java/com/yxt/user/feign/portal/sysorganization/SysOrganizationFeign.java rename to src/main/java/com/yxt/user/feign/sysorganization/SysOrganizationFeign.java index fe6a8d7..0f6ef6a 100644 --- a/src/main/java/com/yxt/user/feign/portal/sysorganization/SysOrganizationFeign.java +++ b/src/main/java/com/yxt/user/feign/sysorganization/SysOrganizationFeign.java @@ -1,4 +1,4 @@ -package com.yxt.goods.feign.portal.sysorganization; +package com.yxt.user.feign.sysorganization; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; diff --git a/src/main/java/com/yxt/user/feign/portal/sysorganization/SysOrganizationVo.java b/src/main/java/com/yxt/user/feign/sysorganization/SysOrganizationVo.java similarity index 98% rename from src/main/java/com/yxt/user/feign/portal/sysorganization/SysOrganizationVo.java rename to src/main/java/com/yxt/user/feign/sysorganization/SysOrganizationVo.java index d066ab6..13f2233 100644 --- a/src/main/java/com/yxt/user/feign/portal/sysorganization/SysOrganizationVo.java +++ b/src/main/java/com/yxt/user/feign/sysorganization/SysOrganizationVo.java @@ -1,4 +1,4 @@ -package com.yxt.goods.feign.portal.sysorganization; +package com.yxt.user.feign.sysorganization; import com.yxt.common.core.vo.Vo; diff --git a/src/main/java/com/yxt/user/feign/portal/sysstafforg/SysStaffOrgFeign.java b/src/main/java/com/yxt/user/feign/sysstafforg/SysStaffOrgFeign.java similarity index 94% rename from src/main/java/com/yxt/user/feign/portal/sysstafforg/SysStaffOrgFeign.java rename to src/main/java/com/yxt/user/feign/sysstafforg/SysStaffOrgFeign.java index 4926334..3183c09 100644 --- a/src/main/java/com/yxt/user/feign/portal/sysstafforg/SysStaffOrgFeign.java +++ b/src/main/java/com/yxt/user/feign/sysstafforg/SysStaffOrgFeign.java @@ -1,4 +1,4 @@ -package com.yxt.goods.feign.portal.sysstafforg; +package com.yxt.user.feign.sysstafforg; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation;