Skip to content

G
gic-store
Commit 0a9f9209 by zhiwj
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !39
parents ad7883b1 50dfd4bd
Showing with 498 additions and 1023 deletions
gic-store-api/src/main/java/com/gic/store/constant/ClerkSearchTypeEnum.java 0 → 100644
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 deleted 100644 → 0
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 deleted 100644 → 0
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 deleted 100644 → 0
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 deleted 100644 → 0
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())) {
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())) {
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.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,31 +178,41 @@ 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 {
ServiceResponse<StoreDTO> existStore = this.getStoreById(storeDTO.getEnterpriseId(), storeDTO.getStoreId());
storeDTO.setStoreInfoId(existStore.getResult().getStoreInfoId());
storeDTO.setStatus(existStore.getResult().getStatus());
Integer update = storeService.update(storeDTO);
if (update == 0) {
return ServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), ErrorCode.NOTEXISTS.getMsg());
}
// 记录门店日志
try {
saveUpdateLog(existStore.getResult(), storeDTO);
} catch (Exception e) {
logger.warn("门店编辑日志记录错误", e);
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());
Integer update = storeService.update(storeDTO);
if (update == 0) {
return ServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), ErrorCode.NOTEXISTS.getMsg());
}
// 记录门店日志
try {
saveUpdateLog(existStore.getResult(), storeDTO);
} catch (Exception e) {
logger.warn("门店编辑日志记录错误", e);
}
//修改门店同步到微盟
updateStoreToWm(storeDTO);
}catch (Exception e){
logger.warn("门店更新异常", e);
}finally {
RedisUtil.unlock(lock);
}
//修改门店同步到微盟
updateStoreToWm(storeDTO);
}
// 保存店长 如果店长保存失败 回滚数据
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(), "门店分组策略条件不能为空");
String errorMessage = validParam(storeStrategyDTO);
if (StringUtils.isNotBlank(errorMessage)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), errorMessage);
}
//是否是门店启用状态没有选择条件，即所有门店策略
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(), "策略名称不能重复");
}
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 0 → 100644
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 deleted 100644 → 0
<?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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment