111

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/AuditStaffDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+public class AuditStaffDTO implements Serializable{
+	
+	private String staffId;
+	
+	private String wxEnterpriseId;
+
+    private String wxUserId;
+
+    private String clerkId;
+
+    private String clerkName;
+
+    private String clerkCode;
+
+    private String staffName;
+    
+    private String headPic;
+    
+    private Integer bindType;
+    
+    private Integer addOrDel;
+
+    private static final long serialVersionUID = 1L;
+
+	public String getStaffId() {
+		return staffId;
+	}
+
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
+	}
+
+	public String getWxEnterpriseId() {
+		return wxEnterpriseId;
+	}
+
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+
+	public String getWxUserId() {
+		return wxUserId;
+	}
+
+	public void setWxUserId(String wxUserId) {
+		this.wxUserId = wxUserId;
+	}
+
+	public String getClerkId() {
+		return clerkId;
+	}
+
+	public void setClerkId(String clerkId) {
+		this.clerkId = clerkId;
+	}
+
+	public String getClerkName() {
+		return clerkName;
+	}
+
+	public void setClerkName(String clerkName) {
+		this.clerkName = clerkName;
+	}
+
+	public String getClerkCode() {
+		return clerkCode;
+	}
+
+	public void setClerkCode(String clerkCode) {
+		this.clerkCode = clerkCode;
+	}
+
+	public String getStaffName() {
+		return staffName;
+	}
+
+	public void setStaffName(String staffName) {
+		this.staffName = staffName;
+	}
+
+	public String getHeadPic() {
+		return headPic;
+	}
+
+	public void setHeadPic(String headPic) {
+		this.headPic = headPic;
+	}
+
+	public Integer getBindType() {
+		return bindType;
+	}
+
+	public void setBindType(Integer bindType) {
+		this.bindType = bindType;
+	}
+
+	public Integer getAddOrDel() {
+		return addOrDel;
+	}
+
+	public void setAddOrDel(Integer addOrDel) {
+		this.addOrDel = addOrDel;
+	}
+
+    
+}

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

@@ -100,29 +100,66 @@ public class AuditController extends WebBaseController{
 		List<StoreDTO> stores = storeService.getStores(array);
 		Map<String,StoreDTO> map = com.gic.commons.util.CollectionUtil.toMap(stores, "storeId");
 		for(AuditDTO dto:list){
-			String t = dto.getChangeField();
-			String detail = "";
-			if(StoreFieldEnum.STORE_NAME.getValue().equals(t)){
-				detail = "将"+"门店名称"+"\""+dto.getOldValue()+"\""+"修改为"+"\""+dto.getNewValue()+"\"";
-			}else if(StoreFieldEnum.STORE_AREA.getValue().equals(t)){
-				detail = "将"+"门店面积"+"\""+dto.getOldValue()+"\""+"修改为"+"\""+dto.getNewValue()+"\"";
-			}else if(StoreFieldEnum.CONACTS_PHONE.getValue().equals(t)){
-				detail = "将"+"联系电话"+"\""+dto.getOldValue()+"\""+"修改为"+"\""+dto.getNewValue()+"\"";
-			}else if(StoreFieldEnum.BUSINESS_TIME_STRING.getValue().equals(t)){
-				detail = "将"+"营业时间"+"\""+dto.getOldValue()+"\""+"修改为"+"\""+dto.getNewValue()+"\"";
-			}else if(StoreFieldEnum.STORE_ADDRESS.getValue().equals(t)){
+			if(dto.getAuditType() !=null && dto.getAuditType()== 1){
+				String t = dto.getChangeField();
+				String detail = "";
+				if(StoreFieldEnum.STORE_NAME.getValue().equals(t)){
+					detail = "将"+"门店名称"+"\""+dto.getOldValue()+"\""+"修改为"+"\""+dto.getNewValue()+"\"";
+				}else if(StoreFieldEnum.STORE_AREA.getValue().equals(t)){
+					detail = "将"+"门店面积"+"\""+dto.getOldValue()+"\""+"修改为"+"\""+dto.getNewValue()+"\"";
+				}else if(StoreFieldEnum.CONACTS_PHONE.getValue().equals(t)){
+					detail = "将"+"联系电话"+"\""+dto.getOldValue()+"\""+"修改为"+"\""+dto.getNewValue()+"\"";
+				}else if(StoreFieldEnum.BUSINESS_TIME_STRING.getValue().equals(t)){
+					detail = "将"+"营业时间"+"\""+dto.getOldValue()+"\""+"修改为"+"\""+dto.getNewValue()+"\"";
+				}else if(StoreFieldEnum.STORE_ADDRESS.getValue().equals(t)){
+					String oldValue = dto.getOldValue();
+					String newValue = dto.getNewValue();
+					JSONObject oldJSONObject = JSONObject.parseObject(oldValue);
+					String oldAddress = oldJSONObject.get("storeAddress").toString();
+					
+					JSONObject newJSONObject = JSONObject.parseObject(newValue);
+					String newAddress = newJSONObject.get("storeAddress").toString();
+					detail = "将"+"门店地址"+"\""+oldAddress+"\""+"修改为"+"\""+newAddress+"\"";
+				}else if(StoreFieldEnum.STORE_IMAG.getValue().equals(t)){
+					detail = "门店图片变更";
+				}
+				dto.setDetail(detail);
+			}else if(dto.getAuditType() !=null && dto.getAuditType()== 2){
+				//门店账户申请
 				String oldValue = dto.getOldValue();
 				String newValue = dto.getNewValue();
-				JSONObject oldJSONObject = JSONObject.parseObject(oldValue);
-				String oldAddress = oldJSONObject.get("storeAddress").toString();
+				AuditStaffDTO auditStaffDTO = JSONObject.parseObject(oldValue, AuditStaffDTO.class);
+				Integer t = auditStaffDTO.getAddOrDel();
+				if(t == 0){
+					//新增导购
+					String detail = "新增导购："+auditStaffDTO.getClerkName()+"("+auditStaffDTO.getClerkCode()+")";
+					dto.setDetail(detail);
+				}else{
+					//删除导购
+					String detail = "删除导购："+auditStaffDTO.getClerkName()+"("+auditStaffDTO.getClerkCode()+")";
+					dto.setDetail(detail);
+				}
+			}else if(dto.getAuditType() !=null && dto.getAuditType()== 3){
+				//门店导购变更
+				//门店账户申请
+				String oldValue = dto.getOldValue();
+				AuditStaffDTO oldAuditStaffDTO = JSONObject.parseObject(oldValue, AuditStaffDTO.class);
+				Integer t = oldAuditStaffDTO.getBindType();
+				if(t == 0){
+					//绑定
+					String staffName = oldAuditStaffDTO.getStaffName();
+					String clerkCode = oldAuditStaffDTO.getClerkCode();
+					String detail = staffName+"申请关联导购code:"+clerkCode;
+					dto.setDetail(detail);
+				}else{
+					//解绑
+					String staffName = oldAuditStaffDTO.getStaffName();
+					String clerkCode = oldAuditStaffDTO.getClerkCode();
+					String detail = staffName+"申请解绑导购code："+clerkCode;
+					dto.setDetail(detail);
+				}
 				
-				JSONObject newJSONObject = JSONObject.parseObject(newValue);
-				String newAddress = newJSONObject.get("storeAddress").toString();
-				detail = "将"+"门店地址"+"\""+oldAddress+"\""+"修改为"+"\""+newAddress+"\"";
-			}else if(StoreFieldEnum.STORE_IMAG.getValue().equals(t)){
-				detail = "门店图片变更";
 			}
-			dto.setDetail(detail);
 			String storeName = map.get(dto.getCommitStoreId())==null?"":map.get(dto.getCommitStoreId()).getStoreName();
 			dto.setCommitStoreName(storeName);
 		}