deleteFlag

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/AccountBalanceRecordDTO.java

@@ -28,11 +28,6 @@ public class AccountBalanceRecordDTO implements Serializable {
     private Integer payType=0;
 
     /**
-     *
-     */
-    private Integer status;
-
-    /**
      * 产品类型
      */
     private Integer productType=0;
@@ -107,14 +102,6 @@ public class AccountBalanceRecordDTO implements Serializable {
         this.payType = payType;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public Integer getProductType() {
         return productType;
     }
@@ -226,7 +213,6 @@ public class AccountBalanceRecordDTO implements Serializable {
                 "accountBalanceRecordId=" + accountBalanceRecordId +
                 ", productName='" + productName + '\'' +
                 ", payType=" + payType +
-                ", status=" + status +
                 ", productType=" + productType +
                 ", billType=" + billType +
                 ", createTime=" + createTime +

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/AppletPageComponentDTO.java

@@ -39,11 +39,6 @@ public class AppletPageComponentDTO implements Serializable{
     private Integer componentIndex;
 
     /**
-     * 1开启，0无效
-     */
-    private Integer status;
-
-    /**
      *
      */
     private Date createTime;
@@ -98,14 +93,6 @@ public class AppletPageComponentDTO implements Serializable{
         this.componentIndex = componentIndex;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -138,7 +125,6 @@ public class AppletPageComponentDTO implements Serializable{
                 ", pageId=" + pageId +
                 ", componentType='" + componentType + '\'' +
                 ", componentIndex=" + componentIndex +
-                ", status=" + status +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", setting='" + setting + '\'' +

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/AppletWechatMenuDTO.java

@@ -71,11 +71,6 @@ public class AppletWechatMenuDTO implements Serializable{
     /**
      *
      */
-    private Integer status;
-
-    /**
-     *
-     */
     private Date createTime;
 
     /**
@@ -176,14 +171,6 @@ public class AppletWechatMenuDTO implements Serializable{
         this.sort = sort;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -232,7 +219,6 @@ public class AppletWechatMenuDTO implements Serializable{
                 ", appKey='" + appKey + '\'' +
                 ", parentMenuId=" + parentMenuId +
                 ", sort=" + sort +
-                ", status=" + status +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", child=" + child +

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/AuditLogDTO.java

@@ -85,11 +85,6 @@ public class AuditLogDTO implements Serializable {
     /**
      *
      */
-    private Integer status;
-
-    /**
-     *
-     */
     private Date createTime;
 
     /**
@@ -216,14 +211,6 @@ public class AuditLogDTO implements Serializable {
         this.auditResult = auditResult;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -336,7 +323,6 @@ public class AuditLogDTO implements Serializable {
                 ", auditorPhone='" + auditorPhone + '\'' +
                 ", auditTime=" + auditTime +
                 ", auditResult=" + auditResult +
-                ", status=" + status +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", extraInfo='" + extraInfo + '\'' +

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/BillingCouponCardDTO.java

@@ -27,11 +27,6 @@ public class BillingCouponCardDTO implements Serializable {
     /**
      *
      */
-    private Integer status;
-
-    /**
-     *
-     */
     private Date createTime;
 
     /**
@@ -90,14 +85,6 @@ public class BillingCouponCardDTO implements Serializable {
         this.enterpriseId = enterpriseId;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -175,7 +162,6 @@ public class BillingCouponCardDTO implements Serializable {
         return "BillingCouponCardDTO{" +
                 "couponCardId=" + couponCardId +
                 ", enterpriseId=" + enterpriseId +
-                ", status=" + status +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", couponCardName='" + couponCardName + '\'' +

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/BillingPayInfoDTO.java

@@ -79,7 +79,7 @@ public class BillingPayInfoDTO implements Serializable{
     /**
      *
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -207,12 +207,12 @@ public class BillingPayInfoDTO implements Serializable{
         this.invoiceStatus = invoiceStatus;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {
@@ -295,7 +295,7 @@ public class BillingPayInfoDTO implements Serializable{
                 ", codeUrl='" + codeUrl + '\'' +
                 ", prepayId='" + prepayId + '\'' +
                 ", invoiceStatus=" + invoiceStatus +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", buyType=" + buyType +

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/BillingRechargeRecordDTO.java

@@ -41,10 +41,6 @@ public class BillingRechargeRecordDTO implements Serializable {
      */
     private Integer payInfoId;
     /**
-     *
-     */
-    private Integer status;
-    /**
      * 发起方  1商户 2运维
      */
     private Integer initiator;
@@ -155,14 +151,6 @@ public class BillingRechargeRecordDTO implements Serializable {
         this.payInfoId = payInfoId;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public Integer getInitiator() {
         return initiator;
     }
@@ -333,7 +321,6 @@ public class BillingRechargeRecordDTO implements Serializable {
                 ", totalFeePaid=" + totalFeePaid +
                 ", payType=" + payType +
                 ", payInfoId=" + payInfoId +
-                ", status=" + status +
                 ", initiator=" + initiator +
                 ", initiatorUser=" + initiatorUser +
                 ", initiatorName='" + initiatorName + '\'' +

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/BillingSmsRecordDTO.java

@@ -16,11 +16,6 @@ public class BillingSmsRecordDTO implements Serializable {
     private Long smsRecordId;
 
     /**
-     * 
-     */
-    private Integer status;
-
-    /**
      * 发送时间
      */
     private Date sendTime;
@@ -123,14 +118,6 @@ public class BillingSmsRecordDTO implements Serializable {
         this.smsRecordId = smsRecordId;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public Date getSendTime() {
         return sendTime;
     }
@@ -287,7 +274,6 @@ public class BillingSmsRecordDTO implements Serializable {
     public String toString() {
         return "BillingSmsRecordDTO{" +
                 "smsRecordId=" + smsRecordId +
-                ", status=" + status +
                 ", sendTime=" + sendTime +
                 ", receivePhone='" + receivePhone + '\'' +
                 ", payType=" + payType +

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/EnterpriseResourceRelDTO.java

@@ -36,7 +36,7 @@ public class EnterpriseResourceRelDTO implements Serializable{
     /**
      * 状态1:有效 0:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -85,12 +85,12 @@ public class EnterpriseResourceRelDTO implements Serializable{
         this.enterpriseId = enterpriseId;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {
@@ -124,7 +124,7 @@ public class EnterpriseResourceRelDTO implements Serializable{
                 ", resourceCode='" + resourceCode + '\'' +
                 ", resourceName='" + resourceName + '\'' +
                 ", enterpriseId=" + enterpriseId +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", resourceSwitch=" + resourceSwitch +

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/data/DataActuallyPaidConfigDTO.java

@@ -41,7 +41,7 @@ public class DataActuallyPaidConfigDTO implements Serializable{
     /**
      * 1:有效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -93,12 +93,12 @@ public class DataActuallyPaidConfigDTO implements Serializable{
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public DataActuallyPaidConfigDTO setStatus(Integer status) {
-        this.status = status;
+    public DataActuallyPaidConfigDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 
@@ -137,7 +137,7 @@ public class DataActuallyPaidConfigDTO implements Serializable{
                 ", classify=" + classify +
                 ", configStatus=" + configStatus +
                 ", hasConfig=" + hasConfig +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 '}';

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabBillingAuditResultMapper.java

-package com.gic.enterprise.dao.mapper;
-
-import com.gic.enterprise.entity.TabBillingAuditResult;
-/**
- *
- * @ClassName: TabBillingAuditResultMapper
- * @Description:
- * @author taogs
- * @date 2020/9/11 15:37
- */
-public interface TabBillingAuditResultMapper {
-
-
-    /**
-     * 插入一条记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int insert(TabBillingAuditResult record);
-
-    /**
-     * 动态插入一条记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int insertSelective(TabBillingAuditResult record);
-
-    /**
-     * 根据主键查询
-     *
-     * @param auditResultId 主键
-     * @return 实体对象
-     */
-    TabBillingAuditResult selectByPrimaryKey(Integer auditResultId);
-
-    /**
-     * 根据主键动态更新记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int updateByPrimaryKeySelective(TabBillingAuditResult record);
-
-    /**
-     * 根据主键更新记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int updateByPrimaryKey(TabBillingAuditResult record);
-}
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabAccountStandard.java

@@ -43,7 +43,7 @@ public class TabAccountStandard {
     /**
      * 状态（0：删除，1：有效）
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     public Integer getStandardId() {
         return standardId;
@@ -93,11 +93,11 @@ public class TabAccountStandard {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabAppletCustomPage.java

@@ -75,6 +75,8 @@ public class TabAppletCustomPage {
      */
     private String setting;
 
+    private Integer deleteFlag;
+
     public Integer getPageId() {
         return pageId;
     }
@@ -180,4 +182,12 @@ public class TabAppletCustomPage {
         this.quickGuideSwitch = quickGuideSwitch;
         return this;
     }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabAppletPageComponent.java

@@ -38,7 +38,7 @@ public class TabAppletPageComponent {
     /**
      * 1开启，0无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -95,12 +95,12 @@ public class TabAppletPageComponent {
         this.componentIndex = componentIndex;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabAppletServiceConfig.java

@@ -53,7 +53,7 @@ public class TabAppletServiceConfig {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     public Integer getAppletServiceId() {
         return appletServiceId;
@@ -119,11 +119,11 @@ public class TabAppletServiceConfig {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabAppletWechatMenu.java

@@ -68,7 +68,7 @@ public class TabAppletWechatMenu {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -168,12 +168,12 @@ public class TabAppletWechatMenu {
         this.sort = sort;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabAuditLog.java

@@ -73,7 +73,7 @@ public class TabAuditLog {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -201,12 +201,12 @@ public class TabAuditLog {
         this.auditResult = auditResult;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabAuditProcess.java

@@ -53,7 +53,7 @@ public class TabAuditProcess {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -129,12 +129,12 @@ public class TabAuditProcess {
         this.auditorType = auditorType;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabBillingAccountBalanceRecord.java

@@ -28,7 +28,7 @@ public class TabBillingAccountBalanceRecord {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 产品类型  1:充值,2:短信套餐,3:服务,4:拓展包,5:套餐包
@@ -119,12 +119,12 @@ public class TabBillingAccountBalanceRecord {
         this.payType = payType;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Integer getProductType() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabBillingDoubleCallingRecord.java

@@ -38,7 +38,7 @@ public class TabBillingDoubleCallingRecord {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -160,12 +160,12 @@ public class TabBillingDoubleCallingRecord {
         this.fee = fee;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabBillingInternationalSmsRecord.java

@@ -21,7 +21,7 @@ public class TabBillingInternationalSmsRecord {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 发送时间
@@ -181,12 +181,12 @@ public class TabBillingInternationalSmsRecord {
         this.smsRecordId = smsRecordId;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getSendTime() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabBillingOrder.java

@@ -68,7 +68,7 @@ public class TabBillingOrder {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -183,12 +183,12 @@ public class TabBillingOrder {
         this.auditResultId = auditResultId;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabBillingPayInfo.java

@@ -78,7 +78,7 @@ public class TabBillingPayInfo {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -219,12 +219,12 @@ public class TabBillingPayInfo {
         this.invoiceStatus = invoiceStatus;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabBillingRechargeRecord.java

@@ -53,7 +53,7 @@ public class TabBillingRechargeRecord {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 发起方  1：商户  2运维后台
@@ -159,12 +159,12 @@ public class TabBillingRechargeRecord {
         this.payInfoId = payInfoId;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Integer getInitiator() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabBillingRecordingStorageRecord.java

@@ -33,7 +33,7 @@ public class TabBillingRecordingStorageRecord {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -157,12 +157,12 @@ public class TabBillingRecordingStorageRecord {
         this.fee = fee;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabBillingRefund.java

@@ -68,7 +68,7 @@ public class TabBillingRefund {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -173,12 +173,12 @@ public class TabBillingRefund {
         this.timeEnd = timeEnd;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabBillingSmsPackageRecord.java

@@ -43,7 +43,7 @@ public class TabBillingSmsPackageRecord {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -143,12 +143,12 @@ public class TabBillingSmsPackageRecord {
         this.payType = payType;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabBillingSmsRecord.java

@@ -21,7 +21,7 @@ public class TabBillingSmsRecord {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 发送时间
@@ -171,12 +171,12 @@ public class TabBillingSmsRecord {
         this.smsRecordId = smsRecordId;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getSendTime() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabBillingVoiceCodeRecord.java

@@ -23,7 +23,7 @@ public class TabBillingVoiceCodeRecord {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 发送时间
@@ -121,12 +121,12 @@ public class TabBillingVoiceCodeRecord {
         this.paySerialNumber = paySerialNumber;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getSendTime() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabConfigRule.java

@@ -78,7 +78,7 @@ public class TabConfigRule {
     /**
      * 状态值 1:有效 0:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -198,12 +198,12 @@ public class TabConfigRule {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabConfigRule setStatus(Integer status) {
-        this.status = status;
+    public TabConfigRule setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabConfigRuleEnterprise.java

@@ -28,7 +28,7 @@ public class TabConfigRuleEnterprise {
     /**
      * 状态值 1:有效 0:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -67,12 +67,12 @@ public class TabConfigRuleEnterprise {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabConfigRuleEnterprise setStatus(Integer status) {
-        this.status = status;
+    public TabConfigRuleEnterprise setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabConfigRuleEnterpriseRel.java

@@ -28,7 +28,7 @@ public class TabConfigRuleEnterpriseRel {
     /**
      * 状态值 1:有效 0:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -67,12 +67,12 @@ public class TabConfigRuleEnterpriseRel {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabConfigRuleEnterpriseRel setStatus(Integer status) {
-        this.status = status;
+    public TabConfigRuleEnterpriseRel setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabConfigRuleRel.java

@@ -28,7 +28,7 @@ public class TabConfigRuleRel {
     /**
      * 状态值 1:有效 0:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -67,12 +67,12 @@ public class TabConfigRuleRel {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabConfigRuleRel setStatus(Integer status) {
-        this.status = status;
+    public TabConfigRuleRel setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabCustomGuide.java

@@ -90,6 +90,8 @@ public class TabCustomGuide {
      */
     private String appid;
 
+    private Integer deleteFlag;
+
     public Integer getGuideId() {
         return guideId;
     }
@@ -217,4 +219,12 @@ public class TabCustomGuide {
     public void setAppid(String appid) {
         this.appid = appid;
     }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabCustomStore.java

@@ -60,6 +60,8 @@ public class TabCustomStore {
      */
     private Integer quickGuideSwitch;
 
+    private Integer deleteFlag;
+
     public Integer getCustomStoreId() {
         return customStoreId;
     }
@@ -140,4 +142,12 @@ public class TabCustomStore {
         this.quickGuideSwitch = quickGuideSwitch;
         return this;
     }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabCustomUdeskField.java

@@ -57,6 +57,8 @@ public class TabCustomUdeskField {
      */
     private Date updateTime;
 
+    private Integer deleteFlag;
+
     public Integer getId() {
         return id;
     }
@@ -146,4 +148,12 @@ public class TabCustomUdeskField {
         this.fieldType = fieldType;
         return this;
     }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabDataActuallyPaidConfig.java

@@ -38,7 +38,7 @@ public class TabDataActuallyPaidConfig {
     /**
      * 1:有效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -86,12 +86,12 @@ public class TabDataActuallyPaidConfig {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabDataActuallyPaidConfig setStatus(Integer status) {
-        this.status = status;
+    public TabDataActuallyPaidConfig setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabDataGenerationConfig.java

@@ -53,7 +53,7 @@ public class TabDataGenerationConfig {
     /**
      * 1:有效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -137,12 +137,12 @@ public class TabDataGenerationConfig {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabDataGenerationConfig setStatus(Integer status) {
-        this.status = status;
+    public TabDataGenerationConfig setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabDataMemberConsumeConfig.java

@@ -48,7 +48,7 @@ public class TabDataMemberConsumeConfig {
     /**
      * 1:有效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -123,12 +123,12 @@ public class TabDataMemberConsumeConfig {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabDataMemberConsumeConfig setStatus(Integer status) {
-        this.status = status;
+    public TabDataMemberConsumeConfig setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabDataPerformanceConfig.java

@@ -33,7 +33,7 @@ public class TabDataPerformanceConfig {
     /**
      * 1:有效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -81,12 +81,12 @@ public class TabDataPerformanceConfig {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabDataPerformanceConfig setStatus(Integer status) {
-        this.status = status;
+    public TabDataPerformanceConfig setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabDataSingleEffectConfig.java

@@ -53,7 +53,7 @@ public class TabDataSingleEffectConfig {
     /**
      * 1:有效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -128,12 +128,12 @@ public class TabDataSingleEffectConfig {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabDataSingleEffectConfig setStatus(Integer status) {
-        this.status = status;
+    public TabDataSingleEffectConfig setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabDataWechatMemberConfig.java

@@ -43,7 +43,7 @@ public class TabDataWechatMemberConfig {
     /**
      * 1:有效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -100,12 +100,12 @@ public class TabDataWechatMemberConfig {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabDataWechatMemberConfig setStatus(Integer status) {
-        this.status = status;
+    public TabDataWechatMemberConfig setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabEnterpriseResourceRel.java

@@ -33,7 +33,7 @@ public class TabEnterpriseResourceRel {
     /**
      * 状态1:有效 0:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -82,12 +82,12 @@ public class TabEnterpriseResourceRel {
         this.enterpriseId = enterpriseId;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabEnterpriseWhiteList.java

@@ -33,7 +33,7 @@ public class TabEnterpriseWhiteList {
     /**
      * 1:有效 0:解除白名单
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -81,12 +81,12 @@ public class TabEnterpriseWhiteList {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabEnterpriseWhiteList setStatus(Integer status) {
-        this.status = status;
+    public TabEnterpriseWhiteList setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/AppletServiceConfigServiceImpl.java

@@ -2,7 +2,6 @@ package com.gic.enterprise.service.impl;
 
 import com.gic.enterprise.constant.LinkSortEnum;
 import com.gic.enterprise.constant.applet.AppletServiceConfigEnum;
-import com.gic.enterprise.constants.Constants;
 import com.gic.enterprise.dao.mapper.TabAppletServiceConfigMapper;
 import com.gic.enterprise.entity.TabAppletServiceConfig;
 import com.gic.enterprise.qo.AppletServiceConfigQO;
@@ -110,7 +109,7 @@ public class AppletServiceConfigServiceImpl implements AppletServiceConfigServic
     public void delAppletService(Integer appletServiceId) {
         TabAppletServiceConfig appletServiceConfig = new TabAppletServiceConfig();
         appletServiceConfig.setAppletServiceId(appletServiceId);
-        appletServiceConfig.setStatus(Constants.DEL_STATUS);
+        appletServiceConfig.setDeleteFlag(1);
         this.tabAppletServiceConfigMapper.updateByPrimaryKeySelective(appletServiceConfig);
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/AppletWechatMenuServiceImpl.java

@@ -27,8 +27,8 @@ public class AppletWechatMenuServiceImpl implements AppletWechatMenuService{
     public Integer save(AppletWechatMenuDTO dto) {
         dto.setCreateTime(new Date());
         dto.setUpdateTime(new Date());
-        dto.setStatus(1);
         TabAppletWechatMenu record = EntityUtil.changeEntityNew(TabAppletWechatMenu.class, dto);
+        record.setDeleteFlag(0);
         tabAppletWechatMenuMapper.insert(record);
         return record.getMenuId();
     }
@@ -63,7 +63,7 @@ public class AppletWechatMenuServiceImpl implements AppletWechatMenuService{
     public void deleteByMenuId(Integer menuId) {
         TabAppletWechatMenu record = new TabAppletWechatMenu();
         record.setMenuId(menuId);
-        record.setStatus(0);
+        record.setDeleteFlag(1);
         tabAppletWechatMenuMapper.updateByPrimaryKeySelective(record);
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/AuditLogServiceImpl.java

 package com.gic.enterprise.service.impl;
 
 import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.dao.mapper.TabAuditLogMapper;
 import com.gic.enterprise.dto.AuditLogDTO;
 import com.gic.enterprise.entity.TabAuditLog;
@@ -46,7 +45,7 @@ public class AuditLogServiceImpl implements AuditLogService {
     @Override
     public Integer save(AuditLogDTO auditLogDTO) {
         TabAuditLog auditLog = EntityUtil.changeEntityByJSON(TabAuditLog.class, auditLogDTO);
-        auditLog.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        auditLog.setDeleteFlag(0);
         auditLog.setCreateTime(new Date());
         tabAuditLogMapper.insertSelective(auditLog);
         return auditLog.getAuditLogId();

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/AuditProcessServiceImpl.java

 package com.gic.enterprise.service.impl;
 
-import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.dao.mapper.TabAuditProcessMapper;
 import com.gic.enterprise.entity.TabAuditProcess;
 import com.gic.enterprise.service.AuditProcessService;
@@ -23,7 +22,7 @@ public class AuditProcessServiceImpl implements AuditProcessService {
 
     @Override
     public int save(TabAuditProcess auditProcess) {
-        auditProcess.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        auditProcess.setDeleteFlag(0);
         auditProcess.setCreateTime(new Date());
         return tabAuditProcessMapper.insertSelective(auditProcess);
     }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingAccountBalanceRecordServiceImpl.java

 package com.gic.enterprise.service.impl;
 
 import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.dao.mapper.TabBillingAccountBalanceRecordMapper;
 import com.gic.enterprise.dto.AccountBalanceRecordDTO;
 import com.gic.enterprise.dto.HomeStatisticsDTO;
@@ -57,7 +56,7 @@ public class BillingAccountBalanceRecordServiceImpl implements BillingAccountBal
     @Override
     public Integer save(AccountBalanceRecordDTO accountBalanceRecordDTO) {
         TabBillingAccountBalanceRecord accountBalanceRecord = EntityUtil.changeEntityByOrika(TabBillingAccountBalanceRecord.class, accountBalanceRecordDTO);
-        accountBalanceRecord.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        accountBalanceRecord.setDeleteFlag(0);
         accountBalanceRecord.setCreateTime(new Date());
         accountBalanceRecord.setDeductionTime(new Date());
         return tabBillingAccountBalanceRecordMapper.insertSelective(accountBalanceRecord);

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingDoubleCallingRecordServiceImpl.java

 package com.gic.enterprise.service.impl;
 
 import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.dao.mapper.TabBillingDoubleCallingRecordMapper;
 import com.gic.enterprise.dto.DoubleCallingRecordDTO;
 import com.gic.enterprise.dto.HomeStatisticsDTO;
@@ -62,7 +61,7 @@ public class BillingDoubleCallingRecordServiceImpl implements BillingDoubleCalli
     @Override
     public Integer save(DoubleCallingRecordDTO doubleCallingRecordDTO) {
         TabBillingDoubleCallingRecord tabBillingDoubleCallingRecord = EntityUtil.changeEntityByJSON(TabBillingDoubleCallingRecord.class, doubleCallingRecordDTO);
-        tabBillingDoubleCallingRecord.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        tabBillingDoubleCallingRecord.setDeleteFlag(0);
         tabBillingDoubleCallingRecord.setCreateTime(new Date());
         return tabBillingDoubleCallingRecordMapper.insertSelective(tabBillingDoubleCallingRecord);
     }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingOrderServiceImpl.java

 package com.gic.enterprise.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.constant.BillingOrderStatusEnum;
 import com.gic.enterprise.constant.EnterpriseStatusTypeEnum;
 import com.gic.enterprise.constant.PayTypeEnum;
@@ -47,7 +46,7 @@ public class BillingOrderServiceImpl implements BillingOrderService {
         billingOrder.setOrderStatus(BillingOrderStatusEnum.WAIT_PAY.getCode());
         billingOrder.setTotalFee(billingOrderDTO.getTotalFee());
         billingOrder.setTotalFeePaid(billingOrderDTO.getTotalFeePaid());
-        billingOrder.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        billingOrder.setDeleteFlag(0);
         billingOrder.setCreateTime(new Date());
         billingOrder.setItemJson(billingOrderDTO.getItemJson());
         billingOrder.setPayType(billingOrderDTO.getPayType());

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingRechargeRecordServiceImpl.java

 package com.gic.enterprise.service.impl;
 
-import java.util.Date;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.constant.BillingAuditStatusEnum;
 import com.gic.enterprise.constant.PayTypeEnum;
 import com.gic.enterprise.dao.mapper.TabBillingRechargeRecordMapper;
@@ -17,6 +11,10 @@ import com.gic.enterprise.service.BillingRechargeRecordService;
 import com.gic.enterprise.utils.CreateRandomUtils;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
 
 /**
  *
@@ -40,7 +38,7 @@ public class BillingRechargeRecordServiceImpl implements BillingRechargeRecordSe
         rechargeRecord.setTotalFee(billingRechargeDTO.getTotalFee());
         rechargeRecord.setPayType(PayTypeEnum.OFFLINE_PAY.getCode());
         rechargeRecord.setPayInfoId(billingRechargeDTO.getPayInfoId());
-        rechargeRecord.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        rechargeRecord.setDeleteFlag(0);
         rechargeRecord.setInitiator(billingRechargeDTO.getInitiator());
         rechargeRecord.setInitiatorUser(billingRechargeDTO.getInitiatorUser());
         rechargeRecord.setInitiatorName(billingRechargeDTO.getInitiatorName());
@@ -60,7 +58,7 @@ public class BillingRechargeRecordServiceImpl implements BillingRechargeRecordSe
         rechargeRecord.setTotalFeePaid(billingRechargeDTO.getTotalFeePaid());
         rechargeRecord.setPayType(PayTypeEnum.WE_CHAT_PAY.getCode());
         rechargeRecord.setPayInfoId(billingRechargeDTO.getPayInfoId());
-        rechargeRecord.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        rechargeRecord.setDeleteFlag(0);
         rechargeRecord.setInitiator(billingRechargeDTO.getInitiator());
         rechargeRecord.setInitiatorUser(billingRechargeDTO.getInitiatorUser());
         rechargeRecord.setInitiatorName(billingRechargeDTO.getInitiatorName());

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingRecordingStorageRecordServiceImpl.java

 package com.gic.enterprise.service.impl;
 
 import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.dao.mapper.TabBillingRecordingStorageRecordMapper;
 import com.gic.enterprise.dto.HomeStatisticsDTO;
 import com.gic.enterprise.dto.RecordingStorageRecordDTO;
@@ -62,7 +61,7 @@ public class BillingRecordingStorageRecordServiceImpl implements BillingRecordin
     @Override
     public Integer save(RecordingStorageRecordDTO recordingStorageRecordDTO) {
         TabBillingRecordingStorageRecord tabBillingRecordingStorageRecord = EntityUtil.changeEntityByJSON(TabBillingRecordingStorageRecord.class, recordingStorageRecordDTO);
-        tabBillingRecordingStorageRecord.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        tabBillingRecordingStorageRecord.setDeleteFlag(0);
         tabBillingRecordingStorageRecord.setCreateTime(new Date());
         return tabBillingRecordingStorageRecordMapper.insertSelective(tabBillingRecordingStorageRecord);
     }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingRefundServiceImpl.java

 package com.gic.enterprise.service.impl;
 
 import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.dao.mapper.TabBillingRefundMapper;
 import com.gic.enterprise.dto.RefundDTO;
 import com.gic.enterprise.entity.TabBillingRefund;
@@ -39,7 +38,7 @@ public class BillingRefundServiceImpl implements BillingRefundService {
     @Override
     public Integer save(RefundDTO refundDTO) {
         TabBillingRefund billingRefund = EntityUtil.changeEntityByOrika(TabBillingRefund.class, refundDTO);
-        billingRefund.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        billingRefund.setDeleteFlag(0);
         billingRefund.setCreateTime(new Date());
         billingRefund.setRefundChannel(1);
         return tabBillingRefundMapper.insertSelective(billingRefund);

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingSmsPackageRecordServiceImpl.java

 package com.gic.enterprise.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.dao.mapper.TabBillingSmsPackageRecordMapper;
 import com.gic.enterprise.dto.BillingOrderDTO;
 import com.gic.enterprise.dto.HomeStatisticsDTO;
@@ -54,7 +53,7 @@ public class BillingSmsPackageRecordServiceImpl implements BillingSmsPackageReco
         packageRecord.setItemFee(new BigDecimal(smsPackageOrderItemDTO.getCost() + "").multiply(new BigDecimal(smsPackageOrderItemDTO.getSmsAmount() + "")).doubleValue());
         packageRecord.setTotalFee(billingOrderDTO.getTotalFee());
         packageRecord.setPayType(billingOrderDTO.getPayType());
-        packageRecord.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        packageRecord.setDeleteFlag(0);
         packageRecord.setOrderId(billingOrderDTO.getOrderId());
         packageRecord.setDeductionTime(new Date());
         packageRecord.setEnterpriseId(billingOrderDTO.getEnterpriseId());

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingSmsRecordServiceImpl.java

 package com.gic.enterprise.service.impl;
 
 import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.dao.mapper.TabBillingSmsRecordMapper;
 import com.gic.enterprise.dto.HomeStatisticsDTO;
 import com.gic.enterprise.dto.SmsRecordDTO;
@@ -67,7 +66,7 @@ public class BillingSmsRecordServiceImpl implements BillingSmsRecordService{
     @Override
     public Long saveSmsRecord(SmsRecordDTO smsRecordDTO) {
         TabBillingSmsRecord billingSmsRecord = EntityUtil.changeEntityByJSON(TabBillingSmsRecord.class, smsRecordDTO);
-        billingSmsRecord.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        billingSmsRecord.setDeleteFlag(0);
         billingSmsRecord.setCreateTime(new Date());
         billingSmsRecord.setBillNumber(1);
         tabBillingSmsRecordMapper.insertSelective(billingSmsRecord);

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingVoiceCodeRecordServiceImpl.java

@@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.dao.mapper.TabBillingVoiceCodeRecordMapper;
 import com.gic.enterprise.dto.HomeStatisticsDTO;
 import com.gic.enterprise.dto.VoiceCodeRecordDTO;
@@ -64,7 +63,7 @@ public class BillingVoiceCodeRecordServiceImpl implements BillingVoiceCodeRecord
     @Override
     public Integer save(VoiceCodeRecordDTO voiceCodeRecordDTO) {
         TabBillingVoiceCodeRecord billingVoiceCodeRecord = EntityUtil.changeEntityByJSON(TabBillingVoiceCodeRecord.class, voiceCodeRecordDTO);
-        billingVoiceCodeRecord.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        billingVoiceCodeRecord.setDeleteFlag(0);
         billingVoiceCodeRecord.setCreateTime(new Date());
         billingVoiceCodeRecord.setPaySerialNumber(CreateRandomUtils.createSerialNumber());
         return tabBillingVoiceCodeRecordMapper.insertSelective(billingVoiceCodeRecord);

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/ConfigRuleServiceImpl.java

@@ -98,7 +98,7 @@ public class ConfigRuleServiceImpl implements ConfigRuleService{
     }
 
     private Integer save(TabConfigRule record) {
-        record.setStatus(1);
+        record.setDeleteFlag(1);
         record.setCreateTime(new Date());
         record.setUpdateTime(new Date());
         tabConfigRuleMapper.insertSelective(record);

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/CustomStoreServiceImpl.java

@@ -50,7 +50,7 @@ public class CustomStoreServiceImpl implements CustomStoreService {
     public int deleteCustomStore(Integer customStoreId) {
         TabCustomStore store = new TabCustomStore();
         store.setCustomStoreId(customStoreId);
-        store.setStatus(0);
+        store.setDeleteFlag(1);
         return this.tabCustomStoreMapper.updateByPrimaryKeySelective(store);
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/DataActuallyPaidConfigServiceImpl.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
+
 /**
  *
  * @ClassName: DataActuallyPaidConfigServiceImpl
@@ -28,7 +28,7 @@ public class DataActuallyPaidConfigServiceImpl implements DataActuallyPaidConfig
         Date now = new Date();
         dto.setCreateTime(now);
         dto.setUpdateTime(now);
-        dto.setStatus(1);
+        dto.setDeleteFlag(1);
         TabDataActuallyPaidConfig record = EntityUtil.changeEntityNew(TabDataActuallyPaidConfig.class, dto);
         tabDataActuallyPaidConfigMapper.insert(record);
         return record.getActuallyPaidConfigId();
@@ -39,7 +39,7 @@ public class DataActuallyPaidConfigServiceImpl implements DataActuallyPaidConfig
         Date now = new Date();
         dto.setCreateTime(now);
         dto.setUpdateTime(now);
-        dto.setStatus(1);
+        dto.setDeleteFlag(1);
         tabDataActuallyPaidConfigMapper.insert(dto);
         return dto.getActuallyPaidConfigId();
     }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/EnterpriseResourceRelServiceImpl.java

@@ -27,7 +27,7 @@ public class EnterpriseResourceRelServiceImpl implements EnterpriseResourceRelSe
         Date now = new Date();
         dto.setCreateTime(now);
         dto.setUpdateTime(now);
-        dto.setStatus(1);
+        dto.setDeleteFlag(0);
         TabEnterpriseResourceRel record = EntityUtil.changeEntityNew(TabEnterpriseResourceRel.class, dto);
         tabEnterpriseResourceRelMapper.insert(record);
     }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/EnterpriseWhiteListServiceImpl.java

@@ -29,14 +29,14 @@ public class EnterpriseWhiteListServiceImpl implements EnterpriseWhiteListServic
         TabEnterpriseWhiteList record = EntityUtil.changeEntityNew(TabEnterpriseWhiteList.class, dto);
         record.setUpdateTime(now);
         record.setCreateTime(now);
-        record.setStatus(1);
+        record.setDeleteFlag(1);
         tabEnterpriseWhiteListMapper.insert(record);
     }
 
     @Override
     public void removeEnterpriseWhiteList(Integer enterpriseId) {
         TabEnterpriseWhiteList record = tabEnterpriseWhiteListMapper.getEnterpriseWhiteList(enterpriseId);
-        record.setStatus(0);
+        record.setDeleteFlag(0);
         tabEnterpriseWhiteListMapper.updateByPrimaryKeySelective(record);
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AppletCustomPageApiServiceImpl.java

@@ -239,7 +239,7 @@ public class AppletCustomPageApiServiceImpl implements AppletCustomPageApiServic
                     temp.setUpdateTime(now);
                     temp.setSetting(json.toJSONString());
                     temp.setPageId(pageId);
-                    temp.setStatus(1);
+                    temp.setDeleteFlag(1);
                     componentList.add(temp);
                 }
             }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/ConfigRuleApiServiceImpl.java

@@ -240,12 +240,12 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
         if (TWO.equals(record.getRuleLevel())) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "分类ID错误，不是分类类型");
         }
-        configRuleService.update(new TabConfigRule().setRuleId(ruleId).setStatus(0));
+        configRuleService.update(new TabConfigRule().setRuleId(ruleId).setDeleteFlag(0));
         //删除下面的场景
         List<TabConfigRule> list = configRuleService.listRule(null, 3, ruleId);
         if (CollectionUtils.isNotEmpty(list)) {
             for (TabConfigRule tabConfigRule : list) {
-                configRuleService.update(new TabConfigRule().setRuleId(tabConfigRule.getRuleId()).setStatus(0));
+                configRuleService.update(new TabConfigRule().setRuleId(tabConfigRule.getRuleId()).setDeleteFlag(0));
             }
         }
         return ServiceResponse.success(record.getRuleName());
@@ -260,7 +260,7 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
         if (THREE.equals(record.getRuleLevel())) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "场景ID错误，不是场景类型");
         }
-        configRuleService.update(new TabConfigRule().setRuleId(ruleId).setStatus(0));
+        configRuleService.update(new TabConfigRule().setRuleId(ruleId).setDeleteFlag(0));
         return ServiceResponse.success(record.getRuleName());
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/ConfigRuleEnterpriseApiServiceImpl.java

@@ -100,7 +100,7 @@ public class ConfigRuleEnterpriseApiServiceImpl implements ConfigRuleEnterpriseA
         Date now = new Date();
         for (Integer enterpriseId : enterpriseIdList) {
             ruleEnterpriseRelList.add(new TabConfigRuleEnterpriseRel().setCreateTime(now).setUpdateTime(now)
-                    .setEnterpriseId(enterpriseId).setStatus(1).setEnterpriseRuleId(enterpriseRuleId));
+                    .setEnterpriseId(enterpriseId).setDeleteFlag(1).setEnterpriseRuleId(enterpriseRuleId));
         }
         //解绑
         configRuleEnterpriseService.deleteByEnterpriseRuleId(enterpriseRuleId);
@@ -111,7 +111,7 @@ public class ConfigRuleEnterpriseApiServiceImpl implements ConfigRuleEnterpriseA
         //新增规则树和商户规则关联数据
         List<TabConfigRuleRel> ruleRelList = new ArrayList<>(ruleIdList.size());
         for (Integer ruleId : ruleIdList) {
-            ruleRelList.add(new TabConfigRuleRel().setCreateTime(now).setUpdateTime(now).setStatus(1).setRuleId(ruleId)
+            ruleRelList.add(new TabConfigRuleRel().setCreateTime(now).setUpdateTime(now).setDeleteFlag(1).setRuleId(ruleId)
                     .setEnterpriseRuleId(enterpriseRuleId));
         }
         //解绑
@@ -185,7 +185,7 @@ public class ConfigRuleEnterpriseApiServiceImpl implements ConfigRuleEnterpriseA
         if (defaultRule != null && defaultRule.getEnterpriseRuleId().intValue() == enterpriseRuleId) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "平台默认规则不允许删除");
         }
-        configRuleEnterpriseService.update(record.setStatus(0));
+        configRuleEnterpriseService.update(record.setDeleteFlag(0));
         //解绑
         configRuleEnterpriseService.deleteByEnterpriseRuleId(enterpriseRuleId);
         configRuleEnterpriseService.deleteByEnterpriseRuleIdForRuleRel(enterpriseRuleId);

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/AccountBalanceStrategy.java

 package com.gic.enterprise.service.outer.impl.pay;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
@@ -24,6 +14,15 @@ import com.gic.enterprise.service.BillingAccountApiService;
 import com.gic.enterprise.service.BillingAccountBalanceRecordService;
 import com.gic.enterprise.service.BillingPayInfoService;
 import com.gic.enterprise.utils.CreateRandomUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  *
@@ -88,7 +87,7 @@ public class AccountBalanceStrategy implements PayStrategy {
         payInfoDTO.setTimeStart(outPayDTO.getTimeStart());
         payInfoDTO.setResultCode(BillingPayResultEnum.WAIT.getCode());
         payInfoDTO.setInvoiceStatus(GlobalInfo.DATA_STATUS_DELETE);
-        payInfoDTO.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        payInfoDTO.setDeleteFlag(0);
         payInfoDTO.setCreateTime(new Date());
         payInfoDTO.setBuyType(outPayDTO.getBuyType());
         payInfoDTO.setOrderSerialNumber(outPayDTO.getOrderSerialNumber());

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/OfflineStrategy.java

@@ -74,7 +74,7 @@ public class OfflineStrategy implements PayStrategy {
         payInfoDTO.setTimeStart(outPayDTO.getTimeStart());
         payInfoDTO.setResultCode(BillingPayResultEnum.WAIT.getCode());
         payInfoDTO.setInvoiceStatus(GlobalInfo.DATA_STATUS_DELETE);
-        payInfoDTO.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        payInfoDTO.setDeleteFlag(0);
         payInfoDTO.setCreateTime(new Date());
         payInfoDTO.setBuyType(outPayDTO.getBuyType());
         payInfoDTO.setOrderSerialNumber(outPayDTO.getOrderSerialNumber());
@@ -104,7 +104,7 @@ public class OfflineStrategy implements PayStrategy {
             billingPayInfoDTO.setInvoiceStatus(GlobalInfo.DATA_STATUS_DELETE);
             billingPayInfoDTO.setPayType(PayTypeEnum.OFFLINE_PAY.getCode());
             billingPayInfoDTO.setTimeStart(DateUtil.formatString(new Date(), DateUtil.FORMAT_DATETIME_14));
-            billingPayInfoDTO.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+            billingPayInfoDTO.setDeleteFlag(0);
             billingPayInfoDTO.setCreateTime(new Date());
             billingPayInfoDTO.setBuyType(outPayDTO.getBuyType());
             billingPayInfoDTO.setAuthCode(outPayDTO.getAuthCode());

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/WxPayStrategy.java

@@ -176,7 +176,7 @@ public class WxPayStrategy implements PayStrategy {
             billingPayInfoDTO.setCodeUrl(serviceResponse.getResult());
             billingPayInfoDTO.setTotalFeePaid(totalFee);
             billingPayInfoDTO.setInvoiceStatus(GlobalInfo.DATA_STATUS_DELETE);
-            billingPayInfoDTO.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+            billingPayInfoDTO.setDeleteFlag(0);
             billingPayInfoDTO.setCreateTime(new Date());
             billingPayInfoDTO.setBuyType(buyType);
             Integer payInfoId = billingPayInfoService.savePayInfo(billingPayInfoDTO);

gic-platform-enterprise-service/src/main/resources/mapper/TabAccountStandardMapper.xml

@@ -8,10 +8,10 @@
     <result column="unit_fee" jdbcType="INTEGER" property="unitFee" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
-    standard_id, enterprise_id, account_type, unit_fee, create_time, update_time, status
+    standard_id, enterprise_id, account_type, unit_fee, create_time, update_time, delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -23,10 +23,10 @@
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabAccountStandard">
     insert into tab_account_standard (standard_id, enterprise_id, account_type, 
       unit_fee, create_time, update_time, 
-      status)
+      delete_flag)
     values (#{standardId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{accountType,jdbcType=INTEGER}, 
       #{unitFee,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{status,jdbcType=INTEGER})
+      #{deleteFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabAccountStandard">
     insert into tab_account_standard
@@ -49,8 +49,8 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -72,8 +72,8 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -95,8 +95,8 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
     </set>
     where standard_id = #{standardId,jdbcType=INTEGER}
@@ -108,7 +108,7 @@
       unit_fee = #{unitFee,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER}
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where standard_id = #{standardId,jdbcType=INTEGER}
   </update>
   <select id="queryUnitFee" resultType="int">
@@ -117,6 +117,6 @@
     from tab_account_standard
     where enterprise_id = #{enterpriseId}
     and account_type = #{accountType}
-    and status = 1
+    and delete_flag = 0
   </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabAppletCustomPageMapper.xml

@@ -14,13 +14,14 @@
     <result column="app_id" jdbcType="VARCHAR" property="appId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.gic.enterprise.entity.TabAppletCustomPage">
     <result column="setting" jdbcType="LONGVARCHAR" property="setting" />
   </resultMap>
   <sql id="Base_Column_List">
     page_id, enterprise_id, title, entry_condition, quick_guide_switch, background_color, page_type, status,
-    app_type, app_id, create_time, update_time
+    app_type, app_id, create_time, update_time, delete_flag
   </sql>
   <sql id="Blob_Column_List">
     setting
@@ -38,12 +39,12 @@
     insert into tab_applet_custom_page (page_id, enterprise_id, title, 
       entry_condition, quick_guide_switch, background_color, page_type, status, app_type,
       app_id, create_time, update_time, 
-      setting)
+      setting, delete_flag)
     values (#{pageId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, 
       #{entryCondition,jdbcType=INTEGER}, #{quickGuideSwitch,jdbcType=INTEGER}, #{backgroundColor,jdbcType=VARCHAR}, #{pageType,jdbcType=INTEGER},
       #{status,jdbcType=INTEGER}, #{appType,jdbcType=INTEGER},
       #{appId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{setting,jdbcType=LONGVARCHAR})
+      #{setting,jdbcType=LONGVARCHAR}, #{deleteFlag, jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabAppletCustomPage">
     insert into tab_applet_custom_page
@@ -87,6 +88,9 @@
       <if test="setting != null">
         setting,
       </if>
+      <if test="deleteFlag != null">
+        delete_flag,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="pageId != null">
@@ -128,6 +132,9 @@
       <if test="setting != null">
         #{setting,jdbcType=LONGVARCHAR},
       </if>
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabAppletCustomPage">
@@ -169,6 +176,9 @@
       <if test="setting != null">
         setting = #{setting,jdbcType=LONGVARCHAR},
       </if>
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      </if>
     </set>
     where page_id = #{pageId,jdbcType=INTEGER}
   </update>
@@ -185,7 +195,8 @@
       app_id = #{appId,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      setting = #{setting,jdbcType=LONGVARCHAR}
+      setting = #{setting,jdbcType=LONGVARCHAR},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where page_id = #{pageId,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabAppletCustomPage">
@@ -200,7 +211,8 @@
       app_type = #{appType,jdbcType=INTEGER},
       app_id = #{appId,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where page_id = #{pageId,jdbcType=INTEGER}
   </update>
 
@@ -210,7 +222,7 @@
     ,
     <include refid="Blob_Column_List" />
     from tab_applet_custom_page
-    where status between 1 and 2
+    where status between 1 and 2 and delete_flag = 0
     <if test="search != null and search != '' ">
       and title like concat('%', #{search}, '%')
     </if>
@@ -238,6 +250,7 @@
   <update id="disableFetch">
     update tab_applet_custom_page set status = 2
     where status = 1
+    and delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and app_id = #{appId}
     and page_type = #{pageType}
@@ -251,6 +264,7 @@
     <include refid="Blob_Column_List" />
     from tab_applet_custom_page
     where status = 1
+    and delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and app_id = #{appId}
     and page_type = #{pageType}
@@ -263,7 +277,7 @@
     and app_id = #{appId}
     and page_type = #{pageType}
     and app_type = #{appType}
-    and status != 0
+    and delete_flag = 0
   </select>
 
   <select id="getDefault" resultMap="BaseResultMap">
@@ -273,12 +287,13 @@
     <include refid="Blob_Column_List" />
     from tab_applet_custom_page
     where status = 1
+    and delete_flag
     and enterprise_id = -1
     and page_type = #{pageType}
   </select>
 
   <update id="deleteFetch">
-    update tab_applet_custom_page set status = 0
+    update tab_applet_custom_page set delete_flag = 1
     where page_id in
     <foreach collection="list" item="item" separator="," open="(" close=")" index="">
       #{item}

gic-platform-enterprise-service/src/main/resources/mapper/TabAppletPageComponentMapper.xml

@@ -7,7 +7,7 @@
     <result column="page_id" jdbcType="INTEGER" property="pageId" />
     <result column="component_type" jdbcType="VARCHAR" property="componentType" />
     <result column="component_index" jdbcType="INTEGER" property="componentIndex" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
@@ -15,7 +15,7 @@
     <result column="setting" jdbcType="LONGVARCHAR" property="setting" />
   </resultMap>
   <sql id="Base_Column_List">
-    component_id, enterprise_id, page_id, component_type, component_index, status, create_time, 
+    component_id, enterprise_id, page_id, component_type, component_index, delete_flag, create_time,
     update_time
   </sql>
   <sql id="Blob_Column_List">
@@ -32,11 +32,11 @@
 
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabAppletPageComponent">
     insert into tab_applet_page_component (component_id, enterprise_id, page_id, 
-      component_type, component_index, status, 
+      component_type, component_index, delete_flag,
       create_time, update_time, setting
       )
     values (#{componentId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{pageId,jdbcType=INTEGER}, 
-      #{componentType,jdbcType=VARCHAR}, #{componentIndex,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{componentType,jdbcType=VARCHAR}, #{componentIndex,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{setting,jdbcType=LONGVARCHAR}
       )
   </insert>
@@ -58,8 +58,8 @@
       <if test="componentIndex != null">
         component_index,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -87,8 +87,8 @@
       <if test="componentIndex != null">
         #{componentIndex,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -116,8 +116,8 @@
       <if test="componentIndex != null">
         component_index = #{componentIndex,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -137,7 +137,7 @@
       page_id = #{pageId,jdbcType=INTEGER},
       component_type = #{componentType,jdbcType=VARCHAR},
       component_index = #{componentIndex,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       setting = #{setting,jdbcType=LONGVARCHAR}
@@ -149,21 +149,21 @@
       page_id = #{pageId,jdbcType=INTEGER},
       component_type = #{componentType,jdbcType=VARCHAR},
       component_index = #{componentIndex,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where component_id = #{componentId,jdbcType=INTEGER}
   </update>
 
   <update id="deleteByPageId">
-    update tab_applet_page_component set status = 0
-    where status = 1
+    update tab_applet_page_component set delete_flag = 1
+    where delete_flag = 0
     and page_id = #{pageId}
   </update>
 
   <insert id="insertFetch" parameterType="java.util.List">
     insert into tab_applet_page_component (component_id, enterprise_id, page_id,
-    component_type, component_index, status,
+    component_type, component_index, delete_flag,
     create_time, update_time, setting
     )
     VALUES
@@ -174,7 +174,7 @@
       #{item.pageId},
       #{item.componentType},
       #{item.componentIndex},
-      #{item.status},
+      #{item.deleteFlag},
       #{item.createTime},
       #{item.updateTime},
       #{item.setting}
@@ -185,7 +185,7 @@
   <select id="listByPageId" resultMap="BaseResultMap">
     SELECT <include refid="Base_Column_List"></include>, <include refid="Blob_Column_List"></include>
     from tab_applet_page_component
-    where status = 1
+    where delete_flag = 1
     and page_id = #{pageId}
 
     order by component_index

gic-platform-enterprise-service/src/main/resources/mapper/TabAppletServiceConfigMapper.xml

@@ -10,11 +10,11 @@
     <result column="config_id" jdbcType="BIGINT" property="configId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
     applet_service_id, enterprise_id, app_id, name, type, config_id, create_time, update_time, 
-    status
+    delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -26,11 +26,11 @@
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabAppletServiceConfig">
     insert into tab_applet_service_config (applet_service_id, enterprise_id, app_id, 
       name, type, config_id, 
-      create_time, update_time, status
+      create_time, update_time, delete_flag
       )
     values (#{appletServiceId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{appId,jdbcType=VARCHAR}, 
       #{name,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{configId,jdbcType=BIGINT}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabAppletServiceConfig">
@@ -60,8 +60,8 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -89,8 +89,8 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -118,8 +118,8 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
     </set>
     where applet_service_id = #{appletServiceId,jdbcType=INTEGER}
@@ -133,13 +133,13 @@
       config_id = #{configId,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER}
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where applet_service_id = #{appletServiceId,jdbcType=INTEGER}
   </update>
   <insert id="insertList">
     insert into tab_applet_service_config (applet_service_id, enterprise_id, app_id,
       name, type, create_time,
-      update_time, status, config_id)
+      update_time, delete_flag, config_id)
     values
       <foreach collection="list" index="index" item="item" separator=",">
         (
@@ -163,7 +163,7 @@
     <if test="type != null ">
         and type = #{type}
     </if>
-    and status = 1
+    and delete_flag = 0
     <if test="search != null and search != '' ">
         and name like concat('%', #{search}, '%')
     </if>
@@ -180,7 +180,7 @@
     from tab_applet_service_config
     where app_id = #{appId}
     and enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = 0
   </select>
   <select id="getByConfigId" resultMap="BaseResultMap">
     select
@@ -188,10 +188,10 @@
     from tab_applet_service_config
     where config_id = #{configId}
     and enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = 0
   </select>
   <update id="delByAppIdList">
-    update tab_applet_service_config set status = 0
+    update tab_applet_service_config set delete_flag = 1
     where enterprise_id = #{enterpriseId}
     <if test="type != null ">
         and type = #{type}
@@ -208,7 +208,7 @@
   </update>
 <!--  delByConfigIdList-->
   <update id="delByConfigIdList">
-    update tab_applet_service_config set status = 0 where enterprise_id = #{enterpriseId} and type = #{type}
+    update tab_applet_service_config set delete_flag = 1 where enterprise_id = #{enterpriseId} and type = #{type}
     <if test="null != ids and ids.size > 0">
       and config_id not in
       <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">

gic-platform-enterprise-service/src/main/resources/mapper/TabAppletWechatMenuMapper.xml

@@ -13,13 +13,13 @@
     <result column="app_key" jdbcType="VARCHAR" property="appKey" />
     <result column="parent_menu_id" jdbcType="CHAR" property="parentMenuId" />
     <result column="sort" jdbcType="INTEGER" property="sort" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
     menu_id, enterprise_id, menu_name, menu_type, menu_code, menu_url, menu_url_para, 
-    content, app_key, parent_menu_id, sort, status, create_time, update_time
+    content, app_key, parent_menu_id, sort, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -32,12 +32,12 @@
     insert into tab_applet_wechat_menu (menu_id, enterprise_id, menu_name, 
       menu_type, menu_code, menu_url, 
       menu_url_para, content, app_key, 
-      parent_menu_id, sort, status, 
+      parent_menu_id, sort, delete_flag,
       create_time, update_time)
     values (#{menuId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{menuName,jdbcType=VARCHAR}, 
       #{menuType,jdbcType=INTEGER}, #{menuCode,jdbcType=VARCHAR}, #{menuUrl,jdbcType=VARCHAR}, 
       #{menuUrlPara,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{appKey,jdbcType=VARCHAR}, 
-      #{parentMenuId,jdbcType=CHAR}, #{sort,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{parentMenuId,jdbcType=CHAR}, #{sort,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabAppletWechatMenu">
@@ -76,8 +76,8 @@
       <if test="sort != null">
         sort,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -120,8 +120,8 @@
       <if test="sort != null">
         #{sort,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -164,8 +164,8 @@
       <if test="sort != null">
         sort = #{sort,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -188,7 +188,7 @@
       app_key = #{appKey,jdbcType=VARCHAR},
       parent_menu_id = #{parentMenuId,jdbcType=CHAR},
       sort = #{sort,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where menu_id = #{menuId,jdbcType=INTEGER}
@@ -197,7 +197,7 @@
   <select id="listByParentId" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include>
     from tab_applet_wechat_menu
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and app_key = #{appKey}
     and parent_menu_id = #{parentId}
@@ -208,7 +208,7 @@
   <select id="countByMenuName" resultType="int">
     select count(1)
     from tab_applet_wechat_menu
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and app_key = #{appKey}
     and menu_name = #{menuName}
@@ -220,7 +220,7 @@
   <select id="listAll" resultMap="BaseResultMap">
     SELECT <include refid="Base_Column_List"></include>
     from tab_applet_wechat_menu
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and app_key = #{appKey}
 
@@ -228,8 +228,8 @@
   </select>
 
   <update id="deleteWechatMenu" >
-    update tab_applet_wechat_menu set status = 0
-    where status = 1
+    update tab_applet_wechat_menu set delete_flag = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and app_key = #{appKey}
   </update>

gic-platform-enterprise-service/src/main/resources/mapper/TabAuditLogMapper.xml

@@ -14,7 +14,7 @@
     <result column="auditor_phone" jdbcType="VARCHAR" property="auditorPhone" />
     <result column="audit_time" jdbcType="TIMESTAMP" property="auditTime" />
     <result column="audit_result" jdbcType="INTEGER" property="auditResult" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="extra_info" jdbcType="VARCHAR" property="extraInfo" />
@@ -25,7 +25,7 @@
   <sql id="Base_Column_List">
     audit_log_id, enterprise_id, apply_user_id, apply_user_name, apply_time, project_item_id, 
     project_item_name, auditor_id, auditor_name, auditor_phone, audit_time, audit_result, 
-    status, create_time, update_time, extra_info, audit_reason, audit_type, audit_expire_time
+    delete_flag, create_time, update_time, extra_info, audit_reason, audit_type, audit_expire_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -39,14 +39,14 @@
       apply_user_name, apply_time, project_item_id, 
       project_item_name, auditor_id, auditor_name, 
       auditor_phone, audit_time, audit_result, 
-      status, create_time, update_time, 
+      delete_flag, create_time, update_time,
       extra_info, audit_reason, audit_type, 
       audit_expire_time)
     values (#{auditLogId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{applyUserId,jdbcType=INTEGER}, 
       #{applyUserName,jdbcType=VARCHAR}, #{applyTime,jdbcType=TIMESTAMP}, #{projectItemId,jdbcType=INTEGER}, 
       #{projectItemName,jdbcType=VARCHAR}, #{auditorId,jdbcType=INTEGER}, #{auditorName,jdbcType=VARCHAR}, 
       #{auditorPhone,jdbcType=VARCHAR}, #{auditTime,jdbcType=TIMESTAMP}, #{auditResult,jdbcType=INTEGER}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
       #{extraInfo,jdbcType=VARCHAR}, #{auditReason,jdbcType=VARCHAR}, #{auditType,jdbcType=INTEGER}, 
       #{auditExpireTime,jdbcType=TIMESTAMP})
   </insert>
@@ -92,8 +92,8 @@
       <if test="auditResult != null">
         audit_result,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -151,8 +151,8 @@
       <if test="auditResult != null">
         #{auditResult,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -210,8 +210,8 @@
       <if test="auditResult != null">
         audit_result = #{auditResult,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -247,7 +247,7 @@
       auditor_phone = #{auditorPhone,jdbcType=VARCHAR},
       audit_time = #{auditTime,jdbcType=TIMESTAMP},
       audit_result = #{auditResult,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       extra_info = #{extraInfo,jdbcType=VARCHAR},
@@ -260,7 +260,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_audit_log
-    where status = 1
+    where delete_flag = 0
     and audit_result = 0
     <if test="enterpriseId != null ">
       and enterprise_id = #{enterpriseId}
@@ -278,7 +278,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_audit_log
-    where status = 1
+    where delete_flag = 0
     <if test="enterpriseId != null ">
       and enterprise_id = #{enterpriseId}
     </if>
@@ -301,7 +301,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_audit_log
-    where status = 1
+    where delete_flag = 0
     and audit_type = 1
     and audit_expire_time &lt; #{auditExpireTime}
     and project_item_id = #{projectItemId}

gic-platform-enterprise-service/src/main/resources/mapper/TabAuditProcessMapper.xml

@@ -10,13 +10,13 @@
     <result column="auditor_id" jdbcType="INTEGER" property="auditorId" />
     <result column="audit_result" jdbcType="INTEGER" property="auditResult" />
     <result column="auditor_type" jdbcType="INTEGER" property="auditorType" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
     audit_process_id, enterprise_id, audit_log_id, project_item_id, is_platform, auditor_id, 
-    audit_result, auditor_type, status, create_time, update_time
+    audit_result, auditor_type, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -28,11 +28,11 @@
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabAuditProcess">
     insert into tab_audit_process (audit_process_id, enterprise_id, audit_log_id, 
       project_item_id, is_platform, auditor_id, 
-      audit_result, auditor_type, status, 
+      audit_result, auditor_type, delete_flag,
       create_time, update_time)
     values (#{auditProcessId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{auditLogId,jdbcType=INTEGER}, 
       #{projectItemId,jdbcType=INTEGER}, #{isPlatform,jdbcType=INTEGER}, #{auditorId,jdbcType=INTEGER}, 
-      #{auditResult,jdbcType=INTEGER}, #{auditorType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{auditResult,jdbcType=INTEGER}, #{auditorType,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabAuditProcess">
@@ -62,8 +62,8 @@
       <if test="auditorType != null">
         auditor_type,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -97,8 +97,8 @@
       <if test="auditorType != null">
         #{auditorType,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -132,8 +132,8 @@
       <if test="auditorType != null">
         auditor_type = #{auditorType,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -153,7 +153,7 @@
       auditor_id = #{auditorId,jdbcType=INTEGER},
       audit_result = #{auditResult,jdbcType=INTEGER},
       auditor_type = #{auditorType,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where audit_process_id = #{auditProcessId,jdbcType=INTEGER}
@@ -164,7 +164,7 @@
     from tab_audit_process
     where enterprise_id = #{enterpriseId}
     and audit_log_id = #{auditLogId}
-    and status = 1
+    and delete_flag = 0
     and auditor_type &lt;&gt; #{auditorType}
   </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingAccountBalanceRecordMapper.xml

@@ -5,7 +5,7 @@
     <id column="account_balance_record_id" jdbcType="INTEGER" property="accountBalanceRecordId" />
     <result column="product_name" jdbcType="VARCHAR" property="productName" />
     <result column="pay_type" jdbcType="INTEGER" property="payType" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="product_type" jdbcType="INTEGER" property="productType" />
     <result column="bill_type" jdbcType="INTEGER" property="billType" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -21,7 +21,7 @@
     <result column="operator_name" jdbcType="VARCHAR" property="operatorName" />
   </resultMap>
   <sql id="Base_Column_List">
-    account_balance_record_id, product_name, pay_type, status, product_type, bill_type, 
+    account_balance_record_id, product_name, pay_type, delete_flag, product_type, bill_type,
     create_time, order_id, deduction_time, enterprise_id, order_serial_number, request_code, 
     fee, fee_paid, fee_discount, operator_id, operator_name
   </sql>
@@ -34,14 +34,14 @@
 
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabBillingAccountBalanceRecord">
     insert into tab_billing_account_balance_record (account_balance_record_id, product_name, 
-      pay_type, status, product_type, 
+      pay_type, delete_flag, product_type,
       bill_type, create_time, order_id, 
       deduction_time, enterprise_id, order_serial_number, 
       request_code, fee, fee_paid, 
       fee_discount, operator_id, operator_name
       )
     values (#{accountBalanceRecordId,jdbcType=INTEGER}, #{productName,jdbcType=VARCHAR}, 
-      #{payType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{productType,jdbcType=INTEGER}, 
+      #{payType,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{productType,jdbcType=INTEGER},
       #{billType,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{orderId,jdbcType=INTEGER}, 
       #{deductionTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=INTEGER}, #{orderSerialNumber,jdbcType=VARCHAR}, 
       #{requestCode,jdbcType=VARCHAR}, #{fee,jdbcType=DOUBLE}, #{feePaid,jdbcType=DOUBLE}, 
@@ -60,8 +60,8 @@
       <if test="payType != null">
         pay_type,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="productType != null">
         product_type,
@@ -113,8 +113,8 @@
       <if test="payType != null">
         #{payType,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="productType != null">
         #{productType,jdbcType=INTEGER},
@@ -166,8 +166,8 @@
       <if test="payType != null">
         pay_type = #{payType,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="productType != null">
         product_type = #{productType,jdbcType=INTEGER},
@@ -215,7 +215,7 @@
     update tab_billing_account_balance_record
     set product_name = #{productName,jdbcType=VARCHAR},
       pay_type = #{payType,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       product_type = #{productType,jdbcType=INTEGER},
       bill_type = #{billType,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -237,7 +237,7 @@
     DATE_FORMAT(deduction_time,'%Y-%m-%d') statisticsDate,
     ifnull(sum(fee), 0) fee
     from tab_billing_account_balance_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="startTime != null">
       and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}
@@ -253,7 +253,7 @@
     select
     ifnull(sum(fee), 0)
     from tab_billing_account_balance_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="dateType == 1 ">
       and date_format(deduction_time,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -266,7 +266,7 @@
     select
     ifnull(sum(fee), 0)
     from tab_billing_account_balance_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="startTime != null and startTime != '' ">
       and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingAuditResultMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gic.enterprise.dao.mapper.TabBillingAuditResultMapper">
-  <resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabBillingAuditResult">
-    <id column="audit_result_id" jdbcType="INTEGER" property="auditResultId" />
-    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
-    <result column="serial_number" jdbcType="VARCHAR" property="serialNumber" />
-    <result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="audit_time" jdbcType="TIMESTAMP" property="auditTime" />
-    <result column="audit_user_id" jdbcType="INTEGER" property="auditUserId" />
-    <result column="audit_user_name" jdbcType="VARCHAR" property="auditUserName" />
-    <result column="audit_user_phone" jdbcType="VARCHAR" property="auditUserPhone" />
-    <result column="fee_plan" jdbcType="DOUBLE" property="feePlan" />
-    <result column="fee_paid" jdbcType="DOUBLE" property="feePaid" />
-    <result column="refuse_reason" jdbcType="VARCHAR" property="refuseReason" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    audit_result_id, enterprise_id, serial_number, audit_status, status, create_time, 
-    update_time, audit_time, audit_user_id, audit_user_name, audit_user_phone, fee_plan, 
-    fee_paid, refuse_reason
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from tab_billing_audit_result
-    where audit_result_id = #{auditResultId,jdbcType=INTEGER}
-  </select>
-
-  <insert id="insert" parameterType="com.gic.enterprise.entity.TabBillingAuditResult">
-    insert into tab_billing_audit_result (audit_result_id, enterprise_id, serial_number, 
-      audit_status, status, create_time, 
-      update_time, audit_time, audit_user_id, 
-      audit_user_name, audit_user_phone, fee_plan, 
-      fee_paid, refuse_reason)
-    values (#{auditResultId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR}, 
-      #{auditStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{auditTime,jdbcType=TIMESTAMP}, #{auditUserId,jdbcType=INTEGER}, 
-      #{auditUserName,jdbcType=VARCHAR}, #{auditUserPhone,jdbcType=VARCHAR}, #{feePlan,jdbcType=DOUBLE}, 
-      #{feePaid,jdbcType=DOUBLE}, #{refuseReason,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabBillingAuditResult">
-    insert into tab_billing_audit_result
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="auditResultId != null">
-        audit_result_id,
-      </if>
-      <if test="enterpriseId != null">
-        enterprise_id,
-      </if>
-      <if test="serialNumber != null">
-        serial_number,
-      </if>
-      <if test="auditStatus != null">
-        audit_status,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="auditTime != null">
-        audit_time,
-      </if>
-      <if test="auditUserId != null">
-        audit_user_id,
-      </if>
-      <if test="auditUserName != null">
-        audit_user_name,
-      </if>
-      <if test="auditUserPhone != null">
-        audit_user_phone,
-      </if>
-      <if test="feePlan != null">
-        fee_plan,
-      </if>
-      <if test="feePaid != null">
-        fee_paid,
-      </if>
-      <if test="refuseReason != null">
-        refuse_reason,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="auditResultId != null">
-        #{auditResultId,jdbcType=INTEGER},
-      </if>
-      <if test="enterpriseId != null">
-        #{enterpriseId,jdbcType=INTEGER},
-      </if>
-      <if test="serialNumber != null">
-        #{serialNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="auditStatus != null">
-        #{auditStatus,jdbcType=INTEGER},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="auditTime != null">
-        #{auditTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="auditUserId != null">
-        #{auditUserId,jdbcType=INTEGER},
-      </if>
-      <if test="auditUserName != null">
-        #{auditUserName,jdbcType=VARCHAR},
-      </if>
-      <if test="auditUserPhone != null">
-        #{auditUserPhone,jdbcType=VARCHAR},
-      </if>
-      <if test="feePlan != null">
-        #{feePlan,jdbcType=DOUBLE},
-      </if>
-      <if test="feePaid != null">
-        #{feePaid,jdbcType=DOUBLE},
-      </if>
-      <if test="refuseReason != null">
-        #{refuseReason,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabBillingAuditResult">
-    update tab_billing_audit_result
-    <set>
-      <if test="enterpriseId != null">
-        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
-      </if>
-      <if test="serialNumber != null">
-        serial_number = #{serialNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="auditStatus != null">
-        audit_status = #{auditStatus,jdbcType=INTEGER},
-      </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="auditTime != null">
-        audit_time = #{auditTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="auditUserId != null">
-        audit_user_id = #{auditUserId,jdbcType=INTEGER},
-      </if>
-      <if test="auditUserName != null">
-        audit_user_name = #{auditUserName,jdbcType=VARCHAR},
-      </if>
-      <if test="auditUserPhone != null">
-        audit_user_phone = #{auditUserPhone,jdbcType=VARCHAR},
-      </if>
-      <if test="feePlan != null">
-        fee_plan = #{feePlan,jdbcType=DOUBLE},
-      </if>
-      <if test="feePaid != null">
-        fee_paid = #{feePaid,jdbcType=DOUBLE},
-      </if>
-      <if test="refuseReason != null">
-        refuse_reason = #{refuseReason,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where audit_result_id = #{auditResultId,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabBillingAuditResult">
-    update tab_billing_audit_result
-    set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
-      serial_number = #{serialNumber,jdbcType=VARCHAR},
-      audit_status = #{auditStatus,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      audit_time = #{auditTime,jdbcType=TIMESTAMP},
-      audit_user_id = #{auditUserId,jdbcType=INTEGER},
-      audit_user_name = #{auditUserName,jdbcType=VARCHAR},
-      audit_user_phone = #{auditUserPhone,jdbcType=VARCHAR},
-      fee_plan = #{feePlan,jdbcType=DOUBLE},
-      fee_paid = #{feePaid,jdbcType=DOUBLE},
-      refuse_reason = #{refuseReason,jdbcType=VARCHAR}
-    where audit_result_id = #{auditResultId,jdbcType=INTEGER}
-  </update>
-</mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingDoubleCallingRecordMapper.xml

@@ -7,7 +7,7 @@
     <result column="caller_name" jdbcType="VARCHAR" property="callerName" />
     <result column="caller_phone" jdbcType="VARCHAR" property="callerPhone" />
     <result column="fee" jdbcType="DOUBLE" property="fee" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="deduction_time" jdbcType="TIMESTAMP" property="deductionTime" />
     <result column="called_id" jdbcType="BIGINT" property="calledId" />
@@ -26,7 +26,7 @@
     <result column="remark" jdbcType="VARCHAR" property="remark" />
   </resultMap>
   <sql id="Base_Column_List">
-    double_calling_record_id, pay_serial_number, caller_name, caller_phone, fee, status, 
+    double_calling_record_id, pay_serial_number, caller_name, caller_phone, fee, delete_flag,
     create_time, deduction_time, called_id, called_name, called_phone, unit_fee, app_code, 
     app_name, voice_time, enterprise_id, store_id, store_name, store_group_id, store_group_name, 
     call_time, remark
@@ -41,7 +41,7 @@
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabBillingDoubleCallingRecord">
     insert into tab_billing_double_calling_record (double_calling_record_id, pay_serial_number, 
       caller_name, caller_phone, fee, 
-      status, create_time, deduction_time, 
+      delete_flag, create_time, deduction_time,
       called_id, called_name, called_phone, 
       unit_fee, app_code, app_name, 
       voice_time, enterprise_id, store_id, 
@@ -49,7 +49,7 @@
       call_time, remark)
     values (#{doubleCallingRecordId,jdbcType=INTEGER}, #{paySerialNumber,jdbcType=VARCHAR}, 
       #{callerName,jdbcType=VARCHAR}, #{callerPhone,jdbcType=VARCHAR}, #{fee,jdbcType=DOUBLE}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{deductionTime,jdbcType=TIMESTAMP}, 
+      #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{deductionTime,jdbcType=TIMESTAMP},
       #{calledId,jdbcType=BIGINT}, #{calledName,jdbcType=VARCHAR}, #{calledPhone,jdbcType=VARCHAR}, 
       #{unitFee,jdbcType=DOUBLE}, #{appCode,jdbcType=VARCHAR}, #{appName,jdbcType=VARCHAR}, 
       #{voiceTime,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=INTEGER}, #{storeId,jdbcType=INTEGER}, 
@@ -74,8 +74,8 @@
       <if test="fee != null">
         fee,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -142,8 +142,8 @@
       <if test="fee != null">
         #{fee,jdbcType=DOUBLE},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -210,8 +210,8 @@
       <if test="fee != null">
         fee = #{fee,jdbcType=DOUBLE},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -270,7 +270,7 @@
       caller_name = #{callerName,jdbcType=VARCHAR},
       caller_phone = #{callerPhone,jdbcType=VARCHAR},
       fee = #{fee,jdbcType=DOUBLE},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       deduction_time = #{deductionTime,jdbcType=TIMESTAMP},
       called_id = #{calledId,jdbcType=BIGINT},
@@ -295,7 +295,7 @@
     DATE_FORMAT(deduction_time,'%Y-%m-%d') statisticsDate,
     ifnull(sum(fee), 0) fee
     from tab_billing_double_calling_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="startTime != null">
       and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}
@@ -310,7 +310,7 @@
     select
     ifnull(sum(fee), 0)
     from tab_billing_double_calling_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="dateType == 1 ">
       and date_format(deduction_time,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -323,7 +323,7 @@
     select
     ifnull(sum(fee), 0)
     from tab_billing_double_calling_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="startTime != null and startTime != '' ">
       and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingInternationalSmsRecordMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.gic.enterprise.dao.mapper.TabBillingInternationalSmsRecordMapper">
   <resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabBillingInternationalSmsRecord">
     <id column="sms_record_id" jdbcType="BIGINT" property="smsRecordId" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="send_time" jdbcType="TIMESTAMP" property="sendTime" />
     <result column="receive_phone" jdbcType="VARCHAR" property="receivePhone" />
     <result column="pay_type" jdbcType="INTEGER" property="payType" />
@@ -36,7 +36,7 @@
     <result column="database_status" jdbcType="INTEGER" property="databaseStatus" />
   </resultMap>
   <sql id="Base_Column_List">
-    sms_record_id, status, send_time, receive_phone, pay_type, app_code, app_name, sms_type, 
+    sms_record_id, delete_flag, send_time, receive_phone, pay_type, app_code, app_name, sms_type,
     bill_number, fee, sms_content, create_time, update_time, deduction_time, enterprise_id, 
     enterprise_sms_package_id, nation_code, nation_name, ecu_id, mcu_id, member_card_id, 
     member_card_name, member_name, store_brand_name, store_id, store_name, store_group_id, 
@@ -50,7 +50,7 @@
   </select>
 
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabBillingInternationalSmsRecord">
-    insert into tab_billing_international_sms_record (sms_record_id, status, send_time, 
+    insert into tab_billing_international_sms_record (sms_record_id, delete_flag, send_time,
       receive_phone, pay_type, app_code, 
       app_name, sms_type, bill_number, 
       fee, sms_content, create_time, 
@@ -61,7 +61,7 @@
       store_id, store_name, store_group_id, 
       store_group_name, user_id, user_name, 
       cache_status, database_status)
-    values (#{smsRecordId,jdbcType=BIGINT}, #{status,jdbcType=INTEGER}, #{sendTime,jdbcType=TIMESTAMP}, 
+    values (#{smsRecordId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=INTEGER}, #{sendTime,jdbcType=TIMESTAMP},
       #{receivePhone,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, #{appCode,jdbcType=VARCHAR}, 
       #{appName,jdbcType=VARCHAR}, #{smsType,jdbcType=INTEGER}, #{billNumber,jdbcType=INTEGER}, 
       #{fee,jdbcType=DOUBLE}, #{smsContent,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
@@ -79,8 +79,8 @@
       <if test="smsRecordId != null">
         sms_record_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="sendTime != null">
         send_time,
@@ -177,8 +177,8 @@
       <if test="smsRecordId != null">
         #{smsRecordId,jdbcType=BIGINT},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="sendTime != null">
         #{sendTime,jdbcType=TIMESTAMP},
@@ -275,8 +275,8 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabBillingInternationalSmsRecord">
     update tab_billing_international_sms_record
     <set>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="sendTime != null">
         send_time = #{sendTime,jdbcType=TIMESTAMP},
@@ -373,7 +373,7 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabBillingInternationalSmsRecord">
     update tab_billing_international_sms_record
-    set status = #{status,jdbcType=INTEGER},
+    set delete_flag = #{deleteFlag,jdbcType=INTEGER},
       send_time = #{sendTime,jdbcType=TIMESTAMP},
       receive_phone = #{receivePhone,jdbcType=VARCHAR},
       pay_type = #{payType,jdbcType=INTEGER},
@@ -411,7 +411,7 @@
     DATE_FORMAT(deduction_time,'%Y-%m-%d') statisticsDate,
     ifnull(sum(fee), 0) fee
     from tab_billing_international_sms_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and pay_type = 4
     <if test="startTime != null">
@@ -426,7 +426,7 @@
     select
     ifnull(sum(fee), 0)
     from tab_billing_international_sms_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and pay_type = 4
     <if test="dateType == 1 ">
@@ -440,7 +440,7 @@
     select
     ifnull(sum(fee), 0)
     from tab_billing_international_sms_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="startTime != null and startTime != '' ">
       and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingOrderMapper.xml

@@ -13,7 +13,7 @@
     <result column="pay_info_id" jdbcType="INTEGER" property="payInfoId" />
     <result column="coupon_card_id" jdbcType="INTEGER" property="couponCardId" />
     <result column="audit_result_id" jdbcType="INTEGER" property="auditResultId" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="item_json" jdbcType="VARCHAR" property="itemJson" />
@@ -22,7 +22,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     order_id, enterprise_id, serial_number, order_status, order_content, pay_type, total_fee, 
-    total_fee_paid, pay_info_id, coupon_card_id, audit_result_id, status, create_time, 
+    total_fee_paid, pay_info_id, coupon_card_id, audit_result_id, delete_flag, create_time,
     update_time, item_json, order_type, initiator_user
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -36,13 +36,13 @@
     insert into tab_billing_order (order_id, enterprise_id, serial_number, 
       order_status, order_content, pay_type, 
       total_fee, total_fee_paid, pay_info_id, 
-      coupon_card_id, audit_result_id, status, 
+      coupon_card_id, audit_result_id, delete_flag,
       create_time, update_time, item_json, 
       order_type, initiator_user)
     values (#{orderId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR}, 
       #{orderStatus,jdbcType=INTEGER}, #{orderContent,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, 
       #{totalFee,jdbcType=DOUBLE}, #{totalFeePaid,jdbcType=DOUBLE}, #{payInfoId,jdbcType=INTEGER}, 
-      #{couponCardId,jdbcType=INTEGER}, #{auditResultId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{couponCardId,jdbcType=INTEGER}, #{auditResultId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{itemJson,jdbcType=VARCHAR}, 
       #{orderType,jdbcType=INTEGER}, #{initiatorUser,jdbcType=INTEGER})
   </insert>
@@ -85,8 +85,8 @@
       <if test="auditResultId != null">
         audit_result_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -138,8 +138,8 @@
       <if test="auditResultId != null">
         #{auditResultId,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -191,8 +191,8 @@
       <if test="auditResultId != null">
         audit_result_id = #{auditResultId,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -224,7 +224,7 @@
       pay_info_id = #{payInfoId,jdbcType=INTEGER},
       coupon_card_id = #{couponCardId,jdbcType=INTEGER},
       audit_result_id = #{auditResultId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       item_json = #{itemJson,jdbcType=VARCHAR},
@@ -248,7 +248,7 @@
         and order_status=#{status}
     </if>
     <if test="status == null">
-        and status != 0
+        and delete_flag != 1
     </if>
     <if test="search != null">
         and (order_content like concat('%',#{search},'%') or serial_number like concat('%', #{search}, '%'))

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingPayInfoMapper.xml

@@ -15,7 +15,7 @@
     <result column="code_url" jdbcType="VARCHAR" property="codeUrl" />
     <result column="prepay_id" jdbcType="VARCHAR" property="prepayId" />
     <result column="invoice_status" jdbcType="INTEGER" property="invoiceStatus" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="buy_type" jdbcType="INTEGER" property="buyType" />
@@ -27,7 +27,7 @@
   <sql id="Base_Column_List">
     pay_info_id, enterprise_id, serial_number, pay_type, total_fee_paid, time_start, 
     time_end, result_code, err_code, err_code_des, code_url, prepay_id, invoice_status, 
-    status, create_time, update_time, buy_type, order_serial_number, auth_code_id, request_code, 
+    delete_flag, create_time, update_time, buy_type, order_serial_number, auth_code_id, request_code,
     product_description
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -45,7 +45,7 @@
       pay_type, total_fee_paid, time_start, 
       time_end, result_code, err_code, 
       err_code_des, code_url, prepay_id, 
-      invoice_status, status, create_time, 
+      invoice_status, delete_flag, create_time,
       update_time, buy_type, order_serial_number, 
       auth_code_id, request_code, product_description
       )
@@ -53,7 +53,7 @@
       #{payType,jdbcType=INTEGER}, #{totalFeePaid,jdbcType=DOUBLE}, #{timeStart,jdbcType=VARCHAR}, 
       #{timeEnd,jdbcType=VARCHAR}, #{resultCode,jdbcType=INTEGER}, #{errCode,jdbcType=VARCHAR}, 
       #{errCodeDes,jdbcType=VARCHAR}, #{codeUrl,jdbcType=VARCHAR}, #{prepayId,jdbcType=VARCHAR}, 
-      #{invoiceStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{invoiceStatus,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP}, #{buyType,jdbcType=INTEGER}, #{orderSerialNumber,jdbcType=VARCHAR}, 
       #{authCodeId,jdbcType=INTEGER}, #{requestCode,jdbcType=VARCHAR}, #{productDescription,jdbcType=VARCHAR}
       )
@@ -103,8 +103,8 @@
       <if test="invoiceStatus != null">
         invoice_status,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -168,8 +168,8 @@
       <if test="invoiceStatus != null">
         #{invoiceStatus,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -233,8 +233,8 @@
       <if test="invoiceStatus != null">
         invoice_status = #{invoiceStatus,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -274,7 +274,7 @@
       code_url = #{codeUrl,jdbcType=VARCHAR},
       prepay_id = #{prepayId,jdbcType=VARCHAR},
       invoice_status = #{invoiceStatus,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       buy_type = #{buyType,jdbcType=INTEGER},
@@ -291,7 +291,7 @@
     where enterprise_id = #{enterpriseId}
     and time_end is not null
     and invoice_status = 0
-    and status = 1
+    and delete_flag = 0
     <if test="serialNumber != null and serialNumber != '' ">
       and (serial_number like concat('%', #{serialNumber}, '%') or order_serial_number like concat('%', #{serialNumber}, '%'))
     </if>
@@ -343,8 +343,8 @@
       <if test="invoiceStatus != null">
         invoice_status = #{invoiceStatus,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -372,7 +372,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_billing_pay_info
-    where status = 1
+    where delete_flag = 0
     <if test="enterpriseId != null ">
       and enterprise_id = #{enterpriseId}
     </if>
@@ -389,15 +389,15 @@
     limit 1
   </select>
   <update id="cancelPay">
-    update tab_billing_pay_info set status = 0
+    update tab_billing_pay_info set delete_flag = 1
     where enterprise_id = #{enterpriseId}
     and request_code = #{requestCode}
     and order_serial_number = #{orderSerialNumber}
     and result_code = 0
-    and status = 1
+    and delete_flag = 0
   </update>
   <update id="delOtherPayInfoExceptId">
-    update tab_billing_pay_info set status = 0
+    update tab_billing_pay_info set delete_flag = 1
     where enterprise_id = #{enterpriseId}
     and pay_info_id &lt;&gt; #{payInfoId}
     and order_serial_number = #{orderSerialNumber}
@@ -406,7 +406,7 @@
 
   <update id="updateInvoiceStatus">
     update tab_billing_pay_info set invoice_status = 1
-    where status = 1
+    where delete_flag = 0
     and serial_number in (#{serialNumbers})
   </update>
 
@@ -415,7 +415,7 @@
     <include refid="Base_Column_List" />
     from tab_billing_pay_info
     where serial_number = #{serialNumber}
-    and status = 1
+    and delete_flag = 0
     and invoice_status = 0
   </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingRechargeRecordMapper.xml

@@ -10,7 +10,7 @@
     <result column="total_fee_paid" jdbcType="DOUBLE" property="totalFeePaid" />
     <result column="pay_type" jdbcType="INTEGER" property="payType" />
     <result column="pay_info_id" jdbcType="INTEGER" property="payInfoId" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="initiator" jdbcType="INTEGER" property="initiator" />
     <result column="initiator_user" jdbcType="INTEGER" property="initiatorUser" />
     <result column="initiator_name" jdbcType="VARCHAR" property="initiatorName" />
@@ -22,7 +22,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     recharge_record_id, enterprise_id, serial_number, online_serial_number, total_fee, 
-    total_fee_paid, pay_type, pay_info_id, status, initiator, initiator_user, initiator_name, 
+    total_fee_paid, pay_type, pay_info_id, delete_flag, initiator, initiator_user, initiator_name,
     audit_status, verification_code, create_time, update_time, deduction_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -35,13 +35,13 @@
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabBillingRechargeRecord">
     insert into tab_billing_recharge_record (recharge_record_id, enterprise_id, serial_number, 
       online_serial_number, total_fee, total_fee_paid, 
-      pay_type, pay_info_id, status, 
+      pay_type, pay_info_id, delete_flag,
       initiator, initiator_user, initiator_name, 
       audit_status, verification_code, create_time, 
       update_time, deduction_time)
     values (#{rechargeRecordId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR}, 
       #{onlineSerialNumber,jdbcType=VARCHAR}, #{totalFee,jdbcType=DOUBLE}, #{totalFeePaid,jdbcType=DOUBLE}, 
-      #{payType,jdbcType=INTEGER}, #{payInfoId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{payType,jdbcType=INTEGER}, #{payInfoId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
       #{initiator,jdbcType=INTEGER}, #{initiatorUser,jdbcType=INTEGER}, #{initiatorName,jdbcType=VARCHAR}, 
       #{auditStatus,jdbcType=INTEGER}, #{verificationCode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{deductionTime,jdbcType=TIMESTAMP})
@@ -73,8 +73,8 @@
       <if test="payInfoId != null">
         pay_info_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="initiator != null">
         initiator,
@@ -126,8 +126,8 @@
       <if test="payInfoId != null">
         #{payInfoId,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="initiator != null">
         #{initiator,jdbcType=INTEGER},
@@ -179,8 +179,8 @@
       <if test="payInfoId != null">
         pay_info_id = #{payInfoId,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="initiator != null">
         initiator = #{initiator,jdbcType=INTEGER},
@@ -218,7 +218,7 @@
       total_fee_paid = #{totalFeePaid,jdbcType=DOUBLE},
       pay_type = #{payType,jdbcType=INTEGER},
       pay_info_id = #{payInfoId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       initiator = #{initiator,jdbcType=INTEGER},
       initiator_user = #{initiatorUser,jdbcType=INTEGER},
       initiator_name = #{initiatorName,jdbcType=VARCHAR},
@@ -233,7 +233,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_billing_recharge_record
-    where status = 1
+    where delete_flag = 0
       <if test="enterpriseId != null ">
         and enterprise_id = #{enterpriseId}
       </if>
@@ -270,7 +270,7 @@
     <include refid="Base_Column_List" />
     from tab_billing_recharge_record
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = 0
     and audit_status = 1
     order by create_time desc
     limit 1
@@ -280,6 +280,6 @@
     <include refid="Base_Column_List" />
     from tab_billing_recharge_record
     where serial_number = #{serialNumber}
-    and status = 1
+    and delete_flag = 0
   </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingRecordingStorageRecordMapper.xml

@@ -6,7 +6,7 @@
     <result column="caller_name" jdbcType="VARCHAR" property="callerName" />
     <result column="caller_phone" jdbcType="VARCHAR" property="callerPhone" />
     <result column="fee" jdbcType="DOUBLE" property="fee" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="deduction_time" jdbcType="TIMESTAMP" property="deductionTime" />
     <result column="called_id" jdbcType="BIGINT" property="calledId" />
@@ -27,7 +27,7 @@
     <result column="remark" jdbcType="VARCHAR" property="remark" />
   </resultMap>
   <sql id="Base_Column_List">
-    recording_storage_record_id, caller_name, caller_phone, fee, status, create_time, 
+    recording_storage_record_id, caller_name, caller_phone, fee, delete_flag, create_time,
     deduction_time, called_id, called_phone, app_code, app_name, voice_time, enterprise_id, 
     pay_serial_number, unit_fee, storage_duration, member_name, store_id, store_name, 
     store_group_id, store_group_name, call_time, remark
@@ -41,7 +41,7 @@
 
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabBillingRecordingStorageRecord">
     insert into tab_billing_recording_storage_record (recording_storage_record_id, caller_name, 
-      caller_phone, fee, status, 
+      caller_phone, fee, delete_flag,
       create_time, deduction_time, called_id, 
       called_phone, app_code, app_name, 
       voice_time, enterprise_id, pay_serial_number, 
@@ -50,7 +50,7 @@
       store_group_name, call_time, remark
       )
     values (#{recordingStorageRecordId,jdbcType=INTEGER}, #{callerName,jdbcType=VARCHAR}, 
-      #{callerPhone,jdbcType=VARCHAR}, #{fee,jdbcType=DOUBLE}, #{status,jdbcType=INTEGER}, 
+      #{callerPhone,jdbcType=VARCHAR}, #{fee,jdbcType=DOUBLE}, #{deleteFlag,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{deductionTime,jdbcType=TIMESTAMP}, #{calledId,jdbcType=BIGINT}, 
       #{calledPhone,jdbcType=VARCHAR}, #{appCode,jdbcType=VARCHAR}, #{appName,jdbcType=VARCHAR}, 
       #{voiceTime,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=INTEGER}, #{paySerialNumber,jdbcType=VARCHAR}, 
@@ -74,8 +74,8 @@
       <if test="fee != null">
         fee,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -145,8 +145,8 @@
       <if test="fee != null">
         #{fee,jdbcType=DOUBLE},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -216,8 +216,8 @@
       <if test="fee != null">
         fee = #{fee,jdbcType=DOUBLE},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -281,7 +281,7 @@
     set caller_name = #{callerName,jdbcType=VARCHAR},
       caller_phone = #{callerPhone,jdbcType=VARCHAR},
       fee = #{fee,jdbcType=DOUBLE},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       deduction_time = #{deductionTime,jdbcType=TIMESTAMP},
       called_id = #{calledId,jdbcType=BIGINT},
@@ -307,7 +307,7 @@
     DATE_FORMAT(deduction_time,'%Y-%m-%d') statisticsDate,
     ifnull(sum(fee), 0) fee
     from tab_billing_recording_storage_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="startTime != null">
       and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingRefundMapper.xml

@@ -13,14 +13,14 @@
     <result column="request_code" jdbcType="VARCHAR" property="requestCode" />
     <result column="refund_channel" jdbcType="INTEGER" property="refundChannel" />
     <result column="time_end" jdbcType="TIMESTAMP" property="timeEnd" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="refund_reason" jdbcType="VARCHAR" property="refundReason" />
   </resultMap>
   <sql id="Base_Column_List">
     refund_id, enterprise_id, refund_pay_number, refund_serial_number, order_serial_number, 
-    order_fee, refund_fee, refund_status, request_code, refund_channel, time_end, status, 
+    order_fee, refund_fee, refund_status, request_code, refund_channel, time_end, delete_flag,
     create_time, update_time, refund_reason
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -35,13 +35,13 @@
       refund_serial_number, order_serial_number, 
       order_fee, refund_fee, refund_status, 
       request_code, refund_channel, time_end, 
-      status, create_time, update_time, 
+      delete_flag, create_time, update_time,
       refund_reason)
     values (#{refundId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{refundPayNumber,jdbcType=VARCHAR}, 
       #{refundSerialNumber,jdbcType=VARCHAR}, #{orderSerialNumber,jdbcType=VARCHAR}, 
       #{orderFee,jdbcType=DOUBLE}, #{refundFee,jdbcType=DOUBLE}, #{refundStatus,jdbcType=INTEGER}, 
       #{requestCode,jdbcType=VARCHAR}, #{refundChannel,jdbcType=INTEGER}, #{timeEnd,jdbcType=TIMESTAMP}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
       #{refundReason,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabBillingRefund">
@@ -80,8 +80,8 @@
       <if test="timeEnd != null">
         time_end,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -127,8 +127,8 @@
       <if test="timeEnd != null">
         #{timeEnd,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -174,8 +174,8 @@
       <if test="timeEnd != null">
         time_end = #{timeEnd,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -201,7 +201,7 @@
       request_code = #{requestCode,jdbcType=VARCHAR},
       refund_channel = #{refundChannel,jdbcType=INTEGER},
       time_end = #{timeEnd,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       refund_reason = #{refundReason,jdbcType=VARCHAR}
@@ -211,7 +211,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_billing_refund
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and refund_serial_number = #{refundSerialNumber}
     and request_code = #{requestCode}
@@ -223,7 +223,7 @@
     where enterprise_id = #{enterpriseId}
     and order_serial_number = #{orderSerialNumber}
     and request_code = #{requestCode}
-    and status = 1
+    and delete_flag = 0
   </select>
   <select id="listRefund" resultMap="BaseResultMap">
     select
@@ -239,6 +239,6 @@
     <if test="endTime != null ">
         and time_end &lt; #{endTime}
     </if>
-    and status = 1
+    and delete_flag = 0
   </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingSmsPackageRecordMapper.xml

@@ -8,7 +8,7 @@
     <result column="item_fee" jdbcType="DOUBLE" property="itemFee" />
     <result column="total_fee" jdbcType="DOUBLE" property="totalFee" />
     <result column="pay_type" jdbcType="INTEGER" property="payType" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="order_id" jdbcType="INTEGER" property="orderId" />
     <result column="deduction_time" jdbcType="TIMESTAMP" property="deductionTime" />
@@ -21,7 +21,7 @@
     <result column="operator_name" jdbcType="VARCHAR" property="operatorName" />
   </resultMap>
   <sql id="Base_Column_List">
-    sms_package_record_id, product_name, item_count, item_fee, total_fee, pay_type, status, 
+    sms_package_record_id, product_name, item_count, item_fee, total_fee, pay_type, delete_flag,
     create_time, order_id, deduction_time, enterprise_id, discount_type, card_name, card_amount, 
     paid_fee, operator_id, operator_name
   </sql>
@@ -35,14 +35,14 @@
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabBillingSmsPackageRecord">
     insert into tab_billing_sms_package_record (sms_package_record_id, product_name, 
       item_count, item_fee, total_fee, 
-      pay_type, status, create_time, 
+      pay_type, delete_flag, create_time,
       order_id, deduction_time, enterprise_id, 
       discount_type, card_name, card_amount, 
       paid_fee, operator_id, operator_name
       )
     values (#{smsPackageRecordId,jdbcType=INTEGER}, #{productName,jdbcType=VARCHAR}, 
       #{itemCount,jdbcType=INTEGER}, #{itemFee,jdbcType=DOUBLE}, #{totalFee,jdbcType=DOUBLE}, 
-      #{payType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{payType,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{orderId,jdbcType=INTEGER}, #{deductionTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=INTEGER}, 
       #{discountType,jdbcType=INTEGER}, #{cardName,jdbcType=VARCHAR}, #{cardAmount,jdbcType=DOUBLE}, 
       #{paidFee,jdbcType=DOUBLE}, #{operatorId,jdbcType=INTEGER}, #{operatorName,jdbcType=VARCHAR}
@@ -69,8 +69,8 @@
       <if test="payType != null">
         pay_type,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -122,8 +122,8 @@
       <if test="payType != null">
         #{payType,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -175,8 +175,8 @@
       <if test="payType != null">
         pay_type = #{payType,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -218,7 +218,7 @@
       item_fee = #{itemFee,jdbcType=DOUBLE},
       total_fee = #{totalFee,jdbcType=DOUBLE},
       pay_type = #{payType,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       order_id = #{orderId,jdbcType=INTEGER},
       deduction_time = #{deductionTime,jdbcType=TIMESTAMP},
@@ -237,7 +237,7 @@
     DATE_FORMAT(deduction_time,'%Y-%m-%d') statisticsDate,
     ifnull(sum(total_fee), 0) fee
     from tab_billing_sms_package_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and pay_type = 4
     <if test="startTime != null">
@@ -254,7 +254,7 @@
     select
     ifnull(sum(total_fee), 0)
     from tab_billing_sms_package_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and pay_type = 4
     <if test="dateType == 1 ">
@@ -268,7 +268,7 @@
     select
     ifnull(sum(total_fee), 0)
     from tab_billing_sms_package_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="startTime != null and startTime != '' ">
       and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingSmsRecordMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.gic.enterprise.dao.mapper.TabBillingSmsRecordMapper">
   <resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabBillingSmsRecord">
     <id column="sms_record_id" jdbcType="BIGINT" property="smsRecordId" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="send_time" jdbcType="TIMESTAMP" property="sendTime" />
     <result column="receive_phone" jdbcType="VARCHAR" property="receivePhone" />
     <result column="pay_type" jdbcType="INTEGER" property="payType" />
@@ -34,7 +34,7 @@
     <result column="database_status" jdbcType="INTEGER" property="databaseStatus" />
   </resultMap>
   <sql id="Base_Column_List">
-    sms_record_id, status, send_time, receive_phone, pay_type, app_code, app_name, sms_type, 
+    sms_record_id, delete_flag, send_time, receive_phone, pay_type, app_code, app_name, sms_type,
     bill_number, fee, sms_content, create_time, update_time, deduction_time, enterprise_id, 
     enterprise_sms_package_id, ecu_id, mcu_id, member_card_id, member_card_name, member_name, 
     store_brand_name, store_id, store_name, store_group_id, store_group_name, user_id, 
@@ -48,7 +48,7 @@
   </select>
 
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabBillingSmsRecord">
-    insert into tab_billing_sms_record (sms_record_id, status, send_time, 
+    insert into tab_billing_sms_record (sms_record_id, delete_flag, send_time,
       receive_phone, pay_type, app_code, 
       app_name, sms_type, bill_number, 
       fee, sms_content, create_time, 
@@ -59,7 +59,7 @@
       store_group_id, store_group_name, user_id, 
       user_name, cache_status, database_status
       )
-    values (#{smsRecordId,jdbcType=BIGINT}, #{status,jdbcType=INTEGER}, #{sendTime,jdbcType=TIMESTAMP}, 
+    values (#{smsRecordId,jdbcType=BIGINT}, #{delete_flag,jdbcType=INTEGER}, #{sendTime,jdbcType=TIMESTAMP},
       #{receivePhone,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, #{appCode,jdbcType=VARCHAR}, 
       #{appName,jdbcType=VARCHAR}, #{smsType,jdbcType=INTEGER}, #{billNumber,jdbcType=INTEGER}, 
       #{fee,jdbcType=DOUBLE}, #{smsContent,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
@@ -80,8 +80,8 @@
       <if test="smsRecordId != null">
         sms_record_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="sendTime != null">
         send_time,
@@ -172,8 +172,8 @@
       <if test="smsRecordId != null">
         #{smsRecordId,jdbcType=BIGINT},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="sendTime != null">
         #{sendTime,jdbcType=TIMESTAMP},
@@ -264,8 +264,8 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabBillingSmsRecord">
     update tab_billing_sms_record
     <set>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="sendTime != null">
         send_time = #{sendTime,jdbcType=TIMESTAMP},
@@ -356,7 +356,7 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabBillingSmsRecord">
     update tab_billing_sms_record
-    set status = #{status,jdbcType=INTEGER},
+    set delete_flag = #{deleteFlag,jdbcType=INTEGER},
       send_time = #{sendTime,jdbcType=TIMESTAMP},
       receive_phone = #{receivePhone,jdbcType=VARCHAR},
       pay_type = #{payType,jdbcType=INTEGER},
@@ -392,7 +392,7 @@
     DATE_FORMAT(deduction_time,'%Y-%m-%d') statisticsDate,
     ifnull(sum(fee), 0) fee
     from tab_billing_sms_record
-    where status = 1
+    where delete_flag = 0
     and cache_status = 1
     and database_status = 1
     and enterprise_id = #{enterpriseId}
@@ -410,7 +410,7 @@
     select
     ifnull(sum(fee), 0)
     from tab_billing_sms_record
-    where status = 1
+    where delete_flag = 0
     and cache_status = 1
     and database_status = 1
     and enterprise_id = #{enterpriseId}
@@ -426,7 +426,7 @@
     select
     ifnull(sum(fee), 0)
     from tab_billing_sms_record
-    where status = 1
+    where delete_flag = 0
     and cache_status = 1
     and database_status = 1
     and enterprise_id = #{enterpriseId}
@@ -441,7 +441,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_billing_sms_record
-    where status = 1
+    where delete_flag = 0
     and cache_status = 1
     and database_status = 1
     and enterprise_sms_package_id=#{smsPackageId}

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingVoiceCodeRecordMapper.xml

@@ -4,7 +4,7 @@
   <resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabBillingVoiceCodeRecord">
     <id column="voice_code_record_id" jdbcType="INTEGER" property="voiceCodeRecordId" />
     <result column="pay_serial_number" jdbcType="VARCHAR" property="paySerialNumber" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="send_time" jdbcType="TIMESTAMP" property="sendTime" />
     <result column="receive_phone" jdbcType="VARCHAR" property="receivePhone" />
     <result column="voice_time" jdbcType="VARCHAR" property="voiceTime" />
@@ -23,7 +23,7 @@
     <result column="store_group_name" jdbcType="VARCHAR" property="storeGroupName" />
   </resultMap>
   <sql id="Base_Column_List">
-    voice_code_record_id, pay_serial_number, status, send_time, receive_phone, voice_time, 
+    voice_code_record_id, pay_serial_number, delete_flag, send_time, receive_phone, voice_time,
     app_code, app_name, fee, create_time, update_time, enterprise_id, unit_fee, deduction_time, 
     member_name, store_id, store_name, store_group_id, store_group_name
   </sql>
@@ -36,14 +36,14 @@
 
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabBillingVoiceCodeRecord">
     insert into tab_billing_voice_code_record (voice_code_record_id, pay_serial_number, 
-      status, send_time, receive_phone, 
+      delete_flag, send_time, receive_phone,
       voice_time, app_code, app_name, 
       fee, create_time, update_time, 
       enterprise_id, unit_fee, deduction_time, 
       member_name, store_id, store_name, 
       store_group_id, store_group_name)
     values (#{voiceCodeRecordId,jdbcType=INTEGER}, #{paySerialNumber,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{sendTime,jdbcType=TIMESTAMP}, #{receivePhone,jdbcType=VARCHAR}, 
+      #{deleteFlag,jdbcType=INTEGER}, #{sendTime,jdbcType=TIMESTAMP}, #{receivePhone,jdbcType=VARCHAR},
       #{voiceTime,jdbcType=VARCHAR}, #{appCode,jdbcType=VARCHAR}, #{appName,jdbcType=VARCHAR}, 
       #{fee,jdbcType=DOUBLE}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{enterpriseId,jdbcType=INTEGER}, #{unitFee,jdbcType=BIGINT}, #{deductionTime,jdbcType=TIMESTAMP}, 
@@ -59,8 +59,8 @@
       <if test="paySerialNumber != null">
         pay_serial_number,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="sendTime != null">
         send_time,
@@ -118,8 +118,8 @@
       <if test="paySerialNumber != null">
         #{paySerialNumber,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="sendTime != null">
         #{sendTime,jdbcType=TIMESTAMP},
@@ -177,8 +177,8 @@
       <if test="paySerialNumber != null">
         pay_serial_number = #{paySerialNumber,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="sendTime != null">
         send_time = #{sendTime,jdbcType=TIMESTAMP},
@@ -234,7 +234,7 @@
   <update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabBillingVoiceCodeRecord">
     update tab_billing_voice_code_record
     set pay_serial_number = #{paySerialNumber,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       send_time = #{sendTime,jdbcType=TIMESTAMP},
       receive_phone = #{receivePhone,jdbcType=VARCHAR},
       voice_time = #{voiceTime,jdbcType=VARCHAR},
@@ -259,7 +259,7 @@
     DATE_FORMAT(send_time,'%Y-%m-%d') statisticsDate,
     ifnull(sum(fee), 0) fee
     from tab_billing_voice_code_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="startTime != null">
       and DATE_FORMAT(send_time,'%Y-%m-%d') &gt;= #{startTime}
@@ -274,7 +274,7 @@
     select
     ifnull(sum(fee), 0)
     from tab_billing_voice_code_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="dateType == 1 ">
       and date_format(send_time,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -287,7 +287,7 @@
     select
     ifnull(sum(fee), 0)
     from tab_billing_voice_code_record
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="startTime != null and startTime != '' ">
       and DATE_FORMAT(send_time,'%Y-%m-%d') &gt;= #{startTime}

gic-platform-enterprise-service/src/main/resources/mapper/TabConfigRuleEnterpriseMapper.xml

@@ -5,12 +5,12 @@
     <id column="enterprise_rule_id" jdbcType="INTEGER" property="enterpriseRuleId" />
     <result column="rule_name" jdbcType="VARCHAR" property="ruleName" />
     <result column="enterprise_type" jdbcType="INTEGER" property="enterpriseType" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    enterprise_rule_id, rule_name, enterprise_type, status, create_time, update_time
+    enterprise_rule_id, rule_name, enterprise_type, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -21,10 +21,10 @@
 
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabConfigRuleEnterprise" useGeneratedKeys="true" keyProperty="enterpriseRuleId">
     insert into tab_config_rule_enterprise (enterprise_rule_id, rule_name, enterprise_type, 
-      status, create_time, update_time
+      delete_flag, create_time, update_time
       )
     values (#{enterpriseRuleId,jdbcType=INTEGER}, #{ruleName,jdbcType=VARCHAR}, #{enterpriseType,jdbcType=INTEGER}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabConfigRuleEnterprise">
@@ -39,8 +39,8 @@
       <if test="enterpriseType != null">
         enterprise_type,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -59,8 +59,8 @@
       <if test="enterpriseType != null">
         #{enterpriseType,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -79,8 +79,8 @@
       <if test="enterpriseType != null">
         enterprise_type = #{enterpriseType,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -95,7 +95,7 @@
     update tab_config_rule_enterprise
     set rule_name = #{ruleName,jdbcType=VARCHAR},
       enterprise_type = #{enterpriseType,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where enterprise_rule_id = #{enterpriseRuleId,jdbcType=INTEGER}
@@ -103,7 +103,7 @@
 
   <select id="countRepeatName" resultType="int">
     select count(1) from tab_config_rule_enterprise
-    where status = 1
+    where delete_flag = 0
     and rule_name = #{ruleName}
     <if test="enterpriseRuleId != null">
       and enterprise_rule_id &lt;&gt; #{enterpriseRuleId}
@@ -114,14 +114,14 @@
     select t1.enterprise_rule_id enterpriseRuleId, t1.rule_name ruleName, count(DISTINCT t2.enterprise_id) countEnterpriseId
     from tab_config_rule_enterprise t1
     left join tab_config_rule_enterprise_rel t2 on t1.enterprise_rule_id = t2.enterprise_rule_id
-    and t2.status = 1
+    and t2.delete_flag = 0
     <if test="search == null or search == '' ">
       and t2.enterprise_id != -1
     </if>
     <if test="search != null and search != '' ">
       left join tab_enterprise t3 on t2.enterprise_id = t3.enterprise_id
     </if>
-    where t1.status = 1
+    where t1.delete_flag = 0
     <if test="search != null and search != '' ">
       and ( t1.rule_name like concat('%', #{search}, '%')
       or t3.enterprise_name like concat('%', #{search}, '%')
@@ -135,8 +135,8 @@
     select t2.enterprise_name enterpriseName, t2.company_name companyName, t2.logo logo, t2.enterprise_id enterpriseId
     from tab_config_rule_enterprise_rel t1
     left join tab_enterprise t2 on t1.enterprise_id = t2.enterprise_id
-    where t1.status = 1
-    and t2.status = 1
+    where t1.delete_flag = 0
+    and t2.delete_flag = 0
     and t1.enterprise_id != -1
     and t1.enterprise_rule_id = #{enterpriseRuleId}
     <if test="search != null and search != '' ">
@@ -149,6 +149,6 @@
   <select id="listEnterpriseRuleAll" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include>
     from tab_config_rule_enterprise
-    where status = 1
+    where delete_flag = 0
   </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabConfigRuleEnterpriseRelMapper.xml

@@ -5,12 +5,12 @@
     <id column="enterprise_rel_id" jdbcType="INTEGER" property="enterpriseRelId" />
     <result column="enterprise_rule_id" jdbcType="INTEGER" property="enterpriseRuleId" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    enterprise_rel_id, enterprise_rule_id, enterprise_id, status, create_time, update_time
+    enterprise_rel_id, enterprise_rule_id, enterprise_id, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -21,10 +21,10 @@
 
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabConfigRuleEnterpriseRel">
     insert into tab_config_rule_enterprise_rel (enterprise_rel_id, enterprise_rule_id, 
-      enterprise_id, status, create_time, 
+      enterprise_id, delete_flag, create_time,
       update_time)
     values (#{enterpriseRelId,jdbcType=INTEGER}, #{enterpriseRuleId,jdbcType=INTEGER}, 
-      #{enterpriseId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{enterpriseId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabConfigRuleEnterpriseRel">
@@ -39,8 +39,8 @@
       <if test="enterpriseId != null">
         enterprise_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -59,8 +59,8 @@
       <if test="enterpriseId != null">
         #{enterpriseId,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -79,8 +79,8 @@
       <if test="enterpriseId != null">
         enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -95,7 +95,7 @@
     update tab_config_rule_enterprise_rel
     set enterprise_rule_id = #{enterpriseRuleId,jdbcType=INTEGER},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where enterprise_rel_id = #{enterpriseRelId,jdbcType=INTEGER}
@@ -103,7 +103,7 @@
 
   <insert id="insertBatch" parameterType="java.util.List">
     insert into tab_config_rule_enterprise_rel (enterprise_rel_id, enterprise_rule_id,
-    enterprise_id, status, create_time,
+    enterprise_id, delete_flag, create_time,
     update_time)
     values
     <foreach collection="list" item="item" index="index" separator=",">
@@ -111,7 +111,7 @@
       #{item.enterpriseRelId},
       #{item.enterpriseRuleId},
       #{item.enterpriseId},
-      #{item.status},
+      #{item.deleteFlag},
       #{item.createTime},
       #{item.updateTime}
       )
@@ -119,14 +119,14 @@
   </insert>
 
   <update id="deleteByEnterpriseRuleId">
-    update tab_config_rule_enterprise_rel set status = 0
-    where status = 1
+    update tab_config_rule_enterprise_rel set delete_flag = 1
+    where delete_flag = 0
     and enterprise_rule_id = #{enterpriseRuleId}
   </update>
 
   <update id="deleteByEnterpriseIdList">
-    update tab_config_rule_enterprise_rel set status = 0
-    where status = 1
+    update tab_config_rule_enterprise_rel set delete_flag = 1
+    where delete_flag = 0
     <if test="list != null and list.size() > 0">
       and enterprise_id in
       <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
@@ -138,14 +138,14 @@
   <select id="listEnterprise" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include>
     from tab_config_rule_enterprise_rel
-    where status = 1
+    where delete_flag = 0
     group by enterprise_id
   </select>
 
   <select id="getByEnterpriseId" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include>
     from tab_config_rule_enterprise_rel
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     limit 1
   </select>

gic-platform-enterprise-service/src/main/resources/mapper/TabConfigRuleMapper.xml

@@ -15,18 +15,18 @@
     <result column="parent_rule_id" jdbcType="INTEGER" property="parentRuleId" />
     <result column="rule_level" jdbcType="INTEGER" property="ruleLevel" />
     <result column="rule_chain" jdbcType="VARCHAR" property="ruleChain" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
     rule_id, rule_name, app_name, app_code, classify_icon, rule_desc, remark, market_name, market_scene, market_object,
-    parent_rule_id, rule_level, rule_chain, status, create_time, update_time
+    parent_rule_id, rule_level, rule_chain, delete_flag, create_time, update_time
   </sql>
   <sql id="Base_Column_List_alias">
     ${alias}.rule_id, ${alias}.rule_name, ${alias}.app_name, ${alias}.app_code, ${alias}.classify_icon,
     ${alias}.rule_desc, ${alias}.remark, ${alias}.market_name, ${alias}.market_scene, ${alias}.market_object,
-    ${alias}.parent_rule_id, ${alias}.rule_level, ${alias}.rule_chain, ${alias}.status, ${alias}.create_time, ${alias}.update_time
+    ${alias}.parent_rule_id, ${alias}.rule_level, ${alias}.rule_chain, ${alias}.delete_flag, ${alias}.create_time, ${alias}.update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -40,13 +40,13 @@
       app_code, classify_icon, rule_desc,
       remark, market_name, market_scene, market_object,
       parent_rule_id, rule_level, rule_chain, 
-      status, create_time, update_time
+      delete_flag, create_time, update_time
       )
     values (#{ruleId,jdbcType=INTEGER}, #{ruleName,jdbcType=VARCHAR}, #{appName,jdbcType=VARCHAR},
       #{appCode,jdbcType=VARCHAR}, #{classifyIcon,jdbcType=VARCHAR}, #{ruleDesc,jdbcType=VARCHAR},
       #{remark,jdbcType=VARCHAR}, #{marketName,jdbcType=VARCHAR}, #{marketScene,jdbcType=VARCHAR}, #{marketObject,jdbcType=INTEGER},
       #{parentRuleId,jdbcType=INTEGER}, #{ruleLevel,jdbcType=INTEGER}, #{ruleChain,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabConfigRule" useGeneratedKeys="true" keyProperty="ruleId">
@@ -91,8 +91,8 @@
       <if test="ruleChain != null">
         rule_chain,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -141,8 +141,8 @@
       <if test="ruleChain != null">
         #{ruleChain,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -191,8 +191,8 @@
       <if test="ruleChain != null">
         rule_chain = #{ruleChain,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -217,7 +217,7 @@
       parent_rule_id = #{parentRuleId,jdbcType=INTEGER},
       rule_level = #{ruleLevel,jdbcType=INTEGER},
       rule_chain = #{ruleChain,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where rule_id = #{ruleId,jdbcType=INTEGER}
@@ -225,7 +225,7 @@
 
   <select id="countRepeatName" resultType="int">
     select count(1) from tab_config_rule
-    where status = 1
+    where delete_flag = 0
     and rule_level  = #{ruleLevel}
     and rule_name = #{name}
     <if test="ruleLevel == 1">
@@ -243,7 +243,7 @@
 
   <select id="countRepeatAppCode" resultType="int">
     select count(1) from tab_config_rule
-    where status = 1
+    where delete_flag = 0
     and app_code = #{appCode}
     and rule_level = 1
       <if test="ruleId != null">
@@ -254,7 +254,7 @@
   <select id="listRule" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include>
     from tab_config_rule
-    where status = 1
+    where delete_flag = 0
     and rule_level  = #{ruleLevel}
     <if test="ruleLevel != 1 ">
       and parent_rule_id = #{ruleId}
@@ -268,7 +268,7 @@
   <select id="listAll" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include>
     from tab_config_rule
-    where status = 1
+    where delete_flag = 0
     <if test="ruleId != null">
       and parent_rule_id = #{ruleId}
     </if>
@@ -283,7 +283,7 @@
       FROM
       tab_config_rule
       WHERE
-      STATUS = 1
+        delete_flag = 0
       AND ( rule_name LIKE concat('%', #{search}, '%') or app_name like concat('%', #{search}, '%') )
     ) t1,
     (
@@ -292,7 +292,7 @@
       FROM
       tab_config_rule
       WHERE
-      STATUS = 1
+        delete_flag = 0
     ) t2
     where t1.rule_chain LIKE concat('%', t2.rule_chain, '%')
   </select>
@@ -300,7 +300,7 @@
   <select id="getByAppCode" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include>
     from tab_config_rule
-    where status = 1
+    where delete_flag = 0
     and app_code = #{appCode}
   </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabConfigRuleRelMapper.xml

@@ -5,12 +5,12 @@
     <id column="rule_rel_id" jdbcType="INTEGER" property="ruleRelId" />
     <result column="enterprise_rule_id" jdbcType="INTEGER" property="enterpriseRuleId" />
     <result column="rule_id" jdbcType="INTEGER" property="ruleId" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    rule_rel_id, enterprise_rule_id, rule_id, status, create_time, update_time
+    rule_rel_id, enterprise_rule_id, rule_id, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -21,10 +21,10 @@
 
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabConfigRuleRel">
     insert into tab_config_rule_rel (rule_rel_id, enterprise_rule_id, rule_id, 
-      status, create_time, update_time
+      delete_flag, create_time, update_time
       )
     values (#{ruleRelId,jdbcType=INTEGER}, #{enterpriseRuleId,jdbcType=INTEGER}, #{ruleId,jdbcType=INTEGER}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabConfigRuleRel">
@@ -39,8 +39,8 @@
       <if test="ruleId != null">
         rule_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -59,8 +59,8 @@
       <if test="ruleId != null">
         #{ruleId,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -79,8 +79,8 @@
       <if test="ruleId != null">
         rule_id = #{ruleId,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -95,7 +95,7 @@
     update tab_config_rule_rel
     set enterprise_rule_id = #{enterpriseRuleId,jdbcType=INTEGER},
       rule_id = #{ruleId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where rule_rel_id = #{ruleRelId,jdbcType=INTEGER}
@@ -103,7 +103,7 @@
 
   <insert id="insertBatch" parameterType="java.util.List">
     insert into tab_config_rule_rel (rule_rel_id, enterprise_rule_id,
-    rule_id, status, create_time,
+    rule_id, delete_flag, create_time,
     update_time)
     values
     <foreach collection="list" item="item" index="index" separator=",">
@@ -111,7 +111,7 @@
       #{item.ruleRelId},
       #{item.enterpriseRuleId},
       #{item.ruleId},
-      #{item.status},
+      #{item.deleteFlag},
       #{item.createTime},
       #{item.updateTime}
       )
@@ -119,15 +119,15 @@
   </insert>
 
   <update id="deleteByEnterpriseRuleId">
-    update tab_config_rule_rel set status = 0
-    where status = 1
+    update tab_config_rule_rel set delete_flag = 1
+    where delete_flag = 0
     and enterprise_rule_id = #{enterpriseRuleId}
   </update>
 
   <select id="listRuleRel" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include>
     from tab_config_rule_rel
-    where status = 1
+    where delete_flag = 0
     and enterprise_rule_id = #{enterpriseRuleId}
   </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabCustomGuideMapper.xml

@@ -18,11 +18,12 @@
     <result column="custom_link_type" jdbcType="INTEGER" property="customLinkType" />
     <result column="custom_page" jdbcType="VARCHAR" property="customPage" />
     <result column="appid" jdbcType="VARCHAR" property="appid" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
     guide_id, enterprise_id, icon, title, entry_condition, link, status, sort, create_time, 
     update_time, version, icon_path, selected_icon_path, custom_link_type, custom_page, 
-    appid
+    appid, delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -37,13 +38,13 @@
       status, sort, create_time, 
       update_time, version, icon_path, 
       selected_icon_path, custom_link_type, custom_page, 
-      appid)
+      appid, delete_flag)
     values (#{guideId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{icon,jdbcType=VARCHAR}, 
       #{title,jdbcType=VARCHAR}, #{entryCondition,jdbcType=INTEGER}, #{link,jdbcType=VARCHAR}, 
       #{status,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{version,jdbcType=INTEGER}, #{iconPath,jdbcType=VARCHAR}, 
       #{selectedIconPath,jdbcType=VARCHAR}, #{customLinkType,jdbcType=INTEGER}, #{customPage,jdbcType=VARCHAR}, 
-      #{appid,jdbcType=VARCHAR})
+      #{appid,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabCustomGuide">
     insert into tab_custom_guide
@@ -96,6 +97,9 @@
       <if test="appid != null">
         appid,
       </if>
+      <if test="deleteFlag != null">
+        delete_flag,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="guideId != null">
@@ -146,6 +150,9 @@
       <if test="appid != null">
         #{appid,jdbcType=VARCHAR},
       </if>
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabCustomGuide">
@@ -196,6 +203,9 @@
       <if test="appid != null">
         appid = #{appid,jdbcType=VARCHAR},
       </if>
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      </if>
     </set>
     where guide_id = #{guideId,jdbcType=INTEGER}
   </update>
@@ -215,7 +225,8 @@
       selected_icon_path = #{selectedIconPath,jdbcType=VARCHAR},
       custom_link_type = #{customLinkType,jdbcType=INTEGER},
       custom_page = #{customPage,jdbcType=VARCHAR},
-      appid = #{appid,jdbcType=VARCHAR}
+      appid = #{appid,jdbcType=VARCHAR},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where guide_id = #{guideId,jdbcType=INTEGER}
   </update>
   <select id="getVersion" resultType="integer">
@@ -240,7 +251,7 @@
     <if test="version != null">
       and version = #{version}
     </if>
-    and (status = 1 or status = 2)
+    and (status = 1 or status = 2) and delete_flag = 0
     <if test="appid != null and appid != ''">
       and appid = #{appid}
     </if>

gic-platform-enterprise-service/src/main/resources/mapper/TabCustomStoreMapper.xml

@@ -12,10 +12,11 @@
     <result column="store_widget_id" jdbcType="INTEGER" property="storeWidgetId" />
     <result column="app_type" jdbcType="INTEGER" property="appType" />
     <result column="quick_guide_switch" jdbcType="INTEGER" property="quickGuideSwitch" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
     custom_store_id, title, enterprise_id, appid, status, create_time, update_time, store_widget_id, 
-    app_type, quick_guide_switch
+    app_type, quick_guide_switch, delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -27,11 +28,12 @@
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabCustomStore">
     insert into tab_custom_store (custom_store_id, title, enterprise_id, 
       appid, status, create_time, 
-      update_time, store_widget_id, app_type, quick_guide_switch
+      update_time, store_widget_id, app_type, quick_guide_switch, delete_flag
       )
     values (#{customStoreId,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=INTEGER}, 
       #{appid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{storeWidgetId,jdbcType=INTEGER}, #{appType,jdbcType=INTEGER}  #{quickGuideSwitch,jdbcType=INTEGER}
+      ,#{deleteFlag,jdbcType=INTEGER}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabCustomStore">
@@ -67,6 +69,9 @@
       <if test="quickGuideSwitch != null">
         quick_guide_switch,
       </if>
+      <if test="deleteFlag != null">
+        delete_flag,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="customStoreId != null">
@@ -99,6 +104,9 @@
       <if test="quickGuideSwitch != null">
         #{quickGuideSwitch,jdbcType=INTEGER},
       </if>
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabCustomStore">
@@ -131,6 +139,9 @@
       <if test="quickGuideSwitch != null">
         quick_guide_switch = #{quickGuideSwitch,jdbcType=INTEGER},
       </if>
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      </if>
     </set>
     where custom_store_id = #{customStoreId,jdbcType=INTEGER}
   </update>
@@ -144,14 +155,15 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       store_widget_id = #{storeWidgetId,jdbcType=INTEGER},
       app_type = #{appType,jdbcType=INTEGER},
-      quick_guide_switch = #{quickGuideSwitch,jdbcType=INTEGER}
+      quick_guide_switch = #{quickGuideSwitch,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where custom_store_id = #{customStoreId,jdbcType=INTEGER}
   </update>
   <select id="pageCustomStore" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from tab_custom_store
-    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and (status=1 or status=2)
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and (status=1 or status=2) and delete_flag = 0
     <if test="appid != null and appid != ''">
       and appid= #{appid}
     </if>
@@ -163,7 +175,7 @@
     update tab_custom_store
     set status = 2
     where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
-    and appid = #{appid,jdbcType=VARCHAR} and status=1
+    and appid = #{appid,jdbcType=VARCHAR} and status=1 and delete_flag = 0
   </update>
   <select id="getCustomStore" resultMap="BaseResultMap">
     select
@@ -171,6 +183,6 @@
     from tab_custom_store
     where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
     and appid= #{appid}
-    and status=1
+    and status=1 and delete_flag = 0
   </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabCustomUdeskFieldMapper.xml

@@ -12,10 +12,11 @@
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="delete_flag" jdbcType="TIMESTAMP" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
     id, udesk_field_id, gic_field_id, gic_field_name, status, app_id, field_type, enterprise_id, create_time,
-    update_time
+    update_time, delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -27,10 +28,10 @@
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabCustomUdeskField">
     insert into tab_custom_udesk_field (id, udesk_field_id, gic_field_id, 
       gic_field_name, status, app_id, field_type, enterprise_id,
-      create_time, update_time)
+      create_time, update_time, delete_flag)
     values (#{id,jdbcType=INTEGER}, #{udeskFieldId,jdbcType=VARCHAR}, #{gicFieldId,jdbcType=INTEGER},
       #{gicFieldName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{appId,jdbcType=VARCHAR}, #{fieldType,jdbcType=INTEGER},#{enterpriseId,jdbcType=INTEGER},
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabCustomUdeskField">
     insert into tab_custom_udesk_field
@@ -65,6 +66,9 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="deleteFlag != null">
+        delete_flag,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -97,6 +101,9 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabCustomUdeskField">
@@ -129,6 +136,9 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -137,7 +147,7 @@
     set udesk_field_id = #{udeskFieldId,jdbcType=VARCHAR},
       gic_field_id = #{gicFieldId,jdbcType=INTEGER},
       gic_field_name = #{gicFieldName,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       app_id = #{appId,jdbcType=VARCHAR},
       field_type = #{fieldType,jdbcType=INTEGER},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
@@ -149,7 +159,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_custom_udesk_field
-    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status != 0
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status != 0 and delete_flag = 0
     and app_id = #{appId}
   </select>
 
@@ -157,7 +167,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_custom_udesk_field
-    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status = 1
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status = 1 and delete_flag = 0
     and app_id = #{appId}
   </select>
 
@@ -165,7 +175,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_custom_udesk_field
-    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status != 0
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status != 0 and delete_flag = 0
     and app_id = #{appId}
     and gic_field_id = #{gicFieldId}
   </select>

gic-platform-enterprise-service/src/main/resources/mapper/TabDataActuallyPaidConfigMapper.xml

@@ -7,12 +7,12 @@
     <result column="classify" jdbcType="INTEGER" property="classify" />
     <result column="config_status" jdbcType="INTEGER" property="configStatus" />
     <result column="has_config" jdbcType="INTEGER" property="hasConfig" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    actually_paid_config_id, enterprise_id, classify, config_status, has_config, status, create_time,
+    actually_paid_config_id, enterprise_id, classify, config_status, has_config, delete_flag, create_time,
     update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -24,10 +24,10 @@
 
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabDataActuallyPaidConfig" useGeneratedKeys="true" keyProperty="actuallyPaidConfigId">
     insert into tab_data_actually_paid_config (actually_paid_config_id, enterprise_id, 
-      classify, config_status, has_config, status,
+      classify, config_status, has_config, delete_flag,
       create_time, update_time)
     values (#{actuallyPaidConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
-      #{classify,jdbcType=INTEGER}, #{configStatus,jdbcType=INTEGER}, #{hasConfig,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
+      #{classify,jdbcType=INTEGER}, #{configStatus,jdbcType=INTEGER}, #{hasConfig,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabDataActuallyPaidConfig">
@@ -48,8 +48,8 @@
       <if test="hasConfig != null">
         has_config,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -74,8 +74,8 @@
       <if test="hasConfig != null">
         #{hasConfig,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -100,8 +100,8 @@
       <if test="hasConfig != null">
         has_config = #{hasConfig,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -118,7 +118,7 @@
       classify = #{classify,jdbcType=INTEGER},
       config_status = #{configStatus,jdbcType=INTEGER},
       has_config = #{hasConfig,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where actually_paid_config_id = #{actuallyPaidConfigId,jdbcType=INTEGER}
@@ -128,21 +128,21 @@
     select <include refid="Base_Column_List"></include>
     from tab_data_actually_paid_config
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = 0
     order by classify
   </select>
 
   <update id="delete">
-    update tab_data_actually_paid_config set status = 0
+    update tab_data_actually_paid_config set delete_flag = 1
     where enterprise_id = #{enterpriseId}
     and classify = #{classify}
-    and status = 1
+    and delete_flag = 0
   </update>
 
   <select id="get" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include> from tab_data_actually_paid_config
     where enterprise_id = #{enterpriseId}
     and classify = #{classify}
-    and status = 1
+    and delete_flag = 0
   </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabDataGenerationConfigMapper.xml

@@ -10,13 +10,13 @@
     <result column="second_sign" jdbcType="INTEGER" property="secondSign" />
     <result column="age_second_value" jdbcType="INTEGER" property="ageSecondValue" />
     <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
     generation_config_id, enterprise_id, age_level, first_sign, age_first_value, second_sign, 
-    age_second_value, description, status, create_time, update_time
+    age_second_value, description, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -29,12 +29,12 @@
     insert into tab_data_generation_config (generation_config_id, enterprise_id, 
       age_level, first_sign, age_first_value, 
       second_sign, age_second_value, description, 
-      status, create_time, update_time
+      delete_flag, create_time, update_time
       )
     values (#{generationConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
       #{ageLevel,jdbcType=INTEGER}, #{firstSign,jdbcType=INTEGER}, #{ageFirstValue,jdbcType=INTEGER}, 
       #{secondSign,jdbcType=INTEGER}, #{ageSecondValue,jdbcType=INTEGER}, #{description,jdbcType=VARCHAR},
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabDataGenerationConfig">
@@ -64,8 +64,8 @@
       <if test="description != null">
         description,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -99,8 +99,8 @@
       <if test="description != null">
         #{description,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -134,8 +134,8 @@
       <if test="description != null">
         description = #{description,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -155,23 +155,23 @@
       second_sign = #{secondSign,jdbcType=INTEGER},
       age_second_value = #{ageSecondValue,jdbcType=INTEGER},
       description = #{description,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where generation_config_id = #{generationConfigId,jdbcType=INTEGER}
   </update>
 
   <update id="deleteGenerationConfig">
-    update tab_data_generation_config set status = 0
+    update tab_data_generation_config set delete_flag = 1
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = 0
   </update>
 
   <select id="listGenerationByEnterpriseId" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include>
     from tab_data_generation_config
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = 0
     order by age_level
   </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabDataMemberConsumeConfigMapper.xml

@@ -9,13 +9,13 @@
     <result column="member_consume_times_default" jdbcType="INTEGER" property="memberConsumeTimesDefault" />
     <result column="member_consume_max_goods" jdbcType="INTEGER" property="memberConsumeMaxGoods" />
     <result column="member_consume_times_goods" jdbcType="INTEGER" property="memberConsumeTimesGoods" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
     member_consume_config_id, enterprise_id, member_consume_count, member_consume_max_default, member_consume_times_default,
-    member_consume_max_goods, member_consume_times_goods, status, create_time, update_time
+    member_consume_max_goods, member_consume_times_goods, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -28,12 +28,12 @@
     insert into tab_data_member_consume_config (member_consume_config_id, enterprise_id, 
       member_consume_count, member_consume_max_default, member_consume_times_default,
       member_consume_max_goods, member_consume_times_goods,
-      status, create_time, update_time
+      delete_flag, create_time, update_time
       )
     values (#{memberConsumeConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
       #{memberConsumeCount,jdbcType=INTEGER}, #{memberConsumeMaxDefault,jdbcType=INTEGER}, #{memberConsumeTimesDefault,jdbcType=INTEGER},
       #{memberConsumeMaxGoods,jdbcType=INTEGER}, #{memberConsumeTimesGoods,jdbcType=INTEGER},
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabDataMemberConsumeConfig" useGeneratedKeys="true" keyProperty="memberConsumeConfigId">
@@ -60,8 +60,8 @@
       <if test="memberConsumeTimesGoods != null">
         member_consume_times_goods,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -92,8 +92,8 @@
       <if test="memberConsumeTimesGoods != null">
         #{memberConsumeTimesGoods,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -124,8 +124,8 @@
       <if test="memberConsumeTimesGoods != null">
         member_consume_times_goods = #{memberConsumeTimesGoods,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -144,7 +144,7 @@
       member_consume_times_default = #{memberConsumeTimesDefault,jdbcType=INTEGER},
       member_consume_max_goods = #{memberConsumeMaxGoods,jdbcType=INTEGER},
       member_consume_times_goods = #{memberConsumeTimesGoods,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where member_consume_config_id = #{memberConsumeConfigId,jdbcType=INTEGER}
@@ -153,7 +153,7 @@
   <select id="getByEnterpriseId" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include>
     from tab_data_member_consume_config
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
   </select>
 </mapper>
\ No newline at end of file