Commit cf6e0f08 by fudahua

导购可编辑状态

parent 5f687f00
......@@ -18,8 +18,17 @@ public class WxEnterpriseRelationDetailDTO implements Serializable {
private String staffName;
private int wxEnterpriseType;
private int memberOpenCardFlag;
private Integer clerkEditFlag;
private List<StoreOrGroupInfoDTO> relations;
public Integer getClerkEditFlag() {
return clerkEditFlag;
}
public void setClerkEditFlag(Integer clerkEditFlag) {
this.clerkEditFlag = clerkEditFlag;
}
public String getWxEnterpriseRelatedId() {
return wxEnterpriseRelatedId;
}
......
......@@ -113,7 +113,7 @@ public class ClerkController extends WebBaseController{
//门店成员列表
@RequestMapping("/store-clerks")
public HaobanResponse storeClerks(String storeId) {
public HaobanResponse storeClerks(String wxEnterpriseId, String storeId, String version) {
if(StringUtils.isAnyBlank(storeId)){
return resultResponse(HaoBanErrCode.ERR_2);
}
......@@ -143,9 +143,19 @@ public class ClerkController extends WebBaseController{
}
resultList.add(vo);
}
return resultResponse(HaoBanErrCode.ERR_1,resultList);
if (StringUtils.isBlank(version)) {
return resultResponse(HaoBanErrCode.ERR_1, resultList);
} else {
WxEnterpriseRelationDetailDTO enterpriseBindInfo = wxEnterpriseRelatedApiService.getEnterpriseBindInfo(wxEnterpriseId, storeDTO.getEnterpriseId());
Map<String, Object> ret = new HashMap<>();
ret.put("clerkEditFlag", enterpriseBindInfo.getClerkEditFlag());
ret.put("clerkList", resultList);
return resultResponse(HaoBanErrCode.ERR_1, ret);
}
}
//获取后台认证配置
@RequestMapping("/get-audit-setting")
public HaobanResponse getAuditSetting(String wxEnterpriseId) {
......@@ -753,9 +763,6 @@ public class ClerkController extends WebBaseController{
Map<String,Object> map = new HashMap<>();
map.put("bindList", bindList);
map.put("unBindList", unBindList);
WxEnterpriseRelationDetailDTO enterpriseBindInfo = wxEnterpriseRelatedApiService.getEnterpriseBindInfo(wxEnterpriseId, store.getEnterpriseId());
// map.put("clerkEditFlag",enterpriseBindInfo.get)
//todo 导购是否可编辑
return resultResponse(HaoBanErrCode.ERR_1,map);
}
......
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