导购列表添加共享标志

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

@@ -25,6 +25,19 @@ public class ClerkStoreListDTO implements Serializable {
     private List<ClerkDTO> clerkList;
     private Integer ownType;
 
+    private Integer fromEnterpriseId;
+    private String fromEnterpriseName;
+
+    /**
+     * 共享标记 1:自有 0：共享
+     */
+    private Integer ownerFlag;
+
+    /**
+     * 自有商户名称
+     */
+    private String ownerEntName;
+
 
     public Integer getStoreId() {
         return storeId;
@@ -74,6 +87,45 @@ public class ClerkStoreListDTO implements Serializable {
         return ownType;
     }
 
+    public Integer getFromEnterpriseId() {
+        return fromEnterpriseId;
+    }
+
+    public ClerkStoreListDTO setFromEnterpriseId(Integer fromEnterpriseId) {
+        this.fromEnterpriseId = fromEnterpriseId;
+        return this;
+    }
+
+    public String getFromEnterpriseName() {
+        return fromEnterpriseName;
+    }
+
+    public ClerkStoreListDTO setFromEnterpriseName(String fromEnterpriseName) {
+        this.fromEnterpriseName = fromEnterpriseName;
+        return this;
+    }
+
+    public Integer getOwnerFlag() {
+        if (ownType != null && ownType == 1) {
+            return 0;
+        }
+        return 1;
+    }
+
+    public ClerkStoreListDTO setOwnerFlag(Integer ownerFlag) {
+        this.ownerFlag = ownerFlag;
+        return this;
+    }
+
+    public String getOwnerEntName() {
+        return fromEnterpriseName;
+    }
+
+    public ClerkStoreListDTO setOwnerEntName(String ownerEntName) {
+        this.ownerEntName = ownerEntName;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "ClerkStoreListDTO{" +
@@ -83,6 +135,10 @@ public class ClerkStoreListDTO implements Serializable {
                 ", storeCode='" + storeCode + '\'' +
                 ", clerkList=" + clerkList +
                 ", ownType=" + ownType +
+                ", fromEnterpriseId=" + fromEnterpriseId +
+                ", fromEnterpriseName='" + fromEnterpriseName + '\'' +
+                ", ownerFlag=" + ownerFlag +
+                ", ownerEntName='" + ownerEntName + '\'' +
                 '}';
     }
 }

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

@@ -43,6 +43,9 @@ public class StoreEsDTO implements Serializable {
     private String conactsPhone;
     private Long updateTime;
 
+    private Integer fromEnterpriseId;
+    private String fromEnterpriseName;
+
     public Integer getStoreId() {
         return storeId;
     }
@@ -299,6 +302,24 @@ public class StoreEsDTO implements Serializable {
         this.updateTime = updateTime;
     }
 
+    public Integer getFromEnterpriseId() {
+        return fromEnterpriseId;
+    }
+
+    public StoreEsDTO setFromEnterpriseId(Integer fromEnterpriseId) {
+        this.fromEnterpriseId = fromEnterpriseId;
+        return this;
+    }
+
+    public String getFromEnterpriseName() {
+        return fromEnterpriseName;
+    }
+
+    public StoreEsDTO setFromEnterpriseName(String fromEnterpriseName) {
+        this.fromEnterpriseName = fromEnterpriseName;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "StoreEsDTO{" +
@@ -334,6 +355,8 @@ public class StoreEsDTO implements Serializable {
                 ", evaluateCount=" + evaluateCount +
                 ", conactsPhone='" + conactsPhone + '\'' +
                 ", updateTime=" + updateTime +
+                ", fromEnterpriseId=" + fromEnterpriseId +
+                ", fromEnterpriseName=" + fromEnterpriseName +
                 '}';
     }
 }

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

@@ -498,7 +498,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         storeSearchDTO.setStoreResource(clerkSearchDTO.getStoreResource());
 
         return storeApiService.listStore(storeSearchDTO, pageNum, pageSize,
-                "storeId,storeName,storeCode,storeInfoId,ownType");
+                "storeId,storeName,storeCode,storeInfoId,ownType,fromEnterpriseId,fromEnterpriseName");
     }
 
     @Override

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

@@ -1686,6 +1686,8 @@ public class StoreApiServiceImpl implements StoreApiService {
             esDTO.setEvaluateCount(dto.getEvaluateCount());
             esDTO.setConactsPhone(dto.getConactsPhone());
             esDTO.setUpdateTime(dto.getUpdateTime().getTime());
+            esDTO.setFromEnterpriseId(dto.getFromEnterpriseId());
+            esDTO.setFromEnterpriseName(dto.getFromEnterpriseName());
             Double[] location = {Double.valueOf(StringUtils.isBlank(dto.getLongitude())? "0" : dto.getLongitude()),Double.valueOf(StringUtils.isBlank(dto.getLatitude())? "0":dto.getLatitude())};
             JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(esDTO));
             jsonObject.put("location", location);