From ff28425eecbb53988b27f0440b4662f8407b455a Mon Sep 17 00:00:00 2001 From: fengb Date: Thu, 24 Aug 2023 16:11:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bigint=E4=B8=BA=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fengb --- .../ProductAttributeController.java | 7 +- .../ProductAttributeValueController.java | 7 +- .../controller/ProductCategoryController.java | 11 +- .../mall/controller/ProductController.java | 6 +- .../mall/controller/PurchaseController.java | 8 +- .../mall/controller/StockController.java | 10 - .../hiver/mall/dao/mapper/CustomerMapper.java | 31 + .../dao/mapper/ProductAttributeMapper.java | 5 +- .../mapper/ProductAttributeValueMapper.java | 4 +- .../dao/mapper/ProductCategoryMapper.java | 4 +- .../hiver/mall/dao/mapper/ProductMapper.java | 4 +- .../mall/dao/mapper/PurchaseDetailMapper.java | 7 +- .../hiver/mall/dao/mapper/PurchaseMapper.java | 4 +- .../mall/dao/mapper/SaleDetailMapper.java | 5 +- .../cc/hiver/mall/dao/mapper/SaleMapper.java | 4 +- .../hiver/mall/dao/mapper/StockLogMapper.java | 4 +- .../cc/hiver/mall/dao/mapper/StockMapper.java | 6 +- .../java/cc/hiver/mall/entity/Customer.java | 175 +++ .../cc/hiver/mall/entity/CustomerExample.java | 1080 +++++++++++++++++ .../java/cc/hiver/mall/entity/Product.java | 18 +- .../hiver/mall/entity/ProductAttribute.java | 20 +- .../mall/entity/ProductAttributeExample.java | 60 +- .../mall/entity/ProductAttributeValue.java | 20 +- .../entity/ProductAttributeValueExample.java | 60 +- .../cc/hiver/mall/entity/ProductCategory.java | 18 +- .../mall/entity/ProductCategoryExample.java | 60 +- .../cc/hiver/mall/entity/ProductExample.java | 60 +- .../java/cc/hiver/mall/entity/Purchase.java | 14 +- .../cc/hiver/mall/entity/PurchaseDetail.java | 32 +- .../mall/entity/PurchaseDetailExample.java | 120 +- .../cc/hiver/mall/entity/PurchaseExample.java | 30 +- .../main/java/cc/hiver/mall/entity/Sale.java | 16 +- .../java/cc/hiver/mall/entity/SaleDetail.java | 28 +- .../hiver/mall/entity/SaleDetailExample.java | 120 +- .../cc/hiver/mall/entity/SaleExample.java | 60 +- .../main/java/cc/hiver/mall/entity/Stock.java | 24 +- .../cc/hiver/mall/entity/StockExample.java | 90 +- .../java/cc/hiver/mall/entity/StockLog.java | 18 +- .../cc/hiver/mall/entity/StockLogExample.java | 60 +- .../serviceimpl/mybatis/StockServiceImpl.java | 2 +- .../main/resources/mapper/CustomerMapper.xml | 338 ++++++ .../mapper/ProductAttributeMapper.xml | 36 +- .../mapper/ProductAttributeValueMapper.xml | 36 +- .../mapper/ProductCategoryMapper.xml | 36 +- .../main/resources/mapper/ProductMapper.xml | 36 +- .../resources/mapper/PurchaseDetailMapper.xml | 62 +- .../main/resources/mapper/PurchaseMapper.xml | 22 +- .../resources/mapper/SaleDetailMapper.xml | 62 +- .../src/main/resources/mapper/SaleMapper.xml | 36 +- .../main/resources/mapper/StockLogMapper.xml | 36 +- .../src/main/resources/mapper/StockMapper.xml | 50 +- 51 files changed, 2459 insertions(+), 603 deletions(-) create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/CustomerMapper.java create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Customer.java create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/CustomerExample.java create mode 100644 hiver-modules/hiver-mall/src/main/resources/mapper/CustomerMapper.xml diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductAttributeController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductAttributeController.java index 2e9a4940..9863018e 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductAttributeController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductAttributeController.java @@ -24,12 +24,13 @@ import java.util.List; @RequestMapping(value = "/hiver/app/productAttribute/") @Transactional public class ProductAttributeController { + @Autowired private ProductAttributeService productAttributeService; @RequestMapping(value = "/save", method = RequestMethod.POST) @ApiOperation(value = "新增货品属性") - public Result addSpu(ProductAttribute productAttribute) { + public Result save(ProductAttribute productAttribute) { boolean result = productAttributeService.save(productAttribute); if(result) { return ResultUtil.success("添加成功"); @@ -40,7 +41,7 @@ public class ProductAttributeController { @RequestMapping(value = "/edit", method = RequestMethod.POST) @ApiOperation(value = "根据id修改货品属性") - public Result updateSpuById(ProductAttribute productAttribute) { + public Result edit(ProductAttribute productAttribute) { boolean result = productAttributeService.updateById(productAttribute); if(result) { return ResultUtil.success("修改成功"); @@ -49,7 +50,7 @@ public class ProductAttributeController { } } - @RequestMapping(value = "/delByIds", method = RequestMethod.POST) + @RequestMapping(value = "/delById", method = RequestMethod.POST) @ApiOperation(value = "根据id删除货品属性") public Result delete(ProductAttribute productAttribute) { boolean result = productAttributeService.removeById(productAttribute); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductAttributeValueController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductAttributeValueController.java index 78dca05f..39a27933 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductAttributeValueController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductAttributeValueController.java @@ -22,12 +22,13 @@ import java.util.List; @RequestMapping(value = "/hiver/app/productAttributeValue/") @Transactional public class ProductAttributeValueController { + @Autowired private ProductAttributeValueService productAttributeValueService; @RequestMapping(value = "/save", method = RequestMethod.POST) @ApiOperation(value = "新增货品属性值") - public Result addSpu(ProductAttributeValue productAttributeValue) { + public Result save(ProductAttributeValue productAttributeValue) { boolean result = productAttributeValueService.save(productAttributeValue); if(result) { return ResultUtil.success("添加成功"); @@ -38,7 +39,7 @@ public class ProductAttributeValueController { @RequestMapping(value = "/edit", method = RequestMethod.POST) @ApiOperation(value = "根据id修改货品属性值") - public Result updateSpuById(ProductAttributeValue productAttributeValue) { + public Result edit(ProductAttributeValue productAttributeValue) { boolean result = productAttributeValueService.updateById(productAttributeValue); if(result) { return ResultUtil.success("修改成功"); @@ -47,7 +48,7 @@ public class ProductAttributeValueController { } } - @RequestMapping(value = "/delByIds", method = RequestMethod.POST) + @RequestMapping(value = "/delById", method = RequestMethod.POST) @ApiOperation(value = "根据id删除货品属性值") public Result delete(ProductAttributeValue productAttributeValue) { boolean result = productAttributeValueService.removeById(productAttributeValue); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductCategoryController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductCategoryController.java index 6639e843..15fca0f3 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductCategoryController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductCategoryController.java @@ -24,14 +24,15 @@ import java.util.List; @RequestMapping(value = "/hiver/app/productCategory/") @Transactional public class ProductCategoryController { + @Autowired private ProductCategoryService productCategoryService; @RequestMapping(value = "/save", method = RequestMethod.POST) @ApiOperation(value = "新增货品类别") - public Result addSpu(ProductCategory productCategory) { + public Result save(ProductCategory productCategory) { boolean result = productCategoryService.save(productCategory); - if(result) { + if (result) { return ResultUtil.success("添加成功"); } else { return ResultUtil.error("添加失败"); @@ -42,18 +43,18 @@ public class ProductCategoryController { @ApiOperation(value = "根据id修改货品类别") public Result updateSpuById(ProductCategory productCategory) { boolean result = productCategoryService.updateById(productCategory); - if(result) { + if (result) { return ResultUtil.success("修改成功"); } else { return ResultUtil.error("修改失败"); } } - @RequestMapping(value = "/delByIds", method = RequestMethod.POST) + @RequestMapping(value = "/delById", method = RequestMethod.POST) @ApiOperation(value = "根据id删除货品类别") public Result delete(ProductCategory productCategory) { boolean result = productCategoryService.removeById(productCategory); - if(result) { + if (result) { return ResultUtil.success("删除成功"); } else { return ResultUtil.error("删除失败"); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductController.java index fd49cebf..b136f378 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductController.java @@ -35,7 +35,7 @@ public class ProductController { @RequestMapping(value = "/save", method = RequestMethod.POST) @ApiOperation(value = "新增货品") - public Result addSpu(Product product) { + public Result save(Product product) { boolean result = productService.save(product); if(result) { return ResultUtil.success("添加成功"); @@ -46,7 +46,7 @@ public class ProductController { @RequestMapping(value = "/edit", method = RequestMethod.POST) @ApiOperation(value = "根据货品id修改货品") - public Result updateSpuById(Product product) { + public Result edit(Product product) { boolean result = productService.updateById(product); if(result) { return ResultUtil.success("修改成功"); @@ -55,7 +55,7 @@ public class ProductController { } } - @RequestMapping(value = "/delByIds", method = RequestMethod.POST) + @RequestMapping(value = "/delById", method = RequestMethod.POST) @ApiOperation(value = "根据id删除货品") public Result delete(Product product) { boolean result = productService.removeById(product); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/PurchaseController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/PurchaseController.java index 868df7ba..f095b789 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/PurchaseController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/PurchaseController.java @@ -1,6 +1,5 @@ package cc.hiver.mall.controller; -import cc.hiver.core.common.utils.ObjectUtil; import cc.hiver.core.common.utils.ResultUtil; import cc.hiver.core.common.utils.StringUtils; import cc.hiver.core.common.vo.Result; @@ -9,7 +8,6 @@ import cc.hiver.mall.entity.PurchaseDetail; import cc.hiver.mall.pojo.vo.PurchaseVo; import cc.hiver.mall.service.mybatis.PurchaseDetailService; import cc.hiver.mall.service.mybatis.PurchaseService; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -38,7 +36,7 @@ public class PurchaseController { @RequestMapping(value = "/save", method = RequestMethod.POST) @ApiOperation(value = "新增采购单") - public Result addSpu(PurchaseVo purchaseVo) { + public Result save(PurchaseVo purchaseVo) { Purchase purchase = purchaseVo.getPurchase(); List purchaseDetails = purchaseVo.getPurchaseDetails(); boolean result = purchaseService.save(purchase); @@ -52,7 +50,7 @@ public class PurchaseController { @RequestMapping(value = "/edit", method = RequestMethod.POST) @ApiOperation(value = "根据id修改货品属性") - public Result updateSpuById(PurchaseVo purchaseVo) { + public Result edit(PurchaseVo purchaseVo) { Purchase purchase = purchaseVo.getPurchase(); List purchaseDetails = purchaseVo.getPurchaseDetails(); boolean result = purchaseService.updateById(purchase); @@ -67,7 +65,7 @@ public class PurchaseController { return ResultUtil.error("修改失败"); } - @RequestMapping(value = "/delByIds", method = RequestMethod.POST) + @RequestMapping(value = "/delById", method = RequestMethod.POST) @ApiOperation(value = "根据id删除采购单") public Result delete(Purchase purchase) { boolean result = purchaseService.removeById(purchase); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/StockController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/StockController.java index 6fe943c1..605b9720 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/StockController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/StockController.java @@ -1,30 +1,20 @@ package cc.hiver.mall.controller; -import cc.hiver.core.common.utils.ResultUtil; -import cc.hiver.core.common.utils.StringUtils; import cc.hiver.core.common.vo.Result; -import cc.hiver.mall.entity.Purchase; -import cc.hiver.mall.entity.PurchaseDetail; -import cc.hiver.mall.entity.Stock; import cc.hiver.mall.pojo.vo.PurchaseVo; -import cc.hiver.mall.pojo.vo.StockVo; import cc.hiver.mall.service.mybatis.PurchaseDetailService; import cc.hiver.mall.service.mybatis.PurchaseService; import cc.hiver.mall.service.mybatis.StockLogService; import cc.hiver.mall.service.mybatis.StockService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @Slf4j @RestController @Api(tags = "库存接口") diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/CustomerMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/CustomerMapper.java new file mode 100644 index 00000000..5e7c2021 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/CustomerMapper.java @@ -0,0 +1,31 @@ +package cc.hiver.mall.dao.mapper; + +import cc.hiver.mall.entity.Customer; +import cc.hiver.mall.entity.CustomerExample; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface CustomerMapper { + long countByExample(CustomerExample example); + + int deleteByExample(CustomerExample example); + + int deleteByPrimaryKey(String id); + + int insert(Customer record); + + int insertSelective(Customer record); + + List selectByExample(CustomerExample example); + + Customer selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") Customer record, @Param("example") CustomerExample example); + + int updateByExample(@Param("record") Customer record, @Param("example") CustomerExample example); + + int updateByPrimaryKeySelective(Customer record); + + int updateByPrimaryKey(Customer record); +} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductAttributeMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductAttributeMapper.java index b16c5e07..ceb113a9 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductAttributeMapper.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductAttributeMapper.java @@ -1,6 +1,5 @@ package cc.hiver.mall.dao.mapper; -import cc.hiver.mall.entity.GoodsAttribute; import cc.hiver.mall.entity.ProductAttribute; import cc.hiver.mall.entity.ProductAttributeExample; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,7 +13,7 @@ public interface ProductAttributeMapper extends BaseMapper { int deleteByExample(ProductAttributeExample example); - int deleteByPrimaryKey(Long id); + int deleteByPrimaryKey(String id); int insert(ProductAttribute record); @@ -22,7 +21,7 @@ public interface ProductAttributeMapper extends BaseMapper { List selectByExample(ProductAttributeExample example); - ProductAttribute selectByPrimaryKey(Long id); + ProductAttribute selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") ProductAttribute record, @Param("example") ProductAttributeExample example); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductAttributeValueMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductAttributeValueMapper.java index c1fcc2ab..5e4da68e 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductAttributeValueMapper.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductAttributeValueMapper.java @@ -13,7 +13,7 @@ public interface ProductAttributeValueMapper extends BaseMapper selectByExample(ProductAttributeValueExample example); - ProductAttributeValue selectByPrimaryKey(Long id); + ProductAttributeValue selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") ProductAttributeValue record, @Param("example") ProductAttributeValueExample example); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductCategoryMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductCategoryMapper.java index 9945518a..4865e08a 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductCategoryMapper.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductCategoryMapper.java @@ -13,7 +13,7 @@ public interface ProductCategoryMapper extends BaseMapper { int deleteByExample(ProductCategoryExample example); - int deleteByPrimaryKey(Long id); + int deleteByPrimaryKey(String id); int insert(ProductCategory record); @@ -21,7 +21,7 @@ public interface ProductCategoryMapper extends BaseMapper { List selectByExample(ProductCategoryExample example); - ProductCategory selectByPrimaryKey(Long id); + ProductCategory selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") ProductCategory record, @Param("example") ProductCategoryExample example); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductMapper.java index 181066cb..8319a846 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductMapper.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductMapper.java @@ -13,7 +13,7 @@ public interface ProductMapper extends BaseMapper { int deleteByExample(ProductExample example); - int deleteByPrimaryKey(Long id); + int deleteByPrimaryKey(String id); int insert(Product record); @@ -21,7 +21,7 @@ public interface ProductMapper extends BaseMapper { List selectByExample(ProductExample example); - Product selectByPrimaryKey(Long id); + Product selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") Product record, @Param("example") ProductExample example); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/PurchaseDetailMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/PurchaseDetailMapper.java index a7ce26a9..ed3a4300 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/PurchaseDetailMapper.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/PurchaseDetailMapper.java @@ -4,15 +4,16 @@ import cc.hiver.mall.entity.PurchaseDetail; import cc.hiver.mall.entity.PurchaseDetailExample; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; - +@Repository public interface PurchaseDetailMapper extends BaseMapper { long countByExample(PurchaseDetailExample example); int deleteByExample(PurchaseDetailExample example); - int deleteByPrimaryKey(Long id); + int deleteByPrimaryKey(String id); int insert(PurchaseDetail record); @@ -20,7 +21,7 @@ public interface PurchaseDetailMapper extends BaseMapper { List selectByExample(PurchaseDetailExample example); - PurchaseDetail selectByPrimaryKey(Long id); + PurchaseDetail selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") PurchaseDetail record, @Param("example") PurchaseDetailExample example); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/PurchaseMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/PurchaseMapper.java index 9972e688..b0585885 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/PurchaseMapper.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/PurchaseMapper.java @@ -13,7 +13,7 @@ public interface PurchaseMapper extends BaseMapper { int deleteByExample(PurchaseExample example); - int deleteByPrimaryKey(Long id); + int deleteByPrimaryKey(String id); int insert(Purchase record); @@ -21,7 +21,7 @@ public interface PurchaseMapper extends BaseMapper { List selectByExample(PurchaseExample example); - Purchase selectByPrimaryKey(Long id); + Purchase selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") Purchase record, @Param("example") PurchaseExample example); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleDetailMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleDetailMapper.java index f182ffce..4a0d44c9 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleDetailMapper.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleDetailMapper.java @@ -1,6 +1,5 @@ package cc.hiver.mall.dao.mapper; -import cc.hiver.mall.entity.Sale; import cc.hiver.mall.entity.SaleDetail; import cc.hiver.mall.entity.SaleDetailExample; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,7 +13,7 @@ public interface SaleDetailMapper extends BaseMapper { int deleteByExample(SaleDetailExample example); - int deleteByPrimaryKey(Long id); + int deleteByPrimaryKey(String id); int insert(SaleDetail record); @@ -22,7 +21,7 @@ public interface SaleDetailMapper extends BaseMapper { List selectByExample(SaleDetailExample example); - SaleDetail selectByPrimaryKey(Long id); + SaleDetail selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") SaleDetail record, @Param("example") SaleDetailExample example); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java index 90c99731..eea76bef 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java @@ -13,7 +13,7 @@ public interface SaleMapper extends BaseMapper { int deleteByExample(SaleExample example); - int deleteByPrimaryKey(Long id); + int deleteByPrimaryKey(String id); int insert(Sale record); @@ -21,7 +21,7 @@ public interface SaleMapper extends BaseMapper { List selectByExample(SaleExample example); - Sale selectByPrimaryKey(Long id); + Sale selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") Sale record, @Param("example") SaleExample example); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/StockLogMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/StockLogMapper.java index 3d7dd303..2f768157 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/StockLogMapper.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/StockLogMapper.java @@ -13,7 +13,7 @@ public interface StockLogMapper extends BaseMapper { int deleteByExample(StockLogExample example); - int deleteByPrimaryKey(Long id); + int deleteByPrimaryKey(String id); int insert(StockLog record); @@ -21,7 +21,7 @@ public interface StockLogMapper extends BaseMapper { List selectByExample(StockLogExample example); - StockLog selectByPrimaryKey(Long id); + StockLog selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") StockLog record, @Param("example") StockLogExample example); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/StockMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/StockMapper.java index dc3123dd..15ec6f9e 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/StockMapper.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/StockMapper.java @@ -1,11 +1,13 @@ package cc.hiver.mall.dao.mapper; +import cc.hiver.mall.entity.Goods; import cc.hiver.mall.entity.Stock; import cc.hiver.mall.entity.StockExample; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import javax.annotation.Resource; import java.util.List; @Repository public interface StockMapper extends BaseMapper { @@ -13,7 +15,7 @@ public interface StockMapper extends BaseMapper { int deleteByExample(StockExample example); - int deleteByPrimaryKey(Long id); + int deleteByPrimaryKey(String id); int insert(Stock record); @@ -21,7 +23,7 @@ public interface StockMapper extends BaseMapper { List selectByExample(StockExample example); - Stock selectByPrimaryKey(Long id); + Stock selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") Stock record, @Param("example") StockExample example); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Customer.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Customer.java new file mode 100644 index 00000000..0bdf6e0e --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Customer.java @@ -0,0 +1,175 @@ +package cc.hiver.mall.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.io.Serializable; +import java.util.Date; + +@ApiModel(value = "客户表") +@TableName(value = "t_customer", autoResultMap = true) +public class Customer implements Serializable { + private String id; + + private String createBy; + + private Date createTime; + + private Integer delFlag; + + private String updateBy; + + private Date updateTime; + + @ApiModelProperty(value = "姓名") + private String name; + + @ApiModelProperty(value = "手机号") + private String phone; + + @ApiModelProperty(value = "地址") + private String address; + + @ApiModelProperty(value = "密码") + private String password; + + @ApiModelProperty(value = "省") + private String province; + + @ApiModelProperty(value = "市") + private String city; + + @ApiModelProperty(value = "县区") + private String area; + + private static final long serialVersionUID = 1L; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Integer getDelFlag() { + return delFlag; + } + + public void setDelFlag(Integer delFlag) { + this.delFlag = delFlag; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", createBy=").append(createBy); + sb.append(", createTime=").append(createTime); + sb.append(", delFlag=").append(delFlag); + sb.append(", updateBy=").append(updateBy); + sb.append(", updateTime=").append(updateTime); + sb.append(", name=").append(name); + sb.append(", phone=").append(phone); + sb.append(", address=").append(address); + sb.append(", password=").append(password); + sb.append(", province=").append(province); + sb.append(", city=").append(city); + sb.append(", area=").append(area); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/CustomerExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/CustomerExample.java new file mode 100644 index 00000000..db913a08 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/CustomerExample.java @@ -0,0 +1,1080 @@ +package cc.hiver.mall.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class CustomerExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CustomerExample() { + oredCriteria = new ArrayList<>(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList<>(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(Integer value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(Integer value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(Integer value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(Integer value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(Integer value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(Integer value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(Integer value1, Integer value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(Integer value1, Integer value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andPhoneIsNull() { + addCriterion("phone is null"); + return (Criteria) this; + } + + public Criteria andPhoneIsNotNull() { + addCriterion("phone is not null"); + return (Criteria) this; + } + + public Criteria andPhoneEqualTo(String value) { + addCriterion("phone =", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotEqualTo(String value) { + addCriterion("phone <>", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneGreaterThan(String value) { + addCriterion("phone >", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneGreaterThanOrEqualTo(String value) { + addCriterion("phone >=", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLessThan(String value) { + addCriterion("phone <", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLessThanOrEqualTo(String value) { + addCriterion("phone <=", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLike(String value) { + addCriterion("phone like", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotLike(String value) { + addCriterion("phone not like", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneIn(List values) { + addCriterion("phone in", values, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotIn(List values) { + addCriterion("phone not in", values, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneBetween(String value1, String value2) { + addCriterion("phone between", value1, value2, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotBetween(String value1, String value2) { + addCriterion("phone not between", value1, value2, "phone"); + return (Criteria) this; + } + + public Criteria andAddressIsNull() { + addCriterion("address is null"); + return (Criteria) this; + } + + public Criteria andAddressIsNotNull() { + addCriterion("address is not null"); + return (Criteria) this; + } + + public Criteria andAddressEqualTo(String value) { + addCriterion("address =", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotEqualTo(String value) { + addCriterion("address <>", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressGreaterThan(String value) { + addCriterion("address >", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressGreaterThanOrEqualTo(String value) { + addCriterion("address >=", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLessThan(String value) { + addCriterion("address <", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLessThanOrEqualTo(String value) { + addCriterion("address <=", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLike(String value) { + addCriterion("address like", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotLike(String value) { + addCriterion("address not like", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressIn(List values) { + addCriterion("address in", values, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotIn(List values) { + addCriterion("address not in", values, "address"); + return (Criteria) this; + } + + public Criteria andAddressBetween(String value1, String value2) { + addCriterion("address between", value1, value2, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotBetween(String value1, String value2) { + addCriterion("address not between", value1, value2, "address"); + return (Criteria) this; + } + + public Criteria andPasswordIsNull() { + addCriterion("password is null"); + return (Criteria) this; + } + + public Criteria andPasswordIsNotNull() { + addCriterion("password is not null"); + return (Criteria) this; + } + + public Criteria andPasswordEqualTo(String value) { + addCriterion("password =", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotEqualTo(String value) { + addCriterion("password <>", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordGreaterThan(String value) { + addCriterion("password >", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordGreaterThanOrEqualTo(String value) { + addCriterion("password >=", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordLessThan(String value) { + addCriterion("password <", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordLessThanOrEqualTo(String value) { + addCriterion("password <=", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordLike(String value) { + addCriterion("password like", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotLike(String value) { + addCriterion("password not like", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordIn(List values) { + addCriterion("password in", values, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotIn(List values) { + addCriterion("password not in", values, "password"); + return (Criteria) this; + } + + public Criteria andPasswordBetween(String value1, String value2) { + addCriterion("password between", value1, value2, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotBetween(String value1, String value2) { + addCriterion("password not between", value1, value2, "password"); + return (Criteria) this; + } + + public Criteria andProvinceIsNull() { + addCriterion("province is null"); + return (Criteria) this; + } + + public Criteria andProvinceIsNotNull() { + addCriterion("province is not null"); + return (Criteria) this; + } + + public Criteria andProvinceEqualTo(String value) { + addCriterion("province =", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceNotEqualTo(String value) { + addCriterion("province <>", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceGreaterThan(String value) { + addCriterion("province >", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceGreaterThanOrEqualTo(String value) { + addCriterion("province >=", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceLessThan(String value) { + addCriterion("province <", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceLessThanOrEqualTo(String value) { + addCriterion("province <=", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceLike(String value) { + addCriterion("province like", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceNotLike(String value) { + addCriterion("province not like", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceIn(List values) { + addCriterion("province in", values, "province"); + return (Criteria) this; + } + + public Criteria andProvinceNotIn(List values) { + addCriterion("province not in", values, "province"); + return (Criteria) this; + } + + public Criteria andProvinceBetween(String value1, String value2) { + addCriterion("province between", value1, value2, "province"); + return (Criteria) this; + } + + public Criteria andProvinceNotBetween(String value1, String value2) { + addCriterion("province not between", value1, value2, "province"); + return (Criteria) this; + } + + public Criteria andCityIsNull() { + addCriterion("city is null"); + return (Criteria) this; + } + + public Criteria andCityIsNotNull() { + addCriterion("city is not null"); + return (Criteria) this; + } + + public Criteria andCityEqualTo(String value) { + addCriterion("city =", value, "city"); + return (Criteria) this; + } + + public Criteria andCityNotEqualTo(String value) { + addCriterion("city <>", value, "city"); + return (Criteria) this; + } + + public Criteria andCityGreaterThan(String value) { + addCriterion("city >", value, "city"); + return (Criteria) this; + } + + public Criteria andCityGreaterThanOrEqualTo(String value) { + addCriterion("city >=", value, "city"); + return (Criteria) this; + } + + public Criteria andCityLessThan(String value) { + addCriterion("city <", value, "city"); + return (Criteria) this; + } + + public Criteria andCityLessThanOrEqualTo(String value) { + addCriterion("city <=", value, "city"); + return (Criteria) this; + } + + public Criteria andCityLike(String value) { + addCriterion("city like", value, "city"); + return (Criteria) this; + } + + public Criteria andCityNotLike(String value) { + addCriterion("city not like", value, "city"); + return (Criteria) this; + } + + public Criteria andCityIn(List values) { + addCriterion("city in", values, "city"); + return (Criteria) this; + } + + public Criteria andCityNotIn(List values) { + addCriterion("city not in", values, "city"); + return (Criteria) this; + } + + public Criteria andCityBetween(String value1, String value2) { + addCriterion("city between", value1, value2, "city"); + return (Criteria) this; + } + + public Criteria andCityNotBetween(String value1, String value2) { + addCriterion("city not between", value1, value2, "city"); + return (Criteria) this; + } + + public Criteria andAreaIsNull() { + addCriterion("area is null"); + return (Criteria) this; + } + + public Criteria andAreaIsNotNull() { + addCriterion("area is not null"); + return (Criteria) this; + } + + public Criteria andAreaEqualTo(String value) { + addCriterion("area =", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotEqualTo(String value) { + addCriterion("area <>", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaGreaterThan(String value) { + addCriterion("area >", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaGreaterThanOrEqualTo(String value) { + addCriterion("area >=", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaLessThan(String value) { + addCriterion("area <", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaLessThanOrEqualTo(String value) { + addCriterion("area <=", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaLike(String value) { + addCriterion("area like", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotLike(String value) { + addCriterion("area not like", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaIn(List values) { + addCriterion("area in", values, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotIn(List values) { + addCriterion("area not in", values, "area"); + return (Criteria) this; + } + + public Criteria andAreaBetween(String value1, String value2) { + addCriterion("area between", value1, value2, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotBetween(String value1, String value2) { + addCriterion("area not between", value1, value2, "area"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Product.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Product.java index ba4d4e87..180528ab 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Product.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Product.java @@ -1,18 +1,18 @@ package cc.hiver.mall.entity; +import cc.hiver.core.common.utils.SnowFlakeUtil; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.persistence.Table; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -@ApiModel(value = "货品表") -@Table(name = "t_product") + +@ApiModel(value = "商品表") @TableName(value = "t_product", autoResultMap = true) public class Product implements Serializable { - private Long id; + private String id = SnowFlakeUtil.nextId().toString(); private String createBy; @@ -34,7 +34,7 @@ public class Product implements Serializable { private String shopId; @ApiModelProperty(value = "商品分类") - private Long categoryId; + private String categoryId; @ApiModelProperty(value = "商品属性列表") private String attributeList; @@ -74,11 +74,11 @@ public class Product implements Serializable { private static final long serialVersionUID = 1L; - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } @@ -146,11 +146,11 @@ public class Product implements Serializable { this.shopId = shopId; } - public Long getCategoryId() { + public String getCategoryId() { return categoryId; } - public void setCategoryId(Long categoryId) { + public void setCategoryId(String categoryId) { this.categoryId = categoryId; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttribute.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttribute.java index b90b782e..77af04b4 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttribute.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttribute.java @@ -1,17 +1,17 @@ package cc.hiver.mall.entity; +import cc.hiver.core.common.utils.SnowFlakeUtil; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.persistence.Table; import java.io.Serializable; import java.util.Date; -@ApiModel(value = "货品属性") -@Table(name = "t_product_attribute ") -@TableName(value = "t_product_attribute ", autoResultMap = true) + +@ApiModel(value = "商品属性") +@TableName(value = "t_product_attribute", autoResultMap = true) public class ProductAttribute implements Serializable { - private Long id; + private String id = SnowFlakeUtil.nextId().toString(); private String createBy; @@ -24,18 +24,18 @@ public class ProductAttribute implements Serializable { private Date updateTime; @ApiModelProperty(value = "商品类别ID") - private Long categoryId; + private String categoryId; @ApiModelProperty(value = "属性名称") private String attributeName; private static final long serialVersionUID = 1L; - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } @@ -79,11 +79,11 @@ public class ProductAttribute implements Serializable { this.updateTime = updateTime; } - public Long getCategoryId() { + public String getCategoryId() { return categoryId; } - public void setCategoryId(Long categoryId) { + public void setCategoryId(String categoryId) { this.categoryId = categoryId; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttributeExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttributeExample.java index be5bcf0c..76c9ac23 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttributeExample.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttributeExample.java @@ -115,52 +115,62 @@ public class ProductAttributeExample { return (Criteria) this; } - public Criteria andIdEqualTo(Long value) { + public Criteria andIdEqualTo(String value) { addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andIdNotEqualTo(Long value) { + public Criteria andIdNotEqualTo(String value) { addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThan(Long value) { + public Criteria andIdGreaterThan(String value) { addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThanOrEqualTo(Long value) { + public Criteria andIdGreaterThanOrEqualTo(String value) { addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andIdLessThan(Long value) { + public Criteria andIdLessThan(String value) { addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andIdLessThanOrEqualTo(Long value) { + public Criteria andIdLessThanOrEqualTo(String value) { addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andIdIn(List values) { + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andIdNotIn(List values) { + public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andIdBetween(Long value1, Long value2) { + public Criteria andIdBetween(String value1, String value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andIdNotBetween(Long value1, Long value2) { + public Criteria andIdNotBetween(String value1, String value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } @@ -495,52 +505,62 @@ public class ProductAttributeExample { return (Criteria) this; } - public Criteria andCategoryIdEqualTo(Long value) { + public Criteria andCategoryIdEqualTo(String value) { addCriterion("category_id =", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotEqualTo(Long value) { + public Criteria andCategoryIdNotEqualTo(String value) { addCriterion("category_id <>", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdGreaterThan(Long value) { + public Criteria andCategoryIdGreaterThan(String value) { addCriterion("category_id >", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdGreaterThanOrEqualTo(Long value) { + public Criteria andCategoryIdGreaterThanOrEqualTo(String value) { addCriterion("category_id >=", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdLessThan(Long value) { + public Criteria andCategoryIdLessThan(String value) { addCriterion("category_id <", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdLessThanOrEqualTo(Long value) { + public Criteria andCategoryIdLessThanOrEqualTo(String value) { addCriterion("category_id <=", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdIn(List values) { + public Criteria andCategoryIdLike(String value) { + addCriterion("category_id like", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdNotLike(String value) { + addCriterion("category_id not like", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdIn(List values) { addCriterion("category_id in", values, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotIn(List values) { + public Criteria andCategoryIdNotIn(List values) { addCriterion("category_id not in", values, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdBetween(Long value1, Long value2) { + public Criteria andCategoryIdBetween(String value1, String value2) { addCriterion("category_id between", value1, value2, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotBetween(Long value1, Long value2) { + public Criteria andCategoryIdNotBetween(String value1, String value2) { addCriterion("category_id not between", value1, value2, "categoryId"); return (Criteria) this; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttributeValue.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttributeValue.java index b9d813f1..491f21c4 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttributeValue.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttributeValue.java @@ -1,17 +1,17 @@ package cc.hiver.mall.entity; +import cc.hiver.core.common.utils.SnowFlakeUtil; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.persistence.Table; import java.io.Serializable; import java.util.Date; -@ApiModel(value = "货品规格表") -@Table(name = "t_product_attribute_value ") -@TableName(value = "t_product_attribute_value ", autoResultMap = true) + +@ApiModel(value = "商品属性值表") +@TableName(value = "t_product_attribute_value", autoResultMap = true) public class ProductAttributeValue implements Serializable { - private Long id; + private String id = SnowFlakeUtil.nextId().toString(); private String createBy; @@ -24,18 +24,18 @@ public class ProductAttributeValue implements Serializable { private Date updateTime; @ApiModelProperty(value = "商品属性ID") - private Long attributeId; + private String attributeId; @ApiModelProperty(value = "属性值") private String value; private static final long serialVersionUID = 1L; - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } @@ -79,11 +79,11 @@ public class ProductAttributeValue implements Serializable { this.updateTime = updateTime; } - public Long getAttributeId() { + public String getAttributeId() { return attributeId; } - public void setAttributeId(Long attributeId) { + public void setAttributeId(String attributeId) { this.attributeId = attributeId; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttributeValueExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttributeValueExample.java index d9232797..a8d4c191 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttributeValueExample.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttributeValueExample.java @@ -115,52 +115,62 @@ public class ProductAttributeValueExample { return (Criteria) this; } - public Criteria andIdEqualTo(Long value) { + public Criteria andIdEqualTo(String value) { addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andIdNotEqualTo(Long value) { + public Criteria andIdNotEqualTo(String value) { addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThan(Long value) { + public Criteria andIdGreaterThan(String value) { addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThanOrEqualTo(Long value) { + public Criteria andIdGreaterThanOrEqualTo(String value) { addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andIdLessThan(Long value) { + public Criteria andIdLessThan(String value) { addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andIdLessThanOrEqualTo(Long value) { + public Criteria andIdLessThanOrEqualTo(String value) { addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andIdIn(List values) { + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andIdNotIn(List values) { + public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andIdBetween(Long value1, Long value2) { + public Criteria andIdBetween(String value1, String value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andIdNotBetween(Long value1, Long value2) { + public Criteria andIdNotBetween(String value1, String value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } @@ -495,52 +505,62 @@ public class ProductAttributeValueExample { return (Criteria) this; } - public Criteria andAttributeIdEqualTo(Long value) { + public Criteria andAttributeIdEqualTo(String value) { addCriterion("attribute_id =", value, "attributeId"); return (Criteria) this; } - public Criteria andAttributeIdNotEqualTo(Long value) { + public Criteria andAttributeIdNotEqualTo(String value) { addCriterion("attribute_id <>", value, "attributeId"); return (Criteria) this; } - public Criteria andAttributeIdGreaterThan(Long value) { + public Criteria andAttributeIdGreaterThan(String value) { addCriterion("attribute_id >", value, "attributeId"); return (Criteria) this; } - public Criteria andAttributeIdGreaterThanOrEqualTo(Long value) { + public Criteria andAttributeIdGreaterThanOrEqualTo(String value) { addCriterion("attribute_id >=", value, "attributeId"); return (Criteria) this; } - public Criteria andAttributeIdLessThan(Long value) { + public Criteria andAttributeIdLessThan(String value) { addCriterion("attribute_id <", value, "attributeId"); return (Criteria) this; } - public Criteria andAttributeIdLessThanOrEqualTo(Long value) { + public Criteria andAttributeIdLessThanOrEqualTo(String value) { addCriterion("attribute_id <=", value, "attributeId"); return (Criteria) this; } - public Criteria andAttributeIdIn(List values) { + public Criteria andAttributeIdLike(String value) { + addCriterion("attribute_id like", value, "attributeId"); + return (Criteria) this; + } + + public Criteria andAttributeIdNotLike(String value) { + addCriterion("attribute_id not like", value, "attributeId"); + return (Criteria) this; + } + + public Criteria andAttributeIdIn(List values) { addCriterion("attribute_id in", values, "attributeId"); return (Criteria) this; } - public Criteria andAttributeIdNotIn(List values) { + public Criteria andAttributeIdNotIn(List values) { addCriterion("attribute_id not in", values, "attributeId"); return (Criteria) this; } - public Criteria andAttributeIdBetween(Long value1, Long value2) { + public Criteria andAttributeIdBetween(String value1, String value2) { addCriterion("attribute_id between", value1, value2, "attributeId"); return (Criteria) this; } - public Criteria andAttributeIdNotBetween(Long value1, Long value2) { + public Criteria andAttributeIdNotBetween(String value1, String value2) { addCriterion("attribute_id not between", value1, value2, "attributeId"); return (Criteria) this; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductCategory.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductCategory.java index 72c9a614..698b2096 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductCategory.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductCategory.java @@ -1,17 +1,17 @@ package cc.hiver.mall.entity; +import cc.hiver.core.common.utils.SnowFlakeUtil; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.persistence.Table; import java.io.Serializable; import java.util.Date; -@ApiModel(value = "货品分类表") -@Table(name = "t_product_category") + +@ApiModel(value = "商品类别表") @TableName(value = "t_product_category", autoResultMap = true) public class ProductCategory implements Serializable { - private Long id; + private String id = SnowFlakeUtil.nextId().toString(); private String createBy; @@ -27,15 +27,15 @@ public class ProductCategory implements Serializable { private String categoryName; @ApiModelProperty(value = "父id") - private Long parentId; + private String parentId; private static final long serialVersionUID = 1L; - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } @@ -87,11 +87,11 @@ public class ProductCategory implements Serializable { this.categoryName = categoryName; } - public Long getParentId() { + public String getParentId() { return parentId; } - public void setParentId(Long parentId) { + public void setParentId(String parentId) { this.parentId = parentId; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductCategoryExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductCategoryExample.java index 63d4e19b..0334c7e3 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductCategoryExample.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductCategoryExample.java @@ -115,52 +115,62 @@ public class ProductCategoryExample { return (Criteria) this; } - public Criteria andIdEqualTo(Long value) { + public Criteria andIdEqualTo(String value) { addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andIdNotEqualTo(Long value) { + public Criteria andIdNotEqualTo(String value) { addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThan(Long value) { + public Criteria andIdGreaterThan(String value) { addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThanOrEqualTo(Long value) { + public Criteria andIdGreaterThanOrEqualTo(String value) { addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andIdLessThan(Long value) { + public Criteria andIdLessThan(String value) { addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andIdLessThanOrEqualTo(Long value) { + public Criteria andIdLessThanOrEqualTo(String value) { addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andIdIn(List values) { + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andIdNotIn(List values) { + public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andIdBetween(Long value1, Long value2) { + public Criteria andIdBetween(String value1, String value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andIdNotBetween(Long value1, Long value2) { + public Criteria andIdNotBetween(String value1, String value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } @@ -565,52 +575,62 @@ public class ProductCategoryExample { return (Criteria) this; } - public Criteria andParentIdEqualTo(Long value) { + public Criteria andParentIdEqualTo(String value) { addCriterion("parent_id =", value, "parentId"); return (Criteria) this; } - public Criteria andParentIdNotEqualTo(Long value) { + public Criteria andParentIdNotEqualTo(String value) { addCriterion("parent_id <>", value, "parentId"); return (Criteria) this; } - public Criteria andParentIdGreaterThan(Long value) { + public Criteria andParentIdGreaterThan(String value) { addCriterion("parent_id >", value, "parentId"); return (Criteria) this; } - public Criteria andParentIdGreaterThanOrEqualTo(Long value) { + public Criteria andParentIdGreaterThanOrEqualTo(String value) { addCriterion("parent_id >=", value, "parentId"); return (Criteria) this; } - public Criteria andParentIdLessThan(Long value) { + public Criteria andParentIdLessThan(String value) { addCriterion("parent_id <", value, "parentId"); return (Criteria) this; } - public Criteria andParentIdLessThanOrEqualTo(Long value) { + public Criteria andParentIdLessThanOrEqualTo(String value) { addCriterion("parent_id <=", value, "parentId"); return (Criteria) this; } - public Criteria andParentIdIn(List values) { + public Criteria andParentIdLike(String value) { + addCriterion("parent_id like", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdNotLike(String value) { + addCriterion("parent_id not like", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdIn(List values) { addCriterion("parent_id in", values, "parentId"); return (Criteria) this; } - public Criteria andParentIdNotIn(List values) { + public Criteria andParentIdNotIn(List values) { addCriterion("parent_id not in", values, "parentId"); return (Criteria) this; } - public Criteria andParentIdBetween(Long value1, Long value2) { + public Criteria andParentIdBetween(String value1, String value2) { addCriterion("parent_id between", value1, value2, "parentId"); return (Criteria) this; } - public Criteria andParentIdNotBetween(Long value1, Long value2) { + public Criteria andParentIdNotBetween(String value1, String value2) { addCriterion("parent_id not between", value1, value2, "parentId"); return (Criteria) this; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductExample.java index 01849921..547f3010 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductExample.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductExample.java @@ -116,52 +116,62 @@ public class ProductExample { return (Criteria) this; } - public Criteria andIdEqualTo(Long value) { + public Criteria andIdEqualTo(String value) { addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andIdNotEqualTo(Long value) { + public Criteria andIdNotEqualTo(String value) { addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThan(Long value) { + public Criteria andIdGreaterThan(String value) { addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThanOrEqualTo(Long value) { + public Criteria andIdGreaterThanOrEqualTo(String value) { addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andIdLessThan(Long value) { + public Criteria andIdLessThan(String value) { addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andIdLessThanOrEqualTo(Long value) { + public Criteria andIdLessThanOrEqualTo(String value) { addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andIdIn(List values) { + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andIdNotIn(List values) { + public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andIdBetween(Long value1, Long value2) { + public Criteria andIdBetween(String value1, String value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andIdNotBetween(Long value1, Long value2) { + public Criteria andIdNotBetween(String value1, String value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } @@ -706,52 +716,62 @@ public class ProductExample { return (Criteria) this; } - public Criteria andCategoryIdEqualTo(Long value) { + public Criteria andCategoryIdEqualTo(String value) { addCriterion("category_id =", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotEqualTo(Long value) { + public Criteria andCategoryIdNotEqualTo(String value) { addCriterion("category_id <>", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdGreaterThan(Long value) { + public Criteria andCategoryIdGreaterThan(String value) { addCriterion("category_id >", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdGreaterThanOrEqualTo(Long value) { + public Criteria andCategoryIdGreaterThanOrEqualTo(String value) { addCriterion("category_id >=", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdLessThan(Long value) { + public Criteria andCategoryIdLessThan(String value) { addCriterion("category_id <", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdLessThanOrEqualTo(Long value) { + public Criteria andCategoryIdLessThanOrEqualTo(String value) { addCriterion("category_id <=", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdIn(List values) { + public Criteria andCategoryIdLike(String value) { + addCriterion("category_id like", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdNotLike(String value) { + addCriterion("category_id not like", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdIn(List values) { addCriterion("category_id in", values, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotIn(List values) { + public Criteria andCategoryIdNotIn(List values) { addCriterion("category_id not in", values, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdBetween(Long value1, Long value2) { + public Criteria andCategoryIdBetween(String value1, String value2) { addCriterion("category_id between", value1, value2, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotBetween(Long value1, Long value2) { + public Criteria andCategoryIdNotBetween(String value1, String value2) { addCriterion("category_id not between", value1, value2, "categoryId"); return (Criteria) this; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Purchase.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Purchase.java index 5fd415a0..521eadc1 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Purchase.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Purchase.java @@ -1,18 +1,18 @@ package cc.hiver.mall.entity; +import cc.hiver.core.common.utils.SnowFlakeUtil; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.persistence.Table; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -@ApiModel(value = "采购入库单主表") -@Table(name = "t_purchase ") -@TableName(value = "t_purchase ", autoResultMap = true) + +@ApiModel(value = "采购单主表") +@TableName(value = "t_purchase", autoResultMap = true) public class Purchase implements Serializable { - private Long id; + private String id = SnowFlakeUtil.nextId().toString(); private String createBy; @@ -44,11 +44,11 @@ public class Purchase implements Serializable { private static final long serialVersionUID = 1L; - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseDetail.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseDetail.java index c6d85262..49d96a6d 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseDetail.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseDetail.java @@ -1,18 +1,18 @@ package cc.hiver.mall.entity; +import cc.hiver.core.common.utils.SnowFlakeUtil; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.persistence.Table; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -@ApiModel(value = "采购入库单明细表") -@Table(name = "t_purchase_detail ") -@TableName(value = "t_purchase_detail ", autoResultMap = true) + +@ApiModel(value = "采购单明细表") +@TableName(value = "t_purchase_detail", autoResultMap = true) public class PurchaseDetail implements Serializable { - private Long id; + private String id = SnowFlakeUtil.nextId().toString(); private String createBy; @@ -25,10 +25,10 @@ public class PurchaseDetail implements Serializable { private Date updateTime; @ApiModelProperty(value = "采购单ID") - private Long purchaseId; + private String purchaseId; @ApiModelProperty(value = "商品ID") - private Long productId; + private String productId; @ApiModelProperty(value = "商品名称") private String productName; @@ -40,7 +40,7 @@ public class PurchaseDetail implements Serializable { private String shopId; @ApiModelProperty(value = "商品分类") - private Long categoryId; + private String categoryId; @ApiModelProperty(value = "商品属性列表") private String attributeList; @@ -83,11 +83,11 @@ public class PurchaseDetail implements Serializable { private static final long serialVersionUID = 1L; - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } @@ -131,19 +131,19 @@ public class PurchaseDetail implements Serializable { this.updateTime = updateTime; } - public Long getPurchaseId() { + public String getPurchaseId() { return purchaseId; } - public void setPurchaseId(Long purchaseId) { + public void setPurchaseId(String purchaseId) { this.purchaseId = purchaseId; } - public Long getProductId() { + public String getProductId() { return productId; } - public void setProductId(Long productId) { + public void setProductId(String productId) { this.productId = productId; } @@ -171,11 +171,11 @@ public class PurchaseDetail implements Serializable { this.shopId = shopId; } - public Long getCategoryId() { + public String getCategoryId() { return categoryId; } - public void setCategoryId(Long categoryId) { + public void setCategoryId(String categoryId) { this.categoryId = categoryId; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseDetailExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseDetailExample.java index 22a55e97..f32daf5e 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseDetailExample.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseDetailExample.java @@ -116,52 +116,62 @@ public class PurchaseDetailExample { return (Criteria) this; } - public Criteria andIdEqualTo(Long value) { + public Criteria andIdEqualTo(String value) { addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andIdNotEqualTo(Long value) { + public Criteria andIdNotEqualTo(String value) { addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThan(Long value) { + public Criteria andIdGreaterThan(String value) { addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThanOrEqualTo(Long value) { + public Criteria andIdGreaterThanOrEqualTo(String value) { addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andIdLessThan(Long value) { + public Criteria andIdLessThan(String value) { addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andIdLessThanOrEqualTo(Long value) { + public Criteria andIdLessThanOrEqualTo(String value) { addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andIdIn(List values) { + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andIdNotIn(List values) { + public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andIdBetween(Long value1, Long value2) { + public Criteria andIdBetween(String value1, String value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andIdNotBetween(Long value1, Long value2) { + public Criteria andIdNotBetween(String value1, String value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } @@ -496,52 +506,62 @@ public class PurchaseDetailExample { return (Criteria) this; } - public Criteria andPurchaseIdEqualTo(Long value) { + public Criteria andPurchaseIdEqualTo(String value) { addCriterion("purchase_id =", value, "purchaseId"); return (Criteria) this; } - public Criteria andPurchaseIdNotEqualTo(Long value) { + public Criteria andPurchaseIdNotEqualTo(String value) { addCriterion("purchase_id <>", value, "purchaseId"); return (Criteria) this; } - public Criteria andPurchaseIdGreaterThan(Long value) { + public Criteria andPurchaseIdGreaterThan(String value) { addCriterion("purchase_id >", value, "purchaseId"); return (Criteria) this; } - public Criteria andPurchaseIdGreaterThanOrEqualTo(Long value) { + public Criteria andPurchaseIdGreaterThanOrEqualTo(String value) { addCriterion("purchase_id >=", value, "purchaseId"); return (Criteria) this; } - public Criteria andPurchaseIdLessThan(Long value) { + public Criteria andPurchaseIdLessThan(String value) { addCriterion("purchase_id <", value, "purchaseId"); return (Criteria) this; } - public Criteria andPurchaseIdLessThanOrEqualTo(Long value) { + public Criteria andPurchaseIdLessThanOrEqualTo(String value) { addCriterion("purchase_id <=", value, "purchaseId"); return (Criteria) this; } - public Criteria andPurchaseIdIn(List values) { + public Criteria andPurchaseIdLike(String value) { + addCriterion("purchase_id like", value, "purchaseId"); + return (Criteria) this; + } + + public Criteria andPurchaseIdNotLike(String value) { + addCriterion("purchase_id not like", value, "purchaseId"); + return (Criteria) this; + } + + public Criteria andPurchaseIdIn(List values) { addCriterion("purchase_id in", values, "purchaseId"); return (Criteria) this; } - public Criteria andPurchaseIdNotIn(List values) { + public Criteria andPurchaseIdNotIn(List values) { addCriterion("purchase_id not in", values, "purchaseId"); return (Criteria) this; } - public Criteria andPurchaseIdBetween(Long value1, Long value2) { + public Criteria andPurchaseIdBetween(String value1, String value2) { addCriterion("purchase_id between", value1, value2, "purchaseId"); return (Criteria) this; } - public Criteria andPurchaseIdNotBetween(Long value1, Long value2) { + public Criteria andPurchaseIdNotBetween(String value1, String value2) { addCriterion("purchase_id not between", value1, value2, "purchaseId"); return (Criteria) this; } @@ -556,52 +576,62 @@ public class PurchaseDetailExample { return (Criteria) this; } - public Criteria andProductIdEqualTo(Long value) { + public Criteria andProductIdEqualTo(String value) { addCriterion("product_id =", value, "productId"); return (Criteria) this; } - public Criteria andProductIdNotEqualTo(Long value) { + public Criteria andProductIdNotEqualTo(String value) { addCriterion("product_id <>", value, "productId"); return (Criteria) this; } - public Criteria andProductIdGreaterThan(Long value) { + public Criteria andProductIdGreaterThan(String value) { addCriterion("product_id >", value, "productId"); return (Criteria) this; } - public Criteria andProductIdGreaterThanOrEqualTo(Long value) { + public Criteria andProductIdGreaterThanOrEqualTo(String value) { addCriterion("product_id >=", value, "productId"); return (Criteria) this; } - public Criteria andProductIdLessThan(Long value) { + public Criteria andProductIdLessThan(String value) { addCriterion("product_id <", value, "productId"); return (Criteria) this; } - public Criteria andProductIdLessThanOrEqualTo(Long value) { + public Criteria andProductIdLessThanOrEqualTo(String value) { addCriterion("product_id <=", value, "productId"); return (Criteria) this; } - public Criteria andProductIdIn(List values) { + public Criteria andProductIdLike(String value) { + addCriterion("product_id like", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdNotLike(String value) { + addCriterion("product_id not like", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdIn(List values) { addCriterion("product_id in", values, "productId"); return (Criteria) this; } - public Criteria andProductIdNotIn(List values) { + public Criteria andProductIdNotIn(List values) { addCriterion("product_id not in", values, "productId"); return (Criteria) this; } - public Criteria andProductIdBetween(Long value1, Long value2) { + public Criteria andProductIdBetween(String value1, String value2) { addCriterion("product_id between", value1, value2, "productId"); return (Criteria) this; } - public Criteria andProductIdNotBetween(Long value1, Long value2) { + public Criteria andProductIdNotBetween(String value1, String value2) { addCriterion("product_id not between", value1, value2, "productId"); return (Criteria) this; } @@ -826,52 +856,62 @@ public class PurchaseDetailExample { return (Criteria) this; } - public Criteria andCategoryIdEqualTo(Long value) { + public Criteria andCategoryIdEqualTo(String value) { addCriterion("category_id =", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotEqualTo(Long value) { + public Criteria andCategoryIdNotEqualTo(String value) { addCriterion("category_id <>", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdGreaterThan(Long value) { + public Criteria andCategoryIdGreaterThan(String value) { addCriterion("category_id >", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdGreaterThanOrEqualTo(Long value) { + public Criteria andCategoryIdGreaterThanOrEqualTo(String value) { addCriterion("category_id >=", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdLessThan(Long value) { + public Criteria andCategoryIdLessThan(String value) { addCriterion("category_id <", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdLessThanOrEqualTo(Long value) { + public Criteria andCategoryIdLessThanOrEqualTo(String value) { addCriterion("category_id <=", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdIn(List values) { + public Criteria andCategoryIdLike(String value) { + addCriterion("category_id like", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdNotLike(String value) { + addCriterion("category_id not like", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdIn(List values) { addCriterion("category_id in", values, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotIn(List values) { + public Criteria andCategoryIdNotIn(List values) { addCriterion("category_id not in", values, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdBetween(Long value1, Long value2) { + public Criteria andCategoryIdBetween(String value1, String value2) { addCriterion("category_id between", value1, value2, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotBetween(Long value1, Long value2) { + public Criteria andCategoryIdNotBetween(String value1, String value2) { addCriterion("category_id not between", value1, value2, "categoryId"); return (Criteria) this; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseExample.java index 1e10fea7..57a75911 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseExample.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseExample.java @@ -116,52 +116,62 @@ public class PurchaseExample { return (Criteria) this; } - public Criteria andIdEqualTo(Long value) { + public Criteria andIdEqualTo(String value) { addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andIdNotEqualTo(Long value) { + public Criteria andIdNotEqualTo(String value) { addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThan(Long value) { + public Criteria andIdGreaterThan(String value) { addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThanOrEqualTo(Long value) { + public Criteria andIdGreaterThanOrEqualTo(String value) { addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andIdLessThan(Long value) { + public Criteria andIdLessThan(String value) { addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andIdLessThanOrEqualTo(Long value) { + public Criteria andIdLessThanOrEqualTo(String value) { addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andIdIn(List values) { + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andIdNotIn(List values) { + public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andIdBetween(Long value1, Long value2) { + public Criteria andIdBetween(String value1, String value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andIdNotBetween(Long value1, Long value2) { + public Criteria andIdNotBetween(String value1, String value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Sale.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Sale.java index f5b65f9a..0b72aeed 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Sale.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Sale.java @@ -1,18 +1,18 @@ package cc.hiver.mall.entity; +import cc.hiver.core.common.utils.SnowFlakeUtil; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.persistence.Table; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; + @ApiModel(value = "销售单主表") -@Table(name = "t_sale") @TableName(value = "t_sale", autoResultMap = true) public class Sale implements Serializable { - private Long id; + private String id = SnowFlakeUtil.nextId().toString(); private String createBy; @@ -25,7 +25,7 @@ public class Sale implements Serializable { private Date updateTime; @ApiModelProperty(value = "客户ID") - private Long userId; + private String userId; @ApiModelProperty(value = "店铺ID") private String shopId; @@ -74,11 +74,11 @@ public class Sale implements Serializable { private static final long serialVersionUID = 1L; - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } @@ -122,11 +122,11 @@ public class Sale implements Serializable { this.updateTime = updateTime; } - public Long getUserId() { + public String getUserId() { return userId; } - public void setUserId(Long userId) { + public void setUserId(String userId) { this.userId = userId; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetail.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetail.java index c0127282..4a7a4b21 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetail.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetail.java @@ -1,18 +1,18 @@ package cc.hiver.mall.entity; +import cc.hiver.core.common.utils.SnowFlakeUtil; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.persistence.Table; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; + @ApiModel(value = "销售单明细表") -@Table(name = "t_sale_detail") @TableName(value = "t_sale_detail", autoResultMap = true) public class SaleDetail implements Serializable { - private Long id; + private String id = SnowFlakeUtil.nextId().toString(); private String createBy; @@ -25,10 +25,10 @@ public class SaleDetail implements Serializable { private Date updateTime; @ApiModelProperty(value = "销售单ID") - private Long saleId; + private String saleId; @ApiModelProperty(value = "商品ID") - private Long productId; + private String productId; @ApiModelProperty(value = "商品名称") private String productName; @@ -40,7 +40,7 @@ public class SaleDetail implements Serializable { private String shopId; @ApiModelProperty(value = "商品分类") - private Long categoryId; + private String categoryId; @ApiModelProperty(value = "商品属性列表") private String attributeList; @@ -59,11 +59,11 @@ public class SaleDetail implements Serializable { private static final long serialVersionUID = 1L; - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } @@ -107,19 +107,19 @@ public class SaleDetail implements Serializable { this.updateTime = updateTime; } - public Long getSaleId() { + public String getSaleId() { return saleId; } - public void setSaleId(Long saleId) { + public void setSaleId(String saleId) { this.saleId = saleId; } - public Long getProductId() { + public String getProductId() { return productId; } - public void setProductId(Long productId) { + public void setProductId(String productId) { this.productId = productId; } @@ -147,11 +147,11 @@ public class SaleDetail implements Serializable { this.shopId = shopId; } - public Long getCategoryId() { + public String getCategoryId() { return categoryId; } - public void setCategoryId(Long categoryId) { + public void setCategoryId(String categoryId) { this.categoryId = categoryId; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetailExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetailExample.java index faa1b5a9..15f6d4bb 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetailExample.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetailExample.java @@ -116,52 +116,62 @@ public class SaleDetailExample { return (Criteria) this; } - public Criteria andIdEqualTo(Long value) { + public Criteria andIdEqualTo(String value) { addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andIdNotEqualTo(Long value) { + public Criteria andIdNotEqualTo(String value) { addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThan(Long value) { + public Criteria andIdGreaterThan(String value) { addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThanOrEqualTo(Long value) { + public Criteria andIdGreaterThanOrEqualTo(String value) { addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andIdLessThan(Long value) { + public Criteria andIdLessThan(String value) { addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andIdLessThanOrEqualTo(Long value) { + public Criteria andIdLessThanOrEqualTo(String value) { addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andIdIn(List values) { + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andIdNotIn(List values) { + public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andIdBetween(Long value1, Long value2) { + public Criteria andIdBetween(String value1, String value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andIdNotBetween(Long value1, Long value2) { + public Criteria andIdNotBetween(String value1, String value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } @@ -496,52 +506,62 @@ public class SaleDetailExample { return (Criteria) this; } - public Criteria andSaleIdEqualTo(Long value) { + public Criteria andSaleIdEqualTo(String value) { addCriterion("sale_id =", value, "saleId"); return (Criteria) this; } - public Criteria andSaleIdNotEqualTo(Long value) { + public Criteria andSaleIdNotEqualTo(String value) { addCriterion("sale_id <>", value, "saleId"); return (Criteria) this; } - public Criteria andSaleIdGreaterThan(Long value) { + public Criteria andSaleIdGreaterThan(String value) { addCriterion("sale_id >", value, "saleId"); return (Criteria) this; } - public Criteria andSaleIdGreaterThanOrEqualTo(Long value) { + public Criteria andSaleIdGreaterThanOrEqualTo(String value) { addCriterion("sale_id >=", value, "saleId"); return (Criteria) this; } - public Criteria andSaleIdLessThan(Long value) { + public Criteria andSaleIdLessThan(String value) { addCriterion("sale_id <", value, "saleId"); return (Criteria) this; } - public Criteria andSaleIdLessThanOrEqualTo(Long value) { + public Criteria andSaleIdLessThanOrEqualTo(String value) { addCriterion("sale_id <=", value, "saleId"); return (Criteria) this; } - public Criteria andSaleIdIn(List values) { + public Criteria andSaleIdLike(String value) { + addCriterion("sale_id like", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdNotLike(String value) { + addCriterion("sale_id not like", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdIn(List values) { addCriterion("sale_id in", values, "saleId"); return (Criteria) this; } - public Criteria andSaleIdNotIn(List values) { + public Criteria andSaleIdNotIn(List values) { addCriterion("sale_id not in", values, "saleId"); return (Criteria) this; } - public Criteria andSaleIdBetween(Long value1, Long value2) { + public Criteria andSaleIdBetween(String value1, String value2) { addCriterion("sale_id between", value1, value2, "saleId"); return (Criteria) this; } - public Criteria andSaleIdNotBetween(Long value1, Long value2) { + public Criteria andSaleIdNotBetween(String value1, String value2) { addCriterion("sale_id not between", value1, value2, "saleId"); return (Criteria) this; } @@ -556,52 +576,62 @@ public class SaleDetailExample { return (Criteria) this; } - public Criteria andProductIdEqualTo(Long value) { + public Criteria andProductIdEqualTo(String value) { addCriterion("product_id =", value, "productId"); return (Criteria) this; } - public Criteria andProductIdNotEqualTo(Long value) { + public Criteria andProductIdNotEqualTo(String value) { addCriterion("product_id <>", value, "productId"); return (Criteria) this; } - public Criteria andProductIdGreaterThan(Long value) { + public Criteria andProductIdGreaterThan(String value) { addCriterion("product_id >", value, "productId"); return (Criteria) this; } - public Criteria andProductIdGreaterThanOrEqualTo(Long value) { + public Criteria andProductIdGreaterThanOrEqualTo(String value) { addCriterion("product_id >=", value, "productId"); return (Criteria) this; } - public Criteria andProductIdLessThan(Long value) { + public Criteria andProductIdLessThan(String value) { addCriterion("product_id <", value, "productId"); return (Criteria) this; } - public Criteria andProductIdLessThanOrEqualTo(Long value) { + public Criteria andProductIdLessThanOrEqualTo(String value) { addCriterion("product_id <=", value, "productId"); return (Criteria) this; } - public Criteria andProductIdIn(List values) { + public Criteria andProductIdLike(String value) { + addCriterion("product_id like", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdNotLike(String value) { + addCriterion("product_id not like", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdIn(List values) { addCriterion("product_id in", values, "productId"); return (Criteria) this; } - public Criteria andProductIdNotIn(List values) { + public Criteria andProductIdNotIn(List values) { addCriterion("product_id not in", values, "productId"); return (Criteria) this; } - public Criteria andProductIdBetween(Long value1, Long value2) { + public Criteria andProductIdBetween(String value1, String value2) { addCriterion("product_id between", value1, value2, "productId"); return (Criteria) this; } - public Criteria andProductIdNotBetween(Long value1, Long value2) { + public Criteria andProductIdNotBetween(String value1, String value2) { addCriterion("product_id not between", value1, value2, "productId"); return (Criteria) this; } @@ -826,52 +856,62 @@ public class SaleDetailExample { return (Criteria) this; } - public Criteria andCategoryIdEqualTo(Long value) { + public Criteria andCategoryIdEqualTo(String value) { addCriterion("category_id =", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotEqualTo(Long value) { + public Criteria andCategoryIdNotEqualTo(String value) { addCriterion("category_id <>", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdGreaterThan(Long value) { + public Criteria andCategoryIdGreaterThan(String value) { addCriterion("category_id >", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdGreaterThanOrEqualTo(Long value) { + public Criteria andCategoryIdGreaterThanOrEqualTo(String value) { addCriterion("category_id >=", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdLessThan(Long value) { + public Criteria andCategoryIdLessThan(String value) { addCriterion("category_id <", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdLessThanOrEqualTo(Long value) { + public Criteria andCategoryIdLessThanOrEqualTo(String value) { addCriterion("category_id <=", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdIn(List values) { + public Criteria andCategoryIdLike(String value) { + addCriterion("category_id like", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdNotLike(String value) { + addCriterion("category_id not like", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdIn(List values) { addCriterion("category_id in", values, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotIn(List values) { + public Criteria andCategoryIdNotIn(List values) { addCriterion("category_id not in", values, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdBetween(Long value1, Long value2) { + public Criteria andCategoryIdBetween(String value1, String value2) { addCriterion("category_id between", value1, value2, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotBetween(Long value1, Long value2) { + public Criteria andCategoryIdNotBetween(String value1, String value2) { addCriterion("category_id not between", value1, value2, "categoryId"); return (Criteria) this; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleExample.java index 0abdc556..e6a1185a 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleExample.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleExample.java @@ -116,52 +116,62 @@ public class SaleExample { return (Criteria) this; } - public Criteria andIdEqualTo(Long value) { + public Criteria andIdEqualTo(String value) { addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andIdNotEqualTo(Long value) { + public Criteria andIdNotEqualTo(String value) { addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThan(Long value) { + public Criteria andIdGreaterThan(String value) { addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThanOrEqualTo(Long value) { + public Criteria andIdGreaterThanOrEqualTo(String value) { addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andIdLessThan(Long value) { + public Criteria andIdLessThan(String value) { addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andIdLessThanOrEqualTo(Long value) { + public Criteria andIdLessThanOrEqualTo(String value) { addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andIdIn(List values) { + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andIdNotIn(List values) { + public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andIdBetween(Long value1, Long value2) { + public Criteria andIdBetween(String value1, String value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andIdNotBetween(Long value1, Long value2) { + public Criteria andIdNotBetween(String value1, String value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } @@ -496,52 +506,62 @@ public class SaleExample { return (Criteria) this; } - public Criteria andUserIdEqualTo(Long value) { + public Criteria andUserIdEqualTo(String value) { addCriterion("user_id =", value, "userId"); return (Criteria) this; } - public Criteria andUserIdNotEqualTo(Long value) { + public Criteria andUserIdNotEqualTo(String value) { addCriterion("user_id <>", value, "userId"); return (Criteria) this; } - public Criteria andUserIdGreaterThan(Long value) { + public Criteria andUserIdGreaterThan(String value) { addCriterion("user_id >", value, "userId"); return (Criteria) this; } - public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + public Criteria andUserIdGreaterThanOrEqualTo(String value) { addCriterion("user_id >=", value, "userId"); return (Criteria) this; } - public Criteria andUserIdLessThan(Long value) { + public Criteria andUserIdLessThan(String value) { addCriterion("user_id <", value, "userId"); return (Criteria) this; } - public Criteria andUserIdLessThanOrEqualTo(Long value) { + public Criteria andUserIdLessThanOrEqualTo(String value) { addCriterion("user_id <=", value, "userId"); return (Criteria) this; } - public Criteria andUserIdIn(List values) { + public Criteria andUserIdLike(String value) { + addCriterion("user_id like", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotLike(String value) { + addCriterion("user_id not like", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { addCriterion("user_id in", values, "userId"); return (Criteria) this; } - public Criteria andUserIdNotIn(List values) { + public Criteria andUserIdNotIn(List values) { addCriterion("user_id not in", values, "userId"); return (Criteria) this; } - public Criteria andUserIdBetween(Long value1, Long value2) { + public Criteria andUserIdBetween(String value1, String value2) { addCriterion("user_id between", value1, value2, "userId"); return (Criteria) this; } - public Criteria andUserIdNotBetween(Long value1, Long value2) { + public Criteria andUserIdNotBetween(String value1, String value2) { addCriterion("user_id not between", value1, value2, "userId"); return (Criteria) this; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Stock.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Stock.java index 2e34e751..21f51e49 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Stock.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Stock.java @@ -1,18 +1,18 @@ package cc.hiver.mall.entity; +import cc.hiver.core.common.utils.SnowFlakeUtil; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.persistence.Table; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -@ApiModel(value = "商品实时库存表") -@Table(name = "t_stock") + +@ApiModel(value = "商品库存表") @TableName(value = "t_stock", autoResultMap = true) public class Stock implements Serializable { - private Long id; + private String id = SnowFlakeUtil.nextId().toString(); private String createBy; @@ -25,7 +25,7 @@ public class Stock implements Serializable { private Date updateTime; @ApiModelProperty(value = "商品id") - private Long productId; + private String productId; @ApiModelProperty(value = "商品名称") private String productName; @@ -37,7 +37,7 @@ public class Stock implements Serializable { private String shopId; @ApiModelProperty(value = "商品分类") - private Long categoryId; + private String categoryId; @ApiModelProperty(value = "商品属性列表") private String attributeList; @@ -80,11 +80,11 @@ public class Stock implements Serializable { private static final long serialVersionUID = 1L; - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } @@ -128,11 +128,11 @@ public class Stock implements Serializable { this.updateTime = updateTime; } - public Long getProductId() { + public String getProductId() { return productId; } - public void setProductId(Long productId) { + public void setProductId(String productId) { this.productId = productId; } @@ -160,11 +160,11 @@ public class Stock implements Serializable { this.shopId = shopId; } - public Long getCategoryId() { + public String getCategoryId() { return categoryId; } - public void setCategoryId(Long categoryId) { + public void setCategoryId(String categoryId) { this.categoryId = categoryId; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/StockExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/StockExample.java index f0099eb7..f3734323 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/StockExample.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/StockExample.java @@ -116,52 +116,62 @@ public class StockExample { return (Criteria) this; } - public Criteria andIdEqualTo(Long value) { + public Criteria andIdEqualTo(String value) { addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andIdNotEqualTo(Long value) { + public Criteria andIdNotEqualTo(String value) { addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThan(Long value) { + public Criteria andIdGreaterThan(String value) { addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThanOrEqualTo(Long value) { + public Criteria andIdGreaterThanOrEqualTo(String value) { addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andIdLessThan(Long value) { + public Criteria andIdLessThan(String value) { addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andIdLessThanOrEqualTo(Long value) { + public Criteria andIdLessThanOrEqualTo(String value) { addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andIdIn(List values) { + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andIdNotIn(List values) { + public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andIdBetween(Long value1, Long value2) { + public Criteria andIdBetween(String value1, String value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andIdNotBetween(Long value1, Long value2) { + public Criteria andIdNotBetween(String value1, String value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } @@ -496,52 +506,62 @@ public class StockExample { return (Criteria) this; } - public Criteria andProductIdEqualTo(Long value) { + public Criteria andProductIdEqualTo(String value) { addCriterion("product_id =", value, "productId"); return (Criteria) this; } - public Criteria andProductIdNotEqualTo(Long value) { + public Criteria andProductIdNotEqualTo(String value) { addCriterion("product_id <>", value, "productId"); return (Criteria) this; } - public Criteria andProductIdGreaterThan(Long value) { + public Criteria andProductIdGreaterThan(String value) { addCriterion("product_id >", value, "productId"); return (Criteria) this; } - public Criteria andProductIdGreaterThanOrEqualTo(Long value) { + public Criteria andProductIdGreaterThanOrEqualTo(String value) { addCriterion("product_id >=", value, "productId"); return (Criteria) this; } - public Criteria andProductIdLessThan(Long value) { + public Criteria andProductIdLessThan(String value) { addCriterion("product_id <", value, "productId"); return (Criteria) this; } - public Criteria andProductIdLessThanOrEqualTo(Long value) { + public Criteria andProductIdLessThanOrEqualTo(String value) { addCriterion("product_id <=", value, "productId"); return (Criteria) this; } - public Criteria andProductIdIn(List values) { + public Criteria andProductIdLike(String value) { + addCriterion("product_id like", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdNotLike(String value) { + addCriterion("product_id not like", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdIn(List values) { addCriterion("product_id in", values, "productId"); return (Criteria) this; } - public Criteria andProductIdNotIn(List values) { + public Criteria andProductIdNotIn(List values) { addCriterion("product_id not in", values, "productId"); return (Criteria) this; } - public Criteria andProductIdBetween(Long value1, Long value2) { + public Criteria andProductIdBetween(String value1, String value2) { addCriterion("product_id between", value1, value2, "productId"); return (Criteria) this; } - public Criteria andProductIdNotBetween(Long value1, Long value2) { + public Criteria andProductIdNotBetween(String value1, String value2) { addCriterion("product_id not between", value1, value2, "productId"); return (Criteria) this; } @@ -766,52 +786,62 @@ public class StockExample { return (Criteria) this; } - public Criteria andCategoryIdEqualTo(Long value) { + public Criteria andCategoryIdEqualTo(String value) { addCriterion("category_id =", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotEqualTo(Long value) { + public Criteria andCategoryIdNotEqualTo(String value) { addCriterion("category_id <>", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdGreaterThan(Long value) { + public Criteria andCategoryIdGreaterThan(String value) { addCriterion("category_id >", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdGreaterThanOrEqualTo(Long value) { + public Criteria andCategoryIdGreaterThanOrEqualTo(String value) { addCriterion("category_id >=", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdLessThan(Long value) { + public Criteria andCategoryIdLessThan(String value) { addCriterion("category_id <", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdLessThanOrEqualTo(Long value) { + public Criteria andCategoryIdLessThanOrEqualTo(String value) { addCriterion("category_id <=", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdIn(List values) { + public Criteria andCategoryIdLike(String value) { + addCriterion("category_id like", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdNotLike(String value) { + addCriterion("category_id not like", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdIn(List values) { addCriterion("category_id in", values, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotIn(List values) { + public Criteria andCategoryIdNotIn(List values) { addCriterion("category_id not in", values, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdBetween(Long value1, Long value2) { + public Criteria andCategoryIdBetween(String value1, String value2) { addCriterion("category_id between", value1, value2, "categoryId"); return (Criteria) this; } - public Criteria andCategoryIdNotBetween(Long value1, Long value2) { + public Criteria andCategoryIdNotBetween(String value1, String value2) { addCriterion("category_id not between", value1, value2, "categoryId"); return (Criteria) this; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/StockLog.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/StockLog.java index 28d72b12..f4036f61 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/StockLog.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/StockLog.java @@ -1,18 +1,18 @@ package cc.hiver.mall.entity; +import cc.hiver.core.common.utils.SnowFlakeUtil; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.persistence.Table; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -@ApiModel(value = "商品库存履历表") -@Table(name = "t_stock_log") + +@ApiModel(value = "库存履历") @TableName(value = "t_stock_log", autoResultMap = true) public class StockLog implements Serializable { - private Long id; + private String id = SnowFlakeUtil.nextId().toString(); private String createBy; @@ -25,7 +25,7 @@ public class StockLog implements Serializable { private Date updateTime; @ApiModelProperty(value = "商品ID") - private Long productId; + private String productId; @ApiModelProperty(value = "商品规格") private String productSpecs; @@ -53,11 +53,11 @@ public class StockLog implements Serializable { private static final long serialVersionUID = 1L; - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } @@ -101,11 +101,11 @@ public class StockLog implements Serializable { this.updateTime = updateTime; } - public Long getProductId() { + public String getProductId() { return productId; } - public void setProductId(Long productId) { + public void setProductId(String productId) { this.productId = productId; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/StockLogExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/StockLogExample.java index c9beb1af..680931be 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/StockLogExample.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/StockLogExample.java @@ -116,52 +116,62 @@ public class StockLogExample { return (Criteria) this; } - public Criteria andIdEqualTo(Long value) { + public Criteria andIdEqualTo(String value) { addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andIdNotEqualTo(Long value) { + public Criteria andIdNotEqualTo(String value) { addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThan(Long value) { + public Criteria andIdGreaterThan(String value) { addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThanOrEqualTo(Long value) { + public Criteria andIdGreaterThanOrEqualTo(String value) { addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andIdLessThan(Long value) { + public Criteria andIdLessThan(String value) { addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andIdLessThanOrEqualTo(Long value) { + public Criteria andIdLessThanOrEqualTo(String value) { addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andIdIn(List values) { + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andIdNotIn(List values) { + public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andIdBetween(Long value1, Long value2) { + public Criteria andIdBetween(String value1, String value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andIdNotBetween(Long value1, Long value2) { + public Criteria andIdNotBetween(String value1, String value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } @@ -496,52 +506,62 @@ public class StockLogExample { return (Criteria) this; } - public Criteria andProductIdEqualTo(Long value) { + public Criteria andProductIdEqualTo(String value) { addCriterion("product_id =", value, "productId"); return (Criteria) this; } - public Criteria andProductIdNotEqualTo(Long value) { + public Criteria andProductIdNotEqualTo(String value) { addCriterion("product_id <>", value, "productId"); return (Criteria) this; } - public Criteria andProductIdGreaterThan(Long value) { + public Criteria andProductIdGreaterThan(String value) { addCriterion("product_id >", value, "productId"); return (Criteria) this; } - public Criteria andProductIdGreaterThanOrEqualTo(Long value) { + public Criteria andProductIdGreaterThanOrEqualTo(String value) { addCriterion("product_id >=", value, "productId"); return (Criteria) this; } - public Criteria andProductIdLessThan(Long value) { + public Criteria andProductIdLessThan(String value) { addCriterion("product_id <", value, "productId"); return (Criteria) this; } - public Criteria andProductIdLessThanOrEqualTo(Long value) { + public Criteria andProductIdLessThanOrEqualTo(String value) { addCriterion("product_id <=", value, "productId"); return (Criteria) this; } - public Criteria andProductIdIn(List values) { + public Criteria andProductIdLike(String value) { + addCriterion("product_id like", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdNotLike(String value) { + addCriterion("product_id not like", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdIn(List values) { addCriterion("product_id in", values, "productId"); return (Criteria) this; } - public Criteria andProductIdNotIn(List values) { + public Criteria andProductIdNotIn(List values) { addCriterion("product_id not in", values, "productId"); return (Criteria) this; } - public Criteria andProductIdBetween(Long value1, Long value2) { + public Criteria andProductIdBetween(String value1, String value2) { addCriterion("product_id between", value1, value2, "productId"); return (Criteria) this; } - public Criteria andProductIdNotBetween(Long value1, Long value2) { + public Criteria andProductIdNotBetween(String value1, String value2) { addCriterion("product_id not between", value1, value2, "productId"); return (Criteria) this; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/StockServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/StockServiceImpl.java index a9278d4f..dedbfff6 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/StockServiceImpl.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/StockServiceImpl.java @@ -42,7 +42,7 @@ public class StockServiceImpl extends ServiceImpl implements Purchase purchase = purchaseVo.getPurchase(); List purchaseDetailList = purchaseVo.getPurchaseDetails(); for (PurchaseDetail purchaseDetail:purchaseDetailList){ - Long productId = purchaseDetail.getProductId(); + String productId = purchaseDetail.getProductId(); String attributeList = purchaseDetail.getAttributeList(); QueryWrapper stockQueryWrapper = new QueryWrapper<>(); stockQueryWrapper.eq("product_id",productId); diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/CustomerMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/CustomerMapper.xml new file mode 100644 index 00000000..f4194ae0 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/CustomerMapper.xml @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, create_by, create_time, del_flag, update_by, update_time, name, phone, address, + password, province, city, area + + + + + delete from t_customer + where id = #{id,jdbcType=VARCHAR} + + + delete from t_customer + + + + + + insert into t_customer (id, create_by, create_time, + del_flag, update_by, update_time, + name, phone, address, + password, province, city, + area) + values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, + #{name,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, + #{password,jdbcType=VARCHAR}, #{province,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, + #{area,jdbcType=VARCHAR}) + + + insert into t_customer + + + id, + + + create_by, + + + create_time, + + + del_flag, + + + update_by, + + + update_time, + + + name, + + + phone, + + + address, + + + password, + + + province, + + + city, + + + area, + + + + + #{id,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{delFlag,jdbcType=INTEGER}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{name,jdbcType=VARCHAR}, + + + #{phone,jdbcType=VARCHAR}, + + + #{address,jdbcType=VARCHAR}, + + + #{password,jdbcType=VARCHAR}, + + + #{province,jdbcType=VARCHAR}, + + + #{city,jdbcType=VARCHAR}, + + + #{area,jdbcType=VARCHAR}, + + + + + + update t_customer + + + id = #{record.id,jdbcType=VARCHAR}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + del_flag = #{record.delFlag,jdbcType=INTEGER}, + + + update_by = #{record.updateBy,jdbcType=VARCHAR}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + phone = #{record.phone,jdbcType=VARCHAR}, + + + address = #{record.address,jdbcType=VARCHAR}, + + + password = #{record.password,jdbcType=VARCHAR}, + + + province = #{record.province,jdbcType=VARCHAR}, + + + city = #{record.city,jdbcType=VARCHAR}, + + + area = #{record.area,jdbcType=VARCHAR}, + + + + + + + + update t_customer + set id = #{record.id,jdbcType=VARCHAR}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + del_flag = #{record.delFlag,jdbcType=INTEGER}, + update_by = #{record.updateBy,jdbcType=VARCHAR}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + name = #{record.name,jdbcType=VARCHAR}, + phone = #{record.phone,jdbcType=VARCHAR}, + address = #{record.address,jdbcType=VARCHAR}, + password = #{record.password,jdbcType=VARCHAR}, + province = #{record.province,jdbcType=VARCHAR}, + city = #{record.city,jdbcType=VARCHAR}, + area = #{record.area,jdbcType=VARCHAR} + + + + + + update t_customer + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + del_flag = #{delFlag,jdbcType=INTEGER}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + name = #{name,jdbcType=VARCHAR}, + + + phone = #{phone,jdbcType=VARCHAR}, + + + address = #{address,jdbcType=VARCHAR}, + + + password = #{password,jdbcType=VARCHAR}, + + + province = #{province,jdbcType=VARCHAR}, + + + city = #{city,jdbcType=VARCHAR}, + + + area = #{area,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=VARCHAR} + + + update t_customer + set create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + del_flag = #{delFlag,jdbcType=INTEGER}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + name = #{name,jdbcType=VARCHAR}, + phone = #{phone,jdbcType=VARCHAR}, + address = #{address,jdbcType=VARCHAR}, + password = #{password,jdbcType=VARCHAR}, + province = #{province,jdbcType=VARCHAR}, + city = #{city,jdbcType=VARCHAR}, + area = #{area,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductAttributeMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductAttributeMapper.xml index aabd9de7..e8f5aedd 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductAttributeMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductAttributeMapper.xml @@ -2,13 +2,13 @@ - + - + @@ -86,15 +86,15 @@ order by ${orderByClause} - select from t_product_attribute - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} - + delete from t_product_attribute - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} delete from t_product_attribute @@ -106,9 +106,9 @@ insert into t_product_attribute (id, create_by, create_time, del_flag, update_by, update_time, category_id, attribute_name) - values (#{id,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, - #{categoryId,jdbcType=BIGINT}, #{attributeName,jdbcType=VARCHAR}) + #{categoryId,jdbcType=VARCHAR}, #{attributeName,jdbcType=VARCHAR}) insert into t_product_attribute @@ -140,7 +140,7 @@ - #{id,jdbcType=BIGINT}, + #{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, @@ -158,7 +158,7 @@ #{updateTime,jdbcType=TIMESTAMP}, - #{categoryId,jdbcType=BIGINT}, + #{categoryId,jdbcType=VARCHAR}, #{attributeName,jdbcType=VARCHAR}, @@ -175,7 +175,7 @@ update t_product_attribute - id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, @@ -193,7 +193,7 @@ update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - category_id = #{record.categoryId,jdbcType=BIGINT}, + category_id = #{record.categoryId,jdbcType=VARCHAR}, attribute_name = #{record.attributeName,jdbcType=VARCHAR}, @@ -205,13 +205,13 @@ update t_product_attribute - set id = #{record.id,jdbcType=BIGINT}, + set id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, del_flag = #{record.delFlag,jdbcType=INTEGER}, update_by = #{record.updateBy,jdbcType=VARCHAR}, update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - category_id = #{record.categoryId,jdbcType=BIGINT}, + category_id = #{record.categoryId,jdbcType=VARCHAR}, attribute_name = #{record.attributeName,jdbcType=VARCHAR} @@ -236,13 +236,13 @@ update_time = #{updateTime,jdbcType=TIMESTAMP}, - category_id = #{categoryId,jdbcType=BIGINT}, + category_id = #{categoryId,jdbcType=VARCHAR}, attribute_name = #{attributeName,jdbcType=VARCHAR}, - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} update t_product_attribute @@ -251,8 +251,8 @@ del_flag = #{delFlag,jdbcType=INTEGER}, update_by = #{updateBy,jdbcType=VARCHAR}, update_time = #{updateTime,jdbcType=TIMESTAMP}, - category_id = #{categoryId,jdbcType=BIGINT}, + category_id = #{categoryId,jdbcType=VARCHAR}, attribute_name = #{attributeName,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductAttributeValueMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductAttributeValueMapper.xml index 8d8461e8..8f6eb287 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductAttributeValueMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductAttributeValueMapper.xml @@ -2,13 +2,13 @@ - + - + @@ -86,15 +86,15 @@ order by ${orderByClause} - select from t_product_attribute_value - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} - + delete from t_product_attribute_value - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} delete from t_product_attribute_value @@ -106,9 +106,9 @@ insert into t_product_attribute_value (id, create_by, create_time, del_flag, update_by, update_time, attribute_id, value) - values (#{id,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, - #{attributeId,jdbcType=BIGINT}, #{value,jdbcType=VARCHAR}) + #{attributeId,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR}) insert into t_product_attribute_value @@ -140,7 +140,7 @@ - #{id,jdbcType=BIGINT}, + #{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, @@ -158,7 +158,7 @@ #{updateTime,jdbcType=TIMESTAMP}, - #{attributeId,jdbcType=BIGINT}, + #{attributeId,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR}, @@ -175,7 +175,7 @@ update t_product_attribute_value - id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, @@ -193,7 +193,7 @@ update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - attribute_id = #{record.attributeId,jdbcType=BIGINT}, + attribute_id = #{record.attributeId,jdbcType=VARCHAR}, value = #{record.value,jdbcType=VARCHAR}, @@ -205,13 +205,13 @@ update t_product_attribute_value - set id = #{record.id,jdbcType=BIGINT}, + set id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, del_flag = #{record.delFlag,jdbcType=INTEGER}, update_by = #{record.updateBy,jdbcType=VARCHAR}, update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - attribute_id = #{record.attributeId,jdbcType=BIGINT}, + attribute_id = #{record.attributeId,jdbcType=VARCHAR}, value = #{record.value,jdbcType=VARCHAR} @@ -236,13 +236,13 @@ update_time = #{updateTime,jdbcType=TIMESTAMP}, - attribute_id = #{attributeId,jdbcType=BIGINT}, + attribute_id = #{attributeId,jdbcType=VARCHAR}, value = #{value,jdbcType=VARCHAR}, - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} update t_product_attribute_value @@ -251,8 +251,8 @@ del_flag = #{delFlag,jdbcType=INTEGER}, update_by = #{updateBy,jdbcType=VARCHAR}, update_time = #{updateTime,jdbcType=TIMESTAMP}, - attribute_id = #{attributeId,jdbcType=BIGINT}, + attribute_id = #{attributeId,jdbcType=VARCHAR}, value = #{value,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductCategoryMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductCategoryMapper.xml index 91beb420..ba838861 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductCategoryMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductCategoryMapper.xml @@ -2,14 +2,14 @@ - + - + @@ -86,15 +86,15 @@ order by ${orderByClause} - select from t_product_category - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} - + delete from t_product_category - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} delete from t_product_category @@ -106,9 +106,9 @@ insert into t_product_category (id, create_by, create_time, del_flag, update_by, update_time, category_name, parent_id) - values (#{id,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, - #{categoryName,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}) + #{categoryName,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}) insert into t_product_category @@ -140,7 +140,7 @@ - #{id,jdbcType=BIGINT}, + #{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, @@ -161,7 +161,7 @@ #{categoryName,jdbcType=VARCHAR}, - #{parentId,jdbcType=BIGINT}, + #{parentId,jdbcType=VARCHAR}, @@ -175,7 +175,7 @@ update t_product_category - id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, @@ -196,7 +196,7 @@ category_name = #{record.categoryName,jdbcType=VARCHAR}, - parent_id = #{record.parentId,jdbcType=BIGINT}, + parent_id = #{record.parentId,jdbcType=VARCHAR}, @@ -205,14 +205,14 @@ update t_product_category - set id = #{record.id,jdbcType=BIGINT}, + set id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, del_flag = #{record.delFlag,jdbcType=INTEGER}, update_by = #{record.updateBy,jdbcType=VARCHAR}, update_time = #{record.updateTime,jdbcType=TIMESTAMP}, category_name = #{record.categoryName,jdbcType=VARCHAR}, - parent_id = #{record.parentId,jdbcType=BIGINT} + parent_id = #{record.parentId,jdbcType=VARCHAR} @@ -239,10 +239,10 @@ category_name = #{categoryName,jdbcType=VARCHAR}, - parent_id = #{parentId,jdbcType=BIGINT}, + parent_id = #{parentId,jdbcType=VARCHAR}, - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} update t_product_category @@ -252,7 +252,7 @@ update_by = #{updateBy,jdbcType=VARCHAR}, update_time = #{updateTime,jdbcType=TIMESTAMP}, category_name = #{categoryName,jdbcType=VARCHAR}, - parent_id = #{parentId,jdbcType=BIGINT} - where id = #{id,jdbcType=BIGINT} + parent_id = #{parentId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml index 35476763..9dd57f6a 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ - + @@ -102,15 +102,15 @@ order by ${orderByClause} - select from t_product - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} - + delete from t_product - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} delete from t_product @@ -127,10 +127,10 @@ purchase_price, wholesale_price, product_picture, product_video, product_intro, sales_week, print_barcode) - values (#{id,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{productName,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, - #{categoryId,jdbcType=BIGINT}, #{attributeList,jdbcType=VARCHAR}, #{supplierId,jdbcType=VARCHAR}, + #{categoryId,jdbcType=VARCHAR}, #{attributeList,jdbcType=VARCHAR}, #{supplierId,jdbcType=VARCHAR}, #{productSn,jdbcType=VARCHAR}, #{barcode,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{purchasePrice,jdbcType=DECIMAL}, #{wholesalePrice,jdbcType=DECIMAL}, #{productPicture,jdbcType=VARCHAR}, #{productVideo,jdbcType=VARCHAR}, #{productIntro,jdbcType=VARCHAR}, #{salesWeek,jdbcType=VARCHAR}, @@ -208,7 +208,7 @@ - #{id,jdbcType=BIGINT}, + #{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, @@ -235,7 +235,7 @@ #{shopId,jdbcType=VARCHAR}, - #{categoryId,jdbcType=BIGINT}, + #{categoryId,jdbcType=VARCHAR}, #{attributeList,jdbcType=VARCHAR}, @@ -285,7 +285,7 @@ update t_product - id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, @@ -312,7 +312,7 @@ shop_id = #{record.shopId,jdbcType=VARCHAR}, - category_id = #{record.categoryId,jdbcType=BIGINT}, + category_id = #{record.categoryId,jdbcType=VARCHAR}, attribute_list = #{record.attributeList,jdbcType=VARCHAR}, @@ -357,7 +357,7 @@ update t_product - set id = #{record.id,jdbcType=BIGINT}, + set id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, del_flag = #{record.delFlag,jdbcType=INTEGER}, @@ -366,7 +366,7 @@ product_name = #{record.productName,jdbcType=VARCHAR}, unit = #{record.unit,jdbcType=VARCHAR}, shop_id = #{record.shopId,jdbcType=VARCHAR}, - category_id = #{record.categoryId,jdbcType=BIGINT}, + category_id = #{record.categoryId,jdbcType=VARCHAR}, attribute_list = #{record.attributeList,jdbcType=VARCHAR}, supplier_id = #{record.supplierId,jdbcType=VARCHAR}, product_sn = #{record.productSn,jdbcType=VARCHAR}, @@ -411,7 +411,7 @@ shop_id = #{shopId,jdbcType=VARCHAR}, - category_id = #{categoryId,jdbcType=BIGINT}, + category_id = #{categoryId,jdbcType=VARCHAR}, attribute_list = #{attributeList,jdbcType=VARCHAR}, @@ -450,7 +450,7 @@ print_barcode = #{printBarcode,jdbcType=VARCHAR}, - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} update t_product @@ -462,7 +462,7 @@ product_name = #{productName,jdbcType=VARCHAR}, unit = #{unit,jdbcType=VARCHAR}, shop_id = #{shopId,jdbcType=VARCHAR}, - category_id = #{categoryId,jdbcType=BIGINT}, + category_id = #{categoryId,jdbcType=VARCHAR}, attribute_list = #{attributeList,jdbcType=VARCHAR}, supplier_id = #{supplierId,jdbcType=VARCHAR}, product_sn = #{productSn,jdbcType=VARCHAR}, @@ -475,6 +475,6 @@ product_intro = #{productIntro,jdbcType=VARCHAR}, sales_week = #{salesWeek,jdbcType=VARCHAR}, print_barcode = #{printBarcode,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseDetailMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseDetailMapper.xml index 147e2a19..7b4e5f19 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseDetailMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseDetailMapper.xml @@ -2,18 +2,18 @@ - + - - + + - + @@ -106,15 +106,15 @@ order by ${orderByClause} - select from t_purchase_detail - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} - + delete from t_purchase_detail - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} delete from t_purchase_detail @@ -132,10 +132,10 @@ wholesale_price, product_picture, product_video, product_intro, sales_week, print_barcode, product_count) - values (#{id,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, - #{purchaseId,jdbcType=BIGINT}, #{productId,jdbcType=BIGINT}, #{productName,jdbcType=VARCHAR}, - #{unit,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, #{categoryId,jdbcType=BIGINT}, + #{purchaseId,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, + #{unit,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR}, #{attributeList,jdbcType=VARCHAR}, #{supplierId,jdbcType=VARCHAR}, #{productSn,jdbcType=VARCHAR}, #{barcode,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{purchasePrice,jdbcType=DECIMAL}, #{wholesalePrice,jdbcType=DECIMAL}, #{productPicture,jdbcType=VARCHAR}, #{productVideo,jdbcType=VARCHAR}, @@ -223,7 +223,7 @@ - #{id,jdbcType=BIGINT}, + #{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, @@ -241,10 +241,10 @@ #{updateTime,jdbcType=TIMESTAMP}, - #{purchaseId,jdbcType=BIGINT}, + #{purchaseId,jdbcType=VARCHAR}, - #{productId,jdbcType=BIGINT}, + #{productId,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, @@ -256,7 +256,7 @@ #{shopId,jdbcType=VARCHAR}, - #{categoryId,jdbcType=BIGINT}, + #{categoryId,jdbcType=VARCHAR}, #{attributeList,jdbcType=VARCHAR}, @@ -309,7 +309,7 @@ update t_purchase_detail - id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, @@ -327,10 +327,10 @@ update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - purchase_id = #{record.purchaseId,jdbcType=BIGINT}, + purchase_id = #{record.purchaseId,jdbcType=VARCHAR}, - product_id = #{record.productId,jdbcType=BIGINT}, + product_id = #{record.productId,jdbcType=VARCHAR}, product_name = #{record.productName,jdbcType=VARCHAR}, @@ -342,7 +342,7 @@ shop_id = #{record.shopId,jdbcType=VARCHAR}, - category_id = #{record.categoryId,jdbcType=BIGINT}, + category_id = #{record.categoryId,jdbcType=VARCHAR}, attribute_list = #{record.attributeList,jdbcType=VARCHAR}, @@ -390,18 +390,18 @@ update t_purchase_detail - set id = #{record.id,jdbcType=BIGINT}, + set id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, del_flag = #{record.delFlag,jdbcType=INTEGER}, update_by = #{record.updateBy,jdbcType=VARCHAR}, update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - purchase_id = #{record.purchaseId,jdbcType=BIGINT}, - product_id = #{record.productId,jdbcType=BIGINT}, + purchase_id = #{record.purchaseId,jdbcType=VARCHAR}, + product_id = #{record.productId,jdbcType=VARCHAR}, product_name = #{record.productName,jdbcType=VARCHAR}, unit = #{record.unit,jdbcType=VARCHAR}, shop_id = #{record.shopId,jdbcType=VARCHAR}, - category_id = #{record.categoryId,jdbcType=BIGINT}, + category_id = #{record.categoryId,jdbcType=VARCHAR}, attribute_list = #{record.attributeList,jdbcType=VARCHAR}, supplier_id = #{record.supplierId,jdbcType=VARCHAR}, product_sn = #{record.productSn,jdbcType=VARCHAR}, @@ -438,10 +438,10 @@ update_time = #{updateTime,jdbcType=TIMESTAMP}, - purchase_id = #{purchaseId,jdbcType=BIGINT}, + purchase_id = #{purchaseId,jdbcType=VARCHAR}, - product_id = #{productId,jdbcType=BIGINT}, + product_id = #{productId,jdbcType=VARCHAR}, product_name = #{productName,jdbcType=VARCHAR}, @@ -453,7 +453,7 @@ shop_id = #{shopId,jdbcType=VARCHAR}, - category_id = #{categoryId,jdbcType=BIGINT}, + category_id = #{categoryId,jdbcType=VARCHAR}, attribute_list = #{attributeList,jdbcType=VARCHAR}, @@ -495,7 +495,7 @@ product_count = #{productCount,jdbcType=INTEGER}, - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} update t_purchase_detail @@ -504,12 +504,12 @@ del_flag = #{delFlag,jdbcType=INTEGER}, update_by = #{updateBy,jdbcType=VARCHAR}, update_time = #{updateTime,jdbcType=TIMESTAMP}, - purchase_id = #{purchaseId,jdbcType=BIGINT}, - product_id = #{productId,jdbcType=BIGINT}, + purchase_id = #{purchaseId,jdbcType=VARCHAR}, + product_id = #{productId,jdbcType=VARCHAR}, product_name = #{productName,jdbcType=VARCHAR}, unit = #{unit,jdbcType=VARCHAR}, shop_id = #{shopId,jdbcType=VARCHAR}, - category_id = #{categoryId,jdbcType=BIGINT}, + category_id = #{categoryId,jdbcType=VARCHAR}, attribute_list = #{attributeList,jdbcType=VARCHAR}, supplier_id = #{supplierId,jdbcType=VARCHAR}, product_sn = #{productSn,jdbcType=VARCHAR}, @@ -523,6 +523,6 @@ sales_week = #{salesWeek,jdbcType=VARCHAR}, print_barcode = #{printBarcode,jdbcType=VARCHAR}, product_count = #{productCount,jdbcType=INTEGER} - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseMapper.xml index edd2bfc9..dc3d1f63 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseMapper.xml @@ -2,7 +2,7 @@ - + @@ -91,15 +91,15 @@ order by ${orderByClause} - select from t_purchase - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} - + delete from t_purchase - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} delete from t_purchase @@ -113,7 +113,7 @@ supplier_id, shop_id, total_amount, should_pay, already_pay, no_pay ) - values (#{id,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{supplierId,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, #{shouldPay,jdbcType=DECIMAL}, #{alreadyPay,jdbcType=DECIMAL}, #{noPay,jdbcType=DECIMAL} @@ -161,7 +161,7 @@ - #{id,jdbcType=BIGINT}, + #{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, @@ -208,7 +208,7 @@ update t_purchase - id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, @@ -250,7 +250,7 @@ update t_purchase - set id = #{record.id,jdbcType=BIGINT}, + set id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, del_flag = #{record.delFlag,jdbcType=INTEGER}, @@ -303,7 +303,7 @@ no_pay = #{noPay,jdbcType=DECIMAL}, - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} update t_purchase @@ -318,6 +318,6 @@ should_pay = #{shouldPay,jdbcType=DECIMAL}, already_pay = #{alreadyPay,jdbcType=DECIMAL}, no_pay = #{noPay,jdbcType=DECIMAL} - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleDetailMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleDetailMapper.xml index 399484dc..78005085 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleDetailMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleDetailMapper.xml @@ -2,18 +2,18 @@ - + - - + + - + @@ -97,15 +97,15 @@ order by ${orderByClause} - select from t_sale_detail - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} - + delete from t_sale_detail - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} delete from t_sale_detail @@ -120,10 +120,10 @@ unit, shop_id, category_id, attribute_list, price, purchase_price, wholesale_price, product_count) - values (#{id,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, - #{saleId,jdbcType=BIGINT}, #{productId,jdbcType=BIGINT}, #{productName,jdbcType=VARCHAR}, - #{unit,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, #{categoryId,jdbcType=BIGINT}, + #{saleId,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, + #{unit,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR}, #{attributeList,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{purchasePrice,jdbcType=DECIMAL}, #{wholesalePrice,jdbcType=DECIMAL}, #{productCount,jdbcType=INTEGER}) @@ -184,7 +184,7 @@ - #{id,jdbcType=BIGINT}, + #{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, @@ -202,10 +202,10 @@ #{updateTime,jdbcType=TIMESTAMP}, - #{saleId,jdbcType=BIGINT}, + #{saleId,jdbcType=VARCHAR}, - #{productId,jdbcType=BIGINT}, + #{productId,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, @@ -217,7 +217,7 @@ #{shopId,jdbcType=VARCHAR}, - #{categoryId,jdbcType=BIGINT}, + #{categoryId,jdbcType=VARCHAR}, #{attributeList,jdbcType=VARCHAR}, @@ -246,7 +246,7 @@ update t_sale_detail - id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, @@ -264,10 +264,10 @@ update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - sale_id = #{record.saleId,jdbcType=BIGINT}, + sale_id = #{record.saleId,jdbcType=VARCHAR}, - product_id = #{record.productId,jdbcType=BIGINT}, + product_id = #{record.productId,jdbcType=VARCHAR}, product_name = #{record.productName,jdbcType=VARCHAR}, @@ -279,7 +279,7 @@ shop_id = #{record.shopId,jdbcType=VARCHAR}, - category_id = #{record.categoryId,jdbcType=BIGINT}, + category_id = #{record.categoryId,jdbcType=VARCHAR}, attribute_list = #{record.attributeList,jdbcType=VARCHAR}, @@ -303,18 +303,18 @@ update t_sale_detail - set id = #{record.id,jdbcType=BIGINT}, + set id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, del_flag = #{record.delFlag,jdbcType=INTEGER}, update_by = #{record.updateBy,jdbcType=VARCHAR}, update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - sale_id = #{record.saleId,jdbcType=BIGINT}, - product_id = #{record.productId,jdbcType=BIGINT}, + sale_id = #{record.saleId,jdbcType=VARCHAR}, + product_id = #{record.productId,jdbcType=VARCHAR}, product_name = #{record.productName,jdbcType=VARCHAR}, unit = #{record.unit,jdbcType=VARCHAR}, shop_id = #{record.shopId,jdbcType=VARCHAR}, - category_id = #{record.categoryId,jdbcType=BIGINT}, + category_id = #{record.categoryId,jdbcType=VARCHAR}, attribute_list = #{record.attributeList,jdbcType=VARCHAR}, price = #{record.price,jdbcType=DECIMAL}, purchase_price = #{record.purchasePrice,jdbcType=DECIMAL}, @@ -343,10 +343,10 @@ update_time = #{updateTime,jdbcType=TIMESTAMP}, - sale_id = #{saleId,jdbcType=BIGINT}, + sale_id = #{saleId,jdbcType=VARCHAR}, - product_id = #{productId,jdbcType=BIGINT}, + product_id = #{productId,jdbcType=VARCHAR}, product_name = #{productName,jdbcType=VARCHAR}, @@ -358,7 +358,7 @@ shop_id = #{shopId,jdbcType=VARCHAR}, - category_id = #{categoryId,jdbcType=BIGINT}, + category_id = #{categoryId,jdbcType=VARCHAR}, attribute_list = #{attributeList,jdbcType=VARCHAR}, @@ -376,7 +376,7 @@ product_count = #{productCount,jdbcType=INTEGER}, - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} update t_sale_detail @@ -385,17 +385,17 @@ del_flag = #{delFlag,jdbcType=INTEGER}, update_by = #{updateBy,jdbcType=VARCHAR}, update_time = #{updateTime,jdbcType=TIMESTAMP}, - sale_id = #{saleId,jdbcType=BIGINT}, - product_id = #{productId,jdbcType=BIGINT}, + sale_id = #{saleId,jdbcType=VARCHAR}, + product_id = #{productId,jdbcType=VARCHAR}, product_name = #{productName,jdbcType=VARCHAR}, unit = #{unit,jdbcType=VARCHAR}, shop_id = #{shopId,jdbcType=VARCHAR}, - category_id = #{categoryId,jdbcType=BIGINT}, + category_id = #{categoryId,jdbcType=VARCHAR}, attribute_list = #{attributeList,jdbcType=VARCHAR}, price = #{price,jdbcType=DECIMAL}, purchase_price = #{purchasePrice,jdbcType=DECIMAL}, wholesale_price = #{wholesalePrice,jdbcType=DECIMAL}, product_count = #{productCount,jdbcType=INTEGER} - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml index 7998dd61..483bdff1 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml @@ -2,13 +2,13 @@ - + - + @@ -102,15 +102,15 @@ order by ${orderByClause} - select from t_sale - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} - + delete from t_sale - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} delete from t_sale @@ -127,9 +127,9 @@ status, transport_type, share_address, receive_address, province, city, area) - values (#{id,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, - #{userId,jdbcType=BIGINT}, #{shopId,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, + #{userId,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, #{discount,jdbcType=DECIMAL}, #{discountAmount,jdbcType=DECIMAL}, #{realAmount,jdbcType=DECIMAL}, #{alreadyEarn,jdbcType=DECIMAL}, #{noEarn,jdbcType=DECIMAL}, #{payStatus,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{transportType,jdbcType=VARCHAR}, #{shareAddress,jdbcType=VARCHAR}, @@ -208,7 +208,7 @@ - #{id,jdbcType=BIGINT}, + #{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, @@ -226,7 +226,7 @@ #{updateTime,jdbcType=TIMESTAMP}, - #{userId,jdbcType=BIGINT}, + #{userId,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, @@ -285,7 +285,7 @@ update t_sale - id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, @@ -303,7 +303,7 @@ update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - user_id = #{record.userId,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=VARCHAR}, shop_id = #{record.shopId,jdbcType=VARCHAR}, @@ -357,13 +357,13 @@ update t_sale - set id = #{record.id,jdbcType=BIGINT}, + set id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, del_flag = #{record.delFlag,jdbcType=INTEGER}, update_by = #{record.updateBy,jdbcType=VARCHAR}, update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - user_id = #{record.userId,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=VARCHAR}, shop_id = #{record.shopId,jdbcType=VARCHAR}, total_amount = #{record.totalAmount,jdbcType=DECIMAL}, discount = #{record.discount,jdbcType=DECIMAL}, @@ -402,7 +402,7 @@ update_time = #{updateTime,jdbcType=TIMESTAMP}, - user_id = #{userId,jdbcType=BIGINT}, + user_id = #{userId,jdbcType=VARCHAR}, shop_id = #{shopId,jdbcType=VARCHAR}, @@ -450,7 +450,7 @@ area = #{area,jdbcType=VARCHAR}, - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} update t_sale @@ -459,7 +459,7 @@ del_flag = #{delFlag,jdbcType=INTEGER}, update_by = #{updateBy,jdbcType=VARCHAR}, update_time = #{updateTime,jdbcType=TIMESTAMP}, - user_id = #{userId,jdbcType=BIGINT}, + user_id = #{userId,jdbcType=VARCHAR}, shop_id = #{shopId,jdbcType=VARCHAR}, total_amount = #{totalAmount,jdbcType=DECIMAL}, discount = #{discount,jdbcType=DECIMAL}, @@ -475,6 +475,6 @@ province = #{province,jdbcType=VARCHAR}, city = #{city,jdbcType=VARCHAR}, area = #{area,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/StockLogMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/StockLogMapper.xml index 857eda34..226158c6 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/StockLogMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/StockLogMapper.xml @@ -2,13 +2,13 @@ - + - + @@ -94,15 +94,15 @@ order by ${orderByClause} - select from t_stock_log - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} - + delete from t_stock_log - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} delete from t_stock_log @@ -117,9 +117,9 @@ change_stock, change_type, price, purchase_price, wholesale_price, shop_id ) - values (#{id,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, - #{productId,jdbcType=BIGINT}, #{productSpecs,jdbcType=VARCHAR}, #{stock,jdbcType=INTEGER}, + #{productId,jdbcType=VARCHAR}, #{productSpecs,jdbcType=VARCHAR}, #{stock,jdbcType=INTEGER}, #{changeStock,jdbcType=INTEGER}, #{changeType,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{purchasePrice,jdbcType=DECIMAL}, #{wholesalePrice,jdbcType=DECIMAL}, #{shopId,jdbcType=VARCHAR} ) @@ -175,7 +175,7 @@ - #{id,jdbcType=BIGINT}, + #{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, @@ -193,7 +193,7 @@ #{updateTime,jdbcType=TIMESTAMP}, - #{productId,jdbcType=BIGINT}, + #{productId,jdbcType=VARCHAR}, #{productSpecs,jdbcType=VARCHAR}, @@ -231,7 +231,7 @@ update t_stock_log - id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, @@ -249,7 +249,7 @@ update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - product_id = #{record.productId,jdbcType=BIGINT}, + product_id = #{record.productId,jdbcType=VARCHAR}, product_specs = #{record.productSpecs,jdbcType=VARCHAR}, @@ -282,13 +282,13 @@ update t_stock_log - set id = #{record.id,jdbcType=BIGINT}, + set id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, del_flag = #{record.delFlag,jdbcType=INTEGER}, update_by = #{record.updateBy,jdbcType=VARCHAR}, update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - product_id = #{record.productId,jdbcType=BIGINT}, + product_id = #{record.productId,jdbcType=VARCHAR}, product_specs = #{record.productSpecs,jdbcType=VARCHAR}, stock = #{record.stock,jdbcType=INTEGER}, change_stock = #{record.changeStock,jdbcType=INTEGER}, @@ -320,7 +320,7 @@ update_time = #{updateTime,jdbcType=TIMESTAMP}, - product_id = #{productId,jdbcType=BIGINT}, + product_id = #{productId,jdbcType=VARCHAR}, product_specs = #{productSpecs,jdbcType=VARCHAR}, @@ -347,7 +347,7 @@ shop_id = #{shopId,jdbcType=VARCHAR}, - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} update t_stock_log @@ -356,7 +356,7 @@ del_flag = #{delFlag,jdbcType=INTEGER}, update_by = #{updateBy,jdbcType=VARCHAR}, update_time = #{updateTime,jdbcType=TIMESTAMP}, - product_id = #{productId,jdbcType=BIGINT}, + product_id = #{productId,jdbcType=VARCHAR}, product_specs = #{productSpecs,jdbcType=VARCHAR}, stock = #{stock,jdbcType=INTEGER}, change_stock = #{changeStock,jdbcType=INTEGER}, @@ -365,6 +365,6 @@ purchase_price = #{purchasePrice,jdbcType=DECIMAL}, wholesale_price = #{wholesalePrice,jdbcType=DECIMAL}, shop_id = #{shopId,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/StockMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/StockMapper.xml index d5f8b8b2..3bb1f240 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/StockMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/StockMapper.xml @@ -2,17 +2,17 @@ - + - + - + @@ -105,15 +105,15 @@ order by ${orderByClause} - select from t_stock - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} - + delete from t_stock - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} delete from t_stock @@ -131,10 +131,10 @@ product_picture, product_video, product_intro, sales_week, print_barcode, stock_count ) - values (#{id,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, - #{productId,jdbcType=BIGINT}, #{productName,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, - #{shopId,jdbcType=VARCHAR}, #{categoryId,jdbcType=BIGINT}, #{attributeList,jdbcType=VARCHAR}, + #{productId,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, + #{shopId,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR}, #{attributeList,jdbcType=VARCHAR}, #{supplierId,jdbcType=VARCHAR}, #{productSn,jdbcType=VARCHAR}, #{barcode,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{purchasePrice,jdbcType=DECIMAL}, #{wholesalePrice,jdbcType=DECIMAL}, #{productPicture,jdbcType=VARCHAR}, #{productVideo,jdbcType=VARCHAR}, #{productIntro,jdbcType=VARCHAR}, @@ -219,7 +219,7 @@ - #{id,jdbcType=BIGINT}, + #{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, @@ -237,7 +237,7 @@ #{updateTime,jdbcType=TIMESTAMP}, - #{productId,jdbcType=BIGINT}, + #{productId,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, @@ -249,7 +249,7 @@ #{shopId,jdbcType=VARCHAR}, - #{categoryId,jdbcType=BIGINT}, + #{categoryId,jdbcType=VARCHAR}, #{attributeList,jdbcType=VARCHAR}, @@ -302,7 +302,7 @@ update t_stock - id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, @@ -320,7 +320,7 @@ update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - product_id = #{record.productId,jdbcType=BIGINT}, + product_id = #{record.productId,jdbcType=VARCHAR}, product_name = #{record.productName,jdbcType=VARCHAR}, @@ -332,7 +332,7 @@ shop_id = #{record.shopId,jdbcType=VARCHAR}, - category_id = #{record.categoryId,jdbcType=BIGINT}, + category_id = #{record.categoryId,jdbcType=VARCHAR}, attribute_list = #{record.attributeList,jdbcType=VARCHAR}, @@ -380,17 +380,17 @@ update t_stock - set id = #{record.id,jdbcType=BIGINT}, + set id = #{record.id,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, del_flag = #{record.delFlag,jdbcType=INTEGER}, update_by = #{record.updateBy,jdbcType=VARCHAR}, update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - product_id = #{record.productId,jdbcType=BIGINT}, + product_id = #{record.productId,jdbcType=VARCHAR}, product_name = #{record.productName,jdbcType=VARCHAR}, unit = #{record.unit,jdbcType=VARCHAR}, shop_id = #{record.shopId,jdbcType=VARCHAR}, - category_id = #{record.categoryId,jdbcType=BIGINT}, + category_id = #{record.categoryId,jdbcType=VARCHAR}, attribute_list = #{record.attributeList,jdbcType=VARCHAR}, supplier_id = #{record.supplierId,jdbcType=VARCHAR}, product_sn = #{record.productSn,jdbcType=VARCHAR}, @@ -427,7 +427,7 @@ update_time = #{updateTime,jdbcType=TIMESTAMP}, - product_id = #{productId,jdbcType=BIGINT}, + product_id = #{productId,jdbcType=VARCHAR}, product_name = #{productName,jdbcType=VARCHAR}, @@ -439,7 +439,7 @@ shop_id = #{shopId,jdbcType=VARCHAR}, - category_id = #{categoryId,jdbcType=BIGINT}, + category_id = #{categoryId,jdbcType=VARCHAR}, attribute_list = #{attributeList,jdbcType=VARCHAR}, @@ -481,7 +481,7 @@ stock_count = #{stockCount,jdbcType=INTEGER}, - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} update t_stock @@ -490,11 +490,11 @@ del_flag = #{delFlag,jdbcType=INTEGER}, update_by = #{updateBy,jdbcType=VARCHAR}, update_time = #{updateTime,jdbcType=TIMESTAMP}, - product_id = #{productId,jdbcType=BIGINT}, + product_id = #{productId,jdbcType=VARCHAR}, product_name = #{productName,jdbcType=VARCHAR}, unit = #{unit,jdbcType=VARCHAR}, shop_id = #{shopId,jdbcType=VARCHAR}, - category_id = #{categoryId,jdbcType=BIGINT}, + category_id = #{categoryId,jdbcType=VARCHAR}, attribute_list = #{attributeList,jdbcType=VARCHAR}, supplier_id = #{supplierId,jdbcType=VARCHAR}, product_sn = #{productSn,jdbcType=VARCHAR}, @@ -508,6 +508,6 @@ sales_week = #{salesWeek,jdbcType=VARCHAR}, print_barcode = #{printBarcode,jdbcType=VARCHAR}, stock_count = #{stockCount,jdbcType=INTEGER} - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file