代码生成优化，去除掉del_flag

ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java

@@ -25,6 +25,10 @@ public class ApplicationTest {
     @Test
     public void test2() {
         List<String> tableNames = Arrays.asList(
+//                "pms_brand",
+//                "pms_product_category" ,
+//                "pms_product",
+//                "pms_sku"
                 "ums_member",
                 "ums_member_address",
                 "ums_member_wechat"

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<Integer> remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
+    public ResponseEntity<Integer> remove(@PathVariable ${pkColumn.javaType} ${pkColumn.javaField}) {
-        return ResponseEntity.ok(service.deleteBy${pkColumn.capJavaField}s(${pkColumn.javaField}s));
+        return ResponseEntity.ok(service.deleteBy${pkColumn.capJavaField}(${pkColumn.javaField}));
     }
 }

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);
 }

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.deleteById(${pkColumn.javaField});
-        return ${className}Mapper.updateDelFlagByIds(${pkColumn.javaField}s);
     }
 }

ruoyi-generator/src/test/resources/vm2/xml/mapper.xml.vm

@@ -51,11 +51,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 #end
         </where>
     </select>
-
-    <update id="updateDelFlagByIds">
-        update ${tableName} set del_flag=1
-        <where>
-            id in <foreach collection="ids" open="(" item="it" close=")" separator=",">#{it}</foreach>
-        </where>
-    </update>
 </mapper>

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<Integer> remove(@PathVariable Long[] ids) {
+    public ResponseEntity<Integer> remove(@PathVariable Long id) {
-        return ResponseEntity.ok(service.deleteByIds(ids));
+        return ResponseEntity.ok(service.deleteById(id));
     }
 }

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<Integer> remove(@PathVariable Long[] ids) {
+    public ResponseEntity<Integer> remove(@PathVariable Long id) {
-        return ResponseEntity.ok(service.deleteByIds(ids));
+        return ResponseEntity.ok(service.deleteById(id));
     }
 }

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<Integer> remove(@PathVariable Long[] ids) {
+    public ResponseEntity<Integer> remove(@PathVariable Long id) {
-        return ResponseEntity.ok(service.deleteByIds(ids));
+        return ResponseEntity.ok(service.deleteById(id));
     }
 }

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<Integer> remove(@PathVariable Long[] ids) {
+    public ResponseEntity<Integer> remove(@PathVariable Long id) {
-        return ResponseEntity.ok(service.deleteByIds(ids));
+        return ResponseEntity.ok(service.deleteById(id));
     }
 }

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;
-
 }

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;
-
 }

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;
-
 }

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;
-
 }

ruoyi-mall/src/main/java/com/cyl/pms/mapper/BrandMapper.java

@@ -18,11 +18,4 @@ public interface BrandMapper extends BaseMapper<Brand> {
      * @return 品牌管理集合
      */
     List<Brand> selectByEntity(Brand brand);
-
-    /**
-     * 批量软删除
-     * @param ids
-     * @return
-    */
-    int updateDelFlagByIds(@Param("ids") Long[] ids);
 }

ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductCategoryMapper.java

@@ -18,11 +18,4 @@ public interface ProductCategoryMapper extends BaseMapper<ProductCategory> {
      * @return 商品分类集合
      */
     List<ProductCategory> selectByEntity(ProductCategory productCategory);
-
-    /**
-     * 批量软删除
-     * @param ids
-     * @return
-    */
-    int updateDelFlagByIds(@Param("ids") Long[] ids);
 }

ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductMapper.java

@@ -18,11 +18,4 @@ public interface ProductMapper extends BaseMapper<Product> {
      * @return 商品信息集合
      */
     List<Product> selectByEntity(Product product);
-
-    /**
-     * 批量软删除
-     * @param ids
-     * @return
-    */
-    int updateDelFlagByIds(@Param("ids") Long[] ids);
 }

ruoyi-mall/src/main/java/com/cyl/pms/mapper/SkuMapper.java

@@ -18,11 +18,4 @@ public interface SkuMapper extends BaseMapper<Sku> {
      * @return sku信息集合
      */
     List<Sku> selectByEntity(Sku sku);
-
-    /**
-     * 批量软删除
-     * @param ids
-     * @return
-    */
-    int updateDelFlagByIds(@Param("ids") Long[] ids);
 }

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<Brand> 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.deleteById(id);
-        return brandMapper.updateDelFlagByIds(ids);
     }
 }

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<ProductCategory> 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.deleteById(id);
-        return productCategoryMapper.updateDelFlagByIds(ids);
     }
 }

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<Product> 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.deleteById(id);
-        return productMapper.updateDelFlagByIds(ids);
     }
 }

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<Sku> 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.deleteById(id);
-        return skuMapper.updateDelFlagByIds(ids);
     }
 }

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<Integer> remove(@PathVariable Long[] ids) {
+    public ResponseEntity<Integer> remove(@PathVariable Long id) {
-        return ResponseEntity.ok(service.deleteByIds(ids));
+        return ResponseEntity.ok(service.deleteById(id));
     }
 }

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<Integer> remove(@PathVariable Long[] ids) {
+    public ResponseEntity<Integer> remove(@PathVariable Long id) {
-        return ResponseEntity.ok(service.deleteByIds(ids));
+        return ResponseEntity.ok(service.deleteById(id));
     }
 }

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<Integer> remove(@PathVariable Long[] ids) {
+    public ResponseEntity<Integer> remove(@PathVariable Long id) {
-        return ResponseEntity.ok(service.deleteByIds(ids));
+        return ResponseEntity.ok(service.deleteById(id));
     }
 }

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;
-
 }

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;
-
 }

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;
-
 }

ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberAddressMapper.java

@@ -18,11 +18,4 @@ public interface MemberAddressMapper extends BaseMapper<MemberAddress> {
      * @return 会员收货地址集合
      */
     List<MemberAddress> selectByEntity(MemberAddress memberAddress);
-
-    /**
-     * 批量软删除
-     * @param ids
-     * @return
-    */
-    int updateDelFlagByIds(@Param("ids") Long[] ids);
 }

ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberMapper.java

@@ -18,11 +18,4 @@ public interface MemberMapper extends BaseMapper<Member> {
      * @return 会员信息集合
      */
     List<Member> selectByEntity(Member member);
-
-    /**
-     * 批量软删除
-     * @param ids
-     * @return
-    */
-    int updateDelFlagByIds(@Param("ids") Long[] ids);
 }

ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberWechatMapper.java

@@ -18,11 +18,4 @@ public interface MemberWechatMapper extends BaseMapper<MemberWechat> {
      * @return 用户微信信息集合
      */
     List<MemberWechat> selectByEntity(MemberWechat memberWechat);
-
-    /**
-     * 批量软删除
-     * @param ids
-     * @return
-    */
-    int updateDelFlagByIds(@Param("ids") Long[] ids);
 }

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;

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;
 }

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;
 }

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;
 }

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<MemberAddress> 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.deleteById(id);
-        return memberAddressMapper.updateDelFlagByIds(ids);
     }
 }

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<Member> 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.deleteById(id);
-        return memberMapper.updateDelFlagByIds(ids);
     }
 }

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<MemberWechat> 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.deleteById(id);
-        return memberWechatMapper.updateDelFlagByIds(ids);
     }
 }

ruoyi-mall/src/main/resources/mapper/pms/BrandMapper.xml

@@ -10,7 +10,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sort" column="sort"/>
         <result property="showStatus" column="show_status"/>
         <result property="logo" column="logo"/>
-        <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -22,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBrandVo">
-        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
     </sql>
 
     <select id="selectByEntity" parameterType="Brand" resultMap="BrandResult">
@@ -34,11 +33,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="logo != null  and logo != ''"> and logo = #{logo}</if>
         </where>
     </select>
-
-    <update id="updateDelFlagByIds">
-        update pms_brand set del_flag=1
-        <where>
-            id in <foreach collection="ids" open="(" item="it" close=")" separator=",">#{it}</foreach>
-        </where>
-    </update>
 </mapper>

ruoyi-mall/src/main/resources/mapper/pms/ProductCategoryMapper.xml

@@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="showStatus" column="show_status"/>
         <result property="sort" column="sort"/>
         <result property="icon" column="icon"/>
-        <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -24,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProductCategoryVo">
-        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
     </sql>
 
     <select id="selectByEntity" parameterType="ProductCategory" resultMap="ProductCategoryResult">
@@ -38,11 +37,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="icon != null  and icon != ''"> and icon = #{icon}</if>
         </where>
     </select>
-
-    <update id="updateDelFlagByIds">
-        update pms_product_category set del_flag=1
-        <where>
-            id in <foreach collection="ids" open="(" item="it" close=")" separator=",">#{it}</foreach>
-        </where>
-    </update>
 </mapper>

ruoyi-mall/src/main/resources/mapper/pms/ProductMapper.xml

@@ -21,7 +21,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="detailMobileHtml" column="detail_mobile_html"/>
         <result property="brandName" column="brand_name"/>
         <result property="productCategoryName" column="product_category_name"/>
-        <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -33,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProductVo">
-        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
     </sql>
 
     <select id="selectByEntity" parameterType="Product" resultMap="ProductResult">
@@ -56,11 +55,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productCategoryName != null  and productCategoryName != ''"> and product_category_name like concat('%', #{productCategoryName}, '%')</if>
         </where>
     </select>
-
-    <update id="updateDelFlagByIds">
-        update pms_product set del_flag=1
-        <where>
-            id in <foreach collection="ids" open="(" item="it" close=")" separator=",">#{it}</foreach>
-        </where>
-    </update>
 </mapper>

ruoyi-mall/src/main/resources/mapper/pms/SkuMapper.xml

@@ -11,7 +11,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="price" column="price"/>
         <result property="pic" column="pic"/>
         <result property="spData" column="sp_data"/>
-        <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -23,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSkuVo">
-        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
     </sql>
 
     <select id="selectByEntity" parameterType="Sku" resultMap="SkuResult">
@@ -36,11 +35,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spData != null  and spData != ''"> and sp_data = #{spData}</if>
         </where>
     </select>
-
-    <update id="updateDelFlagByIds">
-        update pms_sku set del_flag=1
-        <where>
-            id in <foreach collection="ids" open="(" item="it" close=")" separator=",">#{it}</foreach>
-        </where>
-    </update>
 </mapper>

ruoyi-mall/src/main/resources/mapper/ums/MemberAddressMapper.xml

@@ -16,12 +16,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="district" column="district"/>
         <result property="detailAddress" column="detail_address"/>
         <result property="isDefault" column="is_default"/>
+        <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time" />
     </resultMap>
 
     <sql id="selectMemberAddressVo">
-        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
     </sql>
 
     <select id="selectByEntity" parameterType="MemberAddress" resultMap="MemberAddressResult">
@@ -39,11 +45,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDefault != null "> and is_default = #{isDefault}</if>
         </where>
     </select>
-
-    <update id="updateDelFlagByIds">
-        update ums_member_address set del_flag=1
-        <where>
-            id in <foreach collection="ids" open="(" item="it" close=")" separator=",">#{it}</foreach>
-        </where>
-    </update>
 </mapper>

ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml

@@ -22,12 +22,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spreadTime" column="spread_time"/>
         <result property="level" column="level"/>
         <result property="integral" column="integral"/>
+        <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time" />
     </resultMap>
 
     <sql id="selectMemberVo">
-        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
     </sql>
 
     <select id="selectByEntity" parameterType="Member" resultMap="MemberResult">
@@ -50,11 +56,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="integral != null "> and integral = #{integral}</if>
         </where>
     </select>
-
-    <update id="updateDelFlagByIds">
-        update ums_member set del_flag=1
-        <where>
-            id in <foreach collection="ids" open="(" item="it" close=")" separator=",">#{it}</foreach>
-        </where>
-    </update>
 </mapper>

ruoyi-mall/src/main/resources/mapper/ums/MemberWechatMapper.xml

@@ -19,12 +19,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="expiresIn" column="expires_in"/>
         <result property="refreshToken" column="refresh_token"/>
         <result property="expireTime" column="expire_time"/>
+        <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time" />
     </resultMap>
 
     <sql id="selectMemberWechatVo">
-        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
     </sql>
 
     <select id="selectByEntity" parameterType="MemberWechat" resultMap="MemberWechatResult">
@@ -45,11 +51,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="expireTime != null "> and expire_time = #{expireTime}</if>
         </where>
     </select>
-
-    <update id="updateDelFlagByIds">
-        update ums_member_wechat set del_flag=1
-        <where>
-            id in <foreach collection="ids" open="(" item="it" close=")" separator=",">#{it}</foreach>
-        </where>
-    </update>
 </mapper>

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 '修改人',

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='用户微信信息';