Merge branch 'developer' into 'master'

Developer

See merge request !39

gic-store-api/src/main/java/com/gic/store/constant/ClerkSearchTypeEnum.java

+package com.gic.store.constant;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-10-21 11:30
+ */
+public enum ClerkSearchTypeEnum {
+    CLERK(1),
+    STORE(2);
+    private Integer type;
+
+    ClerkSearchTypeEnum(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/Constants.java

@@ -5,6 +5,16 @@ package com.gic.store.constant;
  * @date 2019/7/4
  */
 public interface Constants {
+
+    /**
+     * 正常
+     */
+    Integer NORMAL = 0;
+    /**
+     * 关闭
+     */
+    Integer DELETE = 1;
+
     String STORE_BATCH_IMPORT_MQ_KEY = "storeBulkImport";
     String CLERK_BATCH_IMPORT_MQ_KEY = "clerkBulkImport";
     Integer STORE_BATCH_IMPORT_TASK_TYPE = 6;

gic-store-api/src/main/java/com/gic/store/dto/ClerkDTO.java

 package com.gic.store.dto;
 
+import org.hibernate.validator.constraints.Length;
+
 import java.io.Serializable;
 
 /**
@@ -17,11 +19,13 @@ public class ClerkDTO implements Serializable {
     /**
      * 店员名称
      */
+    @Length(max = 32, message = "导购名称最大长度为32位")
     private String clerkName;
 
     /**
      * 店员编码
      */
+    @Length(max = 32, message = "导购code最大长度为32位")
     private String clerkCode;
 
     /**
@@ -53,6 +57,7 @@ public class ClerkDTO implements Serializable {
     /**
      * 电话号码
      */
+    @Length(max = 11, message = "导购手机号最大长度为11位")
     private String phoneNumber;
 
     /**

gic-store-api/src/main/java/com/gic/store/dto/ClerkLogDTO.java

@@ -60,11 +60,6 @@ public class ClerkLogDTO implements Serializable {
     /**
      *
      */
-    private Integer status;
-
-    /**
-     *
-     */
     private Integer operatorId;
 
     /**
@@ -146,14 +141,6 @@ public class ClerkLogDTO implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public Integer getOperatorId() {
         return operatorId;
     }
@@ -198,7 +185,6 @@ public class ClerkLogDTO implements Serializable {
                 ", remark='" + remark + '\'' +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
-                ", status=" + status +
                 ", operatorId=" + operatorId +
                 ", operatorName='" + operatorName + '\'' +
                 ", startTime='" + startTime + '\'' +

gic-store-api/src/main/java/com/gic/store/dto/ClerkPositionDTO.java

@@ -46,10 +46,6 @@ public class ClerkPositionDTO implements Serializable {
      */
     private Date updateTime;
 
-    /**
-     *
-     */
-    private Integer status;
     private Integer seq;
 
     private Integer relNum;
@@ -110,14 +106,6 @@ public class ClerkPositionDTO implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public void setSeq(Integer seq) {
         this.seq = seq;
     }
@@ -144,7 +132,6 @@ public class ClerkPositionDTO implements Serializable {
                 ", sort=" + sort +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
-                ", status=" + status +
                 ", seq=" + seq +
                 ", relNum=" + relNum +
                 '}';

gic-store-api/src/main/java/com/gic/store/dto/ClerkSearchDTO.java

@@ -27,7 +27,7 @@ public class ClerkSearchDTO implements Serializable {
     private List<String> fieldCodeList;
     private Integer dataType;
     private Integer status;
-
+    private Integer searchType = 1;
 
     public String getSearch() {
         return search;
@@ -149,6 +149,14 @@ public class ClerkSearchDTO implements Serializable {
         return status;
     }
 
+    public Integer getSearchType() {
+        return searchType;
+    }
+
+    public void setSearchType(Integer searchType) {
+        this.searchType = searchType;
+    }
+
     @Override
     public String toString() {
         return "ClerkSearchDTO{" +

gic-store-api/src/main/java/com/gic/store/dto/StoreBrandDTO.java

@@ -44,11 +44,6 @@ public class StoreBrandDTO implements Serializable {
     /**
      *
      */
-    private Integer status;
-
-    /**
-     *
-     */
     private Date createTime;
 
     /**
@@ -108,14 +103,6 @@ public class StoreBrandDTO implements Serializable {
         this.enterpriseId = enterpriseId;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -166,7 +153,6 @@ public class StoreBrandDTO implements Serializable {
                 ", storeBrandCategory='" + storeBrandCategory + '\'' +
                 ", sort=" + sort +
                 ", enterpriseId=" + enterpriseId +
-                ", status=" + status +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", seq=" + seq +

gic-store-api/src/main/java/com/gic/store/dto/StoreFieldDTO.java

@@ -60,7 +60,7 @@ public class StoreFieldDTO implements Serializable {
     /**
      *
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -145,12 +145,12 @@ public class StoreFieldDTO implements Serializable {
         this.storeRegionId = storeRegionId;
     }
 
-    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() {
@@ -218,7 +218,7 @@ public class StoreFieldDTO implements Serializable {
                 ", storeFieldType=" + storeFieldType +
                 ", enterpriseId=" + enterpriseId +
                 ", storeRegionId='" + storeRegionId + '\'' +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", storeFieldDetail='" + storeFieldDetail + '\'' +

gic-store-api/src/main/java/com/gic/store/dto/StoreFieldRegionRelDTO.java

@@ -31,7 +31,7 @@ public class StoreFieldRegionRelDTO implements Serializable{
     /**
      *
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -67,12 +67,12 @@ public class StoreFieldRegionRelDTO implements Serializable{
         this.storeFieldId = storeFieldId;
     }
 
-    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() {
@@ -97,7 +97,7 @@ public class StoreFieldRegionRelDTO implements Serializable{
                 "fieldRegionId=" + fieldRegionId +
                 ", regionId=" + regionId +
                 ", storeFieldId=" + storeFieldId +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 '}';

gic-store-api/src/main/java/com/gic/store/dto/StoreFieldRelDTO.java

@@ -35,7 +35,7 @@ public class StoreFieldRelDTO implements Serializable{
     /**
      *
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -79,12 +79,12 @@ public class StoreFieldRelDTO implements Serializable{
         this.ownType = ownType;
     }
 
-    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() {
@@ -110,7 +110,7 @@ public class StoreFieldRelDTO implements Serializable{
                 ", enterpriseId=" + enterpriseId +
                 ", storeFieldId=" + storeFieldId +
                 ", ownType=" + ownType +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 '}';

gic-store-api/src/main/java/com/gic/store/dto/StoreInfoDTO.java

 package com.gic.store.dto;
 
+import org.hibernate.validator.constraints.Length;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -18,11 +20,13 @@ public class StoreInfoDTO implements Serializable {
     /**
      * 门店名称
      */
+    @Length(max = 40, message = "门店名称最大长度为40位")
     private String storeName;
 
     /**
      * 门店code
      */
+    @Length(max = 40, message = "门店code最大长度为40位")
     private String storeCode;
 
     /**
@@ -40,6 +44,7 @@ public class StoreInfoDTO implements Serializable {
     /**
      * 门店详细地址
      */
+    @Length(max = 200, message = "门店地址最大长度为200位")
     private String address;
 
     /**
@@ -61,11 +66,13 @@ public class StoreInfoDTO implements Serializable {
     /**
      * 经度
      */
+    @Length(max = 50, message = "门店经度最大长度为50位")
     private String longitude;
 
     /**
      * 纬度
      */
+    @Length(max = 50, message = "门店纬度最大长度为50位")
     private String latitude;
 
     private  List<Double> location;

gic-store-api/src/main/java/com/gic/store/dto/StoreRegionDTO.java

@@ -28,7 +28,7 @@ public class StoreRegionDTO implements Serializable {
     /**
      * 状态值；1有效  0无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -74,12 +74,12 @@ public class StoreRegionDTO implements Serializable {
         this.regionName = regionName;
     }
 
-    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() {
@@ -136,7 +136,7 @@ public class StoreRegionDTO implements Serializable {
                 "regionId=" + regionId +
                 ", regionCode='" + regionCode + '\'' +
                 ", regionName='" + regionName + '\'' +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", enterpriseId=" + enterpriseId +

gic-store-api/src/main/java/com/gic/store/dto/StoreStrategyDTO.java

 package com.gic.store.dto;
 
-import java.io.Serializable;
-import java.util.Date;
+import com.gic.store.constant.StoreGroupConstant;
+import com.gic.store.service.StoreStrategyApiService;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-
-import com.gic.store.constant.StoreGroupConstant;
-import com.gic.store.service.StoreStrategyApiService;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 门店分组策略和门店启用策略
@@ -76,7 +75,7 @@ public class StoreStrategyDTO implements Serializable {
     /**
      * 状态值  1有效  0无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 策略类型，1门店状态策略，   2门店分组策略
@@ -167,12 +166,12 @@ public class StoreStrategyDTO implements Serializable {
         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;
     }
 
     public Integer getStrategyType() {
@@ -218,7 +217,7 @@ public class StoreStrategyDTO implements Serializable {
                 ", targetValue='" + targetValue + '\'' +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 ", strategyType=" + strategyType +
                 ", sort=" + sort +
                 ", storeCreateType='" + storeCreateType + '\'' +

gic-store-api/src/main/java/com/gic/store/dto/StoreTagDTO.java

@@ -36,7 +36,7 @@ public class StoreTagDTO implements Serializable{
     /**
      *
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -80,12 +80,12 @@ public class StoreTagDTO implements Serializable{
         this.storeTagName = storeTagName;
     }
 
-    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() {
@@ -111,7 +111,7 @@ public class StoreTagDTO implements Serializable{
                 ", storeWidgetId=" + storeWidgetId +
                 ", enterpriseId=" + enterpriseId +
                 ", storeTagName='" + storeTagName + '\'' +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 '}';

gic-store-api/src/main/java/com/gic/store/dto/StoreTransferDTO.java

@@ -47,7 +47,7 @@ public class StoreTransferDTO implements Serializable {
     /**
      *
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     public Integer getStoreTransferId() {
         return storeTransferId;
@@ -97,12 +97,12 @@ public class StoreTransferDTO implements Serializable {
         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;
     }
 
     public Integer getFromStoreInfoId() {
@@ -132,7 +132,7 @@ public class StoreTransferDTO implements Serializable {
                 ", enterpriseId=" + enterpriseId +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 '}';
     }
 }

gic-store-service/src/main/java/com/gic/store/dao/mapper/DictMapper.java

@@ -11,14 +11,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface DictMapper {
     /**
-     * 根据主键删除
-     *
-     * @param dictId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(String dictId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabAuthStoreLogMapper.java

@@ -14,14 +14,6 @@ import java.util.List;
  */
 public interface TabAuthStoreLogMapper {
     /**
-     * 根据主键删除
-     *
-     * @param id 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer id);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabCityMapper.java

@@ -14,14 +14,6 @@ import java.util.List;
  */
 public interface TabCityMapper {
     /**
-     * 根据主键删除
-     *
-     * @param cityId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(String cityId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabClerkLogMapper.java

@@ -13,14 +13,6 @@ import com.github.pagehelper.Page;
  */
 public interface TabClerkLogMapper {
     /**
-     * 根据主键删除
-     *
-     * @param clerkLogId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer clerkLogId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabClerkPositionMapper.java

@@ -15,14 +15,6 @@ import java.util.List;
  */
 public interface TabClerkPositionMapper {
     /**
-     * 根据主键删除
-     *
-     * @param clerkPositionId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer clerkPositionId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabClerkTmpMapper.java

@@ -14,14 +14,6 @@ import java.util.List;
  */
 public interface TabClerkTmpMapper {
     /**
-     * 根据主键删除
-     *
-     * @param clerkTmpId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer clerkTmpId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabCountyMapper.java

@@ -14,14 +14,6 @@ import java.util.List;
  */
 public interface TabCountyMapper {
     /**
-     * 根据主键删除
-     *
-     * @param countyId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(String countyId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabEnterpriseLicenseMapper.java

-package com.gic.store.dao.mapper;
-
-import com.gic.store.entity.TabEnterpriseLicense;
-
-/**
- * 
- * @ClassName: TabEnterpriseLicenseMapper
- * @Description:  
- * @author zhiwj
- * @date 2020-09-09 18:35
- */
-public interface TabEnterpriseLicenseMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param enterpriseLicenseId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer enterpriseLicenseId);
-
-    /**
-     * 插入一条记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int insert(TabEnterpriseLicense record);
-
-    /**
-     * 动态插入一条记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int insertSelective(TabEnterpriseLicense record);
-
-    /**
-     * 根据主键查询
-     *
-     * @param enterpriseLicenseId 主键
-     * @return 实体对象
-     */
-    TabEnterpriseLicense selectByPrimaryKey(Integer enterpriseLicenseId);
-
-    /**
-     * 根据主键动态更新记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int updateByPrimaryKeySelective(TabEnterpriseLicense record);
-
-    /**
-     * 根据主键更新记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int updateByPrimaryKey(TabEnterpriseLicense record);
-}
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabEnterpriseMapper.java

-package com.gic.store.dao.mapper;
-
-import com.gic.store.entity.TabEnterprise;
-
-/**
- * 
- * @ClassName: TabEnterpriseMapper
- * @Description:  
- * @author zhiwj
- * @date 2020-09-09 18:35
- */
-public interface TabEnterpriseMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param enterpriseId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer enterpriseId);
-
-    /**
-     * 插入一条记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int insert(TabEnterprise record);
-
-    /**
-     * 动态插入一条记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int insertSelective(TabEnterprise record);
-
-    /**
-     * 根据主键查询
-     *
-     * @param enterpriseId 主键
-     * @return 实体对象
-     */
-    TabEnterprise selectByPrimaryKey(Integer enterpriseId);
-
-    /**
-     * 根据主键动态更新记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int updateByPrimaryKeySelective(TabEnterprise record);
-
-    /**
-     * 根据主键更新记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int updateByPrimaryKey(TabEnterprise record);
-}
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabEnterpriseVersionMapper.java

-package com.gic.store.dao.mapper;
-
-import com.gic.store.entity.TabEnterpriseVersion;
-
-/**
- * 
- * @ClassName: TabEnterpriseVersionMapper
- * @Description:  
- * @author zhiwj
- * @date 2020-09-09 18:35
- */
-public interface TabEnterpriseVersionMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param enterpriseServiceId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer enterpriseServiceId);
-
-    /**
-     * 插入一条记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int insert(TabEnterpriseVersion record);
-
-    /**
-     * 动态插入一条记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int insertSelective(TabEnterpriseVersion record);
-
-    /**
-     * 根据主键查询
-     *
-     * @param enterpriseServiceId 主键
-     * @return 实体对象
-     */
-    TabEnterpriseVersion selectByPrimaryKey(Integer enterpriseServiceId);
-
-    /**
-     * 根据主键动态更新记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int updateByPrimaryKeySelective(TabEnterpriseVersion record);
-
-    /**
-     * 根据主键更新记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int updateByPrimaryKey(TabEnterpriseVersion record);
-}
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabIntegralStoreMoveMapper.java

@@ -11,14 +11,6 @@ import com.gic.store.entity.TabIntegralStoreMove;
  */
 public interface TabIntegralStoreMoveMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeMoveId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeMoveId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabProvinceMapper.java

@@ -14,14 +14,6 @@ import java.util.List;
  */
 public interface TabProvinceMapper {
     /**
-     * 根据主键删除
-     *
-     * @param provinceId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(String provinceId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreBusinessTimeMapper.java

@@ -15,14 +15,6 @@ import java.util.List;
  */
 public interface TabStoreBusinessTimeMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeBusinessTimeId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeBusinessTimeId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreExtendMapper.java

@@ -14,14 +14,6 @@ import java.util.List;
  */
 public interface TabStoreExtendMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeExtendId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeExtendId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreFieldMapper.java

@@ -15,14 +15,6 @@ import java.util.List;
  */
 public interface TabStoreFieldMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeFieldId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeFieldId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreFieldRegionRelMapper.java

@@ -16,14 +16,6 @@ import java.util.List;
  */
 public interface TabStoreFieldRegionRelMapper {
     /**
-     * 根据主键删除
-     *
-     * @param fieldRegionId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer fieldRegionId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreFieldRelMapper.java

@@ -15,14 +15,6 @@ import java.util.List;
  */
 public interface TabStoreFieldRelMapper {
     /**
-     * 根据主键删除
-     *
-     * @param fieldRelationId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer fieldRelationId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreFieldSelectMapper.java

@@ -13,14 +13,6 @@ import java.util.List;
  */
 public interface TabStoreFieldSelectMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeFieldSelectId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeFieldSelectId);
-
-    /**
      * deleteBatch
      * @Title: deleteBatch
      * @Description:

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreGroupMapper.java

@@ -15,14 +15,6 @@ import java.util.List;
  */
 public interface TabStoreGroupMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeGroupId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeGroupId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreGroupRelMapper.java

@@ -11,14 +11,6 @@ import com.gic.store.entity.TabStoreGroupRel;
  */
 public interface TabStoreGroupRelMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeGroupRelId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeGroupRelId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreIndexLogMapper.java

@@ -11,14 +11,6 @@ import com.gic.store.entity.TabStoreIndexLog;
  */
 public interface TabStoreIndexLogMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeIndexId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeIndexId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreInfoMapper.java

@@ -16,14 +16,6 @@ import java.util.List;
  */
 public interface TabStoreInfoMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreLogMapper.java

@@ -13,14 +13,6 @@ import com.github.pagehelper.Page;
  */
 public interface TabStoreLogMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeLogId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeLogId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreMapper.java

@@ -14,14 +14,6 @@ import java.util.List;
  */
 public interface TabStoreMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStorePhotoMapper.java

@@ -13,14 +13,6 @@ import java.util.List;
  */
 public interface TabStorePhotoMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storePhotoId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storePhotoId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreRegionRelMapper.java

@@ -114,9 +114,9 @@ public interface TabStoreRegionRelMapper {
      * @author zhiwj
      * @param enterpriseId
      * @param regionId
-     * @param status
+     * @param deleteFlag
      * @return void
      * @throws
      */
-    void updateStatusByOther(@Param("enterpriseId") Integer enterpriseId, @Param("regionId") Integer regionId, @Param("status") int status);
+    void updateStatusByOther(@Param("enterpriseId") Integer enterpriseId, @Param("regionId") Integer regionId, @Param("deleteFlag") int deleteFlag);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreStatusSettingMapper.java

@@ -13,14 +13,6 @@ import java.util.List;
  */
 public interface TabStoreStatusSettingMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeStatusId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeStatusId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreStrategyMapper.java

@@ -13,14 +13,6 @@ import java.util.List;
  */
 public interface TabStoreStrategyMapper {
     /**
-     * 根据主键删除
-     *
-     * @param strategyId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer strategyId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreTagMapper.java

@@ -14,14 +14,6 @@ import java.util.List;
  */
 public interface TabStoreTagMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeTagId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeTagId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreTagTmpMapper.java

@@ -13,14 +13,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface TabStoreTagTmpMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeTagTmpId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeTagTmpId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreTmpMapper.java

@@ -14,14 +14,6 @@ import java.util.List;
 
 public interface TabStoreTmpMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeTmpId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeTmpId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreTransferMapper.java

@@ -11,14 +11,6 @@ import com.gic.store.entity.TabStoreTransfer;
  */
 public interface TabStoreTransferMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeTransferId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeTransferId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreWidgetMapper.java

@@ -11,14 +11,6 @@ import com.gic.store.entity.TabStoreWidget;
  */
 public interface TabStoreWidgetMapper {
     /**
-     * 根据主键删除
-     *
-     * @param storeWidgetId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer storeWidgetId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabUserMapper.java

-package com.gic.store.dao.mapper;
-
-import com.gic.store.entity.TabUser;
-
-/**
- * 
- * @ClassName: TabUserMapper
- * @Description:  
- * @author zhiwj
- * @date 2020-09-09 18:53
- */
-public interface TabUserMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param userId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer userId);
-
-    /**
-     * 插入一条记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int insert(TabUser record);
-
-    /**
-     * 动态插入一条记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int insertSelective(TabUser record);
-
-    /**
-     * 根据主键查询
-     *
-     * @param userId 主键
-     * @return 实体对象
-     */
-    TabUser selectByPrimaryKey(Integer userId);
-
-    /**
-     * 根据主键动态更新记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int updateByPrimaryKeySelective(TabUser record);
-
-    /**
-     * 根据主键更新记录
-     *
-     * @param record 实体对象
-     * @return 更新条目数
-     */
-    int updateByPrimaryKey(TabUser record);
-}
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/entity/TabClerkLog.java

@@ -61,7 +61,7 @@ public class TabClerkLog {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -145,12 +145,12 @@ public class TabClerkLog {
         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;
     }
 
     public Integer getOperatorId() {

gic-store-service/src/main/java/com/gic/store/entity/TabClerkPosition.java

@@ -51,7 +51,7 @@ public class TabClerkPosition {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     public Integer getClerkPositionId() {
         return clerkPositionId;
@@ -109,11 +109,11 @@ public class TabClerkPosition {
         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-store-service/src/main/java/com/gic/store/entity/TabIntegralStoreMove.java

@@ -36,7 +36,7 @@ public class TabIntegralStoreMove {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -80,12 +80,12 @@ public class TabIntegralStoreMove {
         this.endStoreId = endStoreId;
     }
 
-    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-store-service/src/main/java/com/gic/store/entity/TabStoreBrand.java

@@ -51,7 +51,7 @@ public class TabStoreBrand {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -124,12 +124,12 @@ public class TabStoreBrand {
         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-store-service/src/main/java/com/gic/store/entity/TabStoreBusinessTime.java

@@ -50,7 +50,7 @@ public class TabStoreBusinessTime {
 
     private Integer enterpriseId;
 
-    private Integer status=1;
+    private Integer deleteFlag =0;
 
     public Integer getStoreBusinessTimeId() {
         return storeBusinessTimeId;
@@ -116,11 +116,11 @@ public class TabStoreBusinessTime {
         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;
     }
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/entity/TabStoreField.java

@@ -36,7 +36,7 @@ public class TabStoreField {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -95,12 +95,12 @@ public class TabStoreField {
         this.storeFieldType = storeFieldType;
     }
 
-    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-store-service/src/main/java/com/gic/store/entity/TabStoreFieldRegionRel.java

@@ -31,7 +31,7 @@ public class TabStoreFieldRegionRel {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -67,12 +67,12 @@ public class TabStoreFieldRegionRel {
         this.storeFieldId = storeFieldId;
     }
 
-    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-store-service/src/main/java/com/gic/store/entity/TabStoreFieldRel.java

@@ -36,7 +36,7 @@ public class TabStoreFieldRel {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -80,12 +80,12 @@ public class TabStoreFieldRel {
         this.ownType = ownType;
     }
 
-    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-store-service/src/main/java/com/gic/store/entity/TabStoreGroup.java

@@ -51,7 +51,7 @@ public class TabStoreGroup {
     /**
      * 状态值
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -123,12 +123,12 @@ public class TabStoreGroup {
         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-store-service/src/main/java/com/gic/store/entity/TabStoreGroupRel.java

@@ -36,7 +36,7 @@ public class TabStoreGroupRel {
     /**
      * 1有效  0无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -80,12 +80,12 @@ public class TabStoreGroupRel {
         this.storeGroupId = storeGroupId;
     }
 
-    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-store-service/src/main/java/com/gic/store/entity/TabStoreLog.java

@@ -61,7 +61,7 @@ public class TabStoreLog {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -145,12 +145,12 @@ public class TabStoreLog {
         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;
     }
 
     public Integer getOperatorId() {

gic-store-service/src/main/java/com/gic/store/entity/TabStorePhoto.java

@@ -46,7 +46,7 @@ public class TabStorePhoto {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -106,12 +106,12 @@ public class TabStorePhoto {
         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-store-service/src/main/java/com/gic/store/entity/TabStoreRegion.java

@@ -31,7 +31,7 @@ public class TabStoreRegion {
     /**
      * 状态值；1有效  0无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -67,12 +67,12 @@ public class TabStoreRegion {
         this.regionName = regionName;
     }
 
-    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-store-service/src/main/java/com/gic/store/entity/TabStoreRegionRel.java

@@ -41,7 +41,7 @@ public class TabStoreRegionRel {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -93,12 +93,12 @@ public class TabStoreRegionRel {
         this.ownType = ownType;
     }
 
-    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-store-service/src/main/java/com/gic/store/entity/TabStoreStrategy.java

@@ -56,7 +56,7 @@ public class TabStoreStrategy {
     /**
      * 状态值  1有效  0无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 策略类型，1门店状态策略，   2门店分组策略
@@ -137,12 +137,12 @@ public class TabStoreStrategy {
         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;
     }
 
     public Integer getStrategyType() {

gic-store-service/src/main/java/com/gic/store/entity/TabStoreTag.java

@@ -36,7 +36,7 @@ public class TabStoreTag {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -80,12 +80,12 @@ public class TabStoreTag {
         this.storeTagName = storeTagName;
     }
 
-    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-store-service/src/main/java/com/gic/store/entity/TabStoreTransfer.java

@@ -56,7 +56,7 @@ public class TabStoreTransfer {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     public Integer getStoreTransferId() {
         return storeTransferId;
@@ -122,11 +122,11 @@ public class TabStoreTransfer {
         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-store-service/src/main/java/com/gic/store/entity/TabStoreWidget.java

@@ -43,7 +43,7 @@ public class TabStoreWidget {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -90,12 +90,12 @@ public class TabStoreWidget {
         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;
     }
 
     public String getWriteBackParam() {

gic-store-service/src/main/java/com/gic/store/service/StoreFieldSelectService.java

@@ -80,16 +80,6 @@ public interface StoreFieldSelectService {
     void setStoreFieldSelectSort(int storeFieldSelectId, int storeFieldId, int setValue);
 
     /**
-     * delete
-     * @Title: delete

-     * @Description:
-    
 * @author guojuxing
-     * @param storeFieldSelectId

-     * @return  int

-    
 */
-    int delete(int storeFieldSelectId);
-
-    /**
      * 批量个删除
      * @Title: deleteBatch

      * @Description:

gic-store-service/src/main/java/com/gic/store/service/impl/ClerkLogServiceImpl.java

 package com.gic.store.service.impl;
 
-import com.gic.commons.util.GlobalInfo;
 import com.gic.store.constant.ClerkGenderEnum;
 import com.gic.store.constant.ClerkLogTypeEnum;
+import com.gic.store.constant.Constants;
 import com.gic.store.dao.mapper.TabClerkLogMapper;
 import com.gic.store.dto.ClerkDTO;
 import com.gic.store.dto.ClerkLogDTO;
@@ -44,7 +44,7 @@ public class ClerkLogServiceImpl implements ClerkLogService {
             clerkLog.setLogType(ClerkLogTypeEnum.SAVE.getCode());
             clerkLog.setRemark(remark);
             clerkLog.setCreateTime(new Date());
-            clerkLog.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+            clerkLog.setDeleteFlag(Constants.NORMAL);
             clerkLog.setOperatorId(operatorId);
             clerkLog.setOperatorName(operatorName);
             return tabClerkLogMapper.insertSelective(clerkLog);
@@ -64,7 +64,7 @@ public class ClerkLogServiceImpl implements ClerkLogService {
             clerkLog.setLogType(ClerkLogTypeEnum.UPDATE.getCode());
             clerkLog.setRemark(remark);
             clerkLog.setCreateTime(new Date());
-            clerkLog.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+            clerkLog.setDeleteFlag(Constants.NORMAL);
             clerkLog.setOperatorId(operatorId);
             clerkLog.setOperatorName(operatorName);
 

gic-store-service/src/main/java/com/gic/store/service/impl/ClerkPositionServiceImpl.java

@@ -48,7 +48,7 @@ public class ClerkPositionServiceImpl implements ClerkPositionService {
     public void save(ClerkPositionDTO clerkPositionDTO) {
         TabClerkPosition clerkPosition = EntityUtil.changeEntityByJSON(TabClerkPosition.class, clerkPositionDTO);
         clerkPosition.setCreateTime(new Date());
-        clerkPosition.setStatus(1);
+        clerkPosition.setDeleteFlag(Constants.NORMAL);
         Double sort = tabClerkPositionMapper.getMinSort(clerkPositionDTO.getEnterpriseId());
         clerkPosition.setSort(sort == null ? 1d : sort + 1d);
         tabClerkPositionMapper.insertSelective(clerkPosition);
@@ -62,7 +62,11 @@ public class ClerkPositionServiceImpl implements ClerkPositionService {
 
     @Override
     public TabClerkPosition getByClerkPositionId(Integer clerkPositionId) {
-        return tabClerkPositionMapper.selectByPrimaryKey(clerkPositionId);
+        TabClerkPosition position = tabClerkPositionMapper.selectByPrimaryKey(clerkPositionId);
+        if (position != null && Constants.NORMAL.equals(position.getDeleteFlag())) {
+            return position;
+        }
+        return null;
     }
 
     @Override
@@ -80,7 +84,7 @@ public class ClerkPositionServiceImpl implements ClerkPositionService {
     public void deleteById(Integer clerkPositionId) {
         TabClerkPosition clerkPosition = new TabClerkPosition();
         clerkPosition.setClerkPositionId(clerkPositionId);
-        clerkPosition.setStatus(0);
+        clerkPosition.setDeleteFlag(Constants.DELETE);
         tabClerkPositionMapper.updateByPrimaryKeySelective(clerkPosition);
     }
 

gic-store-service/src/main/java/com/gic/store/service/impl/StoreBrandServiceImpl.java

@@ -35,7 +35,7 @@ public class StoreBrandServiceImpl implements StoreBrandService {
         storeBrand.setStoreBrandCategoryCode(copy.getStoreBrandCategoryCode());
         storeBrand.setStoreBrandCategory(copy.getStoreBrandCategory());
         storeBrand.setEnterpriseId(copy.getEnterpriseId());
-        storeBrand.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        storeBrand.setDeleteFlag(0);
         storeBrand.setCreateTime(new Date());
         storeBrand.setHasRel(GlobalInfo.DATA_STATUS_DELETE);
 

gic-store-service/src/main/java/com/gic/store/service/impl/StoreFieldRelServiceImpl.java

@@ -27,7 +27,7 @@ public class StoreFieldRelServiceImpl implements StoreFieldRelService{
     public void saveStoreFieldRel(StoreFieldRelDTO dto) {
         dto.setCreateTime(new Date());
         dto.setUpdateTime(new Date());
-        dto.setStatus(1);
+        dto.setDeleteFlag(0);
         tabStoreFieldRelMapper.insert(EntityUtil.changeEntityNew(TabStoreFieldRel.class, dto));
     }
 

gic-store-service/src/main/java/com/gic/store/service/impl/StoreFieldSelectServiceImpl.java

@@ -85,11 +85,6 @@ public class StoreFieldSelectServiceImpl implements StoreFieldSelectService{
     }
 
     @Override
-    public int delete(int storeFieldSelectId) {
-        return tabStoreFieldSelectMapper.deleteByPrimaryKey(storeFieldSelectId);
-    }
-
-    @Override
     public int deleteBatch(List<Integer> storeFieldSelectIdList) {
         return tabStoreFieldSelectMapper.deleteBatch(storeFieldSelectIdList);
     }

gic-store-service/src/main/java/com/gic/store/service/impl/StoreFieldServiceImpl.java

@@ -110,7 +110,7 @@ public class StoreFieldServiceImpl implements StoreFieldService{
     public int delete(int storeFieldId) {
         TabStoreField storeField = new TabStoreField();
         storeField.setStoreFieldId(storeFieldId);
-        storeField.setStatus(0);
+        storeField.setDeleteFlag(1);
         return tabStoreFieldMapper.updateByPrimaryKeySelective(storeField);
     }
 

gic-store-service/src/main/java/com/gic/store/service/impl/StoreGroupServiceImpl.java

@@ -110,6 +110,9 @@ public class StoreGroupServiceImpl implements StoreGroupService{
     @Override
     public int insert(StoreGroupDTO storeGroupDTO) {
         TabStoreGroup tabStoreGroup = EntityUtil.changeEntityNew(TabStoreGroup.class, storeGroupDTO);
+        if (tabStoreGroup.getDeleteFlag() == null) {
+            tabStoreGroup.setDeleteFlag(0);
+        }
         tabStoreGroupMapper.insert(tabStoreGroup);
         return tabStoreGroup.getStoreGroupId();
     }

gic-store-service/src/main/java/com/gic/store/service/impl/StoreLogServiceImpl.java

 package com.gic.store.service.impl;
 
 import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.GlobalInfo;
 import com.gic.store.constant.StoreLogReasonEnum;
 import com.gic.store.constant.StoreLogTypeEnum;
 import com.gic.store.dao.mapper.TabStoreLogMapper;
@@ -35,7 +34,7 @@ public class StoreLogServiceImpl implements StoreLogService {
     public Integer saveStoreLog(StoreLogDTO storeLog) {
         TabStoreLog tabStoreLog = EntityUtil.changeEntityByJSON(TabStoreLog.class, storeLog);
         tabStoreLog.setCreateTime(new Date());
-        tabStoreLog.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        tabStoreLog.setDeleteFlag(0);
         return tabStoreLogMapper.insertSelective(tabStoreLog);
     }
 
@@ -56,7 +55,7 @@ public class StoreLogServiceImpl implements StoreLogService {
         storeLog.setOperatorName(operatorName);
         storeLog.setContent(content);
         storeLog.setCreateTime(new Date());
-        storeLog.setStatus(1);
+        storeLog.setDeleteFlag(0);
         List<Integer> storeIdList = storeService.listStoredByStoreInfoList(storeInfoIdList, enterpriseId);
         for (Integer storeId : storeIdList) {
             storeLog.setStoreId(storeId);
@@ -75,7 +74,7 @@ public class StoreLogServiceImpl implements StoreLogService {
         storeLog.setOperatorName(operatorName);
         storeLog.setContent(content);
         storeLog.setCreateTime(new Date());
-        storeLog.setStatus(1);
+        storeLog.setDeleteFlag(0);
         for (Integer storeId : storeInfoIdList) {
             storeLog.setStoreId(storeId);
             tabStoreLogMapper.insertSelective(storeLog);

gic-store-service/src/main/java/com/gic/store/service/impl/StorePhotoServiceImpl.java

 package com.gic.store.service.impl;
 
-import com.gic.commons.util.GlobalInfo;
 import com.gic.store.dao.mapper.TabStorePhotoMapper;
 import com.gic.store.dto.StorePhotoDTO;
 import com.gic.store.entity.TabStorePhoto;
@@ -43,7 +42,7 @@ public class StorePhotoServiceImpl implements StorePhotoService {
                 storePhoto.setImageCode(storePhotoDTO.getImageCode());
                 storePhoto.setImageUrl(storePhotoDTO.getImageUrl());
                 storePhoto.setSort(storePhotoDTO.getSort());
-                storePhoto.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+                storePhoto.setDeleteFlag(0);
                 storePhoto.setStoreInfoId(storeInfoId);
                 storePhoto.setSort(i);
                 if (storePhotoDTO.getStorePhotoId() == null) {

gic-store-service/src/main/java/com/gic/store/service/impl/StoreRegionRelServiceImpl.java

 package com.gic.store.service.impl;
 
-import com.gic.commons.util.GlobalInfo;
 import com.gic.store.constant.StoreOwnTypeEnum;
 import com.gic.store.dao.mapper.TabStoreRegionRelMapper;
 import com.gic.store.entity.TabStoreRegionRel;
@@ -30,7 +29,7 @@ public class StoreRegionRelServiceImpl implements StoreRegionRelService {
         storeRegionRel.setEnterpriseId(enterpriseId);
         storeRegionRel.setFromEnterpriseId(enterpriseId);
         storeRegionRel.setOwnType(StoreOwnTypeEnum.OWNER.getCode());
-        storeRegionRel.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        storeRegionRel.setDeleteFlag(0);
         storeRegionRel.setCreateTime(new Date());
         return tabStoreRegionRelMapper.insertSelective(storeRegionRel);
     }
@@ -42,7 +41,7 @@ public class StoreRegionRelServiceImpl implements StoreRegionRelService {
         storeRegionRel.setFromEnterpriseId(fromEnterpriseId);
         storeRegionRel.setEnterpriseId(enterpriseId);
         storeRegionRel.setOwnType(StoreOwnTypeEnum.OTHER.getCode());
-        storeRegionRel.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        storeRegionRel.setDeleteFlag(0);
         storeRegionRel.setCreateTime(new Date());
         return tabStoreRegionRelMapper.insertSelective(storeRegionRel);
     }

gic-store-service/src/main/java/com/gic/store/service/impl/StoreRegionServiceImpl.java

 package com.gic.store.service.impl;
 
-import com.gic.commons.util.GlobalInfo;
 import com.gic.store.dao.mapper.TabStoreRegionMapper;
 import com.gic.store.dto.StoreRegionDTO;
 import com.gic.store.entity.TabStoreRegion;
@@ -50,7 +49,7 @@ public class StoreRegionServiceImpl implements StoreRegionService {
         storeRegion.setRegionCode(regionCode);
         storeRegion.setRegionName(regionName);
         storeRegion.setCreateTime(new Date());
-        storeRegion.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        storeRegion.setDeleteFlag(0);
         storeRegionMapper.insertSelective(storeRegion);
         return storeRegion.getRegionId();
     }

gic-store-service/src/main/java/com/gic/store/service/impl/StoreStrategyServiceImpl.java

@@ -119,7 +119,7 @@ public class StoreStrategyServiceImpl implements StoreStrategyService{
     public int deleteStoreGroupStrategy(int strategyId) {
         TabStoreStrategy storeStrategy = new TabStoreStrategy();
         storeStrategy.setStrategyId(strategyId);
-        storeStrategy.setStatus(0);
+        storeStrategy.setDeleteFlag(1);
         return tabStoreStrategyMapper.updateByPrimaryKeySelective(storeStrategy);
     }
 

gic-store-service/src/main/java/com/gic/store/service/impl/StoreTagServiceImpl.java

@@ -27,7 +27,7 @@ public class StoreTagServiceImpl implements StoreTagService{
     public Integer save(StoreTagDTO dto) {
         dto.setCreateTime(new Date());
         dto.setUpdateTime(new Date());
-        dto.setStatus(1);
+        dto.setDeleteFlag(0);
         TabStoreTag record = EntityUtil.changeEntityNew(TabStoreTag.class, dto);
         tabStoreTagMapper.insert(record);
         return record.getStoreTagId();

gic-store-service/src/main/java/com/gic/store/service/impl/StoreTransferServiceImpl.java

@@ -26,7 +26,7 @@ public class StoreTransferServiceImpl implements StoreTransferService {
         TabStoreTransfer transfer = EntityUtil.changeEntityByJSON(TabStoreTransfer.class, storeTransferDTO);
         transfer.setCreateTime(new Date());
         transfer.setUpdateTime(new Date());
-        transfer.setStatus(1);
+        transfer.setDeleteFlag(0);
         tabStoreTransferMapper.insertSelective(transfer);
     }
 }

gic-store-service/src/main/java/com/gic/store/service/impl/StoreWidgetServiceImpl.java

@@ -32,7 +32,7 @@ public class StoreWidgetServiceImpl implements StoreWidgetService {
         tabStoreWidget.setWriteBackParam(storeWidgetDTO.getWriteBackParam());
         tabStoreWidget.setCreateTime(new Date());
         tabStoreWidget.setUpdateTime(new Date());
-        tabStoreWidget.setStatus(Constants.NORMAL_STATUS);
+        tabStoreWidget.setDeleteFlag(0);
         this.tabStoreWidgetMapper.insert(tabStoreWidget);
         return tabStoreWidget.getStoreWidgetId();
     }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java

@@ -24,6 +24,7 @@ import com.gic.store.dto.clerk.ProcessBatchClerkDTO;
 import com.gic.store.entity.TabClerk;
 import com.gic.store.entity.TabStoreRegion;
 import com.gic.store.service.*;
+import com.gic.store.utils.valid.ValidUtil;
 import com.gic.weimob.api.dto.WeimobGuiderSynDTO;
 import com.gic.weimob.api.service.WeimobStoreSiteService;
 import com.github.pagehelper.PageHelper;
@@ -77,6 +78,10 @@ public class ClerkApiServiceImpl implements ClerkApiService {
 
     @Override
     public ServiceResponse saveOrUpdate(ClerkDTO clerkDTO) {
+        ServiceResponse paramResult = ValidUtil.allCheckValidate(clerkDTO);
+        if (!paramResult.isSuccess()) {
+            return paramResult;
+        }
         if (validStoreIsOther(clerkDTO.getEnterpriseId(), clerkDTO.getStoreInfoId())) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "权限不足");
         }
@@ -90,16 +95,16 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         if (com.gic.store.constant.Constants.NULL.equals(clerkDTO.getClerkCode().toLowerCase())) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "导购代码不可为null");
         }
-        if (!clerkDTO.getClerkCode().matches(com.gic.store.constant.Constants.CLERK_CODE_REGEX)) {
+        /***code暂时不限制***/
+        /**if (!clerkDTO.getClerkCode().matches(com.gic.store.constant.Constants.CLERK_CODE_REGEX)) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "导购代码仅支持数字和英文字符");
-        }
+        }*/
         if (clerkDTO.getPositionId() != null && clerkPositionService.getByClerkPositionId(clerkDTO.getPositionId()) == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店下导购角色不存在");
         }
 
         try {
 
-            RedisUtil.lock("enterprise:clerk:position:" + clerkDTO.getStoreInfoId(), 3L, TimeUnit.SECONDS, 3L);
             if (clerkService.isRepeatByClerkCode(clerkDTO.getStoreInfoId(), clerkDTO.getClerkCode(), clerkDTO.getClerkId())) {
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店下导购代码重复");
             }
@@ -107,16 +112,24 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             // 如果门店下已经存在有导购是店长， 并且当前导购是店长 则做替换
             // 如果门店下没有导购是店长，将当前导购设置成店长
             // 这里并发会出错 加个锁
+            RedisUtil.lock("enterprise:clerk:position:" + clerkDTO.getStoreInfoId(), 3L, TimeUnit.SECONDS, 3L);
             TabClerk clerkLeader = clerkService.getClerkLeaderByStoreInfoId(clerkDTO.getEnterpriseId(), clerkDTO.getStoreInfoId());
-            if (clerkLeader != null && com.gic.store.constant.Constants.CLERK_LEADER_POSITION_ID.equals(clerkDTO.getPositionId())) {
+
+            if (clerkLeader != null) {
+                // 已经有了店长
+                if (com.gic.store.constant.Constants.CLERK_LEADER_POSITION_ID.equals(clerkDTO.getPositionId())) {
+                    // 要把当前的导购改成店长
                     clerkLeader.setPositionId(com.gic.store.constant.Constants.CLERK_POSITION_ID);
                     clerkLeader.setPositionName("导购");
                     clerkService.update(clerkLeader);
                     clerkDTO.setPositionId(com.gic.store.constant.Constants.CLERK_LEADER_POSITION_ID);
-            } else if (clerkLeader == null || clerkLeader.getClerkId().equals(clerkDTO.getClerkId())) {
+                } else if (clerkLeader.getClerkId().equals(clerkDTO.getClerkId()) && !com.gic.store.constant.Constants.CLERK_LEADER_POSITION_ID.equals(clerkDTO.getPositionId())) {
+                    // 当前导购就是店长 要改成不是店长 不能改
+                    return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店下必须有一个店长");
+                }
+            } else if (clerkLeader == null) {
                 clerkDTO.setPositionId(com.gic.store.constant.Constants.CLERK_LEADER_POSITION_ID);
             }
-
             if (StringUtils.isNotBlank(clerkDTO.getPhoneNumber())) {
                 String nationcode = clerkDTO.getNationcode();
                 if (StringUtils.isBlank(nationcode)) {

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -31,6 +31,7 @@ import com.gic.store.entity.*;
 import com.gic.store.service.*;
 import com.gic.store.strategy.BulkUpdateStoreStrtegy;
 import com.gic.store.utils.field.*;
+import com.gic.store.utils.valid.ValidUtil;
 import com.gic.weimob.api.dto.WeimobPhysicalStoreDTO;
 import com.gic.weimob.api.dto.WeimobStoreAccountDTO;
 import com.gic.weimob.api.service.WeimobStoreSiteService;
@@ -52,6 +53,8 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -64,6 +67,7 @@ import java.util.stream.Stream;
 public class StoreApiServiceImpl implements StoreApiService {
     private static final Logger logger = LogManager.getLogger(StoreApiServiceImpl.class);
     private Long storeExpiredTime = 1L;
+    private static Pattern NUMBER_PATTERN = Pattern.compile("\\d+\\.\\d+$|-\\d+\\.\\d+$");
     @Autowired
     private StoreService storeService;
     @Autowired
@@ -174,15 +178,12 @@ public class StoreApiServiceImpl implements StoreApiService {
             }
             Integer id = storeService.save(storeDTO);
             storeDTO.setStoreId(id);
-            // 保存店长 如果店长保存失败 回滚数据
-            ServiceResponse<Void> serviceResponse = saveClerkLeader(storeDTO);
-            if (!serviceResponse.isSuccess()) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return ServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
-            }
             // 记录门店日志
             saveAddLog(storeDTO);
         } else {
+            String lock = "lock:"+ storeDTO.getEnterpriseId() + ":" + storeDTO.getStoreId();
+            RedisUtil.lock(lock, 500l, TimeUnit.MILLISECONDS, 500l);
+            try{
                 ServiceResponse<StoreDTO> existStore = this.getStoreById(storeDTO.getEnterpriseId(), storeDTO.getStoreId());
                 storeDTO.setStoreInfoId(existStore.getResult().getStoreInfoId());
                 storeDTO.setStatus(existStore.getResult().getStatus());
@@ -198,7 +199,20 @@ public class StoreApiServiceImpl implements StoreApiService {
                 }
                 //修改门店同步到微盟
                 updateStoreToWm(storeDTO);
+            }catch (Exception e){
+                logger.warn("门店更新异常", e);
+            }finally {
+                RedisUtil.unlock(lock);
+            }
+        }
+
+        // 保存店长 如果店长保存失败 回滚数据
+        ServiceResponse<Void> serviceResponse = saveClerkLeader(storeDTO);
+        if (!serviceResponse.isSuccess()) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return ServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
         }
+
         // 自定义属性
         String error = storeExtendService.saveOrUpdate(storeDTO.getEnterpriseId(), storeDTO.getStoreInfoId(), storeDTO.getStoreExtendList());
         if (StringUtils.isNotBlank(error)) {
@@ -233,6 +247,10 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     private ServiceResponse<StoreDTO> valid(StoreDTO storeDTO) {
+        ServiceResponse paramResult = ValidUtil.allCheckValidate(storeDTO);
+        if (!paramResult.isSuccess()) {
+            return paramResult;
+        }
         boolean codeValid = storeService.validateStoreCodeIsExist(storeDTO.getEnterpriseId(), storeDTO.getRegionId(), storeDTO.getStoreCode(), storeDTO.getStoreId());
         if (codeValid) {
             return ServiceResponse.failure(ErrorCode.DATA_EXISTS.getCode(), "门店代码已经存在");
@@ -252,15 +270,27 @@ public class StoreApiServiceImpl implements StoreApiService {
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店分组必须为叶子节点");
             }
         }
+        if(org.apache.commons.lang.StringUtils.isNotBlank(storeDTO.getLatitude()) || org.apache.commons.lang.StringUtils.isNotBlank(storeDTO.getLongitude())){
+            Matcher matcher = NUMBER_PATTERN.matcher(storeDTO.getLatitude());
+            if(!matcher.matches()){
+                storeDTO.setLatitude(null);
+            }
+            matcher = NUMBER_PATTERN.matcher(storeDTO.getLongitude());
+            if(!matcher.matches()){
+                storeDTO.setLongitude(null);
+            }
+        }
         return null;
     }
 
     @Override
+    @Transactional
     public ServiceResponse<Integer> saveStoreForOrder(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String orderNum) {
         return saveStoreForOrder(enterpriseId, storeCode, storeName, regionId, orderNum, null);
     }
 
     @Override
+    @Transactional
     public ServiceResponse<Integer> saveStoreForOrder(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String orderNum, Integer storeBrandId) {
         ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId);
         Integer storeLicenseNum = 0;
@@ -293,11 +323,13 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
+    @Transactional
     public ServiceResponse<Integer> saveStoreForPosMember(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String cardNo) {
         return saveStoreForPosMember(enterpriseId, storeCode, storeName, regionId, cardNo, null);
     }
 
     @Override
+    @Transactional
     public ServiceResponse<Integer> saveStoreForPosMember(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String cardNo, Integer storeBrandId) {
         ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId);
         Integer storeLicenseNum = 0;
@@ -336,6 +368,7 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
+    @Transactional
     public ServiceResponse<Void> tranOverFlow(Integer enterpriseId, String storeIds) {
         ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId);
         if (listEnterpriseLicense.isSuccess() && CollectionUtils.isNotEmpty(listEnterpriseLicense.getResult())) {
@@ -583,7 +616,7 @@ public class StoreApiServiceImpl implements StoreApiService {
             return ServiceResponse.success(new Page<>(pageNum, pageSize));
         }
         JSONObject sortJson = null;
-        if(StringUtils.isNotBlank(storeSearchDTO.getLatitude()) && StringUtils.isNotBlank(storeSearchDTO.getLatitude())){
+        if(StringUtils.isNotBlank(storeSearchDTO.getLatitude()) && StringUtils.isNotBlank(storeSearchDTO.getLongitude())){
             sortJson = QueryConditionAssemblyUtil.createSortNodeByLocation(StoreESFieldsEnum.LOCATION.getField(), QueryConditionAssemblyUtil.SORT_RULE_ASC,
                     Double.valueOf(storeSearchDTO.getLatitude()), Double.valueOf(storeSearchDTO.getLongitude()));
         }else {
@@ -601,7 +634,7 @@ public class StoreApiServiceImpl implements StoreApiService {
                 if(StringUtils.isNotBlank(storeSearchDTO.getLatitude()) && StringUtils.isNotBlank(storeSearchDTO.getLongitude()) &&
                         CollectionUtils.isNotEmpty(storeDTO.getLocation())){
                     double v = GeoUtils.arcDistance(Double.valueOf(storeSearchDTO.getLatitude()), Double.valueOf(storeSearchDTO.getLongitude()),
-                            Double.valueOf(storeDTO.getLocation().get(1)), storeDTO.getLocation().get(0));
+                            storeDTO.getLocation().get(1), storeDTO.getLocation().get(0));
                     storeDTO.setDistance(v);
                 }
                 result.add(storeDTO);
@@ -892,6 +925,7 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
+    @Transactional
     public ServiceResponse<String> importStoreForOperation(ProcessBatchStoreDTO processBatchStoreDTO) {
         logger.info("批量处理门店:{}", JSON.toJSONString(processBatchStoreDTO));
         StoreDTO storeDTO = new StoreDTO();
@@ -1066,6 +1100,7 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
+    @Transactional
     public ServiceResponse<Void> saveStoreAndClerkForBulkOrder(String params) {
         logger.info("saveStoreAndClerkForBulkOrder:{}", params);
         Map<String, Object> message = new HashMap<>();

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreFieldApiServiceImpl.java

 package com.gic.store.service.outer.impl;
 
-import java.util.*;
-
-import com.gic.auth.constant.SignConstants;
-import com.gic.store.constant.Constants;
-import org.apache.commons.lang.math.NumberUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.auth.constant.SignConstants;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.error.ErrorCode;
+import com.gic.store.constant.Constants;
 import com.gic.store.constant.StoreOwnTypeEnum;
 import com.gic.store.dto.StoreFieldDTO;
 import com.gic.store.dto.StoreFieldRegionMapDTO;
@@ -28,6 +17,16 @@ import com.gic.store.entity.TabStoreFieldRel;
 import com.gic.store.service.*;
 import com.gic.store.utils.StoreFieldValidParamUtil;
 import com.gic.store.utils.valid.ValidUtil;
+import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.*;
 
 /**
  * @author guojx
@@ -90,7 +89,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
         }
         storeFieldDTO.setCreateTime(new Date());
         storeFieldDTO.setUpdateTime(new Date());
-        storeFieldDTO.setStatus(1);
+        storeFieldDTO.setDeleteFlag(0);
         storeFieldDTO.setSort(storeFieldService.getMinSort(storeFieldDTO.getEnterpriseId()) - 1);
         int storeFieldId = storeFieldService.save(storeFieldDTO);
 
@@ -103,7 +102,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
             StoreFieldRegionRelDTO fieldRegionRelDTO = new StoreFieldRegionRelDTO();
             fieldRegionRelDTO.setCreateTime(now);
             fieldRegionRelDTO.setUpdateTime(now);
-            fieldRegionRelDTO.setStatus(1);
+            fieldRegionRelDTO.setDeleteFlag(0);
             fieldRegionRelDTO.setRegionId(Integer.parseInt(regionId));
             fieldRegionRelDTO.setStoreFieldId(storeFieldId);
             regionRelDTOList.add(fieldRegionRelDTO);
@@ -270,7 +269,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
             StoreFieldRegionRelDTO fieldRegionRelDTO = new StoreFieldRegionRelDTO();
             fieldRegionRelDTO.setCreateTime(now);
             fieldRegionRelDTO.setUpdateTime(now);
-            fieldRegionRelDTO.setStatus(1);
+            fieldRegionRelDTO.setDeleteFlag(0);
             fieldRegionRelDTO.setRegionId(Integer.parseInt(regionId));
             fieldRegionRelDTO.setStoreFieldId(storeFieldDTO.getStoreFieldId());
             regionRelDTOList.add(fieldRegionRelDTO);
@@ -400,7 +399,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
             dto.setStoreFieldId(ownStoreField);
             dto.setEnterpriseId(toEnterpriseId);
             dto.setOwnType(StoreOwnTypeEnum.OTHER.getCode());
-            dto.setStatus(1);
+            dto.setDeleteFlag(0);
             storeFieldRelList.add(dto);
         }
         storeFieldRelService.saveFetch(storeFieldRelList);

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreGroupApiServiceImpl.java

 package com.gic.store.service.outer.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Stack;
-import java.util.concurrent.TimeUnit;
-
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
-import com.gic.commons.util.PageHelperUtils;
-import com.gic.store.service.StoreApiService;
-import com.github.pagehelper.PageHelper;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.store.constant.StoreGroupConstant;
 import com.gic.store.dto.StoreGroupDTO;
 import com.gic.store.entity.TabStoreGroup;
+import com.gic.store.service.StoreApiService;
 import com.gic.store.service.StoreGroupApiService;
 import com.gic.store.service.StoreGroupService;
 import com.gic.store.service.StoreService;
+import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Stack;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author guojx
@@ -62,7 +61,7 @@ public class StoreGroupApiServiceImpl implements StoreGroupApiService {
         }
         storeGroupDTO.setCreateTime(new Date());
         storeGroupDTO.setUpdateTime(new Date());
-        storeGroupDTO.setStatus(1);
+        storeGroupDTO.setStatus(0);
         if (storeGroupDTO.getIsDefault() == null) {
             storeGroupDTO.setIsDefault(0);
         }
@@ -149,7 +148,7 @@ public class StoreGroupApiServiceImpl implements StoreGroupApiService {
                 storeGroupService.update(tabStoreGroup);
 
                 //如果上级分组有门店，则新建一个未分组数据，然后把所有门店放进去
-                if (isNeedTransferStore(storeGroupParentId)) {
+                if (isNeedTransferStoreWhenNew(storeGroupParentId)) {
                     StoreGroupDTO noStoreGroup = new StoreGroupDTO();
                     noStoreGroup.setEnterpriseId(storeGroupDTO.getEnterpriseId());
                     noStoreGroup.setGroupLevel(oldStoreGroup.getGroupLevel());
@@ -292,7 +291,7 @@ public class StoreGroupApiServiceImpl implements StoreGroupApiService {
         }
         TabStoreGroup tabStoreGroup = new TabStoreGroup();
         tabStoreGroup.setStoreGroupId(storeGroupId);
-        tabStoreGroup.setStatus(0);
+        tabStoreGroup.setDeleteFlag(1);
         storeGroupService.update(tabStoreGroup);
 
         refreshRedisCache(storeGroupId);

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreOpenApiServiceImpl.java

@@ -629,6 +629,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
     @Override
     @GatewayParams(query = {"appId", "enterpriseId"})
     public ServiceResponse<String> listRegion(String appId, Integer enterpriseId) {
+        LOGGER.info("appId:{}, enterpriseId:{}", appId, enterpriseId);
         //参数校验
         ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
         if (!enterpriseResult.isSuccess()) {
@@ -645,6 +646,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
     @Override
     @GatewayParams(query = {"appId", "enterpriseId"})
     public ServiceResponse<String> listBrand(String appId, Integer enterpriseId) {
+        LOGGER.info("appId:{}, enterpriseId:{}", appId, enterpriseId);
         //参数校验
         ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
         if (!enterpriseResult.isSuccess()) {
@@ -661,6 +663,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
     @Override
     @GatewayParams(query = {"appId", "enterpriseId", "regionId"})
     public ServiceResponse<String> listField(String appId, Integer enterpriseId, Integer regionId) {
+        LOGGER.info("appId:{}, enterpriseId:{}", appId, enterpriseId);
         //参数校验
         ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
         if (!enterpriseResult.isSuccess()) {

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreRegionApiServiceImpl.java

@@ -155,9 +155,9 @@ public class StoreRegionApiServiceImpl implements StoreRegionApiService {
             if (storeRegionRel == null) {
                 // 插入
                 storeRegionRelService.saveByOther(fromEnterpriseId, toEnterpriseId, regionId);
-            } else if (storeRegionRel.getStatus() == 0) {
+            } else if (storeRegionRel.getDeleteFlag() == 1) {
                 // 状态更新为1
-                storeRegionRelService.updateStatusByOther(toEnterpriseId, regionId, GlobalInfo.DATA_STATUS_NORMAL);
+                storeRegionRelService.updateStatusByOther(toEnterpriseId, regionId, 1);
             }
         }
         // 调用门店自定义属性方法

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreStrategyApiServiceImpl.java

@@ -41,47 +41,10 @@ public class StoreStrategyApiServiceImpl implements StoreStrategyApiService{
 
     @Override
     public ServiceResponse<Integer> saveStoreStrategy(StoreStrategyDTO storeStrategyDTO) {
-        ServiceResponse validParam = ValidUtil.allCheckValidate(storeStrategyDTO, SaveStoreStrategy.class);
-        if (!validParam.isSuccess()) {
-            return validParam;
-        }
-
-        if (storeStrategyDTO.getStrategyType() == StoreGroupConstant.STORE_STRATEGY_TYPE) {
-            //如果是门店状态策略类型，必须有
-            if (StringUtils.isBlank(storeStrategyDTO.getStoreCreateType())) {
-                return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店创建方式不能为空");
-            }
-        }
-        String conditions = storeStrategyDTO.getConditions();
-
-        boolean isNotRightConditionsField = storeStrategyDTO.getStrategyType() != StoreGroupConstant.STORE_STRATEGY_TYPE && StringUtils.isBlank(conditions);
-        if (isNotRightConditionsField) {
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店分组策略条件不能为空");
-        }
-        //是否是门店启用状态没有选择条件，即所有门店策略
-        boolean isAllConditions = storeStrategyDTO.getStrategyType() == StoreGroupConstant.STORE_STRATEGY_TYPE && StringUtils.isBlank(conditions);
-
-        if (!isAllConditions) {
-            //验证conditions合法性
-            if (isConditionsSizeOver(conditions)) {
-                return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店属性条件配置超出5个");
-            }
-            if (validConditionsIsRepeatKey(conditions)) {
-                ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店属性条件每一种都不能重复");
-            }
-        }
-
-        storeStrategyDTO.setCreateTime(new Date());
-        storeStrategyDTO.setUpdateTime(new Date());
-        storeStrategyDTO.setStatus(1);
-        //sort
-        storeStrategyDTO.setSort(storeStrategyService.getMinSort(storeStrategyDTO.getEnterpriseId(), storeStrategyDTO.getStrategyType()) - 1d);
-
-        TabStoreStrategy record = EntityUtil.changeEntityNew(TabStoreStrategy.class, storeStrategyDTO);
-        if (storeStrategyService.isRepeatGroupStrategyName(record)) {
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "策略名称不能重复");
+        String errorMessage = validParam(storeStrategyDTO);
+        if (StringUtils.isNotBlank(errorMessage)) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), errorMessage);
         }
-
         return  ServiceResponse.success(storeStrategyService.saveStoreGroupStrategy(storeStrategyDTO));
     }
 
@@ -97,47 +60,9 @@ public class StoreStrategyApiServiceImpl implements StoreStrategyApiService{
 
     @Override
     public ServiceResponse<Integer> editStoreStrategy(StoreStrategyDTO storeStrategyDTO) {
-        ServiceResponse validParam = ValidUtil.allCheckValidate(storeStrategyDTO, SaveStoreStrategy.class);
-        if (!validParam.isSuccess()) {
-            return validParam;
-        }
-        TabStoreStrategy storeStrategy = storeStrategyService.getStoreStrategyById(storeStrategyDTO.getStrategyId());
-        if (storeStrategy == null) {
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "策略主键ID错误，查询不到数据");
-        }
-        String conditions = storeStrategyDTO.getConditions();
-
-        boolean isNotRightConditionsField = storeStrategyDTO.getStrategyType() != StoreGroupConstant.STORE_STRATEGY_TYPE && StringUtils.isBlank(conditions);
-        if (isNotRightConditionsField) {
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店分组策略条件不能为空");
-        }
-        //是否是门店启用状态没有选择条件，即所有门店策略
-        boolean isAllConditions = storeStrategyDTO.getStrategyType() == StoreGroupConstant.STORE_STRATEGY_TYPE && StringUtils.isBlank(conditions);
-
-        if (!isAllConditions) {
-            //验证conditions合法性
-            if (isConditionsSizeOver(conditions)) {
-                return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店属性条件配置超出5个");
-            }
-            if (validConditionsIsRepeatKey(conditions)) {
-                ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店属性条件每一种都不能重复");
-            }
-        }
-        if (storeStrategy.getStrategyType() == StoreGroupConstant.STORE_STRATEGY_TYPE) {
-            //如果是门店状态策略类型，必须有
-            if (StringUtils.isBlank(storeStrategyDTO.getStoreCreateType())) {
-                return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店创建方式不能为空");
-            }
-        }
-
-        storeStrategyDTO.setCreateTime(storeStrategy.getCreateTime());
-        storeStrategyDTO.setUpdateTime(new Date());
-        storeStrategyDTO.setEnterpriseId(storeStrategy.getEnterpriseId());
-        storeStrategyDTO.setStrategyType(storeStrategy.getStrategyType());
-
-        TabStoreStrategy record = EntityUtil.changeEntityNew(TabStoreStrategy.class, storeStrategyDTO);
-        if (storeStrategyService.isRepeatGroupStrategyName(record)) {
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "策略名称不能重复");
+        String errorMessage = validParam(storeStrategyDTO);
+        if (StringUtils.isNotBlank(errorMessage)) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), errorMessage);
         }
         return ServiceResponse.success(storeStrategyService.modifyStoreGroupStrategy(storeStrategyDTO));
     }
@@ -284,4 +209,67 @@ public class StoreStrategyApiServiceImpl implements StoreStrategyApiService{
         }
         return false;
     }
+
+    /**
+     * 验证新增/编辑参数
+     * @param storeStrategyDTO
+     * @return 错误信息
+     */
+    private String validParam(StoreStrategyDTO storeStrategyDTO) {
+        ServiceResponse validParam = ValidUtil.allCheckValidate(storeStrategyDTO, SaveStoreStrategy.class);
+        if (!validParam.isSuccess()) {
+            return validParam.getMessage();
+        }
+
+        TabStoreStrategy storeStrategy = storeStrategyService.getStoreStrategyById(storeStrategyDTO.getStrategyId());
+        //是否是新增操作
+        boolean isAddOperation = storeStrategy == null;
+
+        boolean isStoreStrategyType = storeStrategyDTO.getStrategyType() == StoreGroupConstant.STORE_STRATEGY_TYPE;
+        if (isStoreStrategyType) {
+            //如果是门店状态策略类型，必须有
+            if (StringUtils.isBlank(storeStrategyDTO.getStoreCreateType())) {
+                return "门店创建方式不能为空";
+            }
+        }
+
+        String conditions = storeStrategyDTO.getConditions();
+
+        boolean isNotRightConditionsField = storeStrategyDTO.getStrategyType() != StoreGroupConstant.STORE_STRATEGY_TYPE && StringUtils.isBlank(conditions);
+        if (isNotRightConditionsField) {
+            return "门店分组策略条件不能为空";
+        }
+
+        //是否是门店启用状态没有选择条件，即所有门店策略
+        boolean isAllConditions = storeStrategyDTO.getStrategyType() == StoreGroupConstant.STORE_STRATEGY_TYPE && StringUtils.isBlank(conditions);
+
+        if (!isAllConditions) {
+            //验证conditions合法性
+            if (isConditionsSizeOver(conditions)) {
+                return "门店属性条件配置超出5个";
+            }
+            if (validConditionsIsRepeatKey(conditions)) {
+                return "门店属性条件每一种都不能重复";
+            }
+        }
+
+        if (isAddOperation) {
+            storeStrategyDTO.setCreateTime(new Date());
+            storeStrategyDTO.setUpdateTime(new Date());
+            storeStrategyDTO.setDeleteFlag(0);
+            //sort
+            storeStrategyDTO.setSort(storeStrategyService.getMinSort(storeStrategyDTO.getEnterpriseId(), storeStrategyDTO.getStrategyType()) - 1d);
+        } else {
+            storeStrategyDTO.setCreateTime(storeStrategy.getCreateTime());
+            storeStrategyDTO.setUpdateTime(new Date());
+            storeStrategyDTO.setEnterpriseId(storeStrategy.getEnterpriseId());
+            storeStrategyDTO.setStrategyType(storeStrategy.getStrategyType());
+        }
+
+        TabStoreStrategy record = EntityUtil.changeEntityNew(TabStoreStrategy.class, storeStrategyDTO);
+        if (storeStrategyService.isRepeatGroupStrategyName(record)) {
+            return "策略名称不能重复";
+        }
+        return null;
+    }
 }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreTagApiServiceImpl.java

@@ -56,7 +56,7 @@ public class StoreTagApiServiceImpl implements StoreTagApiService{
         //set value
         dto.setEnterpriseId(record.getEnterpriseId());
         dto.setCreateTime(record.getCreateTime());
-        dto.setStatus(record.getStatus());
+        dto.setDeleteFlag(record.getDeleteFlag());
 
         storeTagService.update(dto);
         return ServiceResponse.success();
@@ -72,7 +72,7 @@ public class StoreTagApiServiceImpl implements StoreTagApiService{
 
         StoreTagDTO dto = new StoreTagDTO();
         dto.setStoreTagId(storeTagId);
-        dto.setStatus(0);
+        dto.setDeleteFlag(1);
 
         storeTagService.update(dto);
         return ServiceResponse.success(record.getStoreTagName());

gic-store-service/src/main/java/com/gic/store/utils/ParamAop.java

+package com.gic.store.utils;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 采集GIC系统操作日志
+ * 
+ * @author leeon
+ * @date   2019年6月28日
+ */
+@Aspect
+@Configuration
+public class ParamAop {
+
+    private Logger logger = LogManager.getLogger(ParamAop.class);
+
+    /**
+     * 环绕通知
+     *
+     * @param  joinPoint
+     * @return
+     * @throws Throwable
+     */
+    @Around(value = "execution(* com.gic.*.service..*(..))")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        try {
+            // 当前方法
+            String currentMethodName = getMethodName(joinPoint);
+            // 当前方法参数列表
+            Object[] args = joinPoint.getArgs();
+            logger.info("请求方法:{}, 参数:{}", currentMethodName, args);
+            // 执行当前方法
+            return joinPoint.proceed();
+        } catch (Throwable throwable) {
+            logger.warn("拦截器错误", throwable);
+            throw throwable;
+        }
+    }
+
+    /**
+     * 获取当前方法
+     *
+     * @param  joinPoint
+     * @return
+     * @throws
+     */
+    private String getMethodName(ProceedingJoinPoint joinPoint) throws NoSuchMethodException {
+        Signature signature = joinPoint.getSignature();
+        MethodSignature methodSignature = (MethodSignature) signature;
+        Object target = joinPoint.getTarget();
+        return target.getClass().getName() + "." + methodSignature.getName();
+    }
+}
\ No newline at end of file

gic-store-service/src/main/resources/mapper/DictMapper.xml

@@ -20,10 +20,6 @@
     from tab_gic_dict
     where DICT_ID = #{dictId,jdbcType=CHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from tab_gic_dict
-    where DICT_ID = #{dictId,jdbcType=CHAR}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabGicDict">
     insert into tab_gic_dict (DICT_ID, DICT_TYPE, DICT_CODE, 
       DICT_VALUE, DICT_NAME, DICT_STATUS, 

gic-store-service/src/main/resources/mapper/TabAuthStoreLogMapper.xml

@@ -18,10 +18,6 @@
     from tab_auth_store_log
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_auth_store_log
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabAuthStoreLog">
     <selectKey keyProperty="storeInfoId" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()

gic-store-service/src/main/resources/mapper/TabCityMapper.xml

@@ -18,10 +18,6 @@
     from tab_city
     where city_id = #{cityId,jdbcType=VARCHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from tab_city
-    where city_id = #{cityId,jdbcType=VARCHAR}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabCity">
     insert into tab_city (city_id, city_name, province_id, 
       city_py, create_time, update_time

gic-store-service/src/main/resources/mapper/TabClerkLogMapper.xml

@@ -11,13 +11,13 @@
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <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" />
     <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
     <result column="operator_name" jdbcType="VARCHAR" property="operatorName" />
   </resultMap>
   <sql id="Base_Column_List">
     clerk_log_id, enterprise_id, clerk_id, content, reason, log_type, remark, create_time, 
-    update_time, status, operator_id, operator_name
+    update_time, delete_flag, operator_id, operator_name
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -25,20 +25,16 @@
     from tab_clerk_log
     where clerk_log_id = #{clerkLogId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_clerk_log
-    where clerk_log_id = #{clerkLogId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabClerkLog">
     insert into tab_clerk_log (clerk_log_id, enterprise_id, clerk_id, 
       content, reason, log_type, 
       remark, create_time, update_time, 
-      status, operator_id, operator_name
+      delete_flag, operator_id, operator_name
       )
     values (#{clerkLogId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{clerkId,jdbcType=INTEGER}, 
       #{content,jdbcType=VARCHAR}, #{reason,jdbcType=INTEGER}, #{logType,jdbcType=INTEGER}, 
       #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{status,jdbcType=INTEGER}, #{operatorId,jdbcType=INTEGER}, #{operatorName,jdbcType=VARCHAR}
+      #{deleteFlag,jdbcType=INTEGER}, #{operatorId,jdbcType=INTEGER}, #{operatorName,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabClerkLog">
@@ -71,8 +67,8 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="operatorId != null">
         operator_id,
@@ -109,8 +105,8 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="operatorId != null">
         #{operatorId,jdbcType=INTEGER},
@@ -147,8 +143,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>
       <if test="operatorId != null">
         operator_id = #{operatorId,jdbcType=INTEGER},
@@ -169,7 +165,7 @@
       remark = #{remark,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       operator_id = #{operatorId,jdbcType=INTEGER},
       operator_name = #{operatorName,jdbcType=VARCHAR}
     where clerk_log_id = #{clerkLogId,jdbcType=INTEGER}
@@ -178,7 +174,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_clerk_log
-    where status = 1
+    where delete_flag = 0
     <if test="clerkId != null ">
         and clerk_id = #{clerkId}
     </if>

gic-store-service/src/main/resources/mapper/TabClerkPositionMapper.xml

@@ -9,11 +9,11 @@
     <result column="sort" jdbcType="DOUBLE" property="sort" />
     <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">
     clerk_position_id, enterprise_id, position_name, position_code, sort, create_time, 
-    update_time, status
+    update_time, delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -21,17 +21,13 @@
     from tab_clerk_position
     where clerk_position_id = #{clerkPositionId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_clerk_position
-    where clerk_position_id = #{clerkPositionId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabClerkPosition">
     insert into tab_clerk_position (clerk_position_id, enterprise_id, position_name, 
       position_code, sort, create_time, 
-      update_time, status)
+      update_time, delete_flag)
     values (#{clerkPositionId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{positionName,jdbcType=VARCHAR}, 
       #{positionCode,jdbcType=VARCHAR}, #{sort,jdbcType=DOUBLE}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER})
+      #{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabClerkPosition">
     insert into tab_clerk_position
@@ -57,8 +53,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=",">
@@ -83,8 +79,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>
@@ -109,8 +105,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 clerk_position_id = #{clerkPositionId,jdbcType=INTEGER}
@@ -123,13 +119,13 @@
       sort = #{sort,jdbcType=DOUBLE},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER}
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where clerk_position_id = #{clerkPositionId,jdbcType=INTEGER}
   </update>
   <select id="getSelective" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from tab_clerk_position where status = 1
+    from tab_clerk_position where delete_flag = 0
     <if test="enterpriseId != null ">
         and enterprise_id = #{enterpriseId}
     </if>
@@ -146,7 +142,7 @@
   <select id="listClerkPosition" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from tab_clerk_position where status = 1
+    from tab_clerk_position where delete_flag = 0
     and ( enterprise_id = #{enterpriseId} or enterprise_id is null )
     <if test="search != null and search != '' ">
         and ( position_name like concat('%', #{search}, '%') or position_code like concat('%', #{search}, '%') )
@@ -154,16 +150,16 @@
     order by sort
   </select>
   <select id="getMinSort" resultType="double">
-    select sort from tab_clerk_position where status = 1 and enterprise_id = #{enterpriseId} order by sort limit 1
+    select sort from tab_clerk_position where delete_flag = 0 and enterprise_id = #{enterpriseId} order by sort limit 1
   </select>
   <select id="getMaxSort" resultType="double">
-    select sort from tab_clerk_position where status = 1 and enterprise_id = #{enterpriseId} order by sort desc limit 1
+    select sort from tab_clerk_position where delete_flag = 0 and enterprise_id = #{enterpriseId} order by sort desc limit 1
   </select>
   <select id="listTwoElementExceptId" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from tab_clerk_position
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and clerk_position_id &lt;&gt; #{clerkPositionId}
     order by sort

gic-store-service/src/main/resources/mapper/TabClerkTmpMapper.xml

@@ -31,10 +31,6 @@
     from tab_clerk_tmp
     where clerk_tmp_id = #{clerkTmpId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_clerk_tmp
-    where clerk_tmp_id = #{clerkTmpId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabClerkTmp">
     insert into tab_clerk_tmp (clerk_tmp_id, enterprise_id, region_name, 
       clerk_name, clerk_code, store_name, 

gic-store-service/src/main/resources/mapper/TabCountyMapper.xml

@@ -21,10 +21,6 @@
     from tab_county
     where county_id = #{countyId,jdbcType=VARCHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from tab_county
-    where county_id = #{countyId,jdbcType=VARCHAR}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabCounty">
     insert into tab_county (county_id, county_name, city_id, 
       province_id, full_name, create_time, 

gic-store-service/src/main/resources/mapper/TabEnterpriseLicenseMapper.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.store.dao.mapper.TabEnterpriseLicenseMapper">
-  <resultMap id="BaseResultMap" type="com.gic.store.entity.TabEnterpriseLicense">
-    <id column="enterprise_license_id" jdbcType="INTEGER" property="enterpriseLicenseId" />
-    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
-    <result column="license_type" jdbcType="INTEGER" property="licenseType" />
-    <result column="lower_limit" jdbcType="INTEGER" property="lowerLimit" />
-    <result column="upper_limit" jdbcType="INTEGER" property="upperLimit" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    enterprise_license_id, enterprise_id, license_type, lower_limit, upper_limit, create_time, 
-    update_time
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from tab_enterprise_license
-    where enterprise_license_id = #{enterpriseLicenseId,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_enterprise_license
-    where enterprise_license_id = #{enterpriseLicenseId,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.gic.store.entity.TabEnterpriseLicense">
-    insert into tab_enterprise_license (enterprise_license_id, enterprise_id, 
-      license_type, lower_limit, upper_limit, 
-      create_time, update_time)
-    values (#{enterpriseLicenseId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
-      #{licenseType,jdbcType=INTEGER}, #{lowerLimit,jdbcType=INTEGER}, #{upperLimit,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.gic.store.entity.TabEnterpriseLicense">
-    insert into tab_enterprise_license
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="enterpriseLicenseId != null">
-        enterprise_license_id,
-      </if>
-      <if test="enterpriseId != null">
-        enterprise_id,
-      </if>
-      <if test="licenseType != null">
-        license_type,
-      </if>
-      <if test="lowerLimit != null">
-        lower_limit,
-      </if>
-      <if test="upperLimit != null">
-        upper_limit,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="enterpriseLicenseId != null">
-        #{enterpriseLicenseId,jdbcType=INTEGER},
-      </if>
-      <if test="enterpriseId != null">
-        #{enterpriseId,jdbcType=INTEGER},
-      </if>
-      <if test="licenseType != null">
-        #{licenseType,jdbcType=INTEGER},
-      </if>
-      <if test="lowerLimit != null">
-        #{lowerLimit,jdbcType=INTEGER},
-      </if>
-      <if test="upperLimit != null">
-        #{upperLimit,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gic.store.entity.TabEnterpriseLicense">
-    update tab_enterprise_license
-    <set>
-      <if test="enterpriseId != null">
-        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
-      </if>
-      <if test="licenseType != null">
-        license_type = #{licenseType,jdbcType=INTEGER},
-      </if>
-      <if test="lowerLimit != null">
-        lower_limit = #{lowerLimit,jdbcType=INTEGER},
-      </if>
-      <if test="upperLimit != null">
-        upper_limit = #{upperLimit,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where enterprise_license_id = #{enterpriseLicenseId,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.gic.store.entity.TabEnterpriseLicense">
-    update tab_enterprise_license
-    set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
-      license_type = #{licenseType,jdbcType=INTEGER},
-      lower_limit = #{lowerLimit,jdbcType=INTEGER},
-      upper_limit = #{upperLimit,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where enterprise_license_id = #{enterpriseLicenseId,jdbcType=INTEGER}
-  </update>
-</mapper>
\ No newline at end of file

gic-store-service/src/main/resources/mapper/TabEnterpriseMapper.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.store.dao.mapper.TabEnterpriseMapper">
-  <resultMap id="BaseResultMap" type="com.gic.store.entity.TabEnterprise">
-    <id column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
-    <result column="enterprise_name" jdbcType="VARCHAR" property="enterpriseName" />
-    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
-    <result column="logo" jdbcType="VARCHAR" property="logo" />
-    <result column="area_id" jdbcType="VARCHAR" property="areaId" />
-    <result column="address" jdbcType="VARCHAR" property="address" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    enterprise_id, enterprise_name, company_name, logo, area_id, address, status, create_time, 
-    update_time
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from tab_enterprise
-    where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_enterprise
-    where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.gic.store.entity.TabEnterprise">
-    insert into tab_enterprise (enterprise_id, enterprise_name, company_name, 
-      logo, area_id, address, 
-      status, create_time, update_time
-      )
-    values (#{enterpriseId,jdbcType=INTEGER}, #{enterpriseName,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
-      #{logo,jdbcType=VARCHAR}, #{areaId,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.gic.store.entity.TabEnterprise">
-    insert into tab_enterprise
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="enterpriseId != null">
-        enterprise_id,
-      </if>
-      <if test="enterpriseName != null">
-        enterprise_name,
-      </if>
-      <if test="companyName != null">
-        company_name,
-      </if>
-      <if test="logo != null">
-        logo,
-      </if>
-      <if test="areaId != null">
-        area_id,
-      </if>
-      <if test="address != null">
-        address,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="enterpriseId != null">
-        #{enterpriseId,jdbcType=INTEGER},
-      </if>
-      <if test="enterpriseName != null">
-        #{enterpriseName,jdbcType=VARCHAR},
-      </if>
-      <if test="companyName != null">
-        #{companyName,jdbcType=VARCHAR},
-      </if>
-      <if test="logo != null">
-        #{logo,jdbcType=VARCHAR},
-      </if>
-      <if test="areaId != null">
-        #{areaId,jdbcType=VARCHAR},
-      </if>
-      <if test="address != null">
-        #{address,jdbcType=VARCHAR},
-      </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>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gic.store.entity.TabEnterprise">
-    update tab_enterprise
-    <set>
-      <if test="enterpriseName != null">
-        enterprise_name = #{enterpriseName,jdbcType=VARCHAR},
-      </if>
-      <if test="companyName != null">
-        company_name = #{companyName,jdbcType=VARCHAR},
-      </if>
-      <if test="logo != null">
-        logo = #{logo,jdbcType=VARCHAR},
-      </if>
-      <if test="areaId != null">
-        area_id = #{areaId,jdbcType=VARCHAR},
-      </if>
-      <if test="address != null">
-        address = #{address,jdbcType=VARCHAR},
-      </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>
-    </set>
-    where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.gic.store.entity.TabEnterprise">
-    update tab_enterprise
-    set enterprise_name = #{enterpriseName,jdbcType=VARCHAR},
-      company_name = #{companyName,jdbcType=VARCHAR},
-      logo = #{logo,jdbcType=VARCHAR},
-      area_id = #{areaId,jdbcType=VARCHAR},
-      address = #{address,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
-  </update>
-</mapper>
\ No newline at end of file

gic-store-service/src/main/resources/mapper/TabEnterpriseVersionMapper.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.store.dao.mapper.TabEnterpriseVersionMapper">
-  <resultMap id="BaseResultMap" type="com.gic.store.entity.TabEnterpriseVersion">
-    <id column="enterprise_service_id" jdbcType="INTEGER" property="enterpriseServiceId" />
-    <result column="service_code" jdbcType="VARCHAR" property="serviceCode" />
-    <result column="service_name" jdbcType="VARCHAR" property="serviceName" />
-    <result column="service_version" jdbcType="INTEGER" property="serviceVersion" />
-    <result column="service_cycle" jdbcType="INTEGER" property="serviceCycle" />
-    <result column="audit_time" jdbcType="TIMESTAMP" property="auditTime" />
-    <result column="expiration_time" jdbcType="TIMESTAMP" property="expirationTime" />
-    <result column="enterprise_id" jdbcType="BIGINT" property="enterpriseId" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    enterprise_service_id, service_code, service_name, service_version, service_cycle, 
-    audit_time, expiration_time, enterprise_id, status, create_time, update_time
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from tab_enterprise_version
-    where enterprise_service_id = #{enterpriseServiceId,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_enterprise_version
-    where enterprise_service_id = #{enterpriseServiceId,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.gic.store.entity.TabEnterpriseVersion">
-    insert into tab_enterprise_version (enterprise_service_id, service_code, 
-      service_name, service_version, service_cycle, 
-      audit_time, expiration_time, enterprise_id, 
-      status, create_time, update_time
-      )
-    values (#{enterpriseServiceId,jdbcType=INTEGER}, #{serviceCode,jdbcType=VARCHAR}, 
-      #{serviceName,jdbcType=VARCHAR}, #{serviceVersion,jdbcType=INTEGER}, #{serviceCycle,jdbcType=INTEGER}, 
-      #{auditTime,jdbcType=TIMESTAMP}, #{expirationTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=BIGINT}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.gic.store.entity.TabEnterpriseVersion">
-    insert into tab_enterprise_version
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="enterpriseServiceId != null">
-        enterprise_service_id,
-      </if>
-      <if test="serviceCode != null">
-        service_code,
-      </if>
-      <if test="serviceName != null">
-        service_name,
-      </if>
-      <if test="serviceVersion != null">
-        service_version,
-      </if>
-      <if test="serviceCycle != null">
-        service_cycle,
-      </if>
-      <if test="auditTime != null">
-        audit_time,
-      </if>
-      <if test="expirationTime != null">
-        expiration_time,
-      </if>
-      <if test="enterpriseId != null">
-        enterprise_id,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="enterpriseServiceId != null">
-        #{enterpriseServiceId,jdbcType=INTEGER},
-      </if>
-      <if test="serviceCode != null">
-        #{serviceCode,jdbcType=VARCHAR},
-      </if>
-      <if test="serviceName != null">
-        #{serviceName,jdbcType=VARCHAR},
-      </if>
-      <if test="serviceVersion != null">
-        #{serviceVersion,jdbcType=INTEGER},
-      </if>
-      <if test="serviceCycle != null">
-        #{serviceCycle,jdbcType=INTEGER},
-      </if>
-      <if test="auditTime != null">
-        #{auditTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="expirationTime != null">
-        #{expirationTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="enterpriseId != null">
-        #{enterpriseId,jdbcType=BIGINT},
-      </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>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gic.store.entity.TabEnterpriseVersion">
-    update tab_enterprise_version
-    <set>
-      <if test="serviceCode != null">
-        service_code = #{serviceCode,jdbcType=VARCHAR},
-      </if>
-      <if test="serviceName != null">
-        service_name = #{serviceName,jdbcType=VARCHAR},
-      </if>
-      <if test="serviceVersion != null">
-        service_version = #{serviceVersion,jdbcType=INTEGER},
-      </if>
-      <if test="serviceCycle != null">
-        service_cycle = #{serviceCycle,jdbcType=INTEGER},
-      </if>
-      <if test="auditTime != null">
-        audit_time = #{auditTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="expirationTime != null">
-        expiration_time = #{expirationTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="enterpriseId != null">
-        enterprise_id = #{enterpriseId,jdbcType=BIGINT},
-      </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>
-    </set>
-    where enterprise_service_id = #{enterpriseServiceId,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.gic.store.entity.TabEnterpriseVersion">
-    update tab_enterprise_version
-    set service_code = #{serviceCode,jdbcType=VARCHAR},
-      service_name = #{serviceName,jdbcType=VARCHAR},
-      service_version = #{serviceVersion,jdbcType=INTEGER},
-      service_cycle = #{serviceCycle,jdbcType=INTEGER},
-      audit_time = #{auditTime,jdbcType=TIMESTAMP},
-      expiration_time = #{expirationTime,jdbcType=TIMESTAMP},
-      enterprise_id = #{enterpriseId,jdbcType=BIGINT},
-      status = #{status,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where enterprise_service_id = #{enterpriseServiceId,jdbcType=INTEGER}
-  </update>
-</mapper>
\ No newline at end of file

gic-store-service/src/main/resources/mapper/TabIntegralStoreMoveMapper.xml

@@ -6,12 +6,12 @@
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
     <result column="begin_store_id" jdbcType="INTEGER" property="beginStoreId" />
     <result column="end_store_id" jdbcType="INTEGER" property="endStoreId" />
-    <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">
-    store_move_id, enterprise_id, begin_store_id, end_store_id, status, create_time, 
+    store_move_id, enterprise_id, begin_store_id, end_store_id, delete_flag, create_time,
     update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -20,16 +20,12 @@
     from tab_integral_store_move
     where store_move_id = #{storeMoveId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_integral_store_move
-    where store_move_id = #{storeMoveId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabIntegralStoreMove">
     insert into tab_integral_store_move (store_move_id, enterprise_id, begin_store_id, 
-      end_store_id, status, create_time, 
+      end_store_id, delete_flag, create_time,
       update_time)
     values (#{storeMoveId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{beginStoreId,jdbcType=INTEGER}, 
-      #{endStoreId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{endStoreId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabIntegralStoreMove">
@@ -47,8 +43,8 @@
       <if test="endStoreId != null">
         end_store_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -70,8 +66,8 @@
       <if test="endStoreId != null">
         #{endStoreId,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},
@@ -93,8 +89,8 @@
       <if test="endStoreId != null">
         end_store_id = #{endStoreId,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},
@@ -110,7 +106,7 @@
     set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       begin_store_id = #{beginStoreId,jdbcType=INTEGER},
       end_store_id = #{endStoreId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where store_move_id = #{storeMoveId,jdbcType=INTEGER}

gic-store-service/src/main/resources/mapper/TabProvinceMapper.xml

@@ -17,10 +17,6 @@
     from tab_province
     where province_id = #{provinceId,jdbcType=VARCHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from tab_province
-    where province_id = #{provinceId,jdbcType=VARCHAR}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabProvince">
     insert into tab_province (province_id, province_name, province_py, 
       create_time, update_time)

gic-store-service/src/main/resources/mapper/TabStoreBrandMapper.xml

@@ -9,14 +9,14 @@
     <result column="store_brand_category" jdbcType="VARCHAR" property="storeBrandCategory" />
     <result column="sort" jdbcType="DOUBLE" property="sort" />
     <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" />
     <result column="has_rel" jdbcType="INTEGER" property="hasRel" />
   </resultMap>
   <sql id="Base_Column_List">
     store_brand_id, store_brand_code, store_brand_name, store_brand_category_code, store_brand_category, 
-    sort, enterprise_id, status, create_time, update_time, has_rel
+    sort, enterprise_id, delete_flag, create_time, update_time, has_rel
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -31,12 +31,12 @@
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreBrand">
     insert into tab_store_brand (store_brand_id, store_brand_code, store_brand_name, 
       store_brand_category_code, store_brand_category, 
-      sort, enterprise_id, status, 
+      sort, enterprise_id, delete_flag,
       create_time, update_time, has_rel
       )
     values (#{storeBrandId,jdbcType=INTEGER}, #{storeBrandCode,jdbcType=VARCHAR}, #{storeBrandName,jdbcType=VARCHAR}, 
       #{storeBrandCategoryCode,jdbcType=VARCHAR}, #{storeBrandCategory,jdbcType=VARCHAR}, 
-      #{sort,jdbcType=DOUBLE}, #{enterpriseId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{sort,jdbcType=DOUBLE}, #{enterpriseId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{hasRel,jdbcType=INTEGER}
       )
   </insert>
@@ -67,8 +67,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,
@@ -102,8 +102,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},
@@ -137,8 +137,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},
@@ -160,7 +160,7 @@
       store_brand_category = #{storeBrandCategory,jdbcType=VARCHAR},
       sort = #{sort,jdbcType=DOUBLE},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       has_rel = #{hasRel,jdbcType=INTEGER}
@@ -168,14 +168,14 @@
   </update>
 
   <select id="getMinSort" resultType="java.lang.Double">
-    select sort from tab_store_brand where status = 1 and enterprise_id = #{enterpriseId} order by sort limit 0, 1
+    select sort from tab_store_brand where delete_flag = 0 and enterprise_id = #{enterpriseId} order by sort limit 0, 1
   </select>
   <select id="getMaxSort" resultType="java.lang.Double">
-    select sort from tab_store_brand where status = 1 and enterprise_id = #{enterpriseId} order by sort desc limit 0, 1
+    select sort from tab_store_brand where delete_flag = 0 and enterprise_id = #{enterpriseId} order by sort desc limit 0, 1
   </select>
   <select id="countBySelective" resultType="java.lang.Integer">
     select count(1) from tab_store_brand
-    where status = 1
+    where delete_flag = 0
     <if test="enterpriseId != null ">
       and enterprise_id = #{enterpriseId}
     </if>
@@ -193,7 +193,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_store_brand
-    where status = 1
+    where delete_flag = 0
     <if test="enterpriseId != null ">
       and enterprise_id = #{enterpriseId}
     </if>
@@ -206,7 +206,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_store_brand
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and sort &lt; #{sort}
     order by sort desc
@@ -216,7 +216,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_store_brand
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and sort &gt; #{sort}
     order by sort
@@ -226,14 +226,14 @@
     select
     <include refid="Base_Column_List" />
     from tab_store_brand
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and store_brand_id &lt;&gt; #{storeBrandId}
     order by sort
     limit #{start}, #{size}
   </select>
   <update id="deleteByIds">
-    update tab_store_brand set status = 0
+    update tab_store_brand set delete_flag = 1
     <where>
       <if test="null != ids and ids.size() &gt; 0">
         and store_brand_id in
@@ -247,7 +247,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_store_brand
-    where status = 1
+    where delete_flag = 0
     <if test="null != ids and ids.size() &gt; 0">
       and store_brand_id in
       <foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
@@ -260,7 +260,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_store_brand
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="storeBrandName != null ">
         and store_brand_name = #{storeBrandName}

gic-store-service/src/main/resources/mapper/TabStoreBusinessTimeMapper.xml

@@ -10,10 +10,10 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
-    store_business_time_id, weekday, open_time, close_time, store_info_id, create_time, update_time,enterprise_id, status
+    store_business_time_id, weekday, open_time, close_time, store_info_id, create_time, update_time,enterprise_id, delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -21,17 +21,13 @@
     from tab_store_business_time
     where store_business_time_id = #{storeBusinessTimeId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_business_time
-    where store_business_time_id = #{storeBusinessTimeId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreBusinessTime">
     insert into tab_store_business_time (store_business_time_id, weekday, open_time, 
       close_time, store_info_id, create_time, 
-      update_time,enterprise_id, status)
+      update_time,enterprise_id, delete_flag)
     values (#{storeBusinessTimeId,jdbcType=INTEGER}, #{weekday,jdbcType=VARCHAR}, #{openTime,jdbcType=TIME}, 
       #{closeTime,jdbcType=TIME}, #{storeInfoId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP},#{enterpriseId,jdbcType=INTEGER}, #{status, jdbcType=INTEGER})
+      #{updateTime,jdbcType=TIMESTAMP},#{enterpriseId,jdbcType=INTEGER}, #{deleteFlag, jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreBusinessTime">
     insert into tab_store_business_time
@@ -60,8 +56,8 @@
       <if test="enterpriseId != null">
         enterprise_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -89,8 +85,8 @@
       <if test="enterpriseId != null">
         #{enterpriseId,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -118,8 +114,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>
     </set>
     where store_business_time_id = #{storeBusinessTimeId,jdbcType=INTEGER}
@@ -133,14 +129,14 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER}
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where store_business_time_id = #{storeBusinessTimeId,jdbcType=INTEGER}
   </update>
   <select id="listBusinessTime" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from tab_store_business_time
-    where store_info_id = #{storeInfoId} and status = 1
+    where store_info_id = #{storeInfoId} and delete_flag = 0
   </select>
   <insert id="updateAllBuinessTime">
     insert into tab_store_business_time(
@@ -151,9 +147,9 @@
 
   <insert id="updateBuinessTimeBystoreInfoIds">
     insert into tab_store_business_time(
-      weekday,open_time,close_time,store_info_id,create_time,update_time,enterprise_id, status
+      weekday,open_time,close_time,store_info_id,create_time,update_time,enterprise_id, delete_flag
     )
-    select #{weekday},#{openTime},#{closeTime},store_info_id,now(),now(),enterprise_id, 1 from tab_store_info where overflow_status=0
+    select #{weekday},#{openTime},#{closeTime},store_info_id,now(),now(),enterprise_id, 0 from tab_store_info where overflow_status=0
     and store_info_id in
     <foreach collection="storeInfoIdList" index="index" item="storeInfoId" open="(" separator="," close=")">
       #{storeInfoId}
@@ -161,11 +157,11 @@
   </insert>
 
   <delete id="deleteAllByEnterpriseId" parameterType="java.lang.Integer">
-    update tab_store_business_time set status = 0
+    update tab_store_business_time set delete_flag = 1
     where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
   </delete>
   <delete id="deleteBystoreInfoIds" parameterType="java.lang.Integer">
-    update tab_store_business_time set status = 0
+    update tab_store_business_time set delete_flag = 1
     where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
     and store_info_id in
     <foreach collection="storeInfoIdList" index="index" item="storeInfoId" open="(" separator="," close=")">

gic-store-service/src/main/resources/mapper/TabStoreExtendMapper.xml

@@ -22,10 +22,6 @@
     from tab_store_extend
     where store_extend_id = #{storeExtendId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_extend
-    where store_extend_id = #{storeExtendId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreExtend">
     insert into tab_store_extend (store_extend_id, store_info_id, enterprise_id,
       store_field_id, value, sort, 

gic-store-service/src/main/resources/mapper/TabStoreFieldMapper.xml

@@ -6,7 +6,7 @@
     <result column="store_field_name" jdbcType="VARCHAR" property="storeFieldName" />
     <result column="store_field_code" jdbcType="VARCHAR" property="storeFieldCode" />
     <result column="store_field_type" jdbcType="INTEGER" property="storeFieldType" />
-    <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="store_field_detail" jdbcType="VARCHAR" property="storeFieldDetail" />
@@ -18,7 +18,7 @@
     <result column="store_field_name" jdbcType="VARCHAR" property="storeFieldName" />
     <result column="store_field_code" jdbcType="VARCHAR" property="storeFieldCode" />
     <result column="store_field_type" jdbcType="INTEGER" property="storeFieldType" />
-    <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="store_field_detail" jdbcType="VARCHAR" property="storeFieldDetail" />
@@ -30,19 +30,19 @@
   </resultMap>
   <sql id="Base_Column_List">
     store_field_id, store_field_name, store_field_code, store_field_type,
-    status, create_time, update_time, store_field_detail, erp_rel_code, sort
+    delete_flag, create_time, update_time, store_field_detail, erp_rel_code, sort
   </sql>
   <sql id="Base_Column_List_Enterprise">
     a.store_field_id, a.store_field_name, a.store_field_code, a.store_field_type, b.enterprise_id,
-    a.status, a.create_time, a.update_time, a.store_field_detail, a.erp_rel_code, a.sort, b.own_type
+    a.delete_flag, a.create_time, a.update_time, a.store_field_detail, a.erp_rel_code, a.sort, b.own_type
   </sql>
   <sql id="Base_Column_List_Field">
     a.store_field_id, a.store_field_name, a.store_field_code, a.store_field_type, b.enterprise_id,
-    a.status, a.create_time, a.update_time, a.store_field_detail, a.erp_rel_code, a.sort, b.own_type,c.region_id
+    a.delete_flag, a.create_time, a.update_time, a.store_field_detail, a.erp_rel_code, a.sort, b.own_type,c.region_id
   </sql>
   <sql id="Base_Column_List_Region">
     a.store_field_id, a.store_field_name, a.store_field_code, a.store_field_type, b.region_id,
-    a.status, a.create_time, a.update_time, a.store_field_detail, a.erp_rel_code, a.sort
+    a.delete_flag, a.create_time, a.update_time, a.store_field_detail, a.erp_rel_code, a.sort
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -50,18 +50,14 @@
     from tab_store_field
     where store_field_id = #{storeFieldId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_field
-    where store_field_id = #{storeFieldId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreField" useGeneratedKeys="true" keyProperty="storeFieldId">
     insert into tab_store_field (store_field_id, store_field_name, store_field_code, 
       store_field_type,
-      status, create_time, update_time, 
+      delete_flag, create_time, update_time,
       store_field_detail, erp_rel_code, sort)
     values (#{storeFieldId,jdbcType=INTEGER}, #{storeFieldName,jdbcType=VARCHAR}, #{storeFieldCode,jdbcType=VARCHAR}, 
       #{storeFieldType,jdbcType=INTEGER},
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
       #{storeFieldDetail,jdbcType=VARCHAR}, #{erpRelCode,jdbcType=VARCHAR}, #{sort,jdbcType=DOUBLE})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreField">
@@ -79,8 +75,8 @@
       <if test="storeFieldType != null">
         store_field_type,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -111,8 +107,8 @@
       <if test="storeFieldType != null">
         #{storeFieldType,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},
@@ -143,8 +139,8 @@
       <if test="storeFieldType != null">
         store_field_type = #{storeFieldType,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},
@@ -169,7 +165,7 @@
     set store_field_name = #{storeFieldName,jdbcType=VARCHAR},
       store_field_code = #{storeFieldCode,jdbcType=VARCHAR},
       store_field_type = #{storeFieldType,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       store_field_detail = #{storeFieldDetail,jdbcType=VARCHAR},
@@ -184,10 +180,10 @@
     from tab_store_field a
     LEFT JOIN tab_store_field_rel b
     on a.store_field_id = b.store_field_id
-    and b.status = 1
+    and b.delete_flag = 0
     where b.enterprise_id = #{enterpriseId}
     and a.sort > #{sort}
-    and a.status = 1
+    and a.delete_flag = 0
     order by a.sort
     limit 1
   </select>
@@ -198,10 +194,10 @@
     from tab_store_field a
     LEFT JOIN tab_store_field_rel b
     on a.store_field_id = b.store_field_id
-    and b.status = 1
+    and b.delete_flag = 0
     where b.enterprise_id = #{enterpriseId}
     and a.sort &lt; #{sort}
-    and a.status = 1
+    and a.delete_flag = 0
     order by a.sort desc
     limit 1
   </select>
@@ -210,16 +206,16 @@
     select sort from tab_store_field a
     LEFT JOIN tab_store_field_rel b
     on a.store_field_id = b.store_field_id
-    and b.status = 1
-    where b.enterprise_id = #{enterpriseId} and a.status = 1 order by a.sort limit 0, 1
+    and b.delete_flag = 0
+    where b.enterprise_id = #{enterpriseId} and a.delete_flag = 0 order by a.sort limit 0, 1
   </select>
 
   <select id="getMaxSort" resultType="java.lang.Double">
     select sort from tab_store_field a
     LEFT JOIN tab_store_field_rel b
     on a.store_field_id = b.store_field_id
-    and b.status = 1
-    where b.enterprise_id = #{enterpriseId} and a.status = 1 order by a.sort desc limit 0, 1
+    and b.delete_flag = 0
+    where b.enterprise_id = #{enterpriseId} and a.delete_flag = 0 order by a.sort desc limit 0, 1
   </select>
 
   <select id="listTwoElementExceptId" resultMap="BaseResultMap_Dto">
@@ -228,10 +224,10 @@
     from tab_store_field a
     LEFT JOIN tab_store_field_rel b
     on a.store_field_id = b.store_field_id
-    and b.status = 1
+    and b.delete_flag = 0
     where  a.store_field_id &lt;&gt; #{storeFieldId}
     and b.enterprise_id = #{enterpriseId}
-    and a.status = 1
+    and a.delete_flag = 0
     order by a.sort
     limit #{start}, #{size}
   </select>
@@ -244,9 +240,9 @@
     on a.store_field_id = b.store_field_id
     left join tab_store_field_region_rel c
     on b.store_field_id = c.store_field_id
-    and b.status = 1
-    and c.status=1
-    where a.status = 1
+    and b.delete_flag = 0
+    and c.delete_flag=0
+    where a.delete_flag = 0
     <if test="enterpriseId != null ">
       and b.enterprise_id = #{enterpriseId}
     </if>
@@ -266,7 +262,7 @@
   <update id="deleteAll">
     update tab_store_field a left join tab_store_field_rel b on a.store_field_id = b.store_field_id
     set
-    a.status = 0
+    a.delete_flag = 1
     where b.enterprise_id = #{enterpriseId}
   </update>
 
@@ -274,7 +270,7 @@
   <update id="deleteBatch">
     update tab_store_field
     set
-    status = 0
+    delete_flag = 1
     where store_field_id in
       <foreach collection="storeFieldIds" index="index" item="item" open="(" separator="," close=")">
         #{item}
@@ -288,9 +284,9 @@
     from tab_store_field a
     left join tab_store_field_rel b
     on a.store_field_id = b.store_field_id
-    and b.status = 1
+    and b.delete_flag = 0
     where
-    a.status = 1
+    a.delete_flag = 0
     <if test="storeFieldId != null ">
       and a.store_field_id &lt;&gt; #{storeFieldId}
     </if>
@@ -304,9 +300,9 @@
     from tab_store_field a
     left join tab_store_field_rel b
     on a.store_field_id = b.store_field_id
-    and b.status = 1
+    and b.delete_flag = 0
     where
-    a.status = 1
+    a.delete_flag = 0
     <if test="storeFieldId != null ">
       and a.store_field_id &lt;&gt; #{storeFieldId}
     </if>
@@ -320,8 +316,8 @@
     from tab_store_field a
     LEFT JOIN tab_store_field_region_rel b
     on a.store_field_id = b.store_field_id
-    and b.status = 1
-    where a.status = 1
+    and b.delete_flag = 0
+    where a.delete_flag = 0
     <if test="regionId != null ">
       and b.region_id = #{regionId}
     </if>
@@ -335,8 +331,8 @@
     from tab_store_field a
     LEFT JOIN tab_store_field_rel b
     on a.store_field_id = b.store_field_id
-    and b.status = 1
-    where a.status = 1
+    and b.delete_flag = 0
+    where a.delete_flag = 0
     <if test="enterpriseId != null ">
       and b.enterprise_id = #{enterpriseId}
     </if>
@@ -363,9 +359,9 @@
     from tab_store_field a
     LEFT JOIN tab_store_field_rel b
     on a.store_field_id = b.store_field_id
-    and b.status = 1
+    and b.delete_flag = 0
     where
-    a.status = 1
+    a.delete_flag = 0
     <if test="regionId != null ">
       and a.region_id &lt;&gt; #{regionId}
     </if>
@@ -379,8 +375,8 @@
         from tab_store_field a
         left join tab_store_field_rel b
         on a.store_field_id = b.store_field_id
-        and b.status = 1
-        where a.status = 1
+        and b.delete_flag = 0
+        where a.delete_flag = 0
         and b.own_type = 0
         <if test="enterpriseId != null ">
             and b.enterprise_id = #{enterpriseId}

gic-store-service/src/main/resources/mapper/TabStoreFieldRegionRelMapper.xml

@@ -5,12 +5,12 @@
     <id column="field_region_id" jdbcType="INTEGER" property="fieldRegionId" />
     <result column="region_id" jdbcType="INTEGER" property="regionId" />
     <result column="store_field_id" jdbcType="INTEGER" property="storeFieldId" />
-    <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">
-    field_region_id, region_id, store_field_id, status, create_time, update_time
+    field_region_id, region_id, store_field_id, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -18,16 +18,12 @@
     from tab_store_field_region_rel
     where field_region_id = #{fieldRegionId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_field_region_rel
-    where field_region_id = #{fieldRegionId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreFieldRegionRel">
     insert into tab_store_field_region_rel (field_region_id, region_id, store_field_id, 
-      status, create_time, update_time
+      delete_flag, create_time, update_time
       )
     values (#{fieldRegionId,jdbcType=INTEGER}, #{regionId,jdbcType=INTEGER}, #{storeFieldId,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.store.entity.TabStoreFieldRegionRel">
@@ -42,8 +38,8 @@
       <if test="storeFieldId != null">
         store_field_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -62,8 +58,8 @@
       <if test="storeFieldId != null">
         #{storeFieldId,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},
@@ -82,8 +78,8 @@
       <if test="storeFieldId != null">
         store_field_id = #{storeFieldId,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},
@@ -98,21 +94,21 @@
     update tab_store_field_region_rel
     set region_id = #{regionId,jdbcType=INTEGER},
       store_field_id = #{storeFieldId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where field_region_id = #{fieldRegionId,jdbcType=INTEGER}
   </update>
 
   <update id="deleteByStoreFieldId">
-    update tab_store_field_region_rel set status = 0
-    where status = 1
+    update tab_store_field_region_rel set delete_flag = 1
+    where delete_flag = 0
     and store_field_id = #{storeFieldId}
   </update>
 
   <insert id="saveFetch" parameterType="java.util.List">
     insert into tab_store_field_region_rel (field_region_id, region_id, store_field_id,
-    status, create_time, update_time
+    delete_flag, create_time, update_time
     )
     values
     <foreach collection="list" item="item" index="index" separator=",">
@@ -120,7 +116,7 @@
       #{item.fieldRegionId},
       #{item.regionId},
       #{item.storeFieldId},
-      #{item.status},
+      #{item.deleteFlag},
       #{item.createTime},
       #{item.updateTime}
       )
@@ -130,7 +126,7 @@
   <select id="listStoreFieldId" resultType="java.lang.Integer">
     select store_field_id
     from tab_store_field_region_rel
-    where status=1
+    where delete_flag=0
     <if test="null != list and list.size() > 0">
       and region_id in
       <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
@@ -141,8 +137,8 @@
   </select>
 
   <update id="deleteFetchByStoreFieldIds" >
-    update tab_store_field_region_rel set status = 0
-    where status=1
+    update tab_store_field_region_rel set delete_flag = 1
+    where delete_flag=0
     <if test="null != list and list.size() > 0">
       and store_field_id in
       <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
@@ -155,7 +151,7 @@
   <select id="listByStoreFieldIdList" resultType="com.gic.store.dto.StoreFieldRegionMapDTO">
     select store_field_id storeFieldId, GROUP_CONCAT(region_id separator '_') regionIds
     from tab_store_field_region_rel
-    where status=1
+    where delete_flag=0
     <if test="null != list and list.size() > 0">
       and store_field_id in
       <foreach collection="list" index="index" item="item" open="(" separator="," close=")">

gic-store-service/src/main/resources/mapper/TabStoreFieldRelMapper.xml

@@ -6,12 +6,12 @@
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
     <result column="store_field_id" jdbcType="INTEGER" property="storeFieldId" />
     <result column="own_type" jdbcType="INTEGER" property="ownType" />
-    <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">
-    field_relation_id, enterprise_id, store_field_id, own_type, status, create_time, 
+    field_relation_id, enterprise_id, store_field_id, own_type, delete_flag, create_time,
     update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -20,16 +20,12 @@
     from tab_store_field_rel
     where field_relation_id = #{fieldRelationId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_field_rel
-    where field_relation_id = #{fieldRelationId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreFieldRel">
     insert into tab_store_field_rel (field_relation_id, enterprise_id, store_field_id, 
-      own_type, status, create_time, 
+      own_type, delete_flag, create_time,
       update_time)
     values (#{fieldRelationId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{storeFieldId,jdbcType=INTEGER}, 
-      #{ownType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{ownType,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreFieldRel">
@@ -47,8 +43,8 @@
       <if test="ownType != null">
         own_type,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -70,8 +66,8 @@
       <if test="ownType != null">
         #{ownType,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},
@@ -93,8 +89,8 @@
       <if test="ownType != null">
         own_type = #{ownType,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},
@@ -110,7 +106,7 @@
     set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       store_field_id = #{storeFieldId,jdbcType=INTEGER},
       own_type = #{ownType,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where field_relation_id = #{fieldRelationId,jdbcType=INTEGER}
@@ -120,7 +116,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_store_field_rel
-    where status = 1
+    where delete_flag = 0
     <if test="enterpriseId != null">
        and enterprise_id = #{enterpriseId,jdbcType=INTEGER}
     </if>
@@ -130,8 +126,8 @@
     <if test="ownType != null">
       and own_type = #{ownType,jdbcType=INTEGER}
     </if>
-    <if test="status != null">
-      and status = #{status,jdbcType=INTEGER}
+    <if test="deleteFlag != null">
+      and delete_flag = #{deleteFlag,jdbcType=INTEGER}
     </if>
     <if test="createTime != null">
       and create_time = #{createTime,jdbcType=TIMESTAMP}
@@ -142,8 +138,8 @@
   </select>
 
   <update id="deleteFetch">
-    update tab_store_field_rel set status = 0
-    where status = 1
+    update tab_store_field_rel set delete_flag = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="null != list and list.size() > 0">
       and store_field_id in
@@ -155,7 +151,7 @@
 
 
   <insert id="saveFetch" parameterType="java.util.List">
-    insert into tab_store_field_region_rel (field_relation_id, enterprise_id, store_field_id, own_type, status, create_time,
+    insert into tab_store_field_region_rel (field_relation_id, enterprise_id, store_field_id, own_type, delete_flag, create_time,
     update_time
     )
     values
@@ -165,7 +161,7 @@
       #{item.enterpriseId},
       #{item.storeFieldId},
       #{item.ownType},
-      #{item.status},
+      #{item.deleteFlag},
       #{item.createTime},
       #{item.updateTime}
       )

gic-store-service/src/main/resources/mapper/TabStoreFieldSelectMapper.xml

@@ -20,10 +20,6 @@
     from tab_store_field_select
     where store_field_select_id = #{storeFieldSelectId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_field_select
-    where store_field_select_id = #{storeFieldSelectId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreFieldSelect" useGeneratedKeys="true" keyProperty="storeFieldSelectId">
     insert into tab_store_field_select (store_field_select_id, store_field_select_name, 
       store_field_select_code, sort,

gic-store-service/src/main/resources/mapper/TabStoreGroupMapper.xml

@@ -9,14 +9,14 @@
     <result column="group_level" jdbcType="INTEGER" property="groupLevel" />
     <result column="store_group_chain" jdbcType="VARCHAR" property="storeGroupChain" />
     <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" />
     <result column="is_default" jdbcType="INTEGER" property="isDefault" />
   </resultMap>
   <sql id="Base_Column_List">
     store_group_id, store_group_name, parent_store_group_id, enterprise_id, group_level, 
-    store_group_chain, sort, status, create_time, update_time, is_default
+    store_group_chain, sort, delete_flag, create_time, update_time, is_default
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -24,18 +24,14 @@
     from tab_store_group
     where store_group_id = #{storeGroupId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_group
-    where store_group_id = #{storeGroupId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreGroup" useGeneratedKeys="true" keyProperty="storeGroupId">
     insert into tab_store_group (store_group_id, store_group_name, parent_store_group_id, 
       enterprise_id, group_level, store_group_chain, 
-      sort, status, create_time, 
+      sort, delete_flag, create_time,
       update_time, is_default)
     values (#{storeGroupId,jdbcType=INTEGER}, #{storeGroupName,jdbcType=VARCHAR}, #{parentStoreGroupId,jdbcType=INTEGER}, 
       #{enterpriseId,jdbcType=INTEGER}, #{groupLevel,jdbcType=INTEGER}, #{storeGroupChain,jdbcType=VARCHAR}, 
-      #{sort,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{sort,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP}, #{isDefault,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreGroup">
@@ -62,8 +58,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,
@@ -97,8 +93,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},
@@ -132,8 +128,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},
@@ -155,7 +151,7 @@
       group_level = #{groupLevel,jdbcType=INTEGER},
       store_group_chain = #{storeGroupChain,jdbcType=VARCHAR},
       sort = #{sort,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       is_default = #{isDefault,jdbcType=INTEGER}
@@ -166,7 +162,7 @@
     select
     <include refid="Base_Column_List" />
     from
-    tab_store_group where status = 1
+    tab_store_group where delete_flag = 0
     <if test="enterpriseId != null and enterpriseId != '' ">
       and enterprise_id = #{enterpriseId}
     </if>
@@ -190,7 +186,7 @@
     select
     IFNULL(MAX(sort), 0)
     from
-    tab_store_group where status = 1 and enterprise_id = #{enterpriseId} and group_level = #{groupLevel}
+    tab_store_group where delete_flag = 0 and enterprise_id = #{enterpriseId} and group_level = #{groupLevel}
   </select>
 
 
@@ -198,14 +194,14 @@
     UPDATE
     tab_store_group
     SET store_group_chain = replace(store_group_chain, concat('_', #{fromStoreGroupId}, '_'), concat('_', #{toStoreGroupId}, '_'))
-    where status = 1 and store_group_chain like concat('%_', #{storeGroupId}, '_%')
+    where delete_flag = 0 and store_group_chain like concat('%_', #{storeGroupId}, '_%')
   </update>
 
   <select id="getStoreGroupWhenMinSort" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from
-    tab_store_group where status = 1 and enterprise_id = #{enterpriseId} and group_level = #{groupLevel} and sort > #{sort} and is_default = 0
+    tab_store_group where delete_flag = 0 and enterprise_id = #{enterpriseId} and group_level = #{groupLevel} and sort > #{sort} and is_default = 0
     order by sort
     limit 1
   </select>
@@ -215,7 +211,7 @@
     select
     <include refid="Base_Column_List" />
     from
-    tab_store_group where status = 1 and enterprise_id = #{enterpriseId} and group_level = #{groupLevel} and sort &lt; #{sort} and is_default = 0
+    tab_store_group where delete_flag = 0 and enterprise_id = #{enterpriseId} and group_level = #{groupLevel} and sort &lt; #{sort} and is_default = 0
     order by sort desc
     limit 1
   </select>
@@ -224,7 +220,7 @@
     select
     <include refid="Base_Column_List" />
     from
-    tab_store_group where status = 1 and enterprise_id = #{enterpriseId} and group_level = #{groupLevel}
+    tab_store_group where delete_flag = 0 and enterprise_id = #{enterpriseId} and group_level = #{groupLevel}
     limit 1
   </select>
 
@@ -232,7 +228,7 @@
     select
     count(1)
     from
-    tab_store_group where status = 1 and parent_store_group_id = #{parentId}
+    tab_store_group where delete_flag = 0 and parent_store_group_id = #{parentId}
   </select>
 
 
@@ -240,7 +236,7 @@
     select
     count(1)
     from
-    tab_store_group where status = 1
+    tab_store_group where delete_flag = 0
     <if test="storeGroupId != null and storeGroupId != '' ">
       and store_group_id &lt;&gt; #{storeGroupId}
     </if>
@@ -252,7 +248,7 @@
     select
     <include refid="Base_Column_List" />
     from
-    tab_store_group where status = 1 and enterprise_id = #{enterpriseId} and store_group_name = #{storeGroupName}
+    tab_store_group where delete_flag = 0 and enterprise_id = #{enterpriseId} and store_group_name = #{storeGroupName}
     limit 1
   </select>
 
@@ -261,14 +257,14 @@
     select
     <include refid="Base_Column_List" />
     from
-    tab_store_group where status = 1 and enterprise_id = #{enterpriseId} and is_default = 1 and group_level = 1
+    tab_store_group where delete_flag = 0 and enterprise_id = #{enterpriseId} and is_default = 1 and group_level = 1
     limit 1
   </select>
   <select id="listStoreGroupByIds" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from
-    tab_store_group where status = 1 and enterprise_id = #{enterpriseId}
+    tab_store_group where delete_flag = 0 and enterprise_id = #{enterpriseId}
     <if test="null != storeGroupIdList and storeGroupIdList.size() > 0">
       and store_group_id in
       <foreach collection="storeGroupIdList" index="index" item="item" open="(" separator="," close=")">
@@ -283,7 +279,7 @@
     select
     <include refid="Base_Column_List" />
     from
-    tab_store_group where status = 1 and enterprise_id = #{enterpriseId}
+    tab_store_group where delete_flag = 0 and enterprise_id = #{enterpriseId}
     <if test="null != storeGroupIdList and storeGroupIdList.size() > 0">
       and store_group_id in
       <foreach collection="storeGroupIdList" index="index" item="item" open="(" separator="," close=")">

gic-store-service/src/main/resources/mapper/TabStoreGroupRelMapper.xml

@@ -4,14 +4,14 @@
   <resultMap id="BaseResultMap" type="com.gic.store.entity.TabStoreGroupRel">
     <id column="store_group_rel_id" jdbcType="INTEGER" property="storeGroupRelId" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
-    <result column="store_id" jdbcType="INTEGER" property="storeInfoId" />
+    <result column="store_id" jdbcType="INTEGER" property="storeId" />
     <result column="store_group_id" jdbcType="INTEGER" property="storeGroupId" />
-    <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">
-    store_group_rel_id, enterprise_id, store_id, store_group_id, status, create_time, 
+    store_group_rel_id, enterprise_id, store_id, store_group_id, delete_flag, create_time,
     update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -20,16 +20,12 @@
     from tab_store_group_rel
     where store_group_rel_id = #{storeGroupRelId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_group_rel
-    where store_group_rel_id = #{storeGroupRelId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreGroupRel">
     insert into tab_store_group_rel (store_group_rel_id, enterprise_id, store_id, 
-      store_group_id, status, create_time, 
+      store_group_id, delete_flag, create_time,
       update_time)
     values (#{storeGroupRelId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{storeInfoId,jdbcType=INTEGER},
-      #{storeGroupId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{storeGroupId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreGroupRel">
@@ -47,8 +43,8 @@
       <if test="storeGroupId != null">
         store_group_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -70,8 +66,8 @@
       <if test="storeGroupId != null">
         #{storeGroupId,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},
@@ -93,8 +89,8 @@
       <if test="storeGroupId != null">
         store_group_id = #{storeGroupId,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},
@@ -110,7 +106,7 @@
     set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       store_id = #{storeInfoId,jdbcType=INTEGER},
       store_group_id = #{storeGroupId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where store_group_rel_id = #{storeGroupRelId,jdbcType=INTEGER}

gic-store-service/src/main/resources/mapper/TabStoreIndexLogMapper.xml

@@ -18,10 +18,6 @@
     from tab_store_index_log
     where store_index_id = #{storeIndexId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_index_log
-    where store_index_id = #{storeIndexId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreIndexLog" useGeneratedKeys="true" keyProperty="storeIndexId" keyColumn="storeIndexId">
     insert into tab_store_index_log (store_index_id, enterprise_id, store_id, 
       result, create_time, update_time

gic-store-service/src/main/resources/mapper/TabStoreLogMapper.xml

@@ -11,13 +11,13 @@
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <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" />
     <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
     <result column="operator_name" jdbcType="VARCHAR" property="operatorName" />
   </resultMap>
   <sql id="Base_Column_List">
     store_log_id, enterprise_id, store_id, content, reason, log_type, remark, create_time, 
-    update_time, status, operator_id, operator_name
+    update_time, delete_flag, operator_id, operator_name
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -25,20 +25,16 @@
     from tab_store_log
     where store_log_id = #{storeLogId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_log
-    where store_log_id = #{storeLogId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreLog">
     insert into tab_store_log (store_log_id, enterprise_id, store_id,
       content, reason, log_type, 
       remark, create_time, update_time, 
-      status, operator_id, operator_name
+      delete_flag, operator_id, operator_name
       )
     values (#{storeLogId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{storeId,jdbcType=INTEGER}, 
       #{content,jdbcType=VARCHAR}, #{reason,jdbcType=INTEGER}, #{logType,jdbcType=INTEGER}, 
       #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{status,jdbcType=INTEGER}, #{operatorId,jdbcType=INTEGER}, #{operatorName,jdbcType=VARCHAR}
+      #{deleteFlag,jdbcType=INTEGER}, #{operatorId,jdbcType=INTEGER}, #{operatorName,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreLog">
@@ -71,8 +67,8 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="operatorId != null">
         operator_id,
@@ -109,8 +105,8 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="operatorId != null">
         #{operatorId,jdbcType=INTEGER},
@@ -147,8 +143,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>
       <if test="operatorId != null">
         operator_id = #{operatorId,jdbcType=INTEGER},
@@ -169,7 +165,7 @@
       remark = #{remark,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       operator_id = #{operatorId,jdbcType=INTEGER},
       operator_name = #{operatorName,jdbcType=VARCHAR}
     where store_log_id = #{storeLogId,jdbcType=INTEGER}
@@ -178,7 +174,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_store_log
-    where status = 1
+    where delete_flag = 0
     <if test="storeId != null ">
         and store_id = #{storeId}
     </if>
@@ -192,10 +188,10 @@
       and content like concat('%', #{content}, '%')
     </if>
     <if test="startTime != null and startTime != '' ">
-        and start_time &gt;= #{startTime}
+        and create_time &gt;= #{startTime}
     </if>
     <if test="endTime != null and endTime != '' ">
-        and end_time &lt;= #{endTime}
+        and create_time &lt;= #{endTime}
     </if>
     order by create_time desc
   </select>

gic-store-service/src/main/resources/mapper/TabStoreMapper.xml

@@ -25,10 +25,6 @@
     from tab_store
     where store_id = #{storeId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store
-    where store_id = #{storeId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStore">
     insert into tab_store (store_id, store_info_id, enterprise_id, 
       from_enterprise_id, store_group_id, is_edit_store_group, 

gic-store-service/src/main/resources/mapper/TabStorePhotoMapper.xml

@@ -8,12 +8,12 @@
     <result column="image_code" jdbcType="VARCHAR" property="imageCode" />
     <result column="image_url" jdbcType="VARCHAR" property="imageUrl" />
     <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">
-    store_photo_id, store_info_id, enterprise_id, image_code, image_url, sort, status, create_time, 
+    store_photo_id, store_info_id, enterprise_id, image_code, image_url, sort, delete_flag, create_time,
     update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -22,18 +22,14 @@
     from tab_store_photo
     where store_photo_id = #{storePhotoId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_photo
-    where store_photo_id = #{storePhotoId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStorePhoto">
     insert into tab_store_photo (store_photo_id, store_info_id, enterprise_id, 
       image_code, image_url, sort, 
-      status, create_time, update_time
+      delete_flag, create_time, update_time
       )
     values (#{storePhotoId,jdbcType=INTEGER}, #{storeInfoId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
       #{imageCode,jdbcType=VARCHAR}, #{imageUrl,jdbcType=VARCHAR}, #{sort,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.store.entity.TabStorePhoto">
@@ -57,8 +53,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,
@@ -86,8 +82,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},
@@ -115,8 +111,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},
@@ -134,7 +130,7 @@
       image_code = #{imageCode,jdbcType=VARCHAR},
       image_url = #{imageUrl,jdbcType=VARCHAR},
       sort = #{sort,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where store_photo_id = #{storePhotoId,jdbcType=INTEGER}
@@ -143,22 +139,22 @@
     select
     <include refid="Base_Column_List" />
     from tab_store_photo
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and store_info_id = #{storeInfoId}
   </select>
   <insert id="updateAllStorePhoto">
     insert into tab_store_photo(
-      store_info_id,enterprise_id,image_code,image_url,sort,status,create_time,update_time
+      store_info_id,enterprise_id,image_code,image_url,sort,delete_flag,create_time,update_time
     )
-    select store_info_id,enterprise_id,#{imageCode},#{imageUrl},#{sort},1,now(),now() from tab_store where enterprise_id=#{enterpriseId} and overflow_status=0
+    select store_info_id,enterprise_id,#{imageCode},#{imageUrl},#{sort},0,now(),now() from tab_store where enterprise_id=#{enterpriseId} and overflow_status=0
   </insert>
 
   <insert id="updatePhotoBystoreInfoIds">
     insert into tab_store_photo(
-    store_info_id,enterprise_id,image_code,image_url,sort,status,create_time,update_time
+    store_info_id,enterprise_id,image_code,image_url,sort,delete_flag,create_time,update_time
     )
-    select store_info_id,enterprise_id,#{imageCode},#{imageUrl},#{sort},1,now(),now() from tab_store where
+    select store_info_id,enterprise_id,#{imageCode},#{imageUrl},#{sort},0,now(),now() from tab_store where
     store_info_id in
     <foreach collection="storeInfoIds" index="index" item="storeInfoId" open="(" separator="," close=")">
       #{storeInfoId}
@@ -166,11 +162,11 @@
   </insert>
 
   <update id="deleteAllByEnterpriseId" parameterType="java.lang.Integer">
-    update tab_store_photo set status=0
+    update tab_store_photo set delete_flag=1
     where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
   </update>
   <update id="deleteBystoreInfoIds" parameterType="java.lang.Integer">
-    update tab_store_photo set status=0
+    update tab_store_photo set delete_flag=1
     where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
     and store_info_id in
     <foreach collection="storeInfoIdList" index="index" item="storeInfoId" open="(" separator="," close=")">
@@ -179,17 +175,17 @@
   </update>
   <insert id="addAllStorePhoto">
     insert into tab_store_photo(
-      store_info_id,enterprise_id,image_code,image_url,sort,status,create_time,update_time
+      store_info_id,enterprise_id,image_code,image_url,sort,delete_flag,create_time,update_time
     )
-    select store_info_id,enterprise_id,#{imageCode},#{imageUrl},(select count(1) from tab_store_photo where store_info_id=a.store_info_id and status=1) sort,1,now(),now() from tab_store a where enterprise_id=#{enterpriseId} and overflow_status=0
+    select store_info_id,enterprise_id,#{imageCode},#{imageUrl},(select count(1) from tab_store_photo where store_info_id=a.store_info_id and delete_flag=0) sort,0,now(),now() from tab_store a where enterprise_id=#{enterpriseId} and overflow_status=0
     HAVING sort &lt; 10
   </insert>
 
   <insert id="addPhotoBystoreInfoIds">
     insert into tab_store_photo(
-    store_info_id,enterprise_id,image_code,image_url,sort,status,create_time,update_time
+    store_info_id,enterprise_id,image_code,image_url,sort,delete_flag,create_time,update_time
     )
-    select store_info_id,enterprise_id,#{imageCode},#{imageUrl},(select count(1) from tab_store_photo where store_info_id=a.store_info_id and status=1) sort,1,now(),now() from tab_store a
+    select store_info_id,enterprise_id,#{imageCode},#{imageUrl},(select count(1) from tab_store_photo where store_info_id=a.store_info_id and delete_flag=0) sort,0,now(),now() from tab_store a
     where store_info_id in
     <foreach collection="storeInfoIdList" index="index" item="storeInfoId" open="(" separator="," close=")">
       #{storeInfoId}

gic-store-service/src/main/resources/mapper/TabStoreRegionMapper.xml

@@ -5,7 +5,7 @@
     <id column="region_id" jdbcType="INTEGER" property="regionId" />
     <result column="region_code" jdbcType="VARCHAR" property="regionCode" />
     <result column="region_name" jdbcType="VARCHAR" property="regionName" />
-    <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>
@@ -13,7 +13,7 @@
     <id column="region_id" jdbcType="INTEGER" property="regionId" />
     <result column="region_code" jdbcType="VARCHAR" property="regionCode" />
     <result column="region_name" jdbcType="VARCHAR" property="regionName" />
-    <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="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
@@ -21,10 +21,10 @@
     <result column="own_type" jdbcType="INTEGER" property="ownType" />
   </resultMap>
   <sql id="Base_Column_List">
-    region_id, region_code, region_name, status, create_time, update_time
+    region_id, region_code, region_name, delete_flag, create_time, update_time
   </sql>
   <sql id="Base_Column_List1">
-    ${alias}.region_id, ${alias}.region_code, ${alias}.region_name, ${alias}.status, ${alias}.create_time, ${alias}.update_time
+    ${alias}.region_id, ${alias}.region_code, ${alias}.region_name, ${alias}.delete_flag, ${alias}.create_time, ${alias}.update_time
   </sql>
   <sql id="Base_Column_List2">
     ${alias}.enterprise_id,${alias}.from_enterprise_id, ${alias}.own_Type
@@ -40,7 +40,7 @@
     </include>
     from tab_store_region re, tab_store_region_rel rr
     where re.region_id = rr.region_id
-    and rr.`status` = 1
+    and rr.`delete_flag` = 0
     and rr.enterprise_id = #{enterpriseId}
     and re.region_id = #{regionId}
   </select>
@@ -50,10 +50,10 @@
   </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreRegion">
     insert into tab_store_region (region_id, region_code, region_name, 
-      status, create_time, update_time
+      delete_flag, create_time, update_time
       )
     values (#{regionId,jdbcType=INTEGER}, #{regionCode,jdbcType=VARCHAR}, #{regionName,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.store.entity.TabStoreRegion">
@@ -71,8 +71,8 @@
       <if test="regionName != null">
         region_name,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -91,8 +91,8 @@
       <if test="regionName != null">
         #{regionName,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},
@@ -111,8 +111,8 @@
       <if test="regionName != null">
         region_name = #{regionName,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},
@@ -127,7 +127,7 @@
     update tab_store_region
     set region_code = #{regionCode,jdbcType=VARCHAR},
       region_name = #{regionName,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where region_id = #{regionId,jdbcType=INTEGER}
@@ -143,7 +143,7 @@
     </include>
     from tab_store_region re, tab_store_region_rel rr
     where re.region_id = rr.region_id
-    and rr.`status` = 1
+    and rr.`delete_flag` = 0
     and rr.enterprise_id = #{enterpriseId}
     <if test="search != null and search != '' ">
     and ( re.region_code like concat('%', #{search}, '%') or re.region_name like concat('%', #{search}, '%') )
@@ -158,7 +158,7 @@
     count(1)
     from tab_store_region re, tab_store_region_rel rr
     where re.region_id = rr.region_id
-    and rr.`status` = 1
+    and rr.`delete_flag` = 0
     and rr.enterprise_id = #{enterpriseId}
     <if test="regionCode != null and regionCode != '' ">
       and re.region_code = #{regionCode}
@@ -181,7 +181,7 @@
     </include>
     from tab_store_region re, tab_store_region_rel rr
     where re.region_id = rr.region_id
-    and rr.`status` = 1
+    and rr.`delete_flag` = 0
     and rr.enterprise_id = #{enterpriseId}
     <if test="null != storeRegionIdList and storeRegionIdList.size() &gt; 0">
       and rr.region_id in
@@ -205,8 +205,8 @@
     </include>
     from tab_store_region re, tab_store_region_rel rr
     where re.region_id = rr.region_id
-    and rr.`status` = 1
-    and re.status = 1
+    and rr.`delete_flag` = 0
+    and re.delete_flag = 0
     and rr.enterprise_id = #{enterpriseId}
     and re.region_name = #{regionName}
     limit 1

gic-store-service/src/main/resources/mapper/TabStoreRegionRelMapper.xml

@@ -7,12 +7,12 @@
     <result column="from_enterprise_id" jdbcType="INTEGER" property="fromEnterpriseId" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
     <result column="own_type" jdbcType="INTEGER" property="ownType" />
-    <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">
-    store_region_rel_id, region_id, from_enterprise_id, enterprise_id, own_type, status, 
+    store_region_rel_id, region_id, from_enterprise_id, enterprise_id, own_type, delete_flag,
     create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -27,10 +27,10 @@
   </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreRegionRel">
     insert into tab_store_region_rel (store_region_rel_id, region_id, from_enterprise_id, 
-      enterprise_id, own_type, status, 
+      enterprise_id, own_type, delete_flag,
       create_time, update_time)
     values (#{storeRegionRelId,jdbcType=INTEGER}, #{regionId,jdbcType=INTEGER}, #{fromEnterpriseId,jdbcType=INTEGER}, 
-      #{enterpriseId,jdbcType=INTEGER}, #{ownType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{enterpriseId,jdbcType=INTEGER}, #{ownType,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreRegionRel">
@@ -51,8 +51,8 @@
       <if test="ownType != null">
         own_type,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -77,8 +77,8 @@
       <if test="ownType != null">
         #{ownType,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},
@@ -103,8 +103,8 @@
       <if test="ownType != null">
         own_type = #{ownType,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},
@@ -121,7 +121,7 @@
       from_enterprise_id = #{fromEnterpriseId,jdbcType=INTEGER},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       own_type = #{ownType,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where store_region_rel_id = #{storeRegionRelId,jdbcType=INTEGER}
@@ -130,7 +130,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_store_region_rel
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     and region_id = #{regionId}
   </select>
@@ -140,13 +140,13 @@
     from tab_store_region_rel a left join tab_store_region_rel b on a.region_id = b.region_id
     where a.enterprise_id = #{fromEnterpriseId}
     and a.own_type = 0
-    and a.status = 1
+    and a.delete_flag = 0
     and b.enterprise_id = #{toEnterpriseId}
     and b.own_type = 1
-    and b.status = 1
+    and b.delete_flag = 0
   </select>
   <update id="delByRegionIds">
-    update tab_store_region_rel set status = 0
+    update tab_store_region_rel set delete_flag = 1
     where enterprise_id = #{enterpriseId}
     and region_id in
     <foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
@@ -172,7 +172,7 @@
     limit 1
   </select>
   <update id="updateStatusByOther">
-    update tab_store_region_rel set status = #{status}
+    update tab_store_region_rel set delete_flag = #{deleteFlag}
     where enterprise_id = #{enterpriseId}
     and region_id = #{regionId}
   </update>

gic-store-service/src/main/resources/mapper/TabStoreStatusSettingMapper.xml

@@ -19,10 +19,6 @@
     from tab_store_status_setting
     where store_status_id = #{storeStatusId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_status_setting
-    where store_status_id = #{storeStatusId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreStatusSetting">
     insert into tab_store_status_setting (store_status_id, region_id, days, 
       value, enterprise_id, create_time, update_time)

gic-store-service/src/main/resources/mapper/TabStoreStrategyMapper.xml

@@ -10,14 +10,14 @@
     <result column="target_value" jdbcType="VARCHAR" property="targetValue" />
     <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" />
     <result column="strategy_type" jdbcType="INTEGER" property="strategyType" />
     <result column="sort" jdbcType="DOUBLE" property="sort" />
     <result column="store_create_type" jdbcType="VARCHAR" property="storeCreateType" />
   </resultMap>
   <sql id="Base_Column_List">
     strategy_id, strategy_name, enterprise_id, store_region_id, conditions, target_value,
-    create_time, update_time, status, strategy_type, sort, store_create_type
+    create_time, update_time, delete_flag, strategy_type, sort, store_create_type
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -25,18 +25,14 @@
     from tab_store_strategy
     where strategy_id = #{strategyId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_strategy
-    where strategy_id = #{strategyId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreStrategy" useGeneratedKeys="true" keyProperty="strategyId">
     insert into tab_store_strategy (strategy_id, strategy_name, enterprise_id, 
       store_region_id, conditions, target_value,
-      create_time, update_time, status, 
+      create_time, update_time, delete_flag,
       strategy_type, sort, store_create_type)
     values (#{strategyId,jdbcType=INTEGER}, #{strategyName,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=INTEGER}, 
       #{storeRegionId,jdbcType=INTEGER}, #{conditions,jdbcType=VARCHAR}, #{targetValue,jdbcType=VARCHAR},
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER},
       #{strategyType,jdbcType=INTEGER}, #{sort,jdbcType=DOUBLE}, #{storeCreateType,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreStrategy">
@@ -66,8 +62,8 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="strategyType != null">
         strategy_type,
@@ -104,8 +100,8 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="strategyType != null">
         #{strategyType,jdbcType=INTEGER},
@@ -142,8 +138,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>
       <if test="strategyType != null">
         strategy_type = #{strategyType,jdbcType=INTEGER},
@@ -166,7 +162,7 @@
       target_value = #{targetValue,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       strategy_type = #{strategyType,jdbcType=INTEGER},
       sort = #{sort,jdbcType=DOUBLE},
       store_create_type = #{storeCreateType,jdbcType=VARCHAR}
@@ -178,7 +174,7 @@
     select
     count(1)
     from tab_store_strategy
-    where status = 1
+    where delete_flag = 0
     <if test="strategyName != null">
       and strategy_name = #{strategyName,jdbcType=VARCHAR}
     </if>
@@ -200,7 +196,7 @@
     where enterprise_id = #{enterpriseId}
     and strategy_type = #{strategyType}
     and sort > #{sort}
-    and status = 1
+    and delete_flag = 0
     order by sort
     limit 1
   </select>
@@ -212,17 +208,17 @@
     where enterprise_id = #{enterpriseId}
     and strategy_type = #{strategyType}
     and sort &lt; #{sort}
-    and status = 1
+    and delete_flag = 0
     order by sort desc
     limit 1
   </select>
 
   <select id="getMinSort" resultType="java.lang.Double">
-    select sort from tab_store_strategy where enterprise_id = #{enterpriseId} and strategy_type = #{strategyType} and status = 1 order by sort limit 0, 1
+    select sort from tab_store_strategy where enterprise_id = #{enterpriseId} and strategy_type = #{strategyType} and delete_flag = 0 order by sort limit 0, 1
   </select>
 
   <select id="getMaxSort" resultType="java.lang.Double">
-    select sort from tab_store_strategy where enterprise_id = #{enterpriseId} and strategy_type = #{strategyType} and status = 1 order by sort desc limit 0, 1
+    select sort from tab_store_strategy where enterprise_id = #{enterpriseId} and strategy_type = #{strategyType} and delete_flag = 0 order by sort desc limit 0, 1
   </select>
 
   <select id="listTwoElementExceptId" resultMap="BaseResultMap">
@@ -232,7 +228,7 @@
     where  strategy_id &lt;&gt; #{strategyId}
     and enterprise_id = #{enterpriseId}
     and strategy_type = #{strategyType}
-    and status = 1
+    and delete_flag = 0
     order by sort
     limit #{start}, #{size}
   </select>
@@ -246,7 +242,7 @@
     <if test="search != null and search != '' ">
       and strategy_name like concat('%', #{search}, '%')
     </if>
-    and status = 1
+    and delete_flag = 0
     order by sort
   </select>
 </mapper>
\ No newline at end of file

gic-store-service/src/main/resources/mapper/TabStoreTagMapper.xml

@@ -6,12 +6,12 @@
     <result column="store_widget_id" jdbcType="INTEGER" property="storeWidgetId" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
     <result column="store_tag_name" jdbcType="VARCHAR" property="storeTagName" />
-    <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">
-    store_tag_id, store_widget_id, enterprise_id, store_tag_name, status, create_time, 
+    store_tag_id, store_widget_id, enterprise_id, store_tag_name, delete_flag, create_time,
     update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -20,16 +20,12 @@
     from tab_store_tag
     where store_tag_id = #{storeTagId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_tag
-    where store_tag_id = #{storeTagId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreTag" useGeneratedKeys="true" keyProperty="storeTagId">
     insert into tab_store_tag (store_tag_id, store_widget_id, enterprise_id, 
-      store_tag_name, status, create_time, 
+      store_tag_name, delete_flag, create_time,
       update_time)
     values (#{storeTagId,jdbcType=INTEGER}, #{storeWidgetId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
-      #{storeTagName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{storeTagName,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreTag">
@@ -47,8 +43,8 @@
       <if test="storeTagName != null">
         store_tag_name,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -70,8 +66,8 @@
       <if test="storeTagName != null">
         #{storeTagName,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},
@@ -93,8 +89,8 @@
       <if test="storeTagName != null">
         store_tag_name = #{storeTagName,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},
@@ -110,7 +106,7 @@
     set store_widget_id = #{storeWidgetId,jdbcType=INTEGER},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       store_tag_name = #{storeTagName,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where store_tag_id = #{storeTagId,jdbcType=INTEGER}
@@ -119,7 +115,7 @@
   <select id="listByEnterprise" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include>
     from tab_store_tag
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
 
     order by update_time desc

gic-store-service/src/main/resources/mapper/TabStoreTagTmpMapper.xml

@@ -21,10 +21,6 @@
     from tab_store_tag_tmp
     where store_tag_tmp_id = #{storeTagTmpId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_tag_tmp
-    where store_tag_tmp_id = #{storeTagTmpId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreTagTmp">
     insert into tab_store_tag_tmp (store_tag_tmp_id, enterprise_id, store_name, 
       store_code, region_name, error_message, 

gic-store-service/src/main/resources/mapper/TabStoreTmpMapper.xml

@@ -41,10 +41,6 @@
     from tab_store_tmp
     where store_tmp_id = #{storeTmpId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_tmp
-    where store_tmp_id = #{storeTmpId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreTmp">
     insert into tab_store_tmp (store_tmp_id, enterprise_id, region_id, 
       region_name, store_name, store_code, 

gic-store-service/src/main/resources/mapper/TabStoreTransferMapper.xml

@@ -10,11 +10,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="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
     store_transfer_id, from_store_id, from_store_info_id, to_store_id, to_store_info_id, 
-    enterprise_id, create_time, update_time, status
+    enterprise_id, create_time, update_time, delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -22,18 +22,14 @@
     from tab_store_transfer
     where store_transfer_id = #{storeTransferId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_transfer
-    where store_transfer_id = #{storeTransferId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreTransfer">
     insert into tab_store_transfer (store_transfer_id, from_store_id, from_store_info_id, 
       to_store_id, to_store_info_id, enterprise_id, 
-      create_time, update_time, status
+      create_time, update_time, delete_flag
       )
     values (#{storeTransferId,jdbcType=INTEGER}, #{fromStoreId,jdbcType=INTEGER}, #{fromStoreInfoId,jdbcType=INTEGER}, 
       #{toStoreId,jdbcType=INTEGER}, #{toStoreInfoId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
-      #{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.store.entity.TabStoreTransfer">
@@ -63,8 +59,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=",">
@@ -92,8 +88,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>
@@ -121,8 +117,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 store_transfer_id = #{storeTransferId,jdbcType=INTEGER}
@@ -136,7 +132,7 @@
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER}
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where store_transfer_id = #{storeTransferId,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file

gic-store-service/src/main/resources/mapper/TabStoreWidgetMapper.xml

@@ -7,14 +7,14 @@
     <result column="auth_search_param" jdbcType="VARCHAR" property="authSearchParam" />
     <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" />
     <result column="auth_mode" jdbcType="INTEGER" property="authMode" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.gic.store.entity.TabStoreWidget">
     <result column="write_back_param" jdbcType="LONGVARCHAR" property="writeBackParam" />
   </resultMap>
   <sql id="Base_Column_List">
-    store_widget_id, search_param, auth_search_param, create_time, update_time, status, auth_mode
+    store_widget_id, search_param, auth_search_param, create_time, update_time, delete_flag, auth_mode
   </sql>
   <sql id="Blob_Column_List">
     write_back_param
@@ -27,18 +27,14 @@
     from tab_store_widget
     where store_widget_id = #{storeWidgetId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_store_widget
-    where store_widget_id = #{storeWidgetId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreWidget">
     <selectKey keyProperty="storeWidgetId" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into tab_store_widget (store_widget_id, search_param, auth_search_param, 
-      create_time, update_time, status, write_back_param, auth_mode)
+      create_time, update_time, delete_flag, write_back_param, auth_mode)
     values (#{storeWidgetId,jdbcType=INTEGER}, #{searchParam,jdbcType=VARCHAR}, #{authSearchParam,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER},
       #{writeBackParam,jdbcType=LONGVARCHAR}, #{authMode,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreWidget">
@@ -62,8 +58,8 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="writeBackParam != null">
         write_back_param,
@@ -88,8 +84,8 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="writeBackParam != null">
         #{writeBackParam,jdbcType=LONGVARCHAR},
@@ -114,8 +110,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>
       <if test="writeBackParam != null">
         write_back_param = #{writeBackParam,jdbcType=LONGVARCHAR},
@@ -132,7 +128,7 @@
       auth_search_param = #{authSearchParam,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       write_back_param = #{writeBackParam,jdbcType=LONGVARCHAR},
       auth_mode = #{authMode,jdbcType=INTEGER}
     where store_widget_id = #{storeWidgetId,jdbcType=INTEGER}
@@ -143,7 +139,7 @@
       auth_search_param = #{authSearchParam,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       auth_mode = #{authMode,jdbcType=INTEGER}
     where store_widget_id = #{storeWidgetId,jdbcType=INTEGER}
   </update>

gic-store-service/src/main/resources/mapper/TabUserMapper.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.store.dao.mapper.TabUserMapper">
-  <resultMap id="BaseResultMap" type="com.gic.store.entity.TabUser">
-    <id column="user_id" jdbcType="INTEGER" property="userId" />
-    <result column="user_name" jdbcType="VARCHAR" property="userName" />
-    <result column="phone_number" jdbcType="VARCHAR" property="phoneNumber" />
-    <result column="password" jdbcType="VARCHAR" property="password" />
-    <result column="super_admin" jdbcType="INTEGER" property="superAdmin" />
-    <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="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    user_id, user_name, phone_number, password, super_admin, status, create_time, update_time, 
-    enterprise_id
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from tab_user
-    where user_id = #{userId,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_user
-    where user_id = #{userId,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.gic.store.entity.TabUser">
-    insert into tab_user (user_id, user_name, phone_number, 
-      password, super_admin, status, 
-      create_time, update_time, enterprise_id
-      )
-    values (#{userId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{phoneNumber,jdbcType=VARCHAR}, 
-      #{password,jdbcType=VARCHAR}, #{superAdmin,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=INTEGER}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.gic.store.entity.TabUser">
-    insert into tab_user
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="userId != null">
-        user_id,
-      </if>
-      <if test="userName != null">
-        user_name,
-      </if>
-      <if test="phoneNumber != null">
-        phone_number,
-      </if>
-      <if test="password != null">
-        password,
-      </if>
-      <if test="superAdmin != null">
-        super_admin,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="enterpriseId != null">
-        enterprise_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="userId != null">
-        #{userId,jdbcType=INTEGER},
-      </if>
-      <if test="userName != null">
-        #{userName,jdbcType=VARCHAR},
-      </if>
-      <if test="phoneNumber != null">
-        #{phoneNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="superAdmin != null">
-        #{superAdmin,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="enterpriseId != null">
-        #{enterpriseId,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gic.store.entity.TabUser">
-    update tab_user
-    <set>
-      <if test="userName != null">
-        user_name = #{userName,jdbcType=VARCHAR},
-      </if>
-      <if test="phoneNumber != null">
-        phone_number = #{phoneNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        password = #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="superAdmin != null">
-        super_admin = #{superAdmin,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="enterpriseId != null">
-        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
-      </if>
-    </set>
-    where user_id = #{userId,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.gic.store.entity.TabUser">
-    update tab_user
-    set user_name = #{userName,jdbcType=VARCHAR},
-      phone_number = #{phoneNumber,jdbcType=VARCHAR},
-      password = #{password,jdbcType=VARCHAR},
-      super_admin = #{superAdmin,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      enterprise_id = #{enterpriseId,jdbcType=INTEGER}
-    where user_id = #{userId,jdbcType=INTEGER}
-  </update>
-</mapper>
\ No newline at end of file

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java

@@ -18,6 +18,7 @@ import com.gic.enterprise.service.QrCodeApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.store.constant.ClerkLogReasonEnum;
+import com.gic.store.constant.ClerkSearchTypeEnum;
 import com.gic.store.dto.ClerkDTO;
 import com.gic.store.dto.ClerkLogDTO;
 import com.gic.store.dto.ClerkSearchDTO;
@@ -84,6 +85,12 @@ public class ClerkController extends DownloadUtils {
     @RequestMapping("/export-clerk")
     public RestResponse exportClerk(HttpServletRequest request, @RequestBody ClerkSearchDTO clerkSearchDTO) {
         clerkSearchDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (ClerkSearchTypeEnum.STORE.getType().equals(clerkSearchDTO.getSearchType())) {
+            // 如果是查询门店 查询参数其实是storeSearch
+            String search = clerkSearchDTO.getSearch();
+            clerkSearchDTO.setStoreSearch(search);
+            clerkSearchDTO.setSearch(null);
+        }
         ServiceResponse<Integer> totalClerkServiceResponse = clerkApiService.getTotalClerk(UserDetailUtils.getUserDetail().getEnterpriseId(), clerkSearchDTO);
         if (totalClerkServiceResponse.getResult() == 0) {
             return RestResponse.failure(ErrorCode.NOTEXISTS.getCode(), ErrorCode.NOTEXISTS.getMsg());
@@ -161,7 +168,12 @@ public class ClerkController extends DownloadUtils {
         if (CollectionUtils.isNotEmpty(list)) {
             clerkQrcodeQO.setContent(list.stream().filter(Objects::nonNull).collect(Collectors.toList()));
         }
-
+        if (clerkQrcodeQO.getClerkSearchDTO() != null && ClerkSearchTypeEnum.STORE.getType().equals(clerkQrcodeQO.getClerkSearchDTO().getSearchType())) {
+            // 如果是查询门店 查询参数其实是storeSearch
+            String search = clerkQrcodeQO.getClerkSearchDTO().getSearch();
+            clerkQrcodeQO.getClerkSearchDTO().setStoreSearch(search);
+            clerkQrcodeQO.getClerkSearchDTO().setSearch(null);
+        }
         int total = 0;
         if(clerkQrcodeQO.getIsAll() == 1){
             ClerkSearchDTO clerkSearchDTO = clerkQrcodeQO.getClerkSearchDTO();
@@ -252,6 +264,12 @@ public class ClerkController extends DownloadUtils {
     public RestResponse listClerk(@RequestBody ClerkSearchDTO clerkSearchDTO) {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         clerkSearchDTO.setEnterpriseId(enterpriseId);
+        if (ClerkSearchTypeEnum.STORE.getType().equals(clerkSearchDTO.getSearchType())) {
+            // 如果是查询门店 查询参数其实是storeSearch
+            String search = clerkSearchDTO.getSearch();
+            clerkSearchDTO.setStoreSearch(search);
+            clerkSearchDTO.setSearch(null);
+        }
         ServiceResponse serviceResponse = clerkApiService.listClerk(enterpriseId, clerkSearchDTO, clerkSearchDTO.getCurrentPage(), clerkSearchDTO.getPageSize());
         if (serviceResponse.isSuccess()) {
             return RestResponse.success(serviceResponse.getResult());
@@ -275,6 +293,12 @@ public class ClerkController extends DownloadUtils {
     public RestResponse countClerk(@RequestBody ClerkSearchDTO clerkSearchDTO) {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         clerkSearchDTO.setEnterpriseId(enterpriseId);
+        if (ClerkSearchTypeEnum.STORE.getType().equals(clerkSearchDTO.getSearchType())) {
+            // 如果是查询门店 查询参数其实是storeSearch
+            String search = clerkSearchDTO.getSearch();
+            clerkSearchDTO.setStoreSearch(search);
+            clerkSearchDTO.setSearch(null);
+        }
         clerkSearchDTO.setStatus(1);
         ServiceResponse serviceResponse = clerkApiService.getTotalClerk(enterpriseId, clerkSearchDTO);
         if (serviceResponse.isSuccess()) {

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkImportController.java

@@ -103,6 +103,7 @@ public class ClerkImportController {
      * @throws IOException
      */
     @RequestMapping("/clerk-tmp-file-upload")
+    @HeaderSignIgnore
     public RestResponse fileUpload(HttpServletRequest request, MultipartFile file, PageQO pageQO) throws IOException {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         if (file == null || file.isEmpty()) {

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -118,6 +118,7 @@ public class StoreController extends DownloadUtils {
     @RequestMapping("/save-store")
     public RestResponse saveOrUpdate(@Validated({StoreQO.SaveValidView.class}) StoreQO storeQO, ClerkQO clerkQO) {
         logger.info("门店参数：{}", JSON.toJSONString(storeQO));
+        logger.info("导购参数：{}", JSON.toJSONString(clerkQO));
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         StoreDTO storeDTO = EntityUtil.changeEntityByOrika(StoreDTO.class, storeQO);
         storeDTO.setEnterpriseId(enterpriseId);
@@ -144,10 +145,9 @@ public class StoreController extends DownloadUtils {
         storeDTO.setOperatorId(UserDetailUtils.getUserDetail().getUserId());
         storeDTO.setOperatorName(UserDetailUtils.getUserDetail().getUserInfo().getUserName());
         // 保存店长
-        if (storeQO.getStoreId() == null) {
         ClerkDTO saveClerk = getSaveClerk(clerkQO);
         storeDTO.setClerkLeader(saveClerk);
-        }
+
         ServiceResponse<StoreDTO> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
         if (serviceResponse.isSuccess()) {
             LogUtils.createLog((storeQO.getStoreId() == null ? "新增" : "编辑") + "门店", storeQO.getStoreName());
@@ -398,6 +398,10 @@ public class StoreController extends DownloadUtils {
             if (StringUtils.isNotBlank(cacheStoreId)) {
                 return RestResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "请其他门店会员转移完毕后再试");
             }
+            StoreDTO storeDTO = storeApiService.getStoreById(UserDetailUtils.getUserDetail().getEnterpriseId(), memberTransStoreId).getResult();
+            if (StringUtils.isBlank(storeDTO.getBrandIds())) {
+                return RestResponse.failure(ErrorCode.UNKNOWN_ERROR.getCode(), "该门店无店招品牌信息，请完善后再执行此操作");
+            }
         }
 
         ServiceResponse response = this.storeApiService.bulkUpdateStore(storeIds, value, enterpriseId, type, UserDetailUtils.getUserDetail().getUserId(), UserDetailUtils.getUserDetail().getUserInfo().getUserName());
@@ -406,7 +410,10 @@ public class StoreController extends DownloadUtils {
                 // 如果是批量修改状态 要转移门店
                 ServiceResponse<Void> serviceResponse = storeTransferApiService.save(UserDetailUtils.getUserDetail().getEnterpriseId(), storeIds, toStoreId);
             }
-            tranMemberStore(storeIds, memberTransStoreId, memberTransType);
+            ServiceResponse<Boolean> serviceResponse = tranMemberStore(storeIds, memberTransStoreId, memberTransType);
+            if (serviceResponse != null && !serviceResponse.isSuccess()) {
+                logger.warn("转移会员失败:{}", serviceResponse.getMessage());
+            }
             // 写日志
             String[] storeArr = storeIds.split(",");
             StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
@@ -436,7 +443,7 @@ public class StoreController extends DownloadUtils {
         return EnterpriseRestResponse.failure(response);
     }
 
-    private void tranMemberStore(String storeIds, Integer memberTransStoreId, Integer memberTransType) {
+    private ServiceResponse<Boolean> tranMemberStore(String storeIds, Integer memberTransStoreId, Integer memberTransType) {
         if (memberTransStoreId != null && memberTransType != null) {
             List<StoreDTO> storeInfoList;
             StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
@@ -447,10 +454,16 @@ public class StoreController extends DownloadUtils {
                 storeSearchDTO.setStoreIds(storeIds.replace(',', ' '));
                 storeInfoList = this.storeApiService.listStore(storeSearchDTO, 1, storeIds.split(" ").length, "storeInfoId").getResult().getResult();
             }
-            Integer storeInfoId = storeApiService.getStoreById(UserDetailUtils.getUserDetail().getEnterpriseId(), memberTransStoreId).getResult().getStoreInfoId();
+            StoreDTO storeDTO = storeApiService.getStoreById(UserDetailUtils.getUserDetail().getEnterpriseId(), memberTransStoreId).getResult();
+            if (StringUtils.isBlank(storeDTO.getBrandIds())) {
+                return ServiceResponse.failure(ErrorCode.UNKNOWN_ERROR.getCode(), "该门店无店招品牌信息，请完善后再执行此操作");
+            }
+            Integer storeInfoId = storeDTO.getStoreInfoId();
             List<Integer> storeInfoIdList = storeInfoList.stream().map(StoreInfoDTO::getStoreInfoId).collect(Collectors.toList());
-            userOwnerApiService.transferStore(UserDetailUtils.getUserDetail().getEnterpriseId(), storeInfoIdList, storeInfoId, memberTransType);
+            ServiceResponse<Boolean> serviceResponse = userOwnerApiService.transferStore(UserDetailUtils.getUserDetail().getEnterpriseId(), storeInfoIdList, storeInfoId, memberTransType);
+            return serviceResponse;
         }
+        return null;
     }
 
     @RequestMapping("list-store-export-field")
@@ -645,7 +658,10 @@ public class StoreController extends DownloadUtils {
         if (StringUtils.isNotBlank(cacheStoreId)) {
             return RestResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "请其他门店会员转移完毕后再试");
         }
-        tranMemberStore(storeId, toStoreId, memberTransType);
+        ServiceResponse<Boolean> serviceResponse = tranMemberStore(storeId, toStoreId, memberTransType);
+        if (serviceResponse != null && !serviceResponse.isSuccess()) {
+            return EnterpriseRestResponse.failure(ErrorCode.UNKNOWN_ERROR.getCode(), serviceResponse.getMessage());
+        }
         cacheMap.put(UserDetailUtils.getUserDetail().getEnterpriseId(), storeId);
         String[] split = storeId.split(",");
         for (String store : split) {
@@ -911,6 +927,8 @@ public class StoreController extends DownloadUtils {
 
 
     private void convertTranMember(List<StoreDTO> result) {
+        try {
+
             this.hasTransMember();
             RedissonClient redisClient = RedisUtil.getRedisClient();
             RMap<Integer, String> cacheMap = redisClient.getMap("enterprise:store:transfermember:process");
@@ -922,6 +940,10 @@ public class StoreController extends DownloadUtils {
             for (StoreDTO storeDTO : result) {
                 storeDTO.setHasTransMember(storeIdList.contains(storeDTO.getStoreId()) ? 1 : 0);
             }
+        } catch (Exception e) {
+            logger.info("批量转移门店状态错误", e);
+        }
+
     }
 
     /**

gic-store-web/src/main/java/com/gic/store/web/controller/StoreImportController.java

@@ -116,6 +116,7 @@ public class StoreImportController {
      * @throws IOException
      */
     @RequestMapping("/store-tmp-file-upload")
+    @HeaderSignIgnore
     public RestResponse fileUpload(HttpServletRequest request, MultipartFile file, PageQO pageQO) throws IOException {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         if (file == null || file.isEmpty()) {

gic-store-web/src/main/java/com/gic/store/web/qo/storestrategy/StoreStrategyQO.java

@@ -58,7 +58,6 @@ public class StoreStrategyQO implements Serializable{
     /**
      * 门店分组条件，json数组
      */
-    @NotBlank(message = "门店属性条件配置不能为空", groups = {SaveValidView.class})
     private String conditions;
 
     /**