门店

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmStoreController.java

@@ -21,10 +21,12 @@ import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.clerk.api.dto.ClerkStoreListDTO;
 import com.gic.clerk.api.service.ClerkService;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.web.vo.hm.ClerkStoreListVO;
 
 @RestController
 public class HmStoreController {
@@ -38,11 +40,13 @@ public class HmStoreController {
 
     @RequestMapping("store-clerk-list")
     @ResponseBody
-    public RestResponse listStoreClerk(HttpServletRequest request, BasePageInfo basePageInfo) {
+    public RestResponse<Object> listStoreClerk(HttpServletRequest request, BasePageInfo basePageInfo) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         // 分组id
         String storeGroupId = request.getParameter("storeGroupId");
+        // 门店参数
         String storeSearchParams = request.getParameter("storeSearchParams");
+        // 导购参数
         String clerkSearchParams = request.getParameter("clerkSearchParams");
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("enterpriseId", loginUser.getEnterpriseId());
@@ -74,6 +78,15 @@ public class HmStoreController {
         page.setParams(params);
         logger.info("params:{}", JSON.toJSONString(params));
         page = this.clerkService.listStoreClerkByPage(page);
-        return RestResponse.successResult(page);
+        Page<ClerkStoreListVO> retPage = new Page<>();
+        retPage.setPageSize(basePageInfo.getPageSize());
+        retPage.setCurrentPage(basePageInfo.getPageNum());
+        retPage.setParams(params);
+        retPage.setTotalCount(page.getTotalCount());
+        retPage.setTotalPage(page.getTotalPage());
+        List<ClerkStoreListVO> result = EntityUtil.changeEntityListByJSON(ClerkStoreListVO.class, page.getResult()) ;
+        // 好办状态
+        retPage.setResult(result);
+        return RestResponse.successResult(retPage);
     }
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/ClerkListVO.java

+package com.gic.haoban.manage.web.vo.hm;
+
+import java.io.Serializable;
+
+public class ClerkListVO implements Serializable {
+
+    private static final long serialVersionUID = -7063684171950204677L;
+
+    private String clerkId;
+    private String clerkName;
+    private String clerkCode;
+    private String storeId;
+    private String clerkGender;
+    private String phoneNumber;
+    private String enterpriseId;
+    private String imageUrl;
+    private Integer clerkType = 0;// 店长（0：否，1：是）
+    private String nationcode;
+    private String haobanRemark;
+
+    public String getHaobanRemark() {
+        return haobanRemark;
+    }
+
+    public void setHaobanRemark(String haobanRemark) {
+        this.haobanRemark = haobanRemark;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public String getClerkGender() {
+        return clerkGender;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public Integer getClerkType() {
+        return clerkType;
+    }
+
+    public String getNationcode() {
+        return nationcode;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public void setClerkGender(String clerkGender) {
+        this.clerkGender = clerkGender;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+
+    public void setClerkType(Integer clerkType) {
+        this.clerkType = clerkType;
+    }
+
+    public void setNationcode(String nationcode) {
+        this.nationcode = nationcode;
+    }
+}
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/ClerkStoreListVO.java

+package com.gic.haoban.manage.web.vo.hm;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ClerkStoreListVO implements Serializable {
+
+    private static final long serialVersionUID = 6217898214248865279L;
+
+    private String storeId;
+    private String storeName;
+    private String storeCode;
+    private List<ClerkListVO> clerkList;
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public List<ClerkListVO> getClerkList() {
+        return clerkList;
+    }
+
+    public void setClerkList(List<ClerkListVO> clerkList) {
+        this.clerkList = clerkList;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+}