Merge branch 'developer' into 'master'

Developer

See merge request !7

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/applet/AppletDataIconEnum.java

@@ -9,11 +9,11 @@ package com.gic.enterprise.constant.applet;
 public enum AppletDataIconEnum {
     MALL_ORDER("D1", "商城订单"),
     COUPON("D2", "卡券包"),
-    RED("D3", "红包"),
+//    RED("D3", "红包"),
     CART("D4", "购物车"),
     COLLECT("D5", "收藏商品"),
     INTEGRAL("D6", "积分"),
-    GIFT("D7", "礼品"),
+//    GIFT("D7", "礼品"),
     RETAIL_ORDER("D8", "线下订单"),
     WM_ORDER("D9", "微盟订单");
 

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

@@ -13,7 +13,6 @@ import java.util.List;
  */
 public class ProjectDTO implements Serializable{
     private static final long serialVersionUID = -6709186360782680347L;
-
     public interface SaveValid{}
 
     /**
@@ -43,6 +42,17 @@ public class ProjectDTO implements Serializable{
 
     private Integer itemUseCount;
 
+    private int seq;
+
+    public void setSeq(int seq) {
+        this.seq = seq;
+    }
+
+    public int getSeq() {
+        return seq;
+    }
+
+
     public void setItemTotalCount(Integer itemTotalCount) {
         this.itemTotalCount = itemTotalCount;
     }

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

@@ -68,6 +68,7 @@ public class ProjectItemDTO implements Serializable {
      * 审批模板类型   0：普通审批项， 1：风险模式审批， 2：导出完整数据
      */
     private Integer auditTemplateType;
+    private int seq;
 
     public Integer getProjectItemId() {
         return projectItemId;
@@ -164,4 +165,12 @@ public class ProjectItemDTO implements Serializable {
     public void setAuditTemplateType(Integer auditTemplateType) {
         this.auditTemplateType = auditTemplateType;
     }
+
+    public void setSeq(int seq) {
+        this.seq = seq;
+    }
+
+    public int getSeq() {
+        return seq;
+    }
 }

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

+package com.gic.enterprise.dto.wm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: WmStoreSyncLogDTO
  
+ * @Description: 

+ * @author guojuxing
  
+ * @date 2020/5/15 10:05 AM
 
+ */
+public class WmStoreSyncLogDTO implements Serializable{
+    private static final long serialVersionUID = 2365626532131284536L;
+
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 店铺主键ID，用于关联配置
+     */
+    private Integer wmMallStoreId;
+
+    /**
+     *
+     */
+    private String storeId;
+
+    /**
+     * 1:总店 2:门店同步（实体）
+     */
+    private Integer type;
+
+    /**
+     * 门店名称
+     */
+    private String storeName;
+
+    /**
+     * 门店code
+     */
+    private String storeCode;
+
+    /**
+     * 1:已同步微盟 0:微盟侧已删除
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public WmStoreSyncLogDTO setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public WmStoreSyncLogDTO setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Integer getWmMallStoreId() {
+        return wmMallStoreId;
+    }
+
+    public WmStoreSyncLogDTO setWmMallStoreId(Integer wmMallStoreId) {
+        this.wmMallStoreId = wmMallStoreId;
+        return this;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public WmStoreSyncLogDTO setStoreId(String storeId) {
+        this.storeId = storeId;
+        return this;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public WmStoreSyncLogDTO setType(Integer type) {
+        this.type = type;
+        return this;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public WmStoreSyncLogDTO setStoreName(String storeName) {
+        this.storeName = storeName;
+        return this;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public WmStoreSyncLogDTO setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public WmStoreSyncLogDTO setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public WmStoreSyncLogDTO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public WmStoreSyncLogDTO setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+}

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/ProjectApiService.java

@@ -57,4 +57,26 @@ public interface ProjectApiService {
      * @throws 
      */
     ServiceResponse<List<ProjectDTO>> listAllProject();
+
+    /**
+     * @Title: setProjectSort
+     * @Description:
+     * @author zhiwj
+     * @param projectId
+     * @param seq
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Void> setProjectSort(Integer projectId, Integer seq);
+    
+    /**
+     * @Title: setProjectItemSort
+     * @Description: 
+     * @author zhiwj 
+     * @param projectItemId
+     * @param seq
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws 
+     */
+    ServiceResponse<Void> setProjectItemSort(Integer projectItemId, Integer seq);
 }

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/WmStoreSyncLogApiService.java

+package com.gic.enterprise.service;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.enterprise.dto.wm.WmStoreSyncLogDTO;
+
+import java.util.List;
+
+public interface WmStoreSyncLogApiService {
+
+    /**
+     * 新增微盟同步日志
+     * @Title: saveWmStoreSyncLog

+     * @Description: 
+    
* @author guojuxing 
+     * @param storeIdList 门店
+     * @param wmMallStoreId 微盟店铺ID
+     * @param type 1：总店 2：门店同步（一对一）
+     * @param enterpriseId
商户ID
+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

+    
*/
+    ServiceResponse<Void> saveWmStoreSyncLog(List<Integer> storeIdList, Integer wmMallStoreId,
+                                             Integer type, Integer enterpriseId);
+
+    /**
+     * 分页查询门店同步日志
+     * @Title: pageWmStoreSyncLog

+     * @Description:
+    
* @author guojuxing
+     * @param search 门店code/名称
+     * @param type 1：总店 2：门店同步（一对一）
+     * @param wmMallStoreId 店铺ID
+     * @param pageNum 第几页
+     * @param pageSize
每页多少条
+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.enterprise.dto.wm.WmStoreSyncLogDTO>>

+    
*/
+    ServiceResponse<Page<WmStoreSyncLogDTO>> pageWmStoreSyncLog(String search, Integer type, Integer wmMallStoreId,
+                                                                Integer pageNum, Integer pageSize);
+
+    /**
+     * 已经同步过的门店
+     * @Title: getStoreList

+     * @Description:
+    
* @author guojuxing
+     * @param type
+     * @param wmMallStoreId

+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.wm.WmStoreSyncLogDTO>>

+    
*/
+    ServiceResponse<List<WmStoreSyncLogDTO>> getStoreList(List<Integer> type, Integer wmMallStoreId);
+
+    /**
+     * 解除门店关联日志
+     * @Title: deleteLogic

+     * @Description:
+    
* @author guojuxing
+     * @param storeId
+     * @param wmMallStoreId

+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

+    
*/
+    ServiceResponse<Void> deleteLogic(Integer storeId, Integer wmMallStoreId);
+}

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

@@ -65,4 +65,10 @@ public interface TabProjectItemMapper {
     List<Map<String,Object>> getProjectItemCountByProjectIds(@Param("ids") List<Integer> projectIds, @Param("useStatus") Integer useStatus);
 
     TabProjectItem getByProjectItemCode(@Param("projectItemCode") String projectItemCode);
+
+    List<TabProjectItem> listTwoElementExceptId(@Param("start") int start, @Param("size") int size, @Param("projectItemId") Integer projectItemId);
+
+    Double getMinSort();
+
+    Double getMaxSort();
 }
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package com.gic.enterprise.dao.mapper;
 import com.gic.enterprise.dto.ProjectDTO;
 import com.gic.enterprise.entity.TabProject;
 import com.github.pagehelper.Page;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -58,4 +59,10 @@ public interface TabProjectMapper {
     TabProject getFirstProject(ProjectDTO projectDTO);
 
     Page<TabProject> listProject(ProjectDTO projectDTO);
+
+    List<TabProject> listTwoElementExceptId(@Param("start") int start, @Param("size") int size, @Param("projectId") Integer projectId);
+
+    Double getMinSort();
+
+    Double getMaxSort();
 }
\ No newline at end of file

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

+package com.gic.enterprise.dao.mapper;
+
+import com.gic.enterprise.entity.TabWmStoreSyncLog;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface TabWmStoreSyncLogMapper {
+    /**
+     * 根据主键删除
+     *
+     * @param id 主键
+     * @return 更新条目数
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabWmStoreSyncLog record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabWmStoreSyncLog record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param id 主键
+     * @return 实体对象
+     */
+    TabWmStoreSyncLog selectByPrimaryKey(Integer id);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabWmStoreSyncLog record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabWmStoreSyncLog record);
+
+    List<TabWmStoreSyncLog> pageWmStoreSyncLog(@Param("search") String search, @Param("type") Integer type,
+                                               @Param("wmMallStoreId") Integer wmMallStoreId);
+
+    List<TabWmStoreSyncLog> getStoreList(@Param("typeList") List<Integer> type, @Param("wmMallStoreId") Integer wmMallStoreId);
+
+    int deleteLogic(@Param("storeId") Integer storeId, @Param("wmMallStoreId") Integer wmMallStoreId);
+}
\ No newline at end of file

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

@@ -31,6 +31,11 @@ public class TabProject {
      */
     private Date updateTime;
 
+    /**
+     * 排序
+     */
+    private Double sort;
+
     public Integer getProjectId() {
         return projectId;
     }
@@ -70,4 +75,12 @@ public class TabProject {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public Double getSort() {
+        return sort;
+    }
+
+    public void setSort(Double sort) {
+        this.sort = sort;
+    }
 }
\ No newline at end of file

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

@@ -71,6 +71,11 @@ public class TabProjectItem {
      */
     private Integer auditTemplateType;
 
+    /**
+     * 
+     */
+    private Double sort;
+
     public Integer getProjectItemId() {
         return projectItemId;
     }
@@ -174,4 +179,12 @@ public class TabProjectItem {
     public void setAuditTemplateType(Integer auditTemplateType) {
         this.auditTemplateType = auditTemplateType;
     }
+
+    public Double getSort() {
+        return sort;
+    }
+
+    public void setSort(Double sort) {
+        this.sort = sort;
+    }
 }
\ No newline at end of file

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

+package com.gic.enterprise.entity;
+
+import java.util.Date;
+
+/**
+ * tab_wm_store_sync_log
+ */
+public class TabWmStoreSyncLog {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 店铺主键ID，用于关联配置
+     */
+    private Integer wmMallStoreId;
+
+    /**
+     * 
+     */
+    private Integer storeId;
+
+    /**
+     * 1:总店 2:门店同步（实体）
+     */
+    private Integer storeType;
+
+    /**
+     * 门店名称
+     */
+    private String storeName;
+
+    /**
+     * 门店code
+     */
+    private String storeCode;
+
+    /**
+     * 1:已同步微盟 0:微盟侧已删除
+     */
+    private Integer status;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public TabWmStoreSyncLog setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public TabWmStoreSyncLog setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Integer getWmMallStoreId() {
+        return wmMallStoreId;
+    }
+
+    public TabWmStoreSyncLog setWmMallStoreId(Integer wmMallStoreId) {
+        this.wmMallStoreId = wmMallStoreId;
+        return this;
+    }
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public TabWmStoreSyncLog setStoreId(Integer storeId) {
+        this.storeId = storeId;
+        return this;
+    }
+
+    public Integer getStoreType() {
+        return storeType;
+    }
+
+    public TabWmStoreSyncLog setStoreType(Integer storeType) {
+        this.storeType = storeType;
+        return this;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public TabWmStoreSyncLog setStoreName(String storeName) {
+        this.storeName = storeName;
+        return this;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public TabWmStoreSyncLog setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public TabWmStoreSyncLog setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public TabWmStoreSyncLog setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public TabWmStoreSyncLog setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+}
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/ProjectItemService.java

@@ -36,4 +36,6 @@ public interface ProjectItemService {
     TabProjectItem getById(Integer projectItemId);
 
     TabProjectItem getByProjectItemCode(String projectItemCode);
+
+    void setProjectItemSort(Integer projectItemId, Integer seq);
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/ProjectService.java

@@ -28,4 +28,6 @@ public interface ProjectService {
     List<TabProject> listAllProject();
 
     TabProject getProjectByProjectItem(Integer projectItemId);
+
+    void setProjectSort(Integer projectId, Integer seq);
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/WmStoreSyncLogService.java

+package com.gic.enterprise.service;
+
+import com.gic.enterprise.entity.TabWmStoreSyncLog;
+import com.github.pagehelper.Page;
+
+import java.util.List;
+
+public interface WmStoreSyncLogService {
+
+
+    void saveWmStoreSyncLog(Integer storeId, Integer wmMallStoreId,
+                            Integer type, Integer enterpriseId, String storeCode, String storeName);
+
+    Page<TabWmStoreSyncLog> pageWmStoreSyncLog(String search, Integer type, Integer wmMallStoreId,
+                                               Integer pageNum, Integer pageSize);
+
+    List<TabWmStoreSyncLog> getStoreList(List<Integer> type, Integer wmMallStoreId);
+
+    int deleteLogic(Integer storeId, Integer wmMallStoreId);
+}

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

@@ -9,9 +9,11 @@ import com.gic.enterprise.qo.ProjectItemQO;
 import com.gic.enterprise.service.ProjectItemService;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,6 +39,9 @@ public class ProjectItemServiceImpl implements ProjectItemService {
     public Integer save(ProjectItemDTO copy) {
         TabProjectItem projectItem = EntityUtil.changeEntityByJSON(TabProjectItem.class, copy);
         projectItem.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        projectItem.setCreateTime(new Date());
+        Double sort = tabProjectItemMapper.getMinSort();
+        projectItem.setSort(sort == null ? 1d : sort - 1d);
         tabProjectItemMapper.insertSelective(projectItem);
         return projectItem.getProjectItemId();
     }
@@ -105,4 +110,52 @@ public class ProjectItemServiceImpl implements ProjectItemService {
     public TabProjectItem getByProjectItemCode(String projectItemCode) {
         return tabProjectItemMapper.getByProjectItemCode(projectItemCode);
     }
+
+    @Override
+    public void setProjectItemSort(Integer projectItemId, Integer seq) {
+        if (seq <= 1) {
+            // 相当于置顶
+            sortTopping(projectItemId);
+        } else {
+            int start = seq - 2;
+            int size = 2;
+
+            List<TabProjectItem> list = tabProjectItemMapper.listTwoElementExceptId(start, size, projectItemId);
+            if (CollectionUtils.isEmpty(list)) {
+                // 置底
+                sortBottom(projectItemId);
+            } else {
+                Double sort;
+                if (list.size() == 1) {
+                    // 置底
+                    sort = list.get(0).getSort() + 1d;
+                } else {
+                    sort = (list.get(0).getSort() + list.get(1).getSort()) / 2d;
+                }
+                TabProjectItem project = new TabProjectItem();
+                project.setProjectItemId(projectItemId);
+                project.setSort(sort);
+                tabProjectItemMapper.updateByPrimaryKeySelective(project);
+            }
+        }
+    }
+
+    private void sortTopping(Integer projectItemId) {
+        Double sort = tabProjectItemMapper.getMinSort();
+        TabProjectItem projectItem = new TabProjectItem();
+        projectItem.setProjectItemId(projectItemId);
+        projectItem.setSort(sort - 1d);
+        tabProjectItemMapper.updateByPrimaryKeySelective(projectItem);
+    }
+
+    private void sortBottom(Integer projectItemId) {
+        Double sort = tabProjectItemMapper.getMaxSort();
+        if (sort != null) {
+            TabProjectItem projectItem = new TabProjectItem();
+            projectItem.setProjectItemId(projectItemId);
+            projectItem.setSort(sort + 1d);
+            tabProjectItemMapper.updateByPrimaryKeySelective(projectItem);
+        }
+    }
+
 }

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

@@ -9,6 +9,7 @@ import com.gic.enterprise.entity.TabProjectItem;
 import com.gic.enterprise.service.ProjectService;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,6 +37,10 @@ public class ProjectServiceImpl implements ProjectService {
         tabProject.setProjectName(copy.getProjectName());
         tabProject.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
         tabProject.setCreateTime(new Date());
+
+        Double sort = tabProjectMapper.getMinSort();
+        tabProject.setSort(sort == null ? 1d : sort - 1d);
+
         tabProjectMapper.insertSelective(tabProject);
         return tabProject.getProjectId();
     }
@@ -90,4 +95,52 @@ public class ProjectServiceImpl implements ProjectService {
         TabProjectItem projectItem = tabProjectItemMapper.selectByPrimaryKey(projectItemId);
         return tabProjectMapper.selectByPrimaryKey(projectItem.getProjectId());
     }
+
+    @Override
+    public void setProjectSort(Integer projectId, Integer seq) {
+        if (seq <= 1) {
+            // 相当于置顶
+            sortTopping(projectId);
+        } else {
+            int start = seq - 2;
+            int size = 2;
+
+            List<TabProject> list = tabProjectMapper.listTwoElementExceptId(start, size, projectId);
+            if (CollectionUtils.isEmpty(list)) {
+                // 置底
+                sortBottom(projectId);
+            } else {
+                Double sort;
+                if (list.size() == 1) {
+                    // 置底
+                    sort = list.get(0).getSort() + 1d;
+                } else {
+                    sort = (list.get(0).getSort() + list.get(1).getSort()) / 2d;
+                }
+                TabProject project = new TabProject();
+                project.setProjectId(projectId);
+                project.setSort(sort);
+                tabProjectMapper.updateByPrimaryKeySelective(project);
+            }
+        }
+    }
+
+    private void sortTopping(Integer projectId) {
+        Double sort = tabProjectMapper.getMinSort();
+        TabProject project = new TabProject();
+        project.setProjectId(projectId);
+        project.setSort(sort - 1d);
+        tabProjectMapper.updateByPrimaryKeySelective(project);
+    }
+
+    private void sortBottom(Integer projectId) {
+        Double sort = tabProjectMapper.getMaxSort();
+        if (sort != null) {
+            TabProject project = new TabProject();
+            project.setProjectId(projectId);
+            project.setSort(sort + 1d);
+            tabProjectMapper.updateByPrimaryKeySelective(project);
+        }
+    }
+
 }

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

+package com.gic.enterprise.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.gic.enterprise.dao.mapper.TabWmStoreSyncLogMapper;
+import com.gic.enterprise.entity.TabWmStoreSyncLog;
+import com.gic.enterprise.service.WmStoreSyncLogService;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+
+@Service("wmStoreSyncLogService")
+public class WmStoreSyncLogServiceImpl implements WmStoreSyncLogService {
+    @Autowired
+    private TabWmStoreSyncLogMapper tabWmStoreSyncLogMapper;
+
+    @Override
+    public void saveWmStoreSyncLog(Integer storeId, Integer wmMallStoreId, Integer type,
+            Integer enterpriseId, String storeCode, String storeName) {
+        Date now = new Date();
+        TabWmStoreSyncLog record = new TabWmStoreSyncLog()
+                .setStoreId(storeId)
+                .setEnterpriseId(enterpriseId)
+                .setStatus(1)
+                .setStoreCode(storeCode)
+                .setWmMallStoreId(wmMallStoreId)
+                .setStoreName(storeName)
+                .setStoreType(type)
+                .setCreateTime(now)
+                .setUpdateTime(now);
+        tabWmStoreSyncLogMapper.insert(record);
+    }
+
+    @Override
+    public Page<TabWmStoreSyncLog> pageWmStoreSyncLog(String search, Integer type,
+            Integer wmMallStoreId, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<TabWmStoreSyncLog> list = tabWmStoreSyncLogMapper.pageWmStoreSyncLog(search, type, wmMallStoreId);
+        return (Page<TabWmStoreSyncLog>) list;
+    }
+
+    @Override
+    public List<TabWmStoreSyncLog> getStoreList(List<Integer> type, Integer wmMallStoreId) {
+        return tabWmStoreSyncLogMapper.getStoreList(type, wmMallStoreId);
+    }
+
+    @Override
+    public int deleteLogic(Integer storeId, Integer wmMallStoreId) {
+        return tabWmStoreSyncLogMapper.deleteLogic(storeId, wmMallStoreId);
+    }
+}

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

@@ -79,6 +79,8 @@ public class ProjectApiServiceImpl implements ProjectApiService{
             Map<Integer, Integer> totalCountMap = projectItemService.getProjectItemCountByProjectIds(projectIds, null);
             Map<Integer, Integer> countUseMap = projectItemService.getProjectItemCountByProjectIds(projectIds, GlobalInfo.DATA_STATUS_NORMAL);
             List<ProjectDTO> resultList = projectPage.getResult();
+            int index = (pageNum - 1) * pageSize + 1;
+            int i = 0;
             for (ProjectDTO dto : resultList) {
                 Integer totalCount = totalCountMap.get(dto.getProjectId());
                 dto.setItemTotalCount(totalCount == null ? 0 : totalCount);
@@ -90,6 +92,8 @@ public class ProjectApiServiceImpl implements ProjectApiService{
                 itemQO.setPageSize(3);
                 com.github.pagehelper.Page<TabProjectItem> itemList = projectItemService.listProjectItem(itemQO);
                 dto.setItemList(EntityUtil.changeEntityListNew(ProjectItemDTO.class, itemList));
+                dto.setSeq(index + i);
+                i++;
             }
         }
         return ServiceResponse.success(projectPage);
@@ -114,5 +118,16 @@ public class ProjectApiServiceImpl implements ProjectApiService{
         return ServiceResponse.success(result);
     }
 
+    @Override
+    public ServiceResponse<Void> setProjectSort(Integer projectId, Integer seq) {
+        this.projectService.setProjectSort(projectId, seq);
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> setProjectItemSort(Integer projectItemId, Integer seq) {
+        this.projectItemService.setProjectItemSort(projectItemId, seq);
+        return ServiceResponse.success();
+    }
 
 }

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

@@ -15,10 +15,13 @@ import com.gic.enterprise.service.AuditLogService;
 import com.gic.enterprise.service.ProjectItemApiService;
 import com.gic.enterprise.service.ProjectItemService;
 import com.gic.enterprise.service.ProjectService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  *
  * @Description:
@@ -79,6 +82,12 @@ public class ProjectItemApiServiceImpl implements ProjectItemApiService {
     public ServiceResponse<Page<ProjectItemDTO>> listProjectItem(ProjectItemQO projectItemQO) {
         com.github.pagehelper.Page page = projectItemService.listProjectItem(projectItemQO);
         Page<ProjectItemDTO> dtoPage = PageHelperUtils.changePageHelperToCurrentPage(page, ProjectItemDTO.class);
+        List<ProjectItemDTO> resultList = dtoPage.getResult();
+        if (CollectionUtils.isNotEmpty(resultList)) {
+            for (int i = 0; i < resultList.size(); i++) {
+                resultList.get(i).setSeq(1 + i);
+            }
+        }
         return ServiceResponse.success(dtoPage);
     }
 

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

+package com.gic.enterprise.service.outer.impl;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
+import com.gic.enterprise.dto.wm.WmStoreSyncLogDTO;
+import com.gic.enterprise.entity.TabWmStoreSyncLog;
+import com.gic.enterprise.error.ErrorCode;
+import com.gic.enterprise.service.WmStoreSyncLogApiService;
+import com.gic.enterprise.service.WmStoreSyncLogService;
+import com.gic.store.dto.StoreDTO;
+import com.gic.store.dto.StoreSearchDTO;
+import com.gic.store.service.StoreApiService;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+@Service("wmStoreSyncLogApiService")
+public class WmStoreSyncLogApiServiceImpl implements WmStoreSyncLogApiService {
+    @Autowired
+    private WmStoreSyncLogService wmStoreSyncLogService;
+    @Autowired
+    private StoreApiService storeApiService;
+
+    @Override
+    public ServiceResponse<Void> saveWmStoreSyncLog(List<Integer> storeIdList, Integer wmMallStoreId, Integer type,
+            Integer enterpriseId) {
+        StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
+        StringBuilder storeIds = new StringBuilder();
+        storeIdList.forEach(storeId -> storeIds.append(storeId).append(","));
+        storeSearchDTO.setStoreIds(storeIds.toString());
+        ServiceResponse<Page<StoreDTO>> storeResponse = storeApiService.listStore(storeSearchDTO, 0, storeIdList.size());
+        if (storeResponse.isSuccess()) {
+            Page<StoreDTO> page = storeResponse.getResult();
+            if (page != null) {
+                List<StoreDTO> storeList = page.getResult();
+                if (CollectionUtils.isNotEmpty(storeList)) {
+                    storeList.forEach(temp -> wmStoreSyncLogService
+                            .saveWmStoreSyncLog(temp.getStoreId(), enterpriseId, wmMallStoreId, type, temp.getStoreCode(), temp.getStoreName()));
+                }
+                return ServiceResponse.success();
+            }
+        }
+        return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "ES没有门店数据");
+    }
+
+    @Override
+    public ServiceResponse<Page<WmStoreSyncLogDTO>> pageWmStoreSyncLog(String search, Integer type,
+                                                                       Integer wmMallStoreId, Integer pageNum, Integer pageSize) {
+        com.github.pagehelper.Page page = wmStoreSyncLogService.pageWmStoreSyncLog(search, type, wmMallStoreId, pageNum, pageSize);
+        Page<WmStoreSyncLogDTO> resultPage = PageHelperUtils.changePageHelperToCurrentPage(page, WmStoreSyncLogDTO.class);
+        return ServiceResponse.success(resultPage);
+    }
+
+    @Override
+    public ServiceResponse<List<WmStoreSyncLogDTO>> getStoreList(List<Integer> type, Integer wmMallStoreId) {
+        List<TabWmStoreSyncLog> list = wmStoreSyncLogService.getStoreList(type, wmMallStoreId);
+        if (CollectionUtils.isNotEmpty(list)) {
+            return ServiceResponse.success(EntityUtil.changeEntityListNew(WmStoreSyncLogDTO.class, list));
+        }
+        return ServiceResponse.success(Collections.emptyList());
+    }
+
+    @Override
+    public ServiceResponse<Void> deleteLogic(Integer storeId, Integer wmMallStoreId) {
+        wmStoreSyncLogService.deleteLogic(storeId, wmMallStoreId);
+        return ServiceResponse.success();
+    }
+}

gic-platform-enterprise-service/src/main/resources/dubbo-gic-platform-enterprise-service.xml

@@ -128,6 +128,7 @@
 
     <dubbo:service interface="com.gic.enterprise.service.DataConfigApiService" ref="dataConfigApiService" timeout="6000" />
     <dubbo:service interface="com.gic.enterprise.service.AppletQrcodeApiService" ref="appletQrcodeApiService" timeout="6000" />
+    <dubbo:service interface="com.gic.enterprise.service.WmStoreSyncLogApiService" ref="wmStoreSyncLogApiService" timeout="6000" />
 
 
     <dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="shopApiService" timeout="6000" />

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

@@ -15,11 +15,12 @@
     <result column="is_platform" jdbcType="INTEGER" property="isPlatform" />
     <result column="audit_expire_duration" jdbcType="INTEGER" property="auditExpireDuration" />
     <result column="audit_template_type" jdbcType="INTEGER" property="auditTemplateType" />
+    <result column="sort" jdbcType="DOUBLE" property="sort" />
   </resultMap>
   <sql id="Base_Column_List">
     project_item_id, project_item_name, project_item_code, project_item_desc, project_id, 
     callback_url, use_status, status, create_time, update_time, is_platform, audit_expire_duration, 
-    audit_template_type
+    audit_template_type, sort
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -36,14 +37,17 @@
       project_item_desc, project_id, callback_url, 
       use_status, status, create_time, 
       update_time, is_platform, audit_expire_duration, 
-      audit_template_type)
+      audit_template_type, sort)
     values (#{projectItemId,jdbcType=INTEGER}, #{projectItemName,jdbcType=VARCHAR}, #{projectItemCode,jdbcType=VARCHAR}, 
       #{projectItemDesc,jdbcType=VARCHAR}, #{projectId,jdbcType=INTEGER}, #{callbackUrl,jdbcType=VARCHAR}, 
       #{useStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{isPlatform,jdbcType=INTEGER}, #{auditExpireDuration,jdbcType=INTEGER}, 
-      #{auditTemplateType,jdbcType=INTEGER})
+      #{auditTemplateType,jdbcType=INTEGER}, #{sort,jdbcType=DOUBLE})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabProjectItem">
+    <selectKey keyProperty="projectItemId" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
     insert into tab_project_item
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="projectItemId != null">
@@ -85,6 +89,9 @@
       <if test="auditTemplateType != null">
         audit_template_type,
       </if>
+      <if test="sort != null">
+        sort,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="projectItemId != null">
@@ -126,6 +133,9 @@
       <if test="auditTemplateType != null">
         #{auditTemplateType,jdbcType=INTEGER},
       </if>
+      <if test="sort != null">
+        #{sort,jdbcType=DOUBLE},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabProjectItem">
@@ -167,6 +177,9 @@
       <if test="auditTemplateType != null">
         audit_template_type = #{auditTemplateType,jdbcType=INTEGER},
       </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=DOUBLE},
+      </if>
     </set>
     where project_item_id = #{projectItemId,jdbcType=INTEGER}
   </update>
@@ -183,7 +196,8 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       is_platform = #{isPlatform,jdbcType=INTEGER},
       audit_expire_duration = #{auditExpireDuration,jdbcType=INTEGER},
-      audit_template_type = #{auditTemplateType,jdbcType=INTEGER}
+      audit_template_type = #{auditTemplateType,jdbcType=INTEGER},
+      sort = #{sort,jdbcType=DOUBLE}
     where project_item_id = #{projectItemId,jdbcType=INTEGER}
   </update>
   <select id="getFirstProjectItem" resultMap="BaseResultMap">
@@ -222,7 +236,7 @@
       #{item}
     </foreach>
     </if>
-    order by create_time desc
+    order by sort
   </select>
   <select id="getProjectItemCountByProjectIds" resultType="java.util.HashMap">
     select
@@ -250,4 +264,19 @@
     </if>
     limit 1
   </select>
+  <select id="listTwoElementExceptId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_project_item
+    where status = 1
+    and project_item_id &lt;&gt; #{projectItemId}
+    order by sort
+    limit #{start}, #{size}
+  </select>
+  <select id="getMinSort" resultType="java.lang.Double">
+    select sort from tab_project_item where status = 1 order by sort limit 1
+  </select>
+  <select id="getMaxSort" resultType="java.lang.Double">
+    select sort from tab_project_item where status = 1 order by sort desc limit 1
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -7,9 +7,10 @@
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="sort" jdbcType="DOUBLE" property="sort" />
   </resultMap>
   <sql id="Base_Column_List">
-    project_id, project_name, status, create_time, update_time
+    project_id, project_name, status, create_time, update_time, sort
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -23,9 +24,11 @@
   </delete>
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabProject">
     insert into tab_project (project_id, project_name, status, 
-      create_time, update_time)
+      create_time, update_time, sort
+      )
     values (#{projectId,jdbcType=INTEGER}, #{projectName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{sort,jdbcType=DOUBLE}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabProject">
     <selectKey keyProperty="projectId" order="AFTER" resultType="java.lang.Integer">
@@ -48,6 +51,9 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="sort != null">
+        sort,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="projectId != null">
@@ -65,6 +71,9 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="sort != null">
+        #{sort,jdbcType=DOUBLE},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabProject">
@@ -82,6 +91,9 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=DOUBLE},
+      </if>
     </set>
     where project_id = #{projectId,jdbcType=INTEGER}
   </update>
@@ -90,7 +102,8 @@
     set project_name = #{projectName,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      sort = #{sort,jdbcType=DOUBLE}
     where project_id = #{projectId,jdbcType=INTEGER}
   </update>
   <select id="getFirstProject" resultMap="BaseResultMap">
@@ -114,6 +127,21 @@
     <if test="projectName != null and projectName != '' ">
       and project_name like concat('%', #{projectName}, '%')
     </if>
-    order by create_time desc
+    order by sort
+  </select>
+  <select id="listTwoElementExceptId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_project
+    where status = 1
+    and project_id &lt;&gt; #{projectId}
+    order by sort
+    limit #{start}, #{size}
+  </select>
+  <select id="getMinSort" resultType="java.lang.Double">
+    select sort from tab_project where status = 1 order by sort limit 1
+  </select>
+  <select id="getMaxSort" resultType="java.lang.Double">
+    select sort from tab_project where status = 1 order by sort desc limit 1
   </select>
 </mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gic.enterprise.dao.mapper.TabWmStoreSyncLogMapper">
+  <resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabWmStoreSyncLog">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
+    <result column="wm_mall_store_id" jdbcType="INTEGER" property="wmMallStoreId" />
+    <result column="store_id" jdbcType="INTEGER" property="storeId" />
+    <result column="store_type" jdbcType="INTEGER" property="storeType" />
+    <result column="store_name" jdbcType="VARCHAR" property="storeName" />
+    <result column="store_code" jdbcType="VARCHAR" property="storeCode" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, enterprise_id, wm_mall_store_id, store_id, store_type, store_name, store_code, status,
+    create_time, update_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_wm_store_sync_log
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tab_wm_store_sync_log
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.gic.enterprise.entity.TabWmStoreSyncLog">
+    insert into tab_wm_store_sync_log (id, enterprise_id, wm_mall_store_id, 
+      store_id, store_type, store_name,
+      store_code, status, create_time, 
+      update_time)
+    values (#{id,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{wmMallStoreId,jdbcType=INTEGER}, 
+      #{storeId,jdbcType=INTEGER}, #{storeType,jdbcType=INTEGER}, #{storeName,jdbcType=VARCHAR},
+      #{storeCode,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabWmStoreSyncLog">
+    insert into tab_wm_store_sync_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="wmMallStoreId != null">
+        wm_mall_store_id,
+      </if>
+      <if test="storeId != null">
+        store_id,
+      </if>
+      <if test="storeType != null">
+        store_type,
+      </if>
+      <if test="storeName != null">
+        store_name,
+      </if>
+      <if test="storeCode != null">
+        store_code,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="wmMallStoreId != null">
+        #{wmMallStoreId,jdbcType=INTEGER},
+      </if>
+      <if test="storeId != null">
+        #{storeId,jdbcType=INTEGER},
+      </if>
+      <if test="storeType != null">
+        #{storeType,jdbcType=INTEGER},
+      </if>
+      <if test="storeName != null">
+        #{storeName,jdbcType=VARCHAR},
+      </if>
+      <if test="storeCode != null">
+        #{storeCode,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabWmStoreSyncLog">
+    update tab_wm_store_sync_log
+    <set>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="wmMallStoreId != null">
+        wm_mall_store_id = #{wmMallStoreId,jdbcType=INTEGER},
+      </if>
+      <if test="storeId != null">
+        store_id = #{storeId,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        store_type = #{storeType,jdbcType=INTEGER},
+      </if>
+      <if test="storeName != null">
+        store_name = #{storeName,jdbcType=VARCHAR},
+      </if>
+      <if test="storeCode != null">
+        store_code = #{storeCode,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabWmStoreSyncLog">
+    update tab_wm_store_sync_log
+    set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      wm_mall_store_id = #{wmMallStoreId,jdbcType=INTEGER},
+      store_id = #{storeId,jdbcType=INTEGER},
+      store_type = #{storeType,jdbcType=INTEGER},
+      store_name = #{storeName,jdbcType=VARCHAR},
+      store_code = #{storeCode,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="pageWmStoreSyncLog" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    from tab_wm_store_sync_log
+
+    where status = 1
+    <if test="type != null">
+      and store_type = #{type}
+    </if>
+    and wm_mall_store_id = #{wmMallStoreId}
+    <if test="search != null and search != '' ">
+      and (store_name like concat('%', #{search}, '%') or store_code like concat('%', #{search}, '%') )
+    </if>
+  </select>
+
+  <select id="getStoreList" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    from tab_wm_store_sync_log
+    where status = 1
+    and wm_mall_store_id = #{wmMallStoreId}
+    <if test="typeList != null and typeList.size() > 0">
+      and store_type in
+      <foreach collection="typeList" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+  </select>
+
+  <update id="deleteLogic">
+    update tab_wm_store_sync_log set status = 0
+    where status = 1
+    and wm_mall_store_id = #{wmMallStoreId}
+    and store_id = #{storeId}
+  </update>
+</mapper>
\ No newline at end of file

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmMallStoreController.java

@@ -78,12 +78,21 @@ public class WmMallStoreController {
                 OperationResultUtils.LOG_EDIT + "微盟商城店铺", dto.getWmPidName());
     }
 
+    /**
+     * 店铺详情
+     * @param wmMallStoreId
+     * @return
+     */
     @RequestMapping("/get-wm-store-detail")
     public RestResponse getDetail(Integer wmMallStoreId) {
         return ResultControllerUtils.commonResultOne(wmStoreApiService.getWmStoreByWmMallStoreId(wmMallStoreId),
                 WmStoreDetailVO.class);
     }
 
+    /**
+     * 店铺列表
+     * @return
+     */
     @RequestMapping("/list-wm-store")
     public RestResponse listWmStore() {
         ServiceResponse<List<WmStoreDTO>> listResponse = wmStoreApiService.listWmStore(UserDetailUtils.getUserDetail().getEnterpriseId());

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/wm/WeimobStoreClerkLogVO.java

+package com.gic.enterprise.web.vo.wm;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class WeimobStoreClerkLogVO implements Serializable{
+    private static final long serialVersionUID = 1682447695935349495L;
+
+    /**
+     * 日志主键
+     */
+    private String id;
+    /**
+     * 企业id
+     */
+    private String enterpriseId;
+    /**
+     * 微盟商户id
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long pid;
+    /**
+     * 门店编码
+     */
+    private String storeCode;
+    /**
+     * 门店名称
+     */
+    private String storeName;
+    /**
+     * 导购编码
+     */
+    private String clerkCode;
+    /**
+     * 导购手机号
+     */
+    private String clerkPhone;
+
+    /**
+     * 导购名称
+     */
+    private String clerkName;
+    /**
+     * 日志类型（STORE--门店;CLERK--导购）
+     */
+    private String logType;
+    /**
+     * 请求微盟参数
+     */
+    private String paramInfo;
+    /**
+     * 请求返回结果（错误原因）
+     */
+    private String responseInfo;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    public String getId() {
+        return id;
+    }
+
+    public WeimobStoreClerkLogVO setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public WeimobStoreClerkLogVO setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Long getPid() {
+        return pid;
+    }
+
+    public WeimobStoreClerkLogVO setPid(Long pid) {
+        this.pid = pid;
+        return this;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public WeimobStoreClerkLogVO setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+        return this;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public WeimobStoreClerkLogVO setStoreName(String storeName) {
+        this.storeName = storeName;
+        return this;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public WeimobStoreClerkLogVO setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+        return this;
+    }
+
+    public String getClerkPhone() {
+        return clerkPhone;
+    }
+
+    public WeimobStoreClerkLogVO setClerkPhone(String clerkPhone) {
+        this.clerkPhone = clerkPhone;
+        return this;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public WeimobStoreClerkLogVO setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+        return this;
+    }
+
+    public String getLogType() {
+        return logType;
+    }
+
+    public WeimobStoreClerkLogVO setLogType(String logType) {
+        this.logType = logType;
+        return this;
+    }
+
+    public String getParamInfo() {
+        return paramInfo;
+    }
+
+    public WeimobStoreClerkLogVO setParamInfo(String paramInfo) {
+        this.paramInfo = paramInfo;
+        return this;
+    }
+
+    public String getResponseInfo() {
+        return responseInfo;
+    }
+
+    public WeimobStoreClerkLogVO setResponseInfo(String responseInfo) {
+        this.responseInfo = responseInfo;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public WeimobStoreClerkLogVO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public WeimobStoreClerkLogVO setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public WeimobStoreClerkLogVO setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+}

gic-platform-enterprise-web/src/main/resources/dubbo-gic-platform-enterprise-web.xml

@@ -113,6 +113,7 @@
     <dubbo:reference interface="com.gic.enterprise.service.ProjectItemApiService" id="projectItemApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.enterprise.service.WmStoreApiService" id="wmStoreApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.enterprise.service.DataConfigApiService" id="dataConfigApiService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.enterprise.service.WmStoreSyncLogApiService" id="wmStoreSyncLogApiService" timeout="6000"/>
 
     <dubbo:reference interface="com.gic.marketing.api.service.coupon.CouponShelfApiService" id="couponShelfApiService" timeout="6000"/>
 
@@ -128,4 +129,6 @@
     <dubbo:reference interface="com.gic.weimob.api.service.WeimobStoreSiteService" id="weimobStoreSiteService" timeout="6000"/>
     <dubbo:reference interface="com.gic.weimob.api.service.WeimobMerchantService" id="weimobMerchantService" timeout="6000"/>
     <dubbo:reference interface="com.gic.marketing.api.service.coupon.MemberCouponApiService" id="memberCouponApiService" timeout="6000"/>
+
+    <dubbo:reference interface="com.gic.store.service.ClerkApiService" id="clerkApiService" timeout="60000" />
 </beans>

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/ProjectController.java

@@ -43,4 +43,10 @@ public class ProjectController {
         ServiceResponse<Page<ProjectDTO>> serviceResponse = projectApiService.listProject(projectDTO, projectQO.getCurrentPage(), projectQO.getPageSize());
         return ResultControllerUtils.commonResult(serviceResponse);
     }
+
+    @RequestMapping("/set-project-seq")
+    public RestResponse setProjectSeq(Integer projectId, Integer seq) {
+        ServiceResponse<Void> serviceResponse = projectApiService.setProjectSort(projectId, seq);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
 }

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/ProjectItemController.java

@@ -6,6 +6,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.dto.ProjectItemDTO;
 import com.gic.enterprise.qo.ProjectItemQO;
+import com.gic.enterprise.service.ProjectApiService;
 import com.gic.enterprise.service.ProjectItemApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,8 @@ public class ProjectItemController {
 
     @Autowired
     private ProjectItemApiService projectItemApiService;
+    @Autowired
+    private ProjectApiService projectApiService;
 
     @RequestMapping("/save-project-item")
     public RestResponse saveProjectItem(ProjectItemQO projectItemQO) {
@@ -43,4 +46,9 @@ public class ProjectItemController {
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
+    @RequestMapping("/set-project-item-seq")
+    public RestResponse setProjectSeq(Integer projectItemId, Integer seq) {
+        ServiceResponse<Void> serviceResponse = projectApiService.setProjectItemSort(projectItemId, seq);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
 }