Skip to content

G
gic-store
Commit 05dd38e2 by guojuxing
Options

tab_store&tab_store_field_rel&tab_store_region_rel&tab_store_brand_ref own_type改成owner_flag

parent dd517567
Showing with 279 additions and 336 deletions
gic-store-api/src/main/java/com/gic/store/constant/StoreESFieldsEnum.java
......@@ -118,7 +118,7 @@ public enum StoreESFieldsEnum {
/**
* 门店是否共享
*/
OWNTYPE("ownType", "门店是否共享"),
OWNERFLAG("ownerFlag", "门店是否共享"),
/**
* 门店图片
*/
......
gic-store-api/src/main/java/com/gic/store/constant/StoreOwnTypeEnum.java → gic-store-api/src/main/java/com/gic/store/constant/StoreOwnerFlagEnum.java
package com.gic.store.constant;
/**
* 授权者、被授权
* @ClassName: StoreOwnTypeEnum

* @ClassName: =

* @Description: 

* @author guojuxing

* @date 2019/9/23 9:39 AM

*/
public enum StoreOwnTypeEnum {
public enum StoreOwnerFlagEnum {
/**
* owner
*/
OWNER(0, "owner"),
OWNER(1, "owner"),
/**
* other
*/
OTHER(1, "other");
OTHER(0, "other");
private int code;
private String message;
private StoreOwnTypeEnum(int code, String message) {
private StoreOwnerFlagEnum(int code, String message) {
this.code = code;
this.message = message;
}
......@@ -36,8 +36,8 @@ public enum StoreOwnTypeEnum {
if (code == null) {
return false;
}
for (StoreOwnTypeEnum ownTypeEnum : values()) {
if (code.intValue() == ownTypeEnum.getCode()) {
for (StoreOwnerFlagEnum ownerFlagEnum : values()) {
if (code.intValue() == ownerFlagEnum.getCode()) {
return true;
}
}
......
gic-store-api/src/main/java/com/gic/store/dto/ClerkStoreListDTO.java
......@@ -27,7 +27,6 @@ public class ClerkStoreListDTO implements Serializable {
private String storeName;
private String storeCode;
private List<ClerkDTO> clerkList;
private Integer ownType;
private Integer fromEnterpriseId;
private String fromEnterpriseName;
......@@ -83,14 +82,6 @@ public class ClerkStoreListDTO implements Serializable {
this.clerkList = clerkList;
}
public void setOwnType(Integer ownType) {
this.ownType = ownType;
}
public Integer getOwnType() {
return ownType;
}
public Integer getFromEnterpriseId() {
return fromEnterpriseId;
}
......@@ -110,10 +101,7 @@ public class ClerkStoreListDTO implements Serializable {
}
public Integer getOwnerFlag() {
if (ownType != null && ownType == 1) {
return 0;
}
return 1;
return ownerFlag;
}
public ClerkStoreListDTO setOwnerFlag(Integer ownerFlag) {
......@@ -147,7 +135,6 @@ public class ClerkStoreListDTO implements Serializable {
", storeName='" + storeName + '\'' +
", storeCode='" + storeCode + '\'' +
", clerkList=" + clerkList +
", ownType=" + ownType +
", fromEnterpriseId=" + fromEnterpriseId +
", fromEnterpriseName='" + fromEnterpriseName + '\'' +
", ownerFlag=" + ownerFlag +
......
gic-store-api/src/main/java/com/gic/store/dto/StoreBrandDTO.java
......@@ -59,8 +59,6 @@ public class StoreBrandDTO implements Serializable {
private Integer seq;
private Integer hasRel;
/**1自有 2共享*/
private Integer type;
private Integer fromEnterpriseId;
......@@ -163,19 +161,8 @@ public class StoreBrandDTO implements Serializable {
this.hasRel = hasRel;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public Integer getOwnerFlag() {
if (type != null && type == OTHER_ENTERPRISE_TYPE) {
return 0;
}
return 1;
return ownerFlag;
}
public StoreBrandDTO setOwnerFlag(Integer ownerFlag) {
......@@ -215,7 +202,6 @@ public class StoreBrandDTO implements Serializable {
", updateTime=" + updateTime +
", seq=" + seq +
", hasRel=" + hasRel +
", type=" + type +
", ownerFlag=" + ownerFlag +
", ownerEntName='" + ownerEntName + '\'' +
", fromEnterpriseId='" + fromEnterpriseId + '\'' +
......
gic-store-api/src/main/java/com/gic/store/dto/StoreDTO.java
......@@ -24,10 +24,8 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
*
*/
private Integer enterpriseId;
/**
* 是否共享 1是0否
*/
private Integer ownType;
/**
*
......@@ -94,14 +92,6 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
this.storeGroupId = storeGroupId;
}
public Integer getOwnType() {
return ownType;
}
public void setOwnType(Integer ownType) {
this.ownType = ownType;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
......@@ -255,10 +245,7 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
}
public Integer getOwnerFlag() {
if (ownType != null && ownType == 1) {
return 0;
}
return 1;
return ownerFlag;
}
public StoreDTO setOwnerFlag(Integer ownerFlag) {
......@@ -280,7 +267,6 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
return "StoreDTO{" +
"storeId=" + storeId +
", enterpriseId=" + enterpriseId +
", ownType=" + ownType +
", storeGroupId=" + storeGroupId +
", storeGroupIdList=" + storeGroupIdList +
", storeGroupName='" + storeGroupName + '\'' +
......
gic-store-api/src/main/java/com/gic/store/dto/StoreDictDTO.java
......@@ -49,9 +49,9 @@ public class StoreDictDTO implements Serializable {
private Integer checked=0;
/**
* 0：owner 1：other
* 共享标记 1:自有 0：共享
*/
private Integer ownType = 0;
private Integer ownerFlag;
private List<StoreDictDTO> storeDictList;
public Integer getStoreDictId() {
......@@ -118,12 +118,13 @@ public class StoreDictDTO implements Serializable {
this.key = key;
}
public Integer getOwnType() {
return ownType;
public Integer getOwnerFlag() {
return ownerFlag;
}
public void setOwnType(Integer ownType) {
this.ownType = ownType;
public StoreDictDTO setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
public void setStoreDictList(List<StoreDictDTO> storeDictList) {
......@@ -145,7 +146,7 @@ public class StoreDictDTO implements Serializable {
", createTime=" + createTime +
", updateTime=" + updateTime +
", checked=" + checked +
", ownType=" + ownType +
", ownerFlag=" + ownerFlag +
", storeDictList=" + storeDictList +
'}';
}
......
gic-store-api/src/main/java/com/gic/store/dto/StoreEsDTO.java
......@@ -33,7 +33,10 @@ public class StoreEsDTO implements Serializable {
private Integer realStatus;
private List<String> areaIds;
private String id;
private Integer ownType;
/**
* 共享标记 1:自有 0：共享
*/
private Integer ownerFlag;
private List<StorePhotoDTO> photoList;
private List<StoreBusinessTimeDTO> businessTimeList;
private String location;
......@@ -230,12 +233,13 @@ public class StoreEsDTO implements Serializable {
this.storeInfoId = storeInfoId;
}
public Integer getOwnType() {
return ownType;
public Integer getOwnerFlag() {
return ownerFlag;
}
public void setOwnType(Integer ownType) {
this.ownType = ownType;
public StoreEsDTO setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
public List<StorePhotoDTO> getPhotoList() {
......@@ -346,7 +350,6 @@ public class StoreEsDTO implements Serializable {
", realStatus=" + realStatus +
", areaIds=" + areaIds +
", id='" + id + '\'' +
", ownType=" + ownType +
", photoList=" + photoList +
", businessTimeList=" + businessTimeList +
", location='" + location + '\'' +
......@@ -357,6 +360,7 @@ public class StoreEsDTO implements Serializable {
", updateTime=" + updateTime +
", fromEnterpriseId=" + fromEnterpriseId +
", fromEnterpriseName=" + fromEnterpriseName +
", ownerFlag=" + ownerFlag +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreFieldDTO.java
......@@ -93,9 +93,9 @@ public class StoreFieldDTO implements Serializable {
private Integer seq;
/**
* 0:owner 1:other 授权者和被授权
* 共享标记 1:自有 0：共享
*/
private Integer ownType;
private Integer ownerFlag;
public Integer getStoreFieldId() {
return storeFieldId;
......@@ -201,12 +201,13 @@ public class StoreFieldDTO implements Serializable {
this.seq = seq;
}
public Integer getOwnType() {
return ownType;
public Integer getOwnerFlag() {
return ownerFlag;
}
public void setOwnType(Integer ownType) {
this.ownType = ownType;
public StoreFieldDTO setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
@Override
......@@ -225,7 +226,7 @@ public class StoreFieldDTO implements Serializable {
", erpRelCode='" + erpRelCode + '\'' +
", sort=" + sort +
", seq=" + seq +
", ownType=" + ownType +
", ownerFlag=" + ownerFlag +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreFieldRelDTO.java
......@@ -28,9 +28,9 @@ public class StoreFieldRelDTO implements Serializable{
private Integer storeFieldId;
/**
* 0:owner 1:other 授权者和被授权
* 共享标记 1:自有 0：共享
*/
private Integer ownType;
private Integer ownerFlag;
/**
*
......@@ -71,12 +71,13 @@ public class StoreFieldRelDTO implements Serializable{
this.storeFieldId = storeFieldId;
}
public Integer getOwnType() {
return ownType;
public Integer getOwnerFlag() {
return ownerFlag;
}
public void setOwnType(Integer ownType) {
this.ownType = ownType;
public StoreFieldRelDTO setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
public Integer getDeleteFlag() {
......@@ -109,7 +110,7 @@ public class StoreFieldRelDTO implements Serializable{
"fieldRelationId=" + fieldRelationId +
", enterpriseId=" + enterpriseId +
", storeFieldId=" + storeFieldId +
", ownType=" + ownType +
", ownerFlag=" + ownerFlag +
", status=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
......
gic-store-api/src/main/java/com/gic/store/dto/StoreRegionDTO.java
......@@ -52,7 +52,6 @@ public class StoreRegionDTO implements Serializable {
private Integer fromEnterpriseId;
private Integer ownType;
private String shareEnterpriseName;
/***********前端使用字段*********/
......@@ -130,14 +129,6 @@ public class StoreRegionDTO implements Serializable {
this.fromEnterpriseId = fromEnterpriseId;
}
public Integer getOwnType() {
return ownType;
}
public void setOwnType(Integer ownType) {
this.ownType = ownType;
}
public void setShareEnterpriseName(String shareEnterpriseName) {
this.shareEnterpriseName = shareEnterpriseName;
}
......@@ -155,10 +146,7 @@ public class StoreRegionDTO implements Serializable {
}
public Integer getOwnerFlag() {
if (ownType != null && ownType == 1) {
return 0;
}
return 1;
return ownerFlag;
}
public StoreRegionDTO setOwnerFlag(Integer ownerFlag) {
......@@ -187,7 +175,6 @@ public class StoreRegionDTO implements Serializable {
", updateTime=" + updateTime +
", enterpriseId=" + enterpriseId +
", fromEnterpriseId=" + fromEnterpriseId +
", ownType=" + ownType +
", shareEnterpriseName='" + shareEnterpriseName + '\'' +
", ownerFlag=" + ownerFlag +
", ownerEntName='" + ownerEntName + '\'' +
......
gic-store-api/src/main/java/com/gic/store/dto/StoreResourceDTO.java
......@@ -16,9 +16,9 @@ public class StoreResourceDTO implements Serializable{
private String name;
/**
* 1自有 2共享
* 共享标记 1:自有 0：共享
*/
private Integer ownType;
private Integer ownerFlag;
/**
* 自有商户名称
......@@ -47,12 +47,12 @@ public class StoreResourceDTO implements Serializable{
return this;
}
public Integer getOwnType() {
return ownType;
public Integer getOwnerFlag() {
return ownerFlag;
}
public StoreResourceDTO setOwnType(Integer ownType) {
this.ownType = ownType;
public StoreResourceDTO setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
......@@ -88,7 +88,7 @@ public class StoreResourceDTO implements Serializable{
return "StoreResourceDTO{" +
"id='" + id + '\'' +
", name='" + name + '\'' +
", ownType=" + ownType +
", ownerFlag=" + ownerFlag +
", ownerEntName='" + ownerEntName + '\'' +
", ownerEntId=" + ownerEntId +
", enterpriseId=" + enterpriseId +
......
gic-store-api/src/main/java/com/gic/store/dto/StoreSearchDTO.java
......@@ -44,7 +44,10 @@ public class StoreSearchDTO implements Serializable {
private String realStatuss;
private String storeTags;
private String storeBrandIds;
private Integer ownType;
/**
* 共享标记 1:自有 0：共享
*/
private Integer ownerFlag;
public Integer getStoreGroupId() {
return storeGroupId;
......@@ -312,12 +315,12 @@ public class StoreSearchDTO implements Serializable {
this.storeBrandIds = storeBrandIds;
}
public Integer getOwnType() {
return ownType;
public Integer getOwnerFlag() {
return ownerFlag;
}
public StoreSearchDTO setOwnType(Integer ownType) {
this.ownType = ownType;
public StoreSearchDTO setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
......@@ -357,7 +360,7 @@ public class StoreSearchDTO implements Serializable {
", realStatuss='" + realStatuss + '\'' +
", storeTags='" + storeTags + '\'' +
", storeBrandIds='" + storeBrandIds + '\'' +
", ownType='" + ownType + '\'' +
", ownerFlag='" + ownerFlag + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/open/StoreRegionOpenDTO.java
......@@ -14,7 +14,10 @@ public class StoreRegionOpenDTO implements Serializable {
private String regionName;
private Integer ownType;
/**
* 共享标记 1:自有 0：共享
*/
private Integer ownerFlag;
public Integer getRegionId() {
return regionId;
......@@ -32,12 +35,13 @@ public class StoreRegionOpenDTO implements Serializable {
this.regionName = regionName;
}
public Integer getOwnType() {
return ownType;
public Integer getOwnerFlag() {
return ownerFlag;
}
public void setOwnType(Integer ownType) {
this.ownType = ownType;
public StoreRegionOpenDTO setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
@Override
......@@ -47,8 +51,8 @@ public class StoreRegionOpenDTO implements Serializable {
.append(regionId);
sb.append(",\"regionName\":\"")
.append(regionName).append('\"');
sb.append(",\"ownType\":")
.append(ownType);
sb.append(",\"ownerFlag\":")
.append(ownerFlag);
sb.append('}');
return sb.toString();
}
......
gic-store-api/src/main/java/com/gic/store/service/StoreRegionApiService.java
......@@ -61,11 +61,11 @@ public interface StoreRegionApiService {
* @author zhiwj
* @param enterpriseId
* @param search
* @param ownType
* @param ownerFlag
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreRegionDTO>>
* @throws
*/
ServiceResponse<List<StoreRegionDTO>> listStoreRegion(Integer enterpriseId, String search, Integer ownType);
ServiceResponse<List<StoreRegionDTO>> listStoreRegion(Integer enterpriseId, String search, Integer ownerFlag);
/**
* 查询自有的门店域
......
gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreInfoMapper.java
......@@ -251,5 +251,11 @@ public interface TabStoreInfoMapper {
*/
Integer hasUnCompleteStatusStore(@Param("enterpriseId") Integer enterpriseId);
/**
* 更新状态
* @param storeInfoId
* @param status
* @return
*/
int updateStoreRealStatus(@Param("storeInfoId") Integer storeInfoId, @Param("status") int status);
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreRegionMapper.java
......@@ -68,11 +68,11 @@ public interface TabStoreRegionMapper {
* @author zhiwj
* @param enterpriseId
* @param search
* @param ownType
* @param ownerFlag
* @return java.util.List<com.gic.store.dto.StoreRegionDTO>
* @throws
*/
List<StoreRegionDTO> listStoreRegion(@Param("enterpriseId") Integer enterpriseId, @Param("search") String search, @Param("ownType") Integer ownType);
List<StoreRegionDTO> listStoreRegion(@Param("enterpriseId") Integer enterpriseId, @Param("search") String search, @Param("ownerFlag") Integer ownerFlag);
/**
* 查询符合条件的个数； 除id所有值取等于计算， id取不等于计算
......@@ -88,11 +88,11 @@ public interface TabStoreRegionMapper {
* @author zhiwj
* @param enterpriseId
* @param storeRegionIdList
* @param ownType
* @param ownerFlag
* @return java.util.List<com.gic.store.dto.StoreRegionDTO>
* @throws
*/
List<StoreRegionDTO> listStoreRegionByIds(@Param("enterpriseId") Integer enterpriseId, @Param("storeRegionIdList") List<Integer> storeRegionIdList, @Param("ownType") Integer ownType);
List<StoreRegionDTO> listStoreRegionByIds(@Param("enterpriseId") Integer enterpriseId, @Param("storeRegionIdList") List<Integer> storeRegionIdList, @Param("ownerFlag") Integer ownerFlag);
/**
* getStoreRegionByRegionName
......
gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreRegionRelMapper.java
......@@ -90,11 +90,11 @@ public interface TabStoreRegionRelMapper {
* @author zhiwj
* @param enterpriseId
* @param delRelList
* @param ownType
* @param ownerFlag
* @return void
* @throws
*/
void delByRegionIds(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> delRelList, @Param("ownType") Integer ownType);
void delByRegionIds(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> delRelList, @Param("ownerFlag") Integer ownerFlag);
/**
* getByRegionIdAndEnterpriseId
......
gic-store-service/src/main/java/com/gic/store/entity/TabStore.java
......@@ -44,9 +44,9 @@ public class TabStore {
private Integer isEditStoreGroup;
/**
* 是否共享 1是0否
* 共享标记 1:自有 0：共享
*/
private Integer ownType;
private Integer ownerFlag;
/**
*
......@@ -118,12 +118,13 @@ public class TabStore {
this.isEditStoreGroup = isEditStoreGroup;
}
public Integer getOwnType() {
return ownType;
public Integer getOwnerFlag() {
return ownerFlag;
}
public void setOwnType(Integer ownType) {
this.ownType = ownType;
public TabStore setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
public Integer getStatus() {
......
gic-store-service/src/main/java/com/gic/store/entity/TabStoreBrand.java
......@@ -68,7 +68,10 @@ public class TabStoreBrand {
*/
private Integer hasRel;
private Integer type;
/**
* 共享标记 1:自有 0：共享
*/
private Integer ownerFlag;
private Integer fromEnterpriseId;
......@@ -160,12 +163,13 @@ public class TabStoreBrand {
this.hasRel = hasRel;
}
public Integer getType() {
return type;
public Integer getOwnerFlag() {
return ownerFlag;
}
public void setType(Integer type) {
this.type = type;
public TabStoreBrand setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
public Integer getFromEnterpriseId() {
......
gic-store-service/src/main/java/com/gic/store/entity/TabStoreBrandRef.java
......@@ -32,9 +32,9 @@ public class TabStoreBrandRef {
private Integer storeBrandId;
/**
* 1自有 2共享
* 共享标记 1:自有 0：共享
*/
private Integer type;
private Integer ownerFlag;
/**
*
......@@ -80,12 +80,13 @@ public class TabStoreBrandRef {
this.storeBrandId = storeBrandId;
}
public Integer getType() {
return type;
public Integer getOwnerFlag() {
return ownerFlag;
}
public void setType(Integer type) {
this.type = type;
public TabStoreBrandRef setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
public Date getCreateTime() {
......
gic-store-service/src/main/java/com/gic/store/entity/TabStoreFieldRel.java
......@@ -29,9 +29,9 @@ public class TabStoreFieldRel {
private Integer storeFieldId;
/**
* 0:owner 1:other 授权者和被授权
* 共享标记 1:自有 0：共享
*/
private Integer ownType;
private Integer ownerFlag;
/**
*
......@@ -72,12 +72,13 @@ public class TabStoreFieldRel {
this.storeFieldId = storeFieldId;
}
public Integer getOwnType() {
return ownType;
public Integer getOwnerFlag() {
return ownerFlag;
}
public void setOwnType(Integer ownType) {
this.ownType = ownType;
public TabStoreFieldRel setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
public Integer getDeleteFlag() {
......
gic-store-service/src/main/java/com/gic/store/entity/TabStoreRegionRel.java
......@@ -34,9 +34,9 @@ public class TabStoreRegionRel {
private Integer enterpriseId;
/**
*
* 共享标记 1:自有 0：共享
*/
private Integer ownType;
private Integer ownerFlag;
/**
*
......@@ -85,12 +85,13 @@ public class TabStoreRegionRel {
this.enterpriseId = enterpriseId;
}
public Integer getOwnType() {
return ownType;
public Integer getOwnerFlag() {
return ownerFlag;
}
public void setOwnType(Integer ownType) {
this.ownType = ownType;
public TabStoreRegionRel setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
public Integer getDeleteFlag() {
......
gic-store-service/src/main/java/com/gic/store/service/StoreBrandService.java
......@@ -30,11 +30,11 @@ public interface StoreBrandService {
* @param enterpriseId
* @param storeBrandId
* @param ownEnterpriseId
* @param type
* @param ownerFlag
* @return void
* @throws
*/
void saveStoreBrandRef(Integer enterpriseId, Integer storeBrandId, Integer type, Integer ownEnterpriseId);
void saveStoreBrandRef(Integer enterpriseId, Integer storeBrandId, Integer ownerFlag, Integer ownEnterpriseId);
/**
* saveStoreBrandRef
......@@ -44,11 +44,11 @@ public interface StoreBrandService {
* @param enterpriseId
* @param storeBrandIdList
* @param ownEnterpriseId
* @param type
* @param ownerFlag
* @return void
* @throws
*/
void saveStoreBrandRef(Integer enterpriseId, List<Integer> storeBrandIdList, Integer type, Integer ownEnterpriseId);
void saveStoreBrandRef(Integer enterpriseId, List<Integer> storeBrandIdList, Integer ownerFlag, Integer ownEnterpriseId);
/**
* update
......
gic-store-service/src/main/java/com/gic/store/service/StoreRegionRelService.java
......@@ -67,11 +67,11 @@ public interface StoreRegionRelService {
* @author zhiwj
* @param enterpriseId
* @param delRelList
* @param ownType
* @param ownerFlag
* @return void
* @throws
*/
void delByRegionIds(Integer enterpriseId, List<Integer> delRelList, Integer ownType);
void delByRegionIds(Integer enterpriseId, List<Integer> delRelList, Integer ownerFlag);
/**
* getByRegionIdAndEnterpriseId
......@@ -80,11 +80,11 @@ public interface StoreRegionRelService {
* @author zhiwj
* @param regionId
* @param enterpriseId
* @param ownType
* @param ownerFlag
* @return com.gic.store.entity.TabStoreRegionRel
* @throws
*/
TabStoreRegionRel getByRegionIdAndEnterpriseId(Integer regionId, Integer enterpriseId, int ownType);
TabStoreRegionRel getByRegionIdAndEnterpriseId(Integer regionId, Integer enterpriseId, int ownerFlag);
/**
* updateStatusByOther
......
gic-store-service/src/main/java/com/gic/store/service/StoreRegionService.java
......@@ -83,11 +83,11 @@ public interface StoreRegionService {
* @author zhiwj
* @param enterpriseId
* @param search
* @param ownType
* @param ownerFlag
* @return java.util.List<com.gic.store.dto.StoreRegionDTO>
* @throws
*/
List<StoreRegionDTO> listStoreRegion(Integer enterpriseId, String search, Integer ownType);
List<StoreRegionDTO> listStoreRegion(Integer enterpriseId, String search, Integer ownerFlag);
/**
* listStoreRegion
......@@ -119,11 +119,11 @@ public interface StoreRegionService {
* @author zhiwj
* @param enterpriseId
* @param storeRegionIdList
* @param ownType
* @param ownerFlag
* @return java.util.List<com.gic.store.dto.StoreRegionDTO>
* @throws
*/
List<StoreRegionDTO> listStoreRegionByIds(Integer enterpriseId, List<Integer> storeRegionIdList, Integer ownType);
List<StoreRegionDTO> listStoreRegionByIds(Integer enterpriseId, List<Integer> storeRegionIdList, Integer ownerFlag);
/**
* listStoreRegionByIds
......
gic-store-service/src/main/java/com/gic/store/service/impl/StoreBrandServiceImpl.java
......@@ -54,13 +54,13 @@ public class StoreBrandServiceImpl implements StoreBrandService {
tabStoreBrandRef.setDeleteFlag(0);
tabStoreBrandRef.setCreateTime(date);
tabStoreBrandRef.setUpdateTime(date);
tabStoreBrandRef.setType(copy.getType());
tabStoreBrandRef.setOwnerFlag(copy.getOwnerFlag());
tabStoreBrandRefMapper.insertSelective(tabStoreBrandRef);
return storeBrand.getStoreBrandId();
}
@Override
public void saveStoreBrandRef(Integer enterpriseId, Integer storeBrandId, Integer type, Integer ownEnterpriseId){
public void saveStoreBrandRef(Integer enterpriseId, Integer storeBrandId, Integer ownerFlag, Integer ownEnterpriseId){
TabStoreBrandRef existTab = tabStoreBrandRefMapper.selectByEidAndBrandId(enterpriseId, storeBrandId);
if(existTab != null){
return;
......@@ -75,12 +75,12 @@ public class StoreBrandServiceImpl implements StoreBrandService {
tabStoreBrandRef.setDeleteFlag(0);
tabStoreBrandRef.setCreateTime(date);
tabStoreBrandRef.setUpdateTime(date);
tabStoreBrandRef.setType(type);
tabStoreBrandRef.setOwnerFlag(ownerFlag);
tabStoreBrandRefMapper.insertSelective(tabStoreBrandRef);
}
@Override
public void saveStoreBrandRef(Integer enterpriseId, List<Integer> storeBrandIdList, Integer type, Integer ownEnterpriseId) {
public void saveStoreBrandRef(Integer enterpriseId, List<Integer> storeBrandIdList, Integer ownerFlag, Integer ownEnterpriseId) {
if(CollectionUtils.isNotEmpty(storeBrandIdList)){
List<TabStoreBrandRef> list = new ArrayList<>();
Double sort = tabStoreBrandRefMapper.getMinSort(enterpriseId);
......@@ -100,7 +100,7 @@ public class StoreBrandServiceImpl implements StoreBrandService {
tabStoreBrandRef.setDeleteFlag(0);
tabStoreBrandRef.setCreateTime(date);
tabStoreBrandRef.setUpdateTime(date);
tabStoreBrandRef.setType(type);
tabStoreBrandRef.setOwnerFlag(ownerFlag);
list.add(tabStoreBrandRef);
sort = sort - 1d;
}
......
gic-store-service/src/main/java/com/gic/store/service/impl/StoreRegionRelServiceImpl.java
package com.gic.store.service.impl;
import com.gic.store.constant.StoreOwnTypeEnum;
import com.gic.store.constant.StoreOwnerFlagEnum;
import com.gic.store.dao.mapper.TabStoreRegionRelMapper;
import com.gic.store.entity.TabStoreRegionRel;
import com.gic.store.service.StoreRegionRelService;
......@@ -28,7 +28,7 @@ public class StoreRegionRelServiceImpl implements StoreRegionRelService {
storeRegionRel.setRegionId(regionId);
storeRegionRel.setEnterpriseId(enterpriseId);
storeRegionRel.setFromEnterpriseId(enterpriseId);
storeRegionRel.setOwnType(StoreOwnTypeEnum.OWNER.getCode());
storeRegionRel.setOwnerFlag(StoreOwnerFlagEnum.OWNER.getCode());
storeRegionRel.setDeleteFlag(0);
storeRegionRel.setCreateTime(new Date());
return tabStoreRegionRelMapper.insertSelective(storeRegionRel);
......@@ -40,7 +40,7 @@ public class StoreRegionRelServiceImpl implements StoreRegionRelService {
storeRegionRel.setRegionId(regionId);
storeRegionRel.setFromEnterpriseId(fromEnterpriseId);
storeRegionRel.setEnterpriseId(enterpriseId);
storeRegionRel.setOwnType(StoreOwnTypeEnum.OTHER.getCode());
storeRegionRel.setOwnerFlag(StoreOwnerFlagEnum.OTHER.getCode());
storeRegionRel.setDeleteFlag(0);
storeRegionRel.setCreateTime(new Date());
return tabStoreRegionRelMapper.insertSelective(storeRegionRel);
......@@ -52,7 +52,7 @@ public class StoreRegionRelServiceImpl implements StoreRegionRelService {
param.setEnterpriseId(enterpriseId);
param.setRegionId(regionId);
TabStoreRegionRel storeRegionRel = tabStoreRegionRelMapper.get(param);
return storeRegionRel != null && StoreOwnTypeEnum.OWNER.getCode() == storeRegionRel.getOwnType();
return storeRegionRel != null && StoreOwnerFlagEnum.OWNER.getCode() == storeRegionRel.getOwnerFlag();
}
@Override
......@@ -62,16 +62,16 @@ public class StoreRegionRelServiceImpl implements StoreRegionRelService {
}
@Override
public void delByRegionIds(Integer enterpriseId, List<Integer> delRelList, Integer ownType) {
tabStoreRegionRelMapper.delByRegionIds(enterpriseId, delRelList, ownType);
public void delByRegionIds(Integer enterpriseId, List<Integer> delRelList, Integer ownerFlag) {
tabStoreRegionRelMapper.delByRegionIds(enterpriseId, delRelList, ownerFlag);
}
@Override
public TabStoreRegionRel getByRegionIdAndEnterpriseId(Integer regionId, Integer enterpriseId, int ownType) {
public TabStoreRegionRel getByRegionIdAndEnterpriseId(Integer regionId, Integer enterpriseId, int ownerFlag) {
TabStoreRegionRel storeRegionRel = new TabStoreRegionRel();
storeRegionRel.setRegionId(regionId);
storeRegionRel.setEnterpriseId(enterpriseId);
storeRegionRel.setOwnType(ownType);
storeRegionRel.setOwnerFlag(ownerFlag);
return tabStoreRegionRelMapper.getByRegionIdAndEnterpriseId(storeRegionRel);
}
......
gic-store-service/src/main/java/com/gic/store/service/impl/StoreRegionServiceImpl.java
package com.gic.store.service.impl;
import com.gic.store.constant.StoreOwnTypeEnum;
import com.gic.store.constant.StoreOwnerFlagEnum;
import com.gic.store.dao.mapper.TabStoreRegionMapper;
import com.gic.store.dao.mapper.TabStoreRegionRelMapper;
import com.gic.store.dto.StoreRegionDTO;
import com.gic.store.entity.TabStoreRegion;
import com.gic.store.entity.TabStoreRegionRel;
import com.gic.store.service.StoreRegionService;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
......@@ -77,8 +76,8 @@ public class StoreRegionServiceImpl implements StoreRegionService {
}
@Override
public List<StoreRegionDTO> listStoreRegion(Integer enterpriseId, String search, Integer ownType) {
return storeRegionMapper.listStoreRegion(enterpriseId, search, ownType);
public List<StoreRegionDTO> listStoreRegion(Integer enterpriseId, String search, Integer ownerFlag) {
return storeRegionMapper.listStoreRegion(enterpriseId, search, ownerFlag);
}
@Override
......@@ -93,8 +92,8 @@ public class StoreRegionServiceImpl implements StoreRegionService {
}
@Override
public List<StoreRegionDTO> listStoreRegionByIds(Integer enterpriseId, List<Integer> storeRegionIdList, Integer ownType) {
return this.storeRegionMapper.listStoreRegionByIds(enterpriseId, storeRegionIdList, ownType);
public List<StoreRegionDTO> listStoreRegionByIds(Integer enterpriseId, List<Integer> storeRegionIdList, Integer ownerFlag) {
return this.storeRegionMapper.listStoreRegionByIds(enterpriseId, storeRegionIdList, ownerFlag);
}
@Override
......@@ -110,7 +109,7 @@ public class StoreRegionServiceImpl implements StoreRegionService {
@Override
public String relationErp(Integer enterpriseId, Integer regionId) {
StoreRegionDTO storeRegionDTO = this.getById(enterpriseId, regionId);
if(storeRegionDTO.getOwnType() == StoreOwnTypeEnum.OTHER.getCode()){
if(storeRegionDTO.getOwnerFlag() == StoreOwnerFlagEnum.OTHER.getCode()){
return "共享域无法关联";
}
int i = this.storeRegionMapper.relationErp(enterpriseId, regionId);
......
gic-store-service/src/main/java/com/gic/store/service/impl/StoreServiceImpl.java
......@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GlobalInfo;
import com.gic.store.constant.Constants;
import com.gic.store.constant.StoreOwnTypeEnum;
import com.gic.store.constant.StoreOwnerFlagEnum;
import com.gic.store.dao.mapper.TabStoreBusinessTimeMapper;
import com.gic.store.dao.mapper.TabStoreInfoMapper;
import com.gic.store.dao.mapper.TabStoreMapper;
......@@ -87,7 +87,7 @@ public class StoreServiceImpl implements StoreService {
store.setEnterpriseId(copy.getEnterpriseId());
store.setCreateTime(new Date());
store.setUpdateTime(new Date());
store.setOwnType(StoreOwnTypeEnum.OWNER.getCode());
store.setOwnerFlag(StoreOwnerFlagEnum.OWNER.getCode());
store.setStatus(1);
store.setStoreGroupId(copy.getStoreGroupId());
store.setStoreInfoId(tabStoreInfo.getStoreInfoId());
......@@ -125,7 +125,7 @@ public class StoreServiceImpl implements StoreService {
TabStore store = new TabStore();
store.setEnterpriseId(copy.getEnterpriseId());
store.setOwnType(StoreOwnTypeEnum.OWNER.getCode());
store.setOwnerFlag(StoreOwnerFlagEnum.OWNER.getCode());
store.setStatus(com.gic.enterprise.constants.Constants.NORMAL_STATUS);
store.setStoreGroupId(copy.getStoreGroupId());
store.setStoreInfoId(tabStoreInfo.getStoreInfoId());
......@@ -156,7 +156,7 @@ public class StoreServiceImpl implements StoreService {
storeDTO.setEnterpriseId(tabStore.getEnterpriseId());
storeDTO.setStoreGroupId(tabStore.getStoreGroupId());
storeDTO.setStoreId(tabStore.getStoreId());
storeDTO.setOwnType(tabStore.getOwnType());
storeDTO.setOwnerFlag(tabStore.getOwnerFlag());
storeDTO.setFromEnterpriseId(tabStore.getFromEnterpriseId());
storeDTO.setScore(tabStore.getScore());
storeDTO.setEvaluateCount(tabStore.getEvaluateCount());
......@@ -470,7 +470,7 @@ public class StoreServiceImpl implements StoreService {
store.setStoreInfoId(storeDTO.getStoreInfoId());
store.setStoreGroupId(storeDTO.getStoreGroupId());
store.setIsEditStoreGroup(storeDTO.getIsEditStoreGroup());
store.setOwnType(storeDTO.getOwnType());
store.setOwnerFlag(storeDTO.getOwnerFlag());
store.setStatus(com.gic.enterprise.constants.Constants.NORMAL_STATUS);
store.setUpdateTime(new Date());
store.setFromEnterpriseId(storeDTO.getFromEnterpriseId());
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
......@@ -433,7 +433,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
private void validStoreIsOther(Integer enterpriseId, Integer storeInfoId) {
Integer owner = storeService.getStoreOwnerByStoreInfoId(enterpriseId, storeInfoId);
if (owner != null && owner == StoreOwnTypeEnum.OTHER.getCode()) {
if (owner != null && owner == StoreOwnerFlagEnum.OTHER.getCode()) {
throw new CommonException(ErrorCode.PARAMETER_ERROR.getCode(), "共享数据不能编辑");
}
}
......@@ -478,7 +478,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
clerkStoreListDTO.setStoreInfoId(store.getStoreInfoId());
clerkStoreListDTO.setStoreName(store.getStoreName());
clerkStoreListDTO.setStoreCode(store.getStoreCode());
clerkStoreListDTO.setOwnType(store.getOwnType());
clerkStoreListDTO.setOwnerFlag(store.getOwnerFlag());
clerkStoreListDTO.setFromEnterpriseId(store.getFromEnterpriseId());
clerkStoreListDTO.setFromEnterpriseName(store.getFromEnterpriseName());
clerkStoreListDTO.setStatus(store.getStatus());
......@@ -578,7 +578,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
storeSearchDTO.setStoreResource(clerkSearchDTO.getStoreResource());
return storeApiService.listStore(storeSearchDTO, pageNum, pageSize,
"status,storeId,storeName,storeCode,storeInfoId,ownType,fromEnterpriseId,fromEnterpriseName");
"status,storeId,storeName,storeCode,storeInfoId,ownerFlag,fromEnterpriseId,fromEnterpriseName");
}
@Override
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkTaskServiceImpl.java
......@@ -120,7 +120,7 @@ public class ClerkTaskServiceImpl extends AbstractTaskAllocationOperation implem
clerkImportService.updateData(t);
return;
}
if (StoreOwnTypeEnum.OWNER.getCode() != store.getOwnType()) {
if (StoreOwnerFlagEnum.OWNER.getCode() != store.getOwnerFlag()) {
t.setErrorMessage("不能在被授权门店下导入导购");
clerkImportService.updateData(t);
return;
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
......@@ -807,8 +807,8 @@ public class StoreApiServiceImpl implements StoreApiService {
if (StringUtils.isBlank(returnFileds)) {
returnFileds = StoreESFieldsEnum.STOREID.getField();
}
if (!returnFileds.contains(StoreESFieldsEnum.OWNTYPE.getField())) {
returnFileds += "," + StoreESFieldsEnum.OWNTYPE.getField();
if (!returnFileds.contains(StoreESFieldsEnum.OWNERFLAG.getField())) {
returnFileds += "," + StoreESFieldsEnum.OWNERFLAG.getField();
}
if (!returnFileds.contains(StoreESFieldsEnum.FROM_ENTERPRISE_ID.getField())) {
returnFileds += "," + StoreESFieldsEnum.FROM_ENTERPRISE_ID.getField();
......@@ -1702,7 +1702,7 @@ public class StoreApiServiceImpl implements StoreApiService {
esDTO.setStoreGroupName(dto.getStoreGroupName());
esDTO.setStoreName(dto.getStoreName());
esDTO.setStoreType(dto.getStoreType());
esDTO.setOwnType(dto.getOwnType());
esDTO.setOwnerFlag(dto.getOwnerFlag());
esDTO.setBusinessTimeList(dto.getBusinessTimeList());
esDTO.setPhotoList(dto.getPhotoList());
esDTO.setAddress(dto.getAddress());
......@@ -1942,8 +1942,8 @@ public class StoreApiServiceImpl implements StoreApiService {
json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STORECODE.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getStoreCode());
jsonObjectList.add(json);
}
if (storeSearchDTO.getOwnType() != null) {
json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.OWNTYPE.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getOwnType());
if (storeSearchDTO.getOwnerFlag() != null) {
json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.OWNERFLAG.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getOwnerFlag());
jsonObjectList.add(json);
}
return json;
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreAuthorizationApiServiceImpl.java
......@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.AuthModeEnum;
import com.gic.auth.constant.AuthorizationStatusEnum;
import com.gic.auth.service.UnionEnterpriseApiService;
import com.gic.commons.util.GICMQClientUtil;
import com.gic.commons.util.ToolUtil;
......@@ -14,7 +13,7 @@ import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.UnionEnterpriseAuthResDetailApiService;
import com.gic.mq.sdk.GicMQClient;
import com.gic.store.constant.StoreGroupConstant;
import com.gic.store.constant.StoreOwnTypeEnum;
import com.gic.store.constant.StoreOwnerFlagEnum;
import com.gic.store.dto.StoreDTO;
import com.gic.store.dto.StoreSearchDTO;
import com.gic.store.dto.StoreWidgetDTO;
......@@ -81,7 +80,7 @@ public class StoreAuthorizationApiServiceImpl implements StoreAuthorizationApiSe
StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
storeSearchDTO.setEnterpriseId(ownEnterpriseId);
storeSearchDTO.setSearchJson(storeWidgetDTO.getSearchParam());
storeSearchDTO.setOwnType(StoreOwnTypeEnum.OWNER.getCode());
storeSearchDTO.setOwnerFlag(StoreOwnerFlagEnum.OWNER.getCode());
Long count = this.storeApiService.queryStoreCountFromEs(storeSearchDTO).getResult();
if(count <= 0){
this.unionEnterpriseAuthResDetailApiService.unionForStore(UnionEnterpriseAuthDetailStatusEnum.HAS_AUTH.getCode(), ownEnterpriseId, unionEnterpriseId, key, "授权成功");
......@@ -150,7 +149,7 @@ public class StoreAuthorizationApiServiceImpl implements StoreAuthorizationApiSe
}
}
storeDTO.setIsEditStoreGroup(0);
storeDTO.setOwnType(StoreOwnTypeEnum.OTHER.getCode());
storeDTO.setOwnerFlag(StoreOwnerFlagEnum.OTHER.getCode());
log.info("授权门店信息：{}", JSON.toJSONString(storeDTO));
int i = this.storeService.authAddStore(storeDTO);
log.info("{}，门店授权结果：{}", storeDTO.getStoreInfoId(), i);
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreBrandApiServiceImpl.java
......@@ -13,6 +13,7 @@ import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.enterprise.service.EnterpriseApiService;
import com.gic.enterprise.service.EnterpriseInitApiService;
import com.gic.enterprise.service.PlatformBrandApiService;
import com.gic.store.constant.StoreOwnerFlagEnum;
import com.gic.store.dto.StoreBrandDTO;
import com.gic.store.dto.union.StoreBrandShareDTO;
import com.gic.store.entity.TabStoreBrand;
......@@ -112,7 +113,7 @@ public class StoreBrandApiServiceImpl implements StoreBrandApiService {
List<StoreBrandShareDTO> voList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(storeBrandList)) {
//共享类型
List<Integer> brandIdList = storeBrandList.stream().filter(e -> Objects.equals(e.getType(), 2))
List<Integer> brandIdList = storeBrandList.stream().filter(e -> Objects.equals(e.getOwnerFlag(), StoreOwnerFlagEnum.OTHER.getCode()))
.mapToInt(e -> e.getStoreBrandId())
.boxed()
.collect(Collectors.toList());
......@@ -125,11 +126,11 @@ public class StoreBrandApiServiceImpl implements StoreBrandApiService {
List<StoreBrandDTO> brandList = brandResponse.getResult();
//自有品牌的商户ID
List<Integer> enterpriseIdList = brandList.stream()
.filter(e -> Objects.equals(e.getType(), 1))
.filter(e -> Objects.equals(e.getOwnerFlag(), StoreOwnerFlagEnum.OWNER.getCode()))
.mapToInt(e -> e.getEnterpriseId()).boxed()
.collect(Collectors.toList());
//自有品牌
brandIdMap = brandList.stream().filter(e -> Objects.equals(e.getType(), 1))
brandIdMap = brandList.stream().filter(e -> Objects.equals(e.getOwnerFlag(), StoreOwnerFlagEnum.OWNER.getCode()))
.collect(Collectors.toMap(e -> e.getStoreBrandId(), e -> e.getEnterpriseId()));
ServiceResponse<List<EnterpriseDTO>> enterpriseResponse = enterpriseApiService.listEnterpriseByIds(enterpriseIdList);
......@@ -141,15 +142,12 @@ public class StoreBrandApiServiceImpl implements StoreBrandApiService {
Map<Integer, String> finalEnterpriseMap = enterpriseMap;
Map<Integer, Integer> finalBrandIdMap = brandIdMap;
//共享类型
Integer otherType = 2;
voList = storeBrandList.stream()
.map(e -> {
StoreBrandShareDTO vo = new StoreBrandShareDTO();
vo.setStoreBrandId(e.getStoreBrandId());
//共享类型
if (Objects.equals(e.getType(), otherType)) {
if (Objects.equals(e.getOwnerFlag(), StoreOwnerFlagEnum.OTHER.getCode())) {
Integer tempEnterpriseId = finalBrandIdMap.get(e.getStoreBrandId());
vo.setOwnerEntName(finalEnterpriseMap.get(tempEnterpriseId));
vo.setOwnerFlag(0);
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreDictApiServiceImpl.java
......@@ -355,7 +355,7 @@ public class StoreDictApiServiceImpl implements StoreDictApiService {
StoreDictDTO storeDictDTO = new StoreDictDTO();
storeDictDTO.setKey(tabStoreField.getStoreFieldName());
storeDictDTO.setValue(tabStoreField.getStoreFieldId()+"");
storeDictDTO.setOwnType(tabStoreField.getOwnType());
storeDictDTO.setOwnerFlag(tabStoreField.getOwnerFlag());
for(String s : listSelect){
if(tabStoreField.getStoreFieldId().intValue() == Integer.valueOf(s).intValue()){
storeDictDTO.setChecked(1);
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreFieldApiServiceImpl.java
......@@ -7,7 +7,7 @@ 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.constant.StoreOwnerFlagEnum;
import com.gic.store.dto.StoreFieldDTO;
import com.gic.store.dto.StoreFieldRegionMapDTO;
import com.gic.store.dto.StoreFieldRegionRelDTO;
......@@ -228,7 +228,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
//判断是否是owner，如果不是，则不允许编辑
TabStoreFieldRel tabStoreFieldRel = storeFieldRelService
.getByEnterpriseIdAndStoreFieldId(storeFieldDTO.getEnterpriseId(), storeFieldDTO.getStoreFieldId());
if (tabStoreFieldRel.getOwnType().intValue() == StoreOwnTypeEnum.OTHER.getCode()) {
if (tabStoreFieldRel.getOwnerFlag().intValue() == StoreOwnerFlagEnum.OTHER.getCode()) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "被授权字段，不可编辑");
}
......@@ -398,7 +398,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
dto.setUpdateTime(now);
dto.setStoreFieldId(ownStoreField);
dto.setEnterpriseId(toEnterpriseId);
dto.setOwnType(StoreOwnTypeEnum.OTHER.getCode());
dto.setOwnerFlag(StoreOwnerFlagEnum.OTHER.getCode());
dto.setDeleteFlag(0);
storeFieldRelList.add(dto);
}
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreFieldRelApiServiceImpl.java
......@@ -2,7 +2,7 @@ package com.gic.store.service.outer.impl;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.enterprise.error.ErrorCode;
import com.gic.store.constant.StoreOwnTypeEnum;
import com.gic.store.constant.StoreOwnerFlagEnum;
import com.gic.store.dto.StoreFieldRelDTO;
import com.gic.store.service.StoreFieldRelApiService;
import com.gic.store.service.StoreFieldRelService;
......@@ -27,11 +27,11 @@ public class StoreFieldRelApiServiceImpl implements StoreFieldRelApiService{
if (dto.getStoreFieldId() == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "自定义属性字段不能为空");
}
if (dto.getOwnType() == null) {
if (dto.getOwnerFlag() == null) {
//默认是owner
dto.setOwnType(StoreOwnTypeEnum.OWNER.getCode());
dto.setOwnerFlag(StoreOwnerFlagEnum.OWNER.getCode());
} else {
if (!StoreOwnTypeEnum.isRightCode(dto.getOwnType())) {
if (!StoreOwnerFlagEnum.isRightCode(dto.getOwnerFlag())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "授权类型值错误，不在已知范围");
}
}
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreRegionApiServiceImpl.java
......@@ -11,7 +11,7 @@ import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.enterprise.service.EnterpriseApiService;
import com.gic.enterprise.service.EnterpriseInitApiService;
import com.gic.store.constant.StoreOwnTypeEnum;
import com.gic.store.constant.StoreOwnerFlagEnum;
import com.gic.store.dto.StoreRegionDTO;
import com.gic.store.entity.TabStoreRegionRel;
import com.gic.store.service.StoreFieldApiService;
......@@ -109,14 +109,14 @@ public class StoreRegionApiServiceImpl implements StoreRegionApiService {
}
@Override
public ServiceResponse<List<StoreRegionDTO>> listStoreRegion(Integer enterpriseId, String search, Integer ownType) {
List<StoreRegionDTO> list = storeRegionService.listStoreRegion(enterpriseId, search, ownType);
public ServiceResponse<List<StoreRegionDTO>> listStoreRegion(Integer enterpriseId, String search, Integer ownerFlag) {
List<StoreRegionDTO> list = storeRegionService.listStoreRegion(enterpriseId, search, ownerFlag);
return ServiceResponse.success(list);
}
@Override
public ServiceResponse<List<StoreRegionDTO>> listOwnerStoreRegion(Integer enterpriseId) {
List<StoreRegionDTO> list = storeRegionService.listStoreRegion(enterpriseId, null, StoreOwnTypeEnum.OWNER.getCode());
List<StoreRegionDTO> list = storeRegionService.listStoreRegion(enterpriseId, null, StoreOwnerFlagEnum.OWNER.getCode());
return ServiceResponse.success(list);
}
......@@ -138,7 +138,7 @@ public class StoreRegionApiServiceImpl implements StoreRegionApiService {
newStoreRegionIdList = Collections.emptyList();
}
// 新的region是不是自有商户所具有权限的
List<StoreRegionDTO> list = storeRegionService.listStoreRegionByIds(ownerEnterpriseId, newStoreRegionIdList, StoreOwnTypeEnum.OWNER.getCode());
List<StoreRegionDTO> list = storeRegionService.listStoreRegionByIds(ownerEnterpriseId, newStoreRegionIdList, StoreOwnerFlagEnum.OWNER.getCode());
if (CollectionUtils.isEmpty(list) || list.size() != newStoreRegionIdList.size()) {
return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR);
......@@ -150,10 +150,10 @@ public class StoreRegionApiServiceImpl implements StoreRegionApiService {
// 要删除的关联
List<Integer> delRelList = oldRelIdList.stream().filter(e -> !newRelSet.contains(e)).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(delRelList) && authType != 1) { //重新授权时不需要删除门店域
storeRegionRelService.delByRegionIds(unionEnterpriseId, delRelList, StoreOwnTypeEnum.OTHER.getCode());
storeRegionRelService.delByRegionIds(unionEnterpriseId, delRelList, StoreOwnerFlagEnum.OTHER.getCode());
}
for (Integer regionId : newStoreRegionIdList) {
TabStoreRegionRel storeRegionRel = storeRegionRelService.getByRegionIdAndEnterpriseId(regionId, unionEnterpriseId, StoreOwnTypeEnum.OTHER.getCode());
TabStoreRegionRel storeRegionRel = storeRegionRelService.getByRegionIdAndEnterpriseId(regionId, unionEnterpriseId, StoreOwnerFlagEnum.OTHER.getCode());
if (storeRegionRel == null) {
// 插入
storeRegionRelService.saveByOther(ownerEnterpriseId, unionEnterpriseId, regionId);
......
gic-store-service/src/main/java/com/gic/store/utils/resource/BrandAbstractAuthData.java
......@@ -45,7 +45,7 @@ public class BrandAbstractAuthData extends AbstractAuthDataUtils {
List<StoreBrandDTO> list = response.getResult();
if (CollectionUtils.isNotEmpty(list)) {
List<StoreResourceDTO> result = list.stream().map(e -> new StoreResourceDTO().setId(e.getStoreBrandId().toString())
.setName(e.getStoreBrandName()).setOwnType(e.getType()).setEnterpriseId(e.getEnterpriseId())).collect(Collectors.toList());
.setName(e.getStoreBrandName()).setOwnerFlag(e.getOwnerFlag()).setEnterpriseId(e.getEnterpriseId())).collect(Collectors.toList());
return result;
}
}
......
gic-store-service/src/main/resources/mapper/TabStoreBrandMapper.xml
......@@ -13,7 +13,7 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="has_rel" jdbcType="INTEGER" property="hasRel" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="owner_flag" jdbcType="INTEGER" property="ownerFlag" />
<result column="from_enterprise_id" jdbcType="INTEGER" property="fromEnterpriseId" />
</resultMap>
<sql id="Base_Column_List">
......@@ -21,7 +21,7 @@
</sql>
<sql id="Ref_Column_List">
t1.store_brand_id, t1.store_brand_code, t1.store_brand_name, t1.store_brand_category_code, t1.store_brand_category, t1.has_rel,
t2.enterprise_id, t2.type, t2.sort, t2.delete_flag, t2.create_time, t2.update_time, t2.from_enterprise_id
t2.enterprise_id, t2.owner_flag, t2.sort, t2.delete_flag, t2.create_time, t2.update_time, t2.from_enterprise_id
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......
gic-store-service/src/main/resources/mapper/TabStoreFieldMapper.xml
......@@ -26,7 +26,7 @@
<result column="sort" jdbcType="DOUBLE" property="sort" />
<result column="enterprise_id" jdbcType="DOUBLE" property="enterpriseId" />
<result column="region_id" jdbcType="DOUBLE" property="storeRegionId" />
<result column="own_type" jdbcType="DOUBLE" property="ownType" />
<result column="owner_flag" jdbcType="DOUBLE" property="ownerFlag" />
</resultMap>
<sql id="Base_Column_List">
store_field_id, store_field_name, store_field_code, store_field_type,
......@@ -34,11 +34,11 @@
</sql>
<sql id="Base_Column_List_Enterprise">
a.store_field_id, a.store_field_name, a.store_field_code, a.store_field_type, b.enterprise_id,
a.delete_flag, a.create_time, a.update_time, a.store_field_detail, a.erp_rel_code, a.sort, b.own_type
a.delete_flag, a.create_time, a.update_time, a.store_field_detail, a.erp_rel_code, a.sort, b.owner_flag
</sql>
<sql id="Base_Column_List_Field">
a.store_field_id, a.store_field_name, a.store_field_code, a.store_field_type, b.enterprise_id,
a.delete_flag, a.create_time, a.update_time, a.store_field_detail, a.erp_rel_code, a.sort, b.own_type,c.region_id
a.delete_flag, a.create_time, a.update_time, a.store_field_detail, a.erp_rel_code, a.sort, b.owner_flag,c.region_id
</sql>
<sql id="Base_Column_List_Region">
a.store_field_id, a.store_field_name, a.store_field_code, a.store_field_type, b.region_id,
......@@ -377,7 +377,7 @@
on a.store_field_id = b.store_field_id
and b.delete_flag = 0
where a.delete_flag = 0
and b.own_type = 0
and b.owner_flag = 1
<if test="enterpriseId != null ">
and b.enterprise_id = #{enterpriseId}
</if>
......
gic-store-service/src/main/resources/mapper/TabStoreFieldRelMapper.xml
......@@ -5,13 +5,13 @@
<id column="field_relation_id" jdbcType="INTEGER" property="fieldRelationId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="store_field_id" jdbcType="INTEGER" property="storeFieldId" />
<result column="own_type" jdbcType="INTEGER" property="ownType" />
<result column="owner_flag" jdbcType="INTEGER" property="ownerFlag" />
<result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
field_relation_id, enterprise_id, store_field_id, own_type, delete_flag, create_time,
field_relation_id, enterprise_id, store_field_id, owner_flag, delete_flag, create_time,
update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -22,10 +22,10 @@
</select>
<insert id="insert" parameterType="com.gic.store.entity.TabStoreFieldRel">
insert into tab_store_field_rel (field_relation_id, enterprise_id, store_field_id,
own_type, delete_flag, create_time,
owner_flag, delete_flag, create_time,
update_time)
values (#{fieldRelationId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{storeFieldId,jdbcType=INTEGER},
#{ownType,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{ownerFlag,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreFieldRel">
......@@ -40,8 +40,8 @@
<if test="storeFieldId != null">
store_field_id,
</if>
<if test="ownType != null">
own_type,
<if test="ownerFlag != null">
owner_flag,
</if>
<if test="deleteFlag != null">
delete_flag,
......@@ -63,8 +63,8 @@
<if test="storeFieldId != null">
#{storeFieldId,jdbcType=INTEGER},
</if>
<if test="ownType != null">
#{ownType,jdbcType=INTEGER},
<if test="ownerFlag != null">
#{ownerFlag,jdbcType=INTEGER},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=INTEGER},
......@@ -86,8 +86,8 @@
<if test="storeFieldId != null">
store_field_id = #{storeFieldId,jdbcType=INTEGER},
</if>
<if test="ownType != null">
own_type = #{ownType,jdbcType=INTEGER},
<if test="ownerFlag != null">
owner_flag = #{ownerFlag,jdbcType=INTEGER},
</if>
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=INTEGER},
......@@ -105,7 +105,7 @@
update tab_store_field_rel
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
store_field_id = #{storeFieldId,jdbcType=INTEGER},
own_type = #{ownType,jdbcType=INTEGER},
owner_flag = #{ownerFlag,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
......@@ -123,8 +123,8 @@
<if test="storeFieldId != null">
and store_field_id = #{storeFieldId,jdbcType=INTEGER}
</if>
<if test="ownType != null">
and own_type = #{ownType,jdbcType=INTEGER}
<if test="ownerFlag != null">
and owner_flag = #{ownerFlag,jdbcType=INTEGER}
</if>
<if test="deleteFlag != null">
and delete_flag = #{deleteFlag,jdbcType=INTEGER}
......@@ -151,7 +151,7 @@
<insert id="saveFetch" parameterType="java.util.List">
insert into tab_store_field_region_rel (field_relation_id, enterprise_id, store_field_id, own_type, delete_flag, create_time,
insert into tab_store_field_region_rel (field_relation_id, enterprise_id, store_field_id, owner_flag, delete_flag, create_time,
update_time
)
values
......@@ -160,7 +160,7 @@
#{item.fieldRelationId},
#{item.enterpriseId},
#{item.storeFieldId},
#{item.ownType},
#{item.ownerFlag},
#{item.deleteFlag},
#{item.createTime},
#{item.updateTime}
......
gic-store-service/src/main/resources/mapper/TabStoreInfoMapper.xml
......@@ -26,7 +26,7 @@
<result column="index_id" jdbcType="BIGINT" property="indexId"/>
</resultMap>
<resultMap id="DTOResultMap" type="com.gic.store.dto.StoreDTO" extends="BaseResultMap">
<result column="own_type" jdbcType="INTEGER" property="ownType" />
<result column="owner_flag" jdbcType="INTEGER" property="ownerFlag" />
<result column="store_id" jdbcType="INTEGER" property="storeId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="store_group_id" jdbcType="INTEGER" property="storeGroupId" />
......@@ -40,7 +40,7 @@
${alias}.complete_status, ${alias}.status, ${alias}.real_status, ${alias}.store_type,${alias}.create_type, ${alias}.create_time, ${alias}.update_time, ${alias}.index_id
</sql>
<sql id="Base_Column_List2">
${alias}.store_id, ${alias}.enterprise_id, ${alias}.store_group_id, ${alias}.own_type, ${alias}.is_edit_store_group,${alias}.from_enterprise_id
${alias}.store_id, ${alias}.enterprise_id, ${alias}.store_group_id, ${alias}.owner_flag, ${alias}.is_edit_store_group,${alias}.from_enterprise_id
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -551,7 +551,7 @@
</select>
<select id="getStoreOwnerByStoreInfoId" resultType="java.lang.Integer">
select
t2.own_type
t2.owner_flag
from tab_store_info t1,tab_store t2 where t1.store_info_id = t2.store_info_id
and t1.store_info_id = #{storeInfoId}
and t2.enterprise_id = #{enterpriseId}
......@@ -573,7 +573,7 @@
1
from tab_store_info t1,tab_store t2 where t1.store_info_id = t2.store_info_id
and t2.enterprise_id = #{enterpriseId}
and t2.own_type = 0
and t2.owner_flag = 1
and t1.status = 2
and t1.complete_status = 0
......
gic-store-service/src/main/resources/mapper/TabStoreMapper.xml
......@@ -8,7 +8,7 @@
<result column="from_enterprise_id" jdbcType="INTEGER" property="fromEnterpriseId" />
<result column="store_group_id" jdbcType="INTEGER" property="storeGroupId" />
<result column="is_edit_store_group" jdbcType="INTEGER" property="isEditStoreGroup" />
<result column="own_type" jdbcType="INTEGER" property="ownType" />
<result column="owner_flag" jdbcType="INTEGER" property="ownerFlag" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
......@@ -17,7 +17,7 @@
</resultMap>
<sql id="Base_Column_List">
store_id, store_info_id, enterprise_id, from_enterprise_id, store_group_id, is_edit_store_group,
own_type, status, create_time, update_time, score, evaluate_count
owner_flag, status, create_time, update_time, score, evaluate_count
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -28,11 +28,11 @@
<insert id="insert" parameterType="com.gic.store.entity.TabStore">
insert into tab_store (store_id, store_info_id, enterprise_id,
from_enterprise_id, store_group_id, is_edit_store_group,
own_type, status, create_time,
owner_flag, status, create_time,
update_time, score, evaluate_count)
values (#{storeId,jdbcType=INTEGER}, #{storeInfoId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{fromEnterpriseId,jdbcType=INTEGER}, #{storeGroupId,jdbcType=INTEGER}, #{isEditStoreGroup,jdbcType=INTEGER},
#{ownType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{ownerFlag,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{score,jdbcType=DOUBLE}, #{evaluateCount,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.gic.store.entity.TabStore">
......@@ -59,8 +59,8 @@
<if test="isEditStoreGroup != null">
is_edit_store_group,
</if>
<if test="ownType != null">
own_type,
<if test="ownerFlag != null">
owner_flag,
</if>
<if test="status != null">
status,
......@@ -97,8 +97,8 @@
<if test="isEditStoreGroup != null">
#{isEditStoreGroup,jdbcType=INTEGER},
</if>
<if test="ownType != null">
#{ownType,jdbcType=INTEGER},
<if test="ownerFlag != null">
#{ownerFlag,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
......@@ -135,8 +135,8 @@
<if test="isEditStoreGroup != null">
is_edit_store_group = #{isEditStoreGroup,jdbcType=INTEGER},
</if>
<if test="ownType != null">
own_type = #{ownType,jdbcType=INTEGER},
<if test="ownerFlag != null">
owner_flag = #{ownerFlag,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
......@@ -163,7 +163,7 @@
from_enterprise_id = #{fromEnterpriseId,jdbcType=INTEGER},
store_group_id = #{storeGroupId,jdbcType=INTEGER},
is_edit_store_group = #{isEditStoreGroup,jdbcType=INTEGER},
own_type = #{ownType,jdbcType=INTEGER},
owner_flag = #{ownerFlag,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
......@@ -196,7 +196,7 @@
select
store_info_id
from tab_store
where from_enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status=1 and own_type=1
where from_enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status=1 and owner_flag=0
</select>
<update id="cancelAuthStore">
update tab_store set status=0 where enterprise_id=#{toEnterpriseId} and status=1
......@@ -211,7 +211,7 @@
</update>
<select id="listStoreInfoIdByStoreIds" resultType="java.lang.Integer">
select store_info_id
from tab_store where own_type = 0 and enterprise_id = #{enterpriseId}
from tab_store where owner_flag = 1 and enterprise_id = #{enterpriseId}
<if test="null != ids and ids.size &gt; 0">
and store_id in
<foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
......@@ -221,7 +221,7 @@
</select>
<select id="listStoredByStoreInfoList" resultType="java.lang.Integer">
select store_id
from tab_store where own_type = 0 and enterprise_id = #{enterpriseId}
from tab_store where owner_flag = 1 and enterprise_id = #{enterpriseId}
<if test="null != ids and ids.size &gt; 0">
and store_info_id in
<foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
......@@ -246,7 +246,7 @@
select
1
from tab_store
where enterprise_id = #{enterpriseId} and own_type = 0 limit 1
where enterprise_id = #{enterpriseId} and owner_flag = 1 limit 1
</select>
<update id="refreshStoreIndex">
update tab_store t1,tab_store_info t2 set t2.index_id=t2.index_id + 1,t2.update_time=t2.update_time
......
gic-store-service/src/main/resources/mapper/TabStoreRegionMapper.xml
......@@ -20,7 +20,7 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="from_enterprise_id" jdbcType="INTEGER" property="fromEnterpriseId" />
<result column="own_type" jdbcType="INTEGER" property="ownType" />
<result column="owner_flag" jdbcType="INTEGER" property="ownerFlag" />
</resultMap>
<sql id="Base_Column_List">
region_id, region_code, region_name, delete_flag, erp_flag, create_time, update_time
......@@ -29,7 +29,7 @@
${alias}.region_id, ${alias}.region_code, ${alias}.region_name, ${alias}.delete_flag, ${alias}.erp_flag, ${alias}.create_time, ${alias}.update_time
</sql>
<sql id="Base_Column_List2">
${alias}.enterprise_id,${alias}.from_enterprise_id, ${alias}.own_Type
${alias}.enterprise_id,${alias}.from_enterprise_id, ${alias}.owner_flag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="DTOResultMap">
select
......@@ -163,8 +163,8 @@
<if test="search != null and search != '' ">
and ( re.region_code like concat('%', #{search}, '%') or re.region_name like concat('%', #{search}, '%') )
</if>
<if test="ownType != null ">
and rr.own_type = #{ownType}
<if test="ownerFlag != null ">
and rr.owner_flag = #{ownerFlag}
</if>
group by re.region_id
......@@ -210,8 +210,8 @@
#{item}
</foreach>
</if>
<if test="ownType != null ">
and own_type = #{ownType}
<if test="ownerFlag != null ">
and owner_flag = #{ownerFlag}
</if>
group by re.region_id
......
gic-store-service/src/main/resources/mapper/TabStoreRegionRelMapper.xml
......@@ -6,13 +6,13 @@
<result column="region_id" jdbcType="INTEGER" property="regionId" />
<result column="from_enterprise_id" jdbcType="INTEGER" property="fromEnterpriseId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="own_type" jdbcType="INTEGER" property="ownType" />
<result column="owner_flag" jdbcType="INTEGER" property="ownerFlag" />
<result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
store_region_rel_id, region_id, from_enterprise_id, enterprise_id, own_type, delete_flag,
store_region_rel_id, region_id, from_enterprise_id, enterprise_id, owner_flag, delete_flag,
create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -27,10 +27,10 @@
</delete>
<insert id="insert" parameterType="com.gic.store.entity.TabStoreRegionRel">
insert into tab_store_region_rel (store_region_rel_id, region_id, from_enterprise_id,
enterprise_id, own_type, delete_flag,
enterprise_id, owner_flag, delete_flag,
create_time, update_time)
values (#{storeRegionRelId,jdbcType=INTEGER}, #{regionId,jdbcType=INTEGER}, #{fromEnterpriseId,jdbcType=INTEGER},
#{enterpriseId,jdbcType=INTEGER}, #{ownType,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
#{enterpriseId,jdbcType=INTEGER}, #{ownerFlag,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreRegionRel">
......@@ -48,8 +48,8 @@
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="ownType != null">
own_type,
<if test="ownerFlag != null">
owner_flag,
</if>
<if test="deleteFlag != null">
delete_flag,
......@@ -74,8 +74,8 @@
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="ownType != null">
#{ownType,jdbcType=INTEGER},
<if test="ownerFlag != null">
#{ownerFlag,jdbcType=INTEGER},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=INTEGER},
......@@ -100,8 +100,8 @@
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="ownType != null">
own_type = #{ownType,jdbcType=INTEGER},
<if test="ownerFlag != null">
owner_flag = #{ownerFlag,jdbcType=INTEGER},
</if>
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=INTEGER},
......@@ -120,7 +120,7 @@
set region_id = #{regionId,jdbcType=INTEGER},
from_enterprise_id = #{fromEnterpriseId,jdbcType=INTEGER},
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
own_type = #{ownType,jdbcType=INTEGER},
owner_flag = #{ownerFlag,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
......@@ -139,10 +139,10 @@
a.region_id regionId
from tab_store_region_rel a left join tab_store_region_rel b on a.region_id = b.region_id
where a.enterprise_id = #{fromEnterpriseId}
and a.own_type = 0
and a.owner_flag = 1
and a.delete_flag = 0
and b.enterprise_id = #{toEnterpriseId}
and b.own_type = 1
and b.owner_flag = 0
and b.delete_flag = 0
</select>
<update id="delByRegionIds">
......@@ -152,7 +152,7 @@
<foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
#{item}
</foreach>
and own_type = #{ownType}
and owner_flag = #{ownerFlag}
</update>
<select id="getByRegionIdAndEnterpriseId" resultMap="BaseResultMap">
select
......@@ -165,8 +165,8 @@
<if test="enterpriseId != null ">
and enterprise_id = #{enterpriseId}
</if>
<if test="ownType != null ">
and own_type = #{ownType}
<if test="ownerFlag != null ">
and owner_flag = #{ownerFlag}
</if>
</where>
limit 1
......
gic-store-web/src/main/java/com/gic/store/web/controller/ClerkImportController.java
......@@ -10,7 +10,7 @@ import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.store.constant.Constants;
import com.gic.store.constant.GenderEnum;
import com.gic.store.constant.StoreImportEnum;
import com.gic.store.constant.StoreOwnTypeEnum;
import com.gic.store.constant.StoreOwnerFlagEnum;
import com.gic.store.dto.*;
import com.gic.store.service.*;
import com.gic.store.web.qo.PageQO;
......@@ -399,7 +399,7 @@ public class ClerkImportController {
if (storeDTO == null) {
bean.setErrorMessage("门店不存在");
validate = false;
} else if (StoreOwnTypeEnum.OWNER.getCode() != storeDTO.getOwnType()) {
} else if (StoreOwnerFlagEnum.OWNER.getCode() != storeDTO.getOwnerFlag()) {
bean.setErrorMessage("不能在被授权门店下导入导购");
validate = false;
}else if (!isReplace) {
......
gic-store-web/src/main/java/com/gic/store/web/controller/StoreFieldController.java
......@@ -258,7 +258,7 @@ public class StoreFieldController {
if (voList != null) {
Map<Integer, String> enterpriseIdMapName = getEnterpriseIdMapName(storeFieldDTOList.stream()
.filter(e -> e.getOwnType() == 1)
.filter(e -> e.getOwnerFlag() == 1)
.mapToInt(e -> e.getEnterpriseId())
.boxed()
.collect(Collectors.toList()));
......
gic-store-web/src/main/java/com/gic/store/web/controller/StoreRegionController.java
......@@ -6,7 +6,7 @@ import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.download.utils.log.LogUtils;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.store.constant.StoreOwnTypeEnum;
import com.gic.store.constant.StoreOwnerFlagEnum;
import com.gic.store.dto.StoreDTO;
import com.gic.store.dto.StoreRegionDTO;
import com.gic.store.dto.StoreSearchDTO;
......@@ -59,7 +59,7 @@ public class StoreRegionController {
@RequestMapping("/list-store-region")
public RestResponse listStoreRegion(String search) {
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
ServiceResponse<List<StoreRegionDTO>> serviceResponse = storeRegionApiService.listStoreRegion(enterpriseId, search, StoreOwnTypeEnum.OWNER.getCode());
ServiceResponse<List<StoreRegionDTO>> serviceResponse = storeRegionApiService.listStoreRegion(enterpriseId, search, StoreOwnerFlagEnum.OWNER.getCode());
if (serviceResponse.isSuccess()) {
return RestResponse.success(serviceResponse.getResult());
} else {
......
gic-store-web/src/main/java/com/gic/store/web/controller/StoreStatusSettingController.java
......@@ -5,7 +5,7 @@ import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.response.EnterpriseRestResponse;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.store.constant.StoreOwnTypeEnum;
import com.gic.store.constant.StoreOwnerFlagEnum;
import com.gic.store.dto.StoreRegionDTO;
import com.gic.store.dto.StoreStatusSettingDTO;
import com.gic.store.service.StoreRegionApiService;
......@@ -73,7 +73,7 @@ public class StoreStatusSettingController {
vo.setValue(dto.getValue());
list.add(vo);
}
ServiceResponse<List<StoreRegionDTO>> response = this.storeRegionApiService.listStoreRegion(enterpriseId, null, StoreOwnTypeEnum.OWNER.getCode());
ServiceResponse<List<StoreRegionDTO>> response = this.storeRegionApiService.listStoreRegion(enterpriseId, null, StoreOwnerFlagEnum.OWNER.getCode());
if(response.isSuccess()){
List<StoreRegionDTO> storeRegionDTOList = response.getResult();
List<StoreStatusSettingVO> notSetting = new ArrayList<>();
......
gic-store-web/src/main/java/com/gic/store/web/vo/StoreDictVO.java
package com.gic.store.web.vo;
import com.gic.store.constant.StoreOwnTypeEnum;
import com.gic.store.constant.StoreOwnerFlagEnum;
import java.io.Serializable;
import java.util.List;
......@@ -22,9 +22,9 @@ public class StoreDictVO implements Serializable {
private Integer checked=0;
/**
* 0：owner 1:other
* 共享标记 1:自有 0：共享
*/
private Integer ownType;
private Integer ownerFlag;
private String ownTypeStr;
......@@ -69,8 +69,13 @@ public class StoreDictVO implements Serializable {
this.key = key;
}
public void setOwnType(Integer ownType) {
this.ownType = ownType;
public Integer getOwnerFlag() {
return ownerFlag;
}
public StoreDictVO setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
public List<StoreDictVO> getStoreDictList() {
......@@ -82,10 +87,10 @@ public class StoreDictVO implements Serializable {
}
public String getOwnTypeStr() {
if (ownType == null) {
if (ownerFlag == null) {
return "";
}
if (ownType.intValue() == StoreOwnTypeEnum.OTHER.getCode()) {
if (ownerFlag.intValue() == StoreOwnerFlagEnum.OTHER.getCode()) {
return "共享";
}
return "";
......@@ -105,7 +110,7 @@ public class StoreDictVO implements Serializable {
"value='" + value + '\'' +
", key='" + key + '\'' +
", checked=" + checked +
", ownType=" + ownType +
", ownerFlag=" + ownerFlag +
", ownTypeStr='" + ownTypeStr + '\'' +
", storeDictList=" + storeDictList +
", isSystem=" + isSystem +
......
gic-store-web/src/main/java/com/gic/store/web/vo/StoreOverflowVO.java
......@@ -52,11 +52,6 @@ public class StoreOverflowVO implements Serializable {
private String provinces;
/**
* 是否共享 1是0否
*/
private Integer ownType;
/**
* 共享标记 1:自有 0：共享
*/
private Integer ownerFlag;
......@@ -139,15 +134,6 @@ public class StoreOverflowVO implements Serializable {
this.completeStatus = completeStatus;
}
public Integer getOwnType() {
return ownType;
}
public StoreOverflowVO setOwnType(Integer ownType) {
this.ownType = ownType;
return this;
}
public Integer getOwnerFlag() {
return ownerFlag;
}
......@@ -178,7 +164,6 @@ public class StoreOverflowVO implements Serializable {
", completeStatus=" + completeStatus +
", storeGroupName='" + storeGroupName + '\'' +
", provinces='" + provinces + '\'' +
", ownType=" + ownType +
", ownerFlag=" + ownerFlag +
", ownerEntName='" + ownerEntName + '\'' +
'}';
......
gic-store-web/src/main/java/com/gic/store/web/vo/storefield/StoreFieldVO.java
......@@ -68,11 +68,6 @@ public class StoreFieldVO implements Serializable{
private String erpRelCode;
/**
* 0:owner 1:other 授权者和被授权
*/
private Integer ownType;
/**
* 共享标记 1:自有 0：共享
*/
private Integer ownerFlag;
......@@ -177,10 +172,7 @@ public class StoreFieldVO implements Serializable{
}
public Integer getOwnerFlag() {
if (ownType != null && ownType == 1) {
return 0;
}
return 1;
return ownerFlag;
}
public StoreFieldVO setOwnerFlag(Integer ownerFlag) {
......@@ -197,15 +189,6 @@ public class StoreFieldVO implements Serializable{
return this;
}
public Integer getOwnType() {
return ownType;
}
public StoreFieldVO setOwnType(Integer ownType) {
this.ownType = ownType;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
......@@ -232,7 +215,6 @@ public class StoreFieldVO implements Serializable{
", erpRelCode='" + erpRelCode + '\'' +
", ownerFlag='" + ownerFlag + '\'' +
", ownerEntName='" + ownerEntName + '\'' +
", ownType='" + ownType + '\'' +
", enterpriseId='" + enterpriseId + '\'' +
'}';
}
......
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