升级新架构

This commit is contained in:
启航老齐 2025-09-18 13:26:51 +08:00
parent b7f89f61c7
commit 888d04812d
74 changed files with 122 additions and 140 deletions

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain.bo;
package cn.qihangerp.model.bo;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain.bo;
package cn.qihangerp.model.bo;
import java.math.BigDecimal;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain.bo;
package cn.qihangerp.model.bo;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain;
package cn.qihangerp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain;
package cn.qihangerp.model.entity;
import java.io.Serializable;
import java.util.Date;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain;
package cn.qihangerp.model.entity;
import java.io.Serializable;
import java.util.Date;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain;
package cn.qihangerp.model.entity;
import java.io.Serializable;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain;
package cn.qihangerp.model.entity;
import java.io.Serializable;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain;
package cn.qihangerp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain;
package cn.qihangerp.model.entity;
import java.io.Serializable;
import java.util.Date;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain;
package cn.qihangerp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain;
package cn.qihangerp.model.entity;
import java.io.Serializable;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain;
package cn.qihangerp.model.entity;
import java.io.Serializable;
import java.util.Date;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain.vo;
package cn.qihangerp.model.vo;
import lombok.Data;

View File

@ -4,7 +4,7 @@ package cn.qihangerp.api.goods.controller;
import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.module.goods.domain.OGoodsBrand;
import cn.qihangerp.model.entity.OGoodsBrand;
import cn.qihangerp.module.goods.service.OGoodsBrandService;
import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor;

View File

@ -4,9 +4,9 @@ package cn.qihangerp.api.goods.controller;
import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.module.goods.domain.OGoodsCategory;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue;
import cn.qihangerp.model.entity.OGoodsCategory;
import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeService;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeValueService;
import cn.qihangerp.module.goods.service.OGoodsCategoryService;

View File

@ -1,26 +1,18 @@
package cn.qihangerp.api.goods.controller;
import cn.qihangerp.common.*;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.module.goods.domain.bo.GoodsAddBo;
import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.model.bo.GoodsAddBo;
import cn.qihangerp.model.vo.GoodsSpecListVo;
import cn.qihangerp.module.goods.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.security.common.BaseController;
import com.fasterxml.jackson.databind.exc.InvalidFormatException;
import lombok.AllArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 商品管理Controller

View File

@ -5,8 +5,8 @@ import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.module.goods.domain.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService;
import cn.qihangerp.module.goods.service.OGoodsInventoryService;
import cn.qihangerp.security.common.BaseController;

View File

@ -4,7 +4,7 @@ package cn.qihangerp.api.goods.controller;
import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.module.goods.domain.OGoodsSupplier;
import cn.qihangerp.model.entity.OGoodsSupplier;
import cn.qihangerp.module.goods.service.OGoodsSupplierService;
import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor;

View File

@ -5,9 +5,9 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;

View File

@ -4,8 +4,8 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.model.entity.DouGoods;

View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsBrand;
import cn.qihangerp.model.entity.OGoodsBrand;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author qilip
* @description 针对表o_goods_brand的数据库操作Mapper
* @createDate 2024-09-07 16:11:56
* @Entity cn.qihangerp.module.goods.domain.OGoodsBrand
* @Entity cn.qihangerp.model.entity.OGoodsBrand
*/
public interface OGoodsBrandMapper extends BaseMapper<OGoodsBrand> {

View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute;
import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author qilip
* @description 针对表o_goods_category_attribute的数据库操作Mapper
* @createDate 2024-09-07 16:11:56
* @Entity cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute
* @Entity cn.qihangerp.model.entity.OGoodsCategoryAttribute
*/
public interface OGoodsCategoryAttributeMapper extends BaseMapper<OGoodsCategoryAttribute> {

View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue;
import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author qilip
* @description 针对表o_goods_category_attribute_value的数据库操作Mapper
* @createDate 2024-09-07 16:11:56
* @Entity cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue
* @Entity cn.qihangerp.model.entity.OGoodsCategoryAttributeValue
*/
public interface OGoodsCategoryAttributeValueMapper extends BaseMapper<OGoodsCategoryAttributeValue> {

View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsCategory;
import cn.qihangerp.model.entity.OGoodsCategory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author qilip
* @description 针对表o_goods_category的数据库操作Mapper
* @createDate 2024-09-07 16:11:56
* @Entity cn.qihangerp.module.goods.domain.OGoodsCategory
* @Entity cn.qihangerp.model.entity.OGoodsCategory
*/
public interface OGoodsCategoryMapper extends BaseMapper<OGoodsCategory> {

View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch;
import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author qilip
* @description 针对表o_goods_inventory_batch(商品库存批次)的数据库操作Mapper
* @createDate 2024-09-23 22:39:50
* @Entity cn.qihangerp.module.goods.domain.OGoodsInventoryBatch
* @Entity cn.qihangerp.model.entity.OGoodsInventoryBatch
*/
public interface OGoodsInventoryBatchMapper extends BaseMapper<OGoodsInventoryBatch> {

View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsInventory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author qilip
* @description 针对表o_goods_inventory(商品库存表)的数据库操作Mapper
* @createDate 2025-05-19 12:04:26
* @Entity cn.qihangerp.module.goods.domain.OGoodsInventory
* @Entity cn.qihangerp.model.entity.OGoodsInventory
*/
public interface OGoodsInventoryMapper extends BaseMapper<OGoodsInventory> {

View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.vo.GoodsSpecListVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -11,7 +11,7 @@ import java.util.List;
* @author TW
* @description 针对表o_goods(商品库存管理)的数据库操作Mapper
* @createDate 2024-03-11 14:24:49
* @Entity cn.qihangerp.module.goods.domain.OGoods
* @Entity cn.qihangerp.model.entity.OGoods
*/
public interface OGoodsMapper extends BaseMapper<OGoods> {
List<GoodsSpecListVo> searchGoodsSpec(String keyword);

View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsSkuAttr;
import cn.qihangerp.model.entity.OGoodsSkuAttr;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author qilip
* @description 针对表o_goods_sku_attr的数据库操作Mapper
* @createDate 2024-09-07 20:31:18
* @Entity cn.qihangerp.module.goods.domain.OGoodsSkuAttr
* @Entity cn.qihangerp.model.entity.OGoodsSkuAttr
*/
public interface OGoodsSkuAttrMapper extends BaseMapper<OGoodsSkuAttr> {

View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoodsSku;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author qilip
* @description 针对表o_goods_sku(OMS商品SKU表)的数据库操作Mapper
* @createDate 2025-05-19 12:00:55
* @Entity cn.qihangerp.module.goods.domain.OGoodsSku
* @Entity cn.qihangerp.model.entity.OGoodsSku
*/
public interface OGoodsSkuMapper extends BaseMapper<OGoodsSku> {

View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsSupplier;
import cn.qihangerp.model.entity.OGoodsSupplier;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author qilip
* @description 针对表o_goods_supplier的数据库操作Mapper
* @createDate 2024-09-07 16:35:43
* @Entity cn.qihangerp.module.goods.domain.OGoodsSupplier
* @Entity cn.qihangerp.model.entity.OGoodsSupplier
*/
public interface OGoodsSupplierMapper extends BaseMapper<OGoodsSupplier> {

View File

@ -2,7 +2,7 @@ package cn.qihangerp.module.goods.service;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.module.goods.domain.OGoodsBrand;
import cn.qihangerp.model.entity.OGoodsBrand;
import com.baomidou.mybatisplus.extension.service.IService;
/**

View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.goods.service;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute;
import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import com.baomidou.mybatisplus.extension.service.IService;
/**

View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.goods.service;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue;
import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import com.baomidou.mybatisplus.extension.service.IService;
/**

View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.goods.service;
import cn.qihangerp.module.goods.domain.OGoodsCategory;
import cn.qihangerp.model.entity.OGoodsCategory;
import com.baomidou.mybatisplus.extension.service.IService;
/**

View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.goods.service;
import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch;
import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import com.baomidou.mybatisplus.extension.service.IService;
/**

View File

@ -2,7 +2,7 @@ package cn.qihangerp.module.goods.service;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.module.goods.domain.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsInventory;
import com.baomidou.mybatisplus.extension.service.IService;
/**

View File

@ -4,11 +4,10 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.module.goods.domain.bo.GoodsAddBo;
import cn.qihangerp.module.goods.domain.bo.GoodsSkuAddBo;
import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.model.bo.GoodsAddBo;
import cn.qihangerp.model.vo.GoodsSpecListVo;
import com.baomidou.mybatisplus.extension.service.IService;

View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.goods.service;
import cn.qihangerp.module.goods.domain.OGoodsSkuAttr;
import cn.qihangerp.model.entity.OGoodsSkuAttr;
import com.baomidou.mybatisplus.extension.service.IService;
/**

View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.goods.service;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoodsSku;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;

View File

@ -2,7 +2,7 @@ package cn.qihangerp.module.goods.service;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.module.goods.domain.OGoodsSupplier;
import cn.qihangerp.model.entity.OGoodsSupplier;
import com.baomidou.mybatisplus.extension.service.IService;
/**

View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.module.goods.domain.OGoodsBrand;
import cn.qihangerp.model.entity.OGoodsBrand;
import cn.qihangerp.module.goods.service.OGoodsBrandService;
import cn.qihangerp.module.goods.mapper.OGoodsBrandMapper;
import lombok.AllArgsConstructor;

View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.goods.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute;
import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeService;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper;
import org.springframework.stereotype.Service;

View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.goods.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue;
import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeValueService;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper;
import org.springframework.stereotype.Service;

View File

@ -1,11 +1,11 @@
package cn.qihangerp.module.goods.service.impl;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue;
import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.module.goods.domain.OGoodsCategory;
import cn.qihangerp.model.entity.OGoodsCategory;
import cn.qihangerp.module.goods.service.OGoodsCategoryService;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryMapper;
import lombok.AllArgsConstructor;

View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.goods.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch;
import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryBatchMapper;
import org.springframework.stereotype.Service;

View File

@ -5,7 +5,7 @@ import cn.qihangerp.common.PageResult;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.module.goods.domain.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.module.goods.service.OGoodsInventoryService;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import lombok.AllArgsConstructor;

View File

@ -1,9 +1,8 @@
package cn.qihangerp.module.goods.service.impl;
import cn.qihangerp.module.goods.domain.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.module.goods.domain.bo.GoodsSkuAddBo;
import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.model.vo.GoodsSpecListVo;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper;
@ -17,11 +16,11 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSkuAttr;
import cn.qihangerp.module.goods.domain.bo.GoodsAddBo;
import cn.qihangerp.module.goods.domain.bo.GoodsAddSkuBo;
import cn.qihangerp.model.entity.OGoodsSkuAttr;
import cn.qihangerp.model.bo.GoodsAddBo;
import cn.qihangerp.model.bo.GoodsAddSkuBo;
import cn.qihangerp.module.goods.service.OGoodsService;
import lombok.AllArgsConstructor;

View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.goods.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.module.goods.domain.OGoodsSkuAttr;
import cn.qihangerp.model.entity.OGoodsSkuAttr;
import cn.qihangerp.module.goods.service.OGoodsSkuAttrService;
import cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper;
import org.springframework.stereotype.Service;

View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.goods.service.impl;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.module.goods.service.OGoodsSkuService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.module.goods.domain.OGoodsSupplier;
import cn.qihangerp.model.entity.OGoodsSupplier;
import cn.qihangerp.module.goods.service.OGoodsSupplierService;
import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper;
import lombok.AllArgsConstructor;

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsBrandMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsBrand">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsBrand">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="INTEGER"/>

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsCategoryAttribute">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="categoryId" column="category_id" jdbcType="INTEGER"/>
<result property="type" column="type" jdbcType="INTEGER"/>

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsCategoryAttributeValue">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="categoryAttributeId" column="category_attribute_id" jdbcType="INTEGER"/>
<result property="value" column="value" jdbcType="VARCHAR"/>

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsCategoryMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsCategory">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsCategory">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="number" column="number" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsInventoryBatchMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsInventoryBatch">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsInventoryBatch">
<id property="id" column="id" jdbcType="BIGINT"/>
<id property="inventoryId" column="inventory_id" jdbcType="BIGINT"/>
<result property="batchNum" column="batch_num" jdbcType="VARCHAR"/>

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsInventory">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsInventory">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="goodsId" column="goods_id" jdbcType="BIGINT"/>
<result property="goodsNum" column="goods_num" jdbcType="VARCHAR"/>

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoods">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoods">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="image" column="image" jdbcType="VARCHAR"/>
@ -46,7 +46,7 @@
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<resultMap type="cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo" id="GoodsSpecListVoResult">
<resultMap type="cn.qihangerp.model.vo.GoodsSpecListVo" id="GoodsSpecListVoResult">
<result property="skuId" column="sku_id" />
<result property="goodsName" column="goods_name" />
<result property="skuName" column="sku_name" />

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsSkuAttr">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsSkuAttr">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="goodsId" column="goods_id" jdbcType="INTEGER"/>
<result property="type" column="type" jdbcType="CHAR"/>

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsSkuMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsSku">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsSku">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="goodsId" column="goods_id" jdbcType="BIGINT"/>
<result property="outerErpGoodsId" column="outer_erp_goods_id" jdbcType="VARCHAR"/>

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsSupplier">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsSupplier">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="number" column="number" jdbcType="VARCHAR"/>

View File

@ -2,9 +2,9 @@ package cn.qihangerp.module.open.jd.service.impl;
import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
@ -29,9 +29,6 @@ import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

View File

@ -2,8 +2,8 @@ package cn.qihangerp.module.open.jd.service.impl;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.jd.domain.JdGoods;

View File

@ -2,9 +2,9 @@ package cn.qihangerp.module.order.service.impl;
import cn.qihangerp.model.entity.OLogisticsCompany;
import cn.qihangerp.model.request.OrderSearchRequest;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.module.goods.domain.OGoodsSupplier;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.model.entity.OGoodsSupplier;
import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper;

View File

@ -7,7 +7,7 @@ package cn.qihangerp.module.order.service.impl;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.module.order.domain.OAfterSale;
import cn.qihangerp.module.order.domain.OOrder;

View File

@ -3,7 +3,7 @@ package cn.qihangerp.module.order.service.impl;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.module.order.domain.OfflineGoodsSku;
import cn.qihangerp.module.order.mapper.OfflineGoodsSkuMapper;

View File

@ -6,9 +6,9 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
@ -18,8 +18,6 @@ import cn.qihangerp.module.open.pdd.domain.bo.PddGoodsBo;
import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper;
import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper;
import cn.qihangerp.module.open.pdd.service.PddGoodsService;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

View File

@ -4,8 +4,8 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.pdd.domain.PddGoods;

View File

@ -6,8 +6,8 @@ import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.utils.DateUtils;
import cn.qihangerp.module.goods.domain.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService;
import cn.qihangerp.module.goods.service.OGoodsInventoryService;
import cn.qihangerp.module.stock.domain.ErpStockIn;

View File

@ -5,8 +5,8 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.utils.DateUtils;
import cn.qihangerp.module.goods.domain.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService;
import cn.qihangerp.module.goods.service.OGoodsInventoryService;
import cn.qihangerp.module.stock.domain.ErpStockOut;

View File

@ -6,9 +6,9 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
@ -18,8 +18,6 @@ import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo;
import cn.qihangerp.module.open.tao.mapper.TaoGoodsMapper;
import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper;
import cn.qihangerp.module.open.tao.service.TaoGoodsService;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

View File

@ -4,7 +4,7 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.tao.domain.TaoGoods;
import cn.qihangerp.module.open.tao.domain.TaoGoodsSku;

View File

@ -5,9 +5,9 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
@ -17,7 +17,6 @@ import cn.qihangerp.module.open.wei.mapper.WeiGoodsMapper;
import cn.qihangerp.module.open.wei.mapper.WeiGoodsSkuMapper;
import cn.qihangerp.module.open.wei.service.WeiGoodsService;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

View File

@ -4,8 +4,8 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.wei.domain.WeiGoods;