爱贝源bug修改

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/agent/AgentMemberDto.java

@@ -28,6 +28,8 @@ public class AgentMemberDto implements Serializable{
 	private Integer userIdentity;			//会员身份		1:会员   2:微代理
 	
 	private Integer applyIsRead;			//是否已读	 	1:已读	2:未读
+
+	private Integer userStatus;				//用户状态		1:未关注，默认  2:已关注     0:已取消关注
 	
 	private OrderStatusDto orderStatusDto;	//订单状态
 
@@ -110,6 +112,14 @@ public class AgentMemberDto implements Serializable{
 		this.orderStatusDto = orderStatusDto;
 	}
 
+	public Integer getUserStatus() {
+		return userStatus;
+	}
+
+	public void setUserStatus(Integer userStatus) {
+		this.userStatus = userStatus;
+	}
+
 	@Override
 	public String toString() {
 		return "AgentMemberDto [userId=" + userId + ", userOpenid="

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/product/Product.java

@@ -44,7 +44,7 @@ public class Product implements java.io.Serializable{
 	
 	private Integer productSortNum;			//排序
 	
-	private String productColorDes;			//产品颜色释义
+	private String productColorDes;			//产品颜色释义  -- 产品简介
 	
 	private String productRemark;			//产品备注
 	

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/agent/AgentMemberServiceImpl.java

@@ -67,6 +67,7 @@ public class AgentMemberServiceImpl implements AgentMemberService{
 		agentMember.setUserNickname(StrUtils.checkStr(member.getUserNickname()));
 		agentMember.setUserIncome(member.getUserIncome() == null ? 0 : member.getUserIncome());
 		agentMember.setUserOpenid(StrUtils.checkStr(member.getUserOpenid()));
+		agentMember.setUserStatus(member.getUserStatus());
 		//各种状态订单的数量
 		List<Map<String, Integer>> list = agentMemberDAO.getMyOrderStatusCount(member.getUserOpenid());
 		OrderStatusDto statusDto = getOrderStatusDtoByMap(list);

iamberry-wechat-web/src/main/java/com/iamberry/wechat/filters/AdminLoginFilter.java

@@ -80,7 +80,8 @@ public class AdminLoginFilter implements Filter {
 			// 进行日志记录
 			long startTime = new Date().getTime();
 			chain.doFilter(req, resp);
-			AdminLog adminLog = new AdminLog();
+			return;
+			/*AdminLog adminLog = new AdminLog();
 			// cookie,此处cookie不做保存
 			adminLog.setAdminLogCookie("");
 			// 时间
@@ -100,7 +101,7 @@ public class AdminLoginFilter implements Filter {
 			// 使用JSP获取spring中注入的Bean
 			AdminLogService adminService = (AdminLogService) context.getBean("adminLogServiceImpl");
 			adminService.insertOne(adminLog);
-			return;
+			return;*/
 		} else if (object instanceof AdminChildInfo) {
 			// 检测数据
 			List<AdminChildPermissionErmissions> list = (List<AdminChildPermissionErmissions>) req.getSession().getAttribute("permission");

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminLoginHandler.java

@@ -212,8 +212,6 @@ public class AdminLoginHandler {
 				request.getSession().setAttribute("menuInfos", adminLoginService.selectMenusById(adminInfo.getAdminId(), false));
 			}
 		}
-		
-		
 		return mv;
 	}