Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -126,41 +126,34 @@ public class AuditController extends WebBaseController{
 					detail = "门店图片变更";
 				}
 				dto.setDetail(detail);
-			}else if(dto.getAuditType() !=null && dto.getAuditType()== 2){
-				//门店账户申请
+			}else if(dto.getAuditType() !=null && dto.getAuditType()== 3){
+				//新增导购
 				String oldValue = dto.getOldValue();
-				String newValue = dto.getNewValue();
 				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 detail = "新增导购："+auditStaffDTO.getClerkName()+"("+auditStaffDTO.getClerkCode()+")";
+				dto.setDetail(detail);
+			}else if(dto.getAuditType() !=null && dto.getAuditType()== 4){
+				//删除导购
+				String oldValue = dto.getOldValue();
+				AuditStaffDTO auditStaffDTO = JSONObject.parseObject(oldValue, AuditStaffDTO.class);
+				String detail = "删除导购："+auditStaffDTO.getClerkName()+"("+auditStaffDTO.getClerkCode()+")";
+				dto.setDetail(detail);
+			}else if(dto.getAuditType() !=null && dto.getAuditType()== 2){
+				//门店导购绑定
 				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);
-				}
-				
+				String staffName = oldAuditStaffDTO.getStaffName();
+				String clerkCode = oldAuditStaffDTO.getClerkCode();
+				String detail = staffName+"申请关联导购code:"+clerkCode;
+				dto.setDetail(detail);
+			}else if(dto.getAuditType() !=null && dto.getAuditType()== 5){
+				//门店导购解绑
+				String oldValue = dto.getOldValue();
+				AuditStaffDTO oldAuditStaffDTO = JSONObject.parseObject(oldValue, AuditStaffDTO.class);
+				String staffName = oldAuditStaffDTO.getStaffName();
+				String clerkCode = oldAuditStaffDTO.getClerkCode();
+				String detail = staffName+"申请解绑导购code："+clerkCode;
+				dto.setDetail(detail);
 			}
 			String storeName = map.get(dto.getCommitStoreId())==null?"":map.get(dto.getCommitStoreId()).getStoreName();
 			dto.setCommitStoreName(storeName);