From 1679894ee5fe3cf3c03615d1c778110d793307d5 Mon Sep 17 00:00:00 2001 From: zhaochencheng Date: Mon, 28 Nov 2022 15:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=8E=BB=E9=99=A4=E6=8E=89del=5Fflag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/generator/ApplicationTest.java | 4 ++++ .../test/resources/vm2/java/controller.java.vm | 4 ++-- .../src/test/resources/vm2/java/mapper.java.vm | 7 ------- .../test/resources/vm2/java/service.java.vm | 18 +----------------- .../src/test/resources/vm2/xml/mapper.xml.vm | 7 ------- .../cyl/pms/controller/BrandController.java | 6 +++--- .../controller/ProductCategoryController.java | 6 +++--- .../cyl/pms/controller/ProductController.java | 6 +++--- .../com/cyl/pms/controller/SkuController.java | 6 +++--- .../main/java/com/cyl/pms/domain/Brand.java | 3 --- .../main/java/com/cyl/pms/domain/Product.java | 3 --- .../com/cyl/pms/domain/ProductCategory.java | 3 --- .../src/main/java/com/cyl/pms/domain/Sku.java | 3 --- .../java/com/cyl/pms/mapper/BrandMapper.java | 7 ------- .../cyl/pms/mapper/ProductCategoryMapper.java | 7 ------- .../java/com/cyl/pms/mapper/ProductMapper.java | 7 ------- .../java/com/cyl/pms/mapper/SkuMapper.java | 7 ------- .../java/com/cyl/pms/service/BrandService.java | 15 +-------------- .../pms/service/ProductCategoryService.java | 15 +-------------- .../com/cyl/pms/service/ProductService.java | 15 +-------------- .../java/com/cyl/pms/service/SkuService.java | 15 +-------------- .../controller/MemberAddressController.java | 4 ++-- .../cyl/ums/controller/MemberController.java | 4 ++-- .../ums/controller/MemberWechatController.java | 4 ++-- .../main/java/com/cyl/ums/domain/Member.java | 9 ++------- .../java/com/cyl/ums/domain/MemberAddress.java | 10 ++-------- .../java/com/cyl/ums/domain/MemberWechat.java | 9 ++------- .../cyl/ums/mapper/MemberAddressMapper.java | 7 ------- .../java/com/cyl/ums/mapper/MemberMapper.java | 7 ------- .../com/cyl/ums/mapper/MemberWechatMapper.java | 7 ------- .../cyl/ums/pojo/query/MemberAddressQuery.java | 1 - .../com/cyl/ums/pojo/vo/MemberAddressVO.java | 8 ++------ .../java/com/cyl/ums/pojo/vo/MemberVO.java | 7 ++----- .../com/cyl/ums/pojo/vo/MemberWechatVO.java | 7 ++----- .../cyl/ums/service/MemberAddressService.java | 16 +--------------- .../com/cyl/ums/service/MemberService.java | 15 +-------------- .../cyl/ums/service/MemberWechatService.java | 15 +-------------- .../main/resources/mapper/pms/BrandMapper.xml | 10 +--------- .../mapper/pms/ProductCategoryMapper.xml | 10 +--------- .../resources/mapper/pms/ProductMapper.xml | 10 +--------- .../main/resources/mapper/pms/SkuMapper.xml | 10 +--------- .../mapper/ums/MemberAddressMapper.xml | 15 +++++++-------- .../main/resources/mapper/ums/MemberMapper.xml | 15 +++++++-------- .../mapper/ums/MemberWechatMapper.xml | 15 +++++++-------- sql/mall_pms结构.sql | 4 ---- sql/mall_ums结构.sql | 6 ++++++ 46 files changed, 75 insertions(+), 314 deletions(-) diff --git a/ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java b/ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java index f20dfb6..48cc26c 100644 --- a/ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java +++ b/ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java @@ -25,6 +25,10 @@ public class ApplicationTest { @Test public void test2() { List tableNames = Arrays.asList( +// "pms_brand", +// "pms_product_category" , +// "pms_product", +// "pms_sku" "ums_member", "ums_member_address", "ums_member_wechat" diff --git a/ruoyi-generator/src/test/resources/vm2/java/controller.java.vm b/ruoyi-generator/src/test/resources/vm2/java/controller.java.vm index af28e19..3811244 100644 --- a/ruoyi-generator/src/test/resources/vm2/java/controller.java.vm +++ b/ruoyi-generator/src/test/resources/vm2/java/controller.java.vm @@ -87,7 +87,7 @@ public class ${_className.controller} extends BaseController { @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')") @Log(title = "${functionName}", businessType = BusinessType.DELETE) @DeleteMapping("/{${pkColumn.javaField}s}") - public ResponseEntity remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) { - return ResponseEntity.ok(service.deleteBy${pkColumn.capJavaField}s(${pkColumn.javaField}s)); + public ResponseEntity remove(@PathVariable ${pkColumn.javaType} ${pkColumn.javaField}) { + return ResponseEntity.ok(service.deleteBy${pkColumn.capJavaField}(${pkColumn.javaField})); } } diff --git a/ruoyi-generator/src/test/resources/vm2/java/mapper.java.vm b/ruoyi-generator/src/test/resources/vm2/java/mapper.java.vm index 0d44884..ee7771a 100644 --- a/ruoyi-generator/src/test/resources/vm2/java/mapper.java.vm +++ b/ruoyi-generator/src/test/resources/vm2/java/mapper.java.vm @@ -18,11 +18,4 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> { * @return ${functionName}集合 */ List<${ClassName}> selectByEntity(${ClassName} ${className}); - - /** - * 批量软删除 - * @param ids - * @return - */ - int updateDelFlagByIds(@Param("ids") Long[] ids); } diff --git a/ruoyi-generator/src/test/resources/vm2/java/service.java.vm b/ruoyi-generator/src/test/resources/vm2/java/service.java.vm index ecdee67..a824463 100644 --- a/ruoyi-generator/src/test/resources/vm2/java/service.java.vm +++ b/ruoyi-generator/src/test/resources/vm2/java/service.java.vm @@ -53,7 +53,6 @@ public class ${ClassName}Service { PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } QueryWrapper<${_className.domain}> qw = new QueryWrapper<>(); - qw.eq("del_flag",0); #foreach($column in $columns) #if($column.query) ## 根据查询类型生成 EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围 @@ -91,7 +90,6 @@ public class ${ClassName}Service { @Transactional #end public int insert(${ClassName} ${className}) { - ${className}.setDelFlag(0); #foreach ($column in $columns) #if($column.javaField == 'createTime') ${className}.setCreateTime(#if($column.javaType == "Date")new Date()#else${column.javaType}.now()#end); @@ -123,19 +121,6 @@ public class ${ClassName}Service { return ${className}Mapper.updateById(${className}); } - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的${functionName}主键 - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - public int deleteBy${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) { - return ${className}Mapper.updateDelFlagByIds(${pkColumn.javaField}s); - } - /** * 删除${functionName}信息 * @@ -143,7 +128,6 @@ public class ${ClassName}Service { * @return 结果 */ public int deleteBy${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) { - Long[] ${pkColumn.javaField}s = {${pkColumn.javaField}}; - return ${className}Mapper.updateDelFlagByIds(${pkColumn.javaField}s); + return ${className}Mapper.deleteById(${pkColumn.javaField}); } } diff --git a/ruoyi-generator/src/test/resources/vm2/xml/mapper.xml.vm b/ruoyi-generator/src/test/resources/vm2/xml/mapper.xml.vm index a3ecbf9..2803423 100644 --- a/ruoyi-generator/src/test/resources/vm2/xml/mapper.xml.vm +++ b/ruoyi-generator/src/test/resources/vm2/xml/mapper.xml.vm @@ -51,11 +51,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #end - - - update ${tableName} set del_flag=1 - - id in #{it} - - diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/controller/BrandController.java b/ruoyi-mall/src/main/java/com/cyl/pms/controller/BrandController.java index e36a70a..b326667 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/controller/BrandController.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/controller/BrandController.java @@ -31,7 +31,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; * 品牌管理Controller * * @author zcc - * @date 2022-11-18 + * @date 2022-11-28 */ @Api(description ="品牌管理接口列表") @RestController @@ -87,7 +87,7 @@ public class BrandController extends BaseController { @PreAuthorize("@ss.hasPermi('pms:brand:remove')") @Log(title = "品牌管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public ResponseEntity remove(@PathVariable Long[] ids) { - return ResponseEntity.ok(service.deleteByIds(ids)); + public ResponseEntity remove(@PathVariable Long id) { + return ResponseEntity.ok(service.deleteById(id)); } } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductCategoryController.java b/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductCategoryController.java index 5004705..310b34d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductCategoryController.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductCategoryController.java @@ -31,7 +31,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; * 商品分类Controller * * @author zcc - * @date 2022-11-18 + * @date 2022-11-28 */ @Api(description ="商品分类接口列表") @RestController @@ -87,7 +87,7 @@ public class ProductCategoryController extends BaseController { @PreAuthorize("@ss.hasPermi('pms:productCategory:remove')") @Log(title = "商品分类", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public ResponseEntity remove(@PathVariable Long[] ids) { - return ResponseEntity.ok(service.deleteByIds(ids)); + public ResponseEntity remove(@PathVariable Long id) { + return ResponseEntity.ok(service.deleteById(id)); } } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductController.java b/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductController.java index 9ca0695..d6a1d1e 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductController.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductController.java @@ -31,7 +31,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; * 商品信息Controller * * @author zcc - * @date 2022-11-18 + * @date 2022-11-28 */ @Api(description ="商品信息接口列表") @RestController @@ -87,7 +87,7 @@ public class ProductController extends BaseController { @PreAuthorize("@ss.hasPermi('pms:product:remove')") @Log(title = "商品信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public ResponseEntity remove(@PathVariable Long[] ids) { - return ResponseEntity.ok(service.deleteByIds(ids)); + public ResponseEntity remove(@PathVariable Long id) { + return ResponseEntity.ok(service.deleteById(id)); } } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/controller/SkuController.java b/ruoyi-mall/src/main/java/com/cyl/pms/controller/SkuController.java index 95a8663..b8ce4d8 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/controller/SkuController.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/controller/SkuController.java @@ -31,7 +31,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; * sku信息Controller * * @author zcc - * @date 2022-11-18 + * @date 2022-11-28 */ @Api(description ="sku信息接口列表") @RestController @@ -87,7 +87,7 @@ public class SkuController extends BaseController { @PreAuthorize("@ss.hasPermi('pms:sku:remove')") @Log(title = "sku信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public ResponseEntity remove(@PathVariable Long[] ids) { - return ResponseEntity.ok(service.deleteByIds(ids)); + public ResponseEntity remove(@PathVariable Long id) { + return ResponseEntity.ok(service.deleteById(id)); } } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/domain/Brand.java b/ruoyi-mall/src/main/java/com/cyl/pms/domain/Brand.java index a2fffd4..d359920 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/domain/Brand.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/domain/Brand.java @@ -36,7 +36,4 @@ public class Brand extends BaseAudit { @Excel(name = "品牌logo") private String logo; - @ApiModelProperty("删除标识") - private Integer delFlag; - } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/domain/Product.java b/ruoyi-mall/src/main/java/com/cyl/pms/domain/Product.java index 2eec023..5e42cc7 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/domain/Product.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/domain/Product.java @@ -81,7 +81,4 @@ public class Product extends BaseAudit { @Excel(name = "商品分类名称") private String productCategoryName; - @ApiModelProperty("删除标识") - private Integer delFlag; - } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/domain/ProductCategory.java b/ruoyi-mall/src/main/java/com/cyl/pms/domain/ProductCategory.java index 7b6dd46..9725da1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/domain/ProductCategory.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/domain/ProductCategory.java @@ -44,7 +44,4 @@ public class ProductCategory extends BaseAudit { @Excel(name = "图标") private String icon; - @ApiModelProperty("删除标识") - private Integer delFlag; - } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/domain/Sku.java b/ruoyi-mall/src/main/java/com/cyl/pms/domain/Sku.java index 0053d82..81fbc47 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/domain/Sku.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/domain/Sku.java @@ -41,7 +41,4 @@ public class Sku extends BaseAudit { @Excel(name = "商品销售属性，json格式") private String spData; - @ApiModelProperty("删除标识") - private Integer delFlag; - } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/BrandMapper.java b/ruoyi-mall/src/main/java/com/cyl/pms/mapper/BrandMapper.java index e8c278c..75abf69 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/BrandMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/mapper/BrandMapper.java @@ -18,11 +18,4 @@ public interface BrandMapper extends BaseMapper { * @return 品牌管理集合 */ List selectByEntity(Brand brand); - - /** - * 批量软删除 - * @param ids - * @return - */ - int updateDelFlagByIds(@Param("ids") Long[] ids); } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductCategoryMapper.java b/ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductCategoryMapper.java index 220cf8d..2d95b2f 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductCategoryMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductCategoryMapper.java @@ -18,11 +18,4 @@ public interface ProductCategoryMapper extends BaseMapper { * @return 商品分类集合 */ List selectByEntity(ProductCategory productCategory); - - /** - * 批量软删除 - * @param ids - * @return - */ - int updateDelFlagByIds(@Param("ids") Long[] ids); } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductMapper.java b/ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductMapper.java index ad871ac..751acec 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductMapper.java @@ -18,11 +18,4 @@ public interface ProductMapper extends BaseMapper { * @return 商品信息集合 */ List selectByEntity(Product product); - - /** - * 批量软删除 - * @param ids - * @return - */ - int updateDelFlagByIds(@Param("ids") Long[] ids); } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/SkuMapper.java b/ruoyi-mall/src/main/java/com/cyl/pms/mapper/SkuMapper.java index 2d91142..691d172 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/SkuMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/mapper/SkuMapper.java @@ -18,11 +18,4 @@ public interface SkuMapper extends BaseMapper { * @return sku信息集合 */ List selectByEntity(Sku sku); - - /** - * 批量软删除 - * @param ids - * @return - */ - int updateDelFlagByIds(@Param("ids") Long[] ids); } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/service/BrandService.java b/ruoyi-mall/src/main/java/com/cyl/pms/service/BrandService.java index 43e479b..7f95b64 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/service/BrandService.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/service/BrandService.java @@ -46,7 +46,6 @@ public class BrandService { PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } QueryWrapper qw = new QueryWrapper<>(); - qw.eq("del_flag",0); String nameLike = query.getNameLike(); if (!StringUtils.isEmpty(nameLike)) { qw.like("name", nameLike); @@ -73,7 +72,6 @@ public class BrandService { * @return 结果 */ public int insert(Brand brand) { - brand.setDelFlag(0); brand.setCreateTime(LocalDateTime.now()); return brandMapper.insert(brand); } @@ -88,16 +86,6 @@ public class BrandService { return brandMapper.updateById(brand); } - /** - * 批量删除品牌管理 - * - * @param ids 需要删除的品牌管理主键 - * @return 结果 - */ - public int deleteByIds(Long[] ids) { - return brandMapper.updateDelFlagByIds(ids); - } - /** * 删除品牌管理信息 * @@ -105,7 +93,6 @@ public class BrandService { * @return 结果 */ public int deleteById(Long id) { - Long[] ids = {id}; - return brandMapper.updateDelFlagByIds(ids); + return brandMapper.deleteById(id); } } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductCategoryService.java b/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductCategoryService.java index 98f979d..8544f00 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductCategoryService.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductCategoryService.java @@ -46,7 +46,6 @@ public class ProductCategoryService { PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } QueryWrapper qw = new QueryWrapper<>(); - qw.eq("del_flag",0); Long parentId = query.getParentId(); if (parentId != null) { qw.eq("parent_id", parentId); @@ -81,7 +80,6 @@ public class ProductCategoryService { * @return 结果 */ public int insert(ProductCategory productCategory) { - productCategory.setDelFlag(0); productCategory.setCreateTime(LocalDateTime.now()); return productCategoryMapper.insert(productCategory); } @@ -96,16 +94,6 @@ public class ProductCategoryService { return productCategoryMapper.updateById(productCategory); } - /** - * 批量删除商品分类 - * - * @param ids 需要删除的商品分类主键 - * @return 结果 - */ - public int deleteByIds(Long[] ids) { - return productCategoryMapper.updateDelFlagByIds(ids); - } - /** * 删除商品分类信息 * @@ -113,7 +101,6 @@ public class ProductCategoryService { * @return 结果 */ public int deleteById(Long id) { - Long[] ids = {id}; - return productCategoryMapper.updateDelFlagByIds(ids); + return productCategoryMapper.deleteById(id); } } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductService.java b/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductService.java index 5ba193b..aef1883 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductService.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductService.java @@ -47,7 +47,6 @@ public class ProductService { PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } QueryWrapper qw = new QueryWrapper<>(); - qw.eq("del_flag",0); Long brandId = query.getBrandId(); if (brandId != null) { qw.eq("brand_id", brandId); @@ -118,7 +117,6 @@ public class ProductService { * @return 结果 */ public int insert(Product product) { - product.setDelFlag(0); product.setCreateTime(LocalDateTime.now()); return productMapper.insert(product); } @@ -133,16 +131,6 @@ public class ProductService { return productMapper.updateById(product); } - /** - * 批量删除商品信息 - * - * @param ids 需要删除的商品信息主键 - * @return 结果 - */ - public int deleteByIds(Long[] ids) { - return productMapper.updateDelFlagByIds(ids); - } - /** * 删除商品信息信息 * @@ -150,7 +138,6 @@ public class ProductService { * @return 结果 */ public int deleteById(Long id) { - Long[] ids = {id}; - return productMapper.updateDelFlagByIds(ids); + return productMapper.deleteById(id); } } diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/service/SkuService.java b/ruoyi-mall/src/main/java/com/cyl/pms/service/SkuService.java index 3072b3e..3bf8b9e 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/service/SkuService.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/service/SkuService.java @@ -47,7 +47,6 @@ public class SkuService { PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } QueryWrapper qw = new QueryWrapper<>(); - qw.eq("del_flag",0); Long productId = query.getProductId(); if (productId != null) { qw.eq("product_id", productId); @@ -78,7 +77,6 @@ public class SkuService { * @return 结果 */ public int insert(Sku sku) { - sku.setDelFlag(0); sku.setCreateTime(LocalDateTime.now()); return skuMapper.insert(sku); } @@ -93,16 +91,6 @@ public class SkuService { return skuMapper.updateById(sku); } - /** - * 批量删除sku信息 - * - * @param ids 需要删除的sku信息主键 - * @return 结果 - */ - public int deleteByIds(Long[] ids) { - return skuMapper.updateDelFlagByIds(ids); - } - /** * 删除sku信息信息 * @@ -110,7 +98,6 @@ public class SkuService { * @return 结果 */ public int deleteById(Long id) { - Long[] ids = {id}; - return skuMapper.updateDelFlagByIds(ids); + return skuMapper.deleteById(id); } } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java b/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java index ca57062..08dea8b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java @@ -87,7 +87,7 @@ public class MemberAddressController extends BaseController { @PreAuthorize("@ss.hasPermi('ums:memberAddress:remove')") @Log(title = "会员收货地址", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public ResponseEntity remove(@PathVariable Long[] ids) { - return ResponseEntity.ok(service.deleteByIds(ids)); + public ResponseEntity remove(@PathVariable Long id) { + return ResponseEntity.ok(service.deleteById(id)); } } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java b/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java index 746d3e6..da2edf2 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java @@ -87,7 +87,7 @@ public class MemberController extends BaseController { @PreAuthorize("@ss.hasPermi('ums:member:remove')") @Log(title = "会员信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public ResponseEntity remove(@PathVariable Long[] ids) { - return ResponseEntity.ok(service.deleteByIds(ids)); + public ResponseEntity remove(@PathVariable Long id) { + return ResponseEntity.ok(service.deleteById(id)); } } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberWechatController.java b/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberWechatController.java index 251febd..420c73b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberWechatController.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberWechatController.java @@ -87,7 +87,7 @@ public class MemberWechatController extends BaseController { @PreAuthorize("@ss.hasPermi('ums:memberWechat:remove')") @Log(title = "用户微信信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public ResponseEntity remove(@PathVariable Long[] ids) { - return ResponseEntity.ok(service.deleteByIds(ids)); + public ResponseEntity remove(@PathVariable Long id) { + return ResponseEntity.ok(service.deleteById(id)); } } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/domain/Member.java b/ruoyi-mall/src/main/java/com/cyl/ums/domain/Member.java index 7139500..2d75d50 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/domain/Member.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/domain/Member.java @@ -6,6 +6,7 @@ import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; /** @@ -16,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @ApiModel(description="会员信息对象") @Data @TableName("ums_member") -public class Member { +public class Member extends BaseAudit { private static final long serialVersionUID = 1L; @ApiModelProperty("ID") @@ -86,10 +87,4 @@ public class Member { @Excel(name = "用户剩余积分") private BigDecimal integral; - @ApiModelProperty("创建时间") - private LocalDateTime createTime; - - @ApiModelProperty("修改时间") - private LocalDateTime updateTime; - } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberAddress.java b/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberAddress.java index 45e5048..b561ddf 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberAddress.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberAddress.java @@ -1,9 +1,9 @@ package com.cyl.ums.domain; -import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; /** @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @ApiModel(description="会员收货地址对象") @Data @TableName("ums_member_address") -public class MemberAddress { +public class MemberAddress extends BaseAudit { private static final long serialVersionUID = 1L; @ApiModelProperty("ID") @@ -60,10 +60,4 @@ public class MemberAddress { @Excel(name = "是否默认") private Integer isDefault; - @ApiModelProperty("创建时间") - private LocalDateTime createTime; - - @ApiModelProperty("修改时间") - private LocalDateTime updateTime; - } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberWechat.java b/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberWechat.java index f78f1b9..106995f 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberWechat.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberWechat.java @@ -4,6 +4,7 @@ import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; /** @@ -14,7 +15,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @ApiModel(description="用户微信信息对象") @Data @TableName("ums_member_wechat") -public class MemberWechat { +public class MemberWechat extends BaseAudit { private static final long serialVersionUID = 1L; @ApiModelProperty("ID") @@ -72,10 +73,4 @@ public class MemberWechat { @Excel(name = "过期时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private LocalDateTime expireTime; - @ApiModelProperty("创建时间") - private LocalDateTime createTime; - - @ApiModelProperty("修改时间") - private LocalDateTime updateTime; - } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberAddressMapper.java b/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberAddressMapper.java index e64280c..0296927 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberAddressMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberAddressMapper.java @@ -18,11 +18,4 @@ public interface MemberAddressMapper extends BaseMapper { * @return 会员收货地址集合 */ List selectByEntity(MemberAddress memberAddress); - - /** - * 批量软删除 - * @param ids - * @return - */ - int updateDelFlagByIds(@Param("ids") Long[] ids); } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberMapper.java b/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberMapper.java index aca0108..c238f5c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberMapper.java @@ -18,11 +18,4 @@ public interface MemberMapper extends BaseMapper { * @return 会员信息集合 */ List selectByEntity(Member member); - - /** - * 批量软删除 - * @param ids - * @return - */ - int updateDelFlagByIds(@Param("ids") Long[] ids); } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberWechatMapper.java b/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberWechatMapper.java index cfdae71..6bd2873 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberWechatMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberWechatMapper.java @@ -18,11 +18,4 @@ public interface MemberWechatMapper extends BaseMapper { * @return 用户微信信息集合 */ List selectByEntity(MemberWechat memberWechat); - - /** - * 批量软删除 - * @param ids - * @return - */ - int updateDelFlagByIds(@Param("ids") Long[] ids); } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberAddressQuery.java b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberAddressQuery.java index a10a80f..f6dece8 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberAddressQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberAddressQuery.java @@ -1,6 +1,5 @@ package com.cyl.ums.pojo.query; -import java.time.LocalDateTime; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberAddressVO.java b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberAddressVO.java index 2f6a182..be11b6e 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberAddressVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberAddressVO.java @@ -1,8 +1,8 @@ package com.cyl.ums.pojo.vo; -import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; /** * 会员收货地址 数据视图对象 @@ -10,7 +10,7 @@ import lombok.Data; * @author zcc */ @Data -public class MemberAddressVO { +public class MemberAddressVO extends BaseAudit { /** ID */ private Long id; /** MEMBER_ID */ @@ -43,8 +43,4 @@ public class MemberAddressVO { /** 是否默认 */ @Excel(name = "是否默认") private Integer isDefault; - /** 创建时间 */ - private LocalDateTime createTime; - /** 修改时间 */ - private LocalDateTime updateTime; } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberVO.java b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberVO.java index d6b5344..0df9d81 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberVO.java @@ -5,6 +5,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; /** * 会员信息 数据视图对象 @@ -12,7 +13,7 @@ import lombok.Data; * @author zcc */ @Data -public class MemberVO { +public class MemberVO extends BaseAudit { /** ID */ private Long id; /** 昵称 */ @@ -65,8 +66,4 @@ public class MemberVO { /** 用户剩余积分 */ @Excel(name = "用户剩余积分") private BigDecimal integral; - /** 创建时间 */ - private LocalDateTime createTime; - /** 修改时间 */ - private LocalDateTime updateTime; } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberWechatVO.java b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberWechatVO.java index df8cf8b..60b5a11 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberWechatVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberWechatVO.java @@ -3,6 +3,7 @@ package com.cyl.ums.pojo.vo; import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; /** * 用户微信信息 数据视图对象 @@ -10,7 +11,7 @@ import lombok.Data; * @author zcc */ @Data -public class MemberWechatVO { +public class MemberWechatVO extends BaseAudit { /** ID */ private Long id; /** MEMBER_ID */ @@ -53,8 +54,4 @@ public class MemberWechatVO { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private LocalDateTime expireTime; - /** 创建时间 */ - private LocalDateTime createTime; - /** 修改时间 */ - private LocalDateTime updateTime; } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberAddressService.java b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberAddressService.java index daff59e..e1666f3 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberAddressService.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberAddressService.java @@ -1,6 +1,5 @@ package com.cyl.ums.service; -import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; import java.time.LocalDateTime; @@ -47,7 +46,6 @@ public class MemberAddressService { PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } QueryWrapper qw = new QueryWrapper<>(); - qw.eq("del_flag",0); Long memberId = query.getMemberId(); if (memberId != null) { qw.eq("member_id", memberId); @@ -98,7 +96,6 @@ public class MemberAddressService { * @return 结果 */ public int insert(MemberAddress memberAddress) { - memberAddress.setDelFlag(0); memberAddress.setCreateTime(LocalDateTime.now()); return memberAddressMapper.insert(memberAddress); } @@ -113,16 +110,6 @@ public class MemberAddressService { return memberAddressMapper.updateById(memberAddress); } - /** - * 批量删除会员收货地址 - * - * @param ids 需要删除的会员收货地址主键 - * @return 结果 - */ - public int deleteByIds(Long[] ids) { - return memberAddressMapper.updateDelFlagByIds(ids); - } - /** * 删除会员收货地址信息 * @@ -130,7 +117,6 @@ public class MemberAddressService { * @return 结果 */ public int deleteById(Long id) { - Long[] ids = {id}; - return memberAddressMapper.updateDelFlagByIds(ids); + return memberAddressMapper.deleteById(id); } } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java index 503106e..096011a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java @@ -50,7 +50,6 @@ public class MemberService { PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } QueryWrapper qw = new QueryWrapper<>(); - qw.eq("del_flag",0); String nicknameLike = query.getNicknameLike(); if (!StringUtils.isEmpty(nicknameLike)) { qw.like("nickname", nicknameLike); @@ -121,7 +120,6 @@ public class MemberService { * @return 结果 */ public int insert(Member member) { - member.setDelFlag(0); member.setCreateTime(LocalDateTime.now()); return memberMapper.insert(member); } @@ -136,16 +134,6 @@ public class MemberService { return memberMapper.updateById(member); } - /** - * 批量删除会员信息 - * - * @param ids 需要删除的会员信息主键 - * @return 结果 - */ - public int deleteByIds(Long[] ids) { - return memberMapper.updateDelFlagByIds(ids); - } - /** * 删除会员信息信息 * @@ -153,7 +141,6 @@ public class MemberService { * @return 结果 */ public int deleteById(Long id) { - Long[] ids = {id}; - return memberMapper.updateDelFlagByIds(ids); + return memberMapper.deleteById(id); } } diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberWechatService.java b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberWechatService.java index 7c66ebe..062d27b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberWechatService.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberWechatService.java @@ -47,7 +47,6 @@ public class MemberWechatService { PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } QueryWrapper qw = new QueryWrapper<>(); - qw.eq("del_flag",0); Long memberId = query.getMemberId(); if (memberId != null) { qw.eq("member_id", memberId); @@ -110,7 +109,6 @@ public class MemberWechatService { * @return 结果 */ public int insert(MemberWechat memberWechat) { - memberWechat.setDelFlag(0); memberWechat.setCreateTime(LocalDateTime.now()); return memberWechatMapper.insert(memberWechat); } @@ -125,16 +123,6 @@ public class MemberWechatService { return memberWechatMapper.updateById(memberWechat); } - /** - * 批量删除用户微信信息 - * - * @param ids 需要删除的用户微信信息主键 - * @return 结果 - */ - public int deleteByIds(Long[] ids) { - return memberWechatMapper.updateDelFlagByIds(ids); - } - /** * 删除用户微信信息信息 * @@ -142,7 +130,6 @@ public class MemberWechatService { * @return 结果 */ public int deleteById(Long id) { - Long[] ids = {id}; - return memberWechatMapper.updateDelFlagByIds(ids); + return memberWechatMapper.deleteById(id); } } diff --git a/ruoyi-mall/src/main/resources/mapper/pms/BrandMapper.xml b/ruoyi-mall/src/main/resources/mapper/pms/BrandMapper.xml index 5948c0d..a2d796d 100644 --- a/ruoyi-mall/src/main/resources/mapper/pms/BrandMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/pms/BrandMapper.xml @@ -10,7 +10,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -22,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, name, sort, show_status, logo, del_flag, create_by, create_time, update_by, update_time from pms_brand + select id, name, sort, show_status, logo, create_by, create_time, update_by, update_time from pms_brand - - - update pms_brand set del_flag=1 - - id in #{it} - - diff --git a/ruoyi-mall/src/main/resources/mapper/pms/ProductCategoryMapper.xml b/ruoyi-mall/src/main/resources/mapper/pms/ProductCategoryMapper.xml index 3402f8d..c68f07c 100644 --- a/ruoyi-mall/src/main/resources/mapper/pms/ProductCategoryMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/pms/ProductCategoryMapper.xml @@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -24,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, parent_id, name, level, show_status, sort, icon, del_flag, create_by, create_time, update_by, update_time from pms_product_category + select id, parent_id, name, level, show_status, sort, icon, create_by, create_time, update_by, update_time from pms_product_category - - - update pms_product_category set del_flag=1 - - id in #{it} - - diff --git a/ruoyi-mall/src/main/resources/mapper/pms/ProductMapper.xml b/ruoyi-mall/src/main/resources/mapper/pms/ProductMapper.xml index 6ee7251..48ecab9 100644 --- a/ruoyi-mall/src/main/resources/mapper/pms/ProductMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/pms/ProductMapper.xml @@ -21,7 +21,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -33,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, brand_id, category_id, out_product_id, name, pic, album_pics, publish_status, sort, price, unit, weight, detail_html, detail_mobile_html, brand_name, product_category_name, del_flag, create_by, create_time, update_by, update_time from pms_product + select id, brand_id, category_id, out_product_id, name, pic, album_pics, publish_status, sort, price, unit, weight, detail_html, detail_mobile_html, brand_name, product_category_name, create_by, create_time, update_by, update_time from pms_product - - - update pms_product set del_flag=1 - - id in #{it} - - diff --git a/ruoyi-mall/src/main/resources/mapper/pms/SkuMapper.xml b/ruoyi-mall/src/main/resources/mapper/pms/SkuMapper.xml index a81c612..8196986 100644 --- a/ruoyi-mall/src/main/resources/mapper/pms/SkuMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/pms/SkuMapper.xml @@ -11,7 +11,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -23,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, product_id, out_sku_id, price, pic, sp_data, del_flag, create_by, create_time, update_by, update_time from pms_sku + select id, product_id, out_sku_id, price, pic, sp_data, create_by, create_time, update_by, update_time from pms_sku - - - update pms_sku set del_flag=1 - - id in #{it} - - diff --git a/ruoyi-mall/src/main/resources/mapper/ums/MemberAddressMapper.xml b/ruoyi-mall/src/main/resources/mapper/ums/MemberAddressMapper.xml index 667e9f1..d883136 100644 --- a/ruoyi-mall/src/main/resources/mapper/ums/MemberAddressMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/ums/MemberAddressMapper.xml @@ -16,12 +16,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + - select id, member_id, name, phone, default_status, post_code, province, city, district, detail_address, is_default, create_time, update_time from ums_member_address + select id, member_id, name, phone, default_status, post_code, province, city, district, detail_address, is_default, create_by, create_time, update_by, update_time from ums_member_address - - - update ums_member_address set del_flag=1 - - id in #{it} - - diff --git a/ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml b/ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml index 871bb68..5e39d49 100644 --- a/ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml @@ -22,12 +22,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + - select id, nickname, password, phone, mark, status, avatar, gender, city, province, country, remark, birthday, spread_uid, spread_time, level, integral, create_time, update_time from ums_member + select id, nickname, password, phone, mark, status, avatar, gender, city, province, country, remark, birthday, spread_uid, spread_time, level, integral, create_by, create_time, update_by, update_time from ums_member - - - update ums_member set del_flag=1 - - id in #{it} - - diff --git a/ruoyi-mall/src/main/resources/mapper/ums/MemberWechatMapper.xml b/ruoyi-mall/src/main/resources/mapper/ums/MemberWechatMapper.xml index 3f84ad7..5be3ed7 100644 --- a/ruoyi-mall/src/main/resources/mapper/ums/MemberWechatMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/ums/MemberWechatMapper.xml @@ -19,12 +19,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + - select id, member_id, unionid, openid, routine_openid, groupid, tagid_list, subscribe, subscribe_time, session_key, access_token, expires_in, refresh_token, expire_time, create_time, update_time from ums_member_wechat + select id, member_id, unionid, openid, routine_openid, groupid, tagid_list, subscribe, subscribe_time, session_key, access_token, expires_in, refresh_token, expire_time, create_by, create_time, update_by, update_time from ums_member_wechat - - - update ums_member_wechat set del_flag=1 - - id in #{it} - - diff --git a/sql/mall_pms结构.sql b/sql/mall_pms结构.sql index 3bad87d..459ac16 100644 --- a/sql/mall_pms结构.sql +++ b/sql/mall_pms结构.sql @@ -9,7 +9,6 @@ CREATE TABLE `pms_brand` `sort` int(11) NULL DEFAULT NULL, `show_status` int(1) NULL DEFAULT NULL, `logo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '品牌logo', - `del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标识', `create_by` bigint(20) DEFAULT NULL COMMENT '创建人', `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间', `update_by` bigint(20) DEFAULT NULL COMMENT '修改人', @@ -39,7 +38,6 @@ CREATE TABLE `pms_product` `detail_mobile_html` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '移动端网页详情', `brand_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '品牌名称', `product_category_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品分类名称', - `del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标识', `create_by` bigint(20) DEFAULT NULL COMMENT '创建人', `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间', `update_by` bigint(20) DEFAULT NULL COMMENT '修改人', @@ -60,7 +58,6 @@ CREATE TABLE `pms_product_category` `show_status` int(1) NULL DEFAULT NULL COMMENT '显示状态：0->不显示；1->显示', `sort` int(11) NULL DEFAULT NULL, `icon` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '图标', - `del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标识', `create_by` bigint(20) DEFAULT NULL COMMENT '创建人', `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间', `update_by` bigint(20) DEFAULT NULL COMMENT '修改人', @@ -80,7 +77,6 @@ CREATE TABLE `pms_sku` `price` decimal(10, 2) NULL DEFAULT NULL, `pic` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '展示图片', `sp_data` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品销售属性，json格式', - `del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标识', `create_by` bigint(20) DEFAULT NULL COMMENT '创建人', `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间', `update_by` bigint(20) DEFAULT NULL COMMENT '修改人', diff --git a/sql/mall_ums结构.sql b/sql/mall_ums结构.sql index b92d8e2..581f50e 100644 --- a/sql/mall_ums结构.sql +++ b/sql/mall_ums结构.sql @@ -20,7 +20,9 @@ CREATE TABLE `ums_member` ( `spread_time` datetime DEFAULT NULL COMMENT '推广员关联时间', `level` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '等级', `integral` decimal(8,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '用户剩余积分', + `create_by` bigint(20) DEFAULT NULL COMMENT '创建人', `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间', + `update_by` bigint(20) DEFAULT NULL COMMENT '修改人', `update_time` datetime(3) DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`), UNIQUE KEY `idx_username` (`nickname`), @@ -40,7 +42,9 @@ CREATE TABLE `ums_member_address` ( `district` varchar(100) DEFAULT NULL COMMENT '区', `detail_address` varchar(128) DEFAULT NULL COMMENT '详细地址(街道)', `is_default` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '是否默认', + `create_by` bigint(20) DEFAULT NULL COMMENT '创建人', `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间', + `update_by` bigint(20) DEFAULT NULL COMMENT '修改人', `update_time` datetime(3) DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COMMENT='会员收货地址'; @@ -61,7 +65,9 @@ CREATE TABLE `ums_member_wechat` ( expires_in int null comment '过期时间', refresh_token varchar(500) null comment '刷新token', expire_time datetime(3) null comment '过期时间', + `create_by` bigint(20) DEFAULT NULL COMMENT '创建人', `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间', + `update_by` bigint(20) DEFAULT NULL COMMENT '修改人', `update_time` datetime(3) DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COMMENT='用户微信信息';