整理项目CartHeandler

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/binding/BindingAppHandler.java

@@ -37,6 +37,7 @@ import com.iamberry.wechat.tools.ResultInfo;
  * @author 欧阳明
  * @date  2016-06-08
  */
+@Deprecated
 @Controller
 @RequestMapping("/wechat/qrcode/")
 public class BindingAppHandler {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/binding/BindingHandler.java

@@ -26,6 +26,7 @@ import com.iamberry.wechat.tools.ObjectExcelView;
  * @author 穆再兴
  *
  */
+@Deprecated
 @Controller
 @RequestMapping("/admin/binding")
 public class BindingHandler {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/ProbationOrderHandler.java

@@ -33,6 +33,7 @@ import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.sendMsg.SendMessageUtil;
 @Controller
+@Deprecated
 @RequestMapping("/wechat/probationOrder")
 public class ProbationOrderHandler {
 	@Autowired

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/ProductInfoHandler.java

@@ -83,23 +83,20 @@ public class ProductInfoHandler {
 	public ResultMsg productIndex(HttpServletRequest request,
 			@RequestParam(value= "pageSize",defaultValue= "6" ,required=false) Integer pageSize,
 			@RequestParam(value = "pageNO", defaultValue = "1") Integer pageNO,
-			@RequestParam(value = "productName", defaultValue = "")String productName,
+			@RequestParam(value = "productName", required = false)String productName,
 			@RequestParam(value = "productType", defaultValue = "1") Integer productType,
 			@RequestParam(value = "productRentType", defaultValue = "1") Integer productRentType) throws Exception {
-		
-		ResultMsg remsg= new ResultMsg();
-		Member member =  WechatUtils.getUserBySession(request);
-		//member.setUserId(11907);
-		//member.setUserOpenid("o-icas-WiwbEXfwO1wLGDKQ1iWJU");
+		// 获取当前登陆的用户
+		WechatUtils.getUserBySession(request);
+		// 组装查询数据
 		Product product = new Product();
-		if (null != productName && !"".equals(productName)) {
-			product.setProductName(productName);
-		}
+		product.setProductName(productName);
 		product.getProductType().setTypeId(productType);
 		product.setProductRentType(productRentType);
 		product.getPage().setPageNumber(pageNO);
 		product.getPage().setPageSize(pageSize);
 		product.getPage().initRecordBegin();
+		// 查询产品
 		List<Product> productList = productInfoService.selectPageProduct(product);
 		Promotions promotions = activityUtil.getAllPromotions();
 		if(promotions != null){
@@ -116,17 +113,13 @@ public class ProductInfoHandler {
 				}
 			}
 		}
-
+		// 返回数据
 		int num = this.productInfoService.selectProductCount(product);
 		int count = num % pageSize == 0? num/pageSize:(num/pageSize)+1;
-		Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> map = new HashMap<String, Object>(2);
 		map.put("productList", productList);
 		map.put("total", count);
-		remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-		remsg.setResultCode(ResultInfo.SUCCESSCODE);
-		remsg.setStatus(true);
-		remsg.setData(map);
-		return remsg;
+		return ResultMsg.SUCCESS().setData(map);
 	}
 
 
@@ -145,15 +138,10 @@ public class ProductInfoHandler {
 		IndexProduct seccoluproduct = new IndexProduct();
 		seccoluproduct.setIndeProdType(2);
 		// 开始返回
-		ResultMsg remsg= new ResultMsg();
-		Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> map = new HashMap<String, Object>(2);
 		map.put("firColuProductList", indexProductService.getIndexProductList(firColuProduct));
 		map.put("SecColuProductList", indexProductService.getIndexProductList(seccoluproduct));
-		remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-		remsg.setResultCode(ResultInfo.SUCCESSCODE);
-		remsg.setStatus(true);
-		remsg.setData(map);
-		return remsg;
+		return ResultMsg.SUCCESS().setData(map);
 	}
 	
 	/**
@@ -166,32 +154,15 @@ public class ProductInfoHandler {
 	 */
 	@ResponseBody
 	@RequestMapping("/getProductByProductId")
-	public ResultMsg getProductByProductId(HttpServletRequest request,HttpServletResponse response,
-			@RequestParam(value = "productId",defaultValue = "") String productId, 
-			@RequestParam("colorId") Integer colorId 
-			) throws Exception {
-
-		ResultMsg remsg = new ResultMsg();
+	public ResultMsg getProductByProductId(
+			HttpServletRequest request,
+			HttpServletResponse response,
+			@RequestParam(value = "productId") String productId,
+			@RequestParam("colorId") Integer colorId) throws Exception {
+		// 获取当前登陆的用户信息
 		Member member =  WechatUtils.getUserBySession(request);
-		//member.setUserId(11907);
-		//member.setUserOpenid("o-icas-WiwbEXfwO1wLGDKQ1iWJU");
+		ResultMsg remsg = new ResultMsg();
 		Map<String, Object> map=null;
-		/*
-		 * 判断用户信息及其参数
-		 */
-		if (member == null || member.getUserOpenid() == null) {
-			remsg.setMessage(ResultInfo.loginOutError);
-			remsg.setStatus(false);
-			remsg.setMessage(ResultInfo.loginOutError);
-			return remsg;
-		}
-		if (productId == null) {
-			remsg.setStatus(false);
-			remsg.setResultCode(ResultInfo.ERRORCODE);
-			remsg.setMessage(NameUtils.getConfig("ERRORINFO"));
-			return remsg;
-		}
-		
 		if (StaticInfo.pattern.matcher(productId).find()) {
 			Product product = this.productInfoService.getProductByProductId(Integer.parseInt(productId),colorId);
 
@@ -217,18 +188,11 @@ public class ProductInfoHandler {
 			/*
 			 * 组装数据
 			 */
-			map = new HashMap<String, Object>();
-//			map.put("isShow", ResultInfo.ISSHOW);
-//			map.put("cartDesc", ResultInfo.CARTDESC);
-//			map.put("cart_url", ResultInfo.CART_URL);
+			map = new HashMap<String, Object>(3);
 			map.put("product", product);
 			map.put("shareOpenid", member.getUserOpenid());
 			map.put("colorList", colorList);
-			remsg.setData(map);
-			remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-			remsg.setResultCode(ResultInfo.SUCCESSCODE);
-			remsg.setStatus(true);
-			return remsg;
+			return ResultMsg.SUCCESS().setData(map);
 		}
 		
 		try {
@@ -239,21 +203,13 @@ public class ProductInfoHandler {
 			/*
 			 * 组装数据
 			 */
-			map = new HashMap<String, Object>();
-//			map.put("isShow", ResultInfo.ISSHOW);
-//			map.put("cartDesc", ResultInfo.CARTDESC);
-//			map.put("cart_url", ResultInfo.CART_URL);
+			map = new HashMap<String, Object>(2);
 			map.put("product", product);
 			map.put("shareOpenid", member.getUserOpenid());
-			remsg.setData(map);
-			remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-			remsg.setResultCode(ResultInfo.SUCCESSCODE);
+			return ResultMsg.SUCCESS().setData(map);
 		} catch (Exception e) {
-			remsg.setMessage(NameUtils.getConfig("ERRORINFO"));
-			remsg.setResultCode(ResultInfo.ERRORCODE);
-			remsg.setStatus(false);			
+			return ResultMsg.ERROR().setData(e.getMessage());
 		}
-		return remsg;
 	}
 	
 	/**
@@ -266,37 +222,20 @@ public class ProductInfoHandler {
 	 */
 	@ResponseBody
 	@RequestMapping("/getPictureByProductId")
-	public ResultMsg getPictureByProductId(HttpServletRequest request,HttpServletResponse response,
-			@RequestParam(value = "productId",defaultValue = "") String productId) throws Exception {
-		ResultMsg remsg = new ResultMsg();
-		if (productId == null) {
-			remsg.setStatus(false);
-			remsg.setResultCode(ResultInfo.ERRORCODE);
-			remsg.setMessage(NameUtils.getConfig("ERRORINFO"));
-			return remsg;
-		}
+	public ResultMsg getPictureByProductId(@RequestParam(value = "productId") String productId) throws Exception {
 		if (StaticInfo.pattern.matcher(productId).find()) {
 			ProductImageText productImageText = productImageTextService.getProductImageTextByProduectId(Integer.parseInt(productId));
-			remsg.setData(productImageText);
-			remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-			remsg.setResultCode(ResultInfo.SUCCESSCODE);
-			remsg.setStatus(true);
-			return remsg;
+			return ResultMsg.SUCCESS().setData(productImageText);
 		}
 		try {
 			String productIdString = StaticInfo.md5.decrypt(productId);
 			ProductImageText productImageText = productImageTextService.getProductImageTextByProduectId(Integer.parseInt(productId));
 			List<ProductPicture> pictureList = productPictureService.getProductPictureByproductId(Integer.parseInt(productIdString));
 			productImageText.setPictureList(pictureList);
-			remsg.setData(productImageText);
-			remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-			remsg.setResultCode(ResultInfo.SUCCESSCODE);
+			return ResultMsg.SUCCESS().setData(productImageText);
 		} catch (Exception e) {
-			remsg.setMessage(NameUtils.getConfig("ERRORINFO"));
-			remsg.setResultCode(ResultInfo.ERRORCODE);
-			remsg.setStatus(false);			
+			return ResultMsg.ERROR().setData(e.getMessage());
 		}
-		return remsg;
 	}
 	
 	/**
@@ -309,65 +248,52 @@ public class ProductInfoHandler {
 	 */
 	@ResponseBody
 	@RequestMapping("/getProductByProductName")
-	public ResultMsg getProductByProductName(HttpServletRequest request,HttpServletResponse response,
-			@RequestParam(value = "productName", defaultValue = "")String productName) throws Exception {
-		
-		List<Product> productList = new ArrayList<Product>();
-		ResultMsg remsg=new ResultMsg();
+	public ResultMsg getProductByProductName(
+			HttpServletRequest request,
+			HttpServletResponse response,
+			@RequestParam(value = "productName", required = false) String productName) throws Exception {
+		// 获取登陆的用户
 		Member member =  WechatUtils.getUserBySession(request);
-		
+		// 查询
+		List<Product> productList = productInfoService.getProductByProductName(productName);
+		if (productList == null || productList.isEmpty()) {
+			return ResultMsg.SUCCESS().setData(productList);
+		}
 		/*
-		 * 判断用户信息及其参数
+		 * 优惠价计算
 		 */
-		if (member == null || member.getUserOpenid() == null) {
-			remsg.setMessage(ResultInfo.loginOutError);
-			remsg.setStatus(false);
-			remsg.setMessage(ResultInfo.loginOutError);
-			return remsg;
-		}
-		
-		if (null != productName && !"".equals(productName)) {
-			productName = "%" + productName + "%";
-		}
-		productList = this.productInfoService.getProductByProductName(productName);
-		
-		if (productList != null && productList.size() >= 1) {
-			/*
-			 * 优惠价计算
-			 */
-			boolean isPrice = false;
-			if (member.getUserIdentity() != null && member.getUserIdentity() == 2) { 									// 微代理:优惠价
+		boolean isPrice = false;
+		if (member.getUserIdentity() != null && member.getUserIdentity() == 2) {
+			// 微代理:优惠价
+			isPrice = true;
+		} else {
+			if (member.getUserResType() != null && (member.getUserResType() == 2 || member.getUserResType() == 3)) {
+				// 来源他人二维码:优惠价
 				isPrice = true;
 			} else {
-				if (member.getUserResType() != null && (member.getUserResType() == 2 || member.getUserResType() == 3)) { // 来源他人二维码:优惠价
+				Member tempMember = memberService.selectUserResAndIdSByOpenId(member.getUserOpenid());
+				member.setUserIdentity(tempMember.getUserIdentity());
+				member.setUserResType(tempMember.getUserResType());
+				if (tempMember.getUserIdentity() == 2) {
+					// 微代理：优惠价
 					isPrice = true;
 				} else {
-					Member tempMember = memberService.selectUserResAndIdSByOpenId(member.getUserOpenid());
-					member.setUserIdentity(tempMember.getUserIdentity());
-					member.setUserResType(tempMember.getUserResType());
-					if (tempMember.getUserIdentity() == 2) {// 微代理：优惠价
+					if (tempMember.getUserResType() == 2 || tempMember.getUserResType() == 3) {
+						// 来源他人二维码:优惠价
 						isPrice = true;
-					} else {
-						if (tempMember.getUserResType() == 2 || tempMember.getUserResType() == 3) { // 来源他人二维码:优惠价
-							isPrice = true;
-						}
 					}
 				}
 			}
-			if (isPrice) {
-				int price = systemService.selectOneShopRuleById(22).getRuleNum().intValue(); 
-				for (Product product2 : productList) {
-					product2.setProductPrice(product2.getProductDiscount());
-					product2.setProductDiscount(price);
-				}
+		}
+		if (isPrice) {
+			int price = systemService.selectOneShopRuleById(22).getRuleNum().intValue();
+			for (Product product2 : productList) {
+				product2.setProductPrice(product2.getProductDiscount());
+				product2.setProductDiscount(price);
 			}
 		}
 		
-		remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-		remsg.setResultCode(ResultInfo.SUCCESSCODE);
-		remsg.setStatus(true);
-		remsg.setData(productList);
-		return remsg;
+		return ResultMsg.SUCCESS().setData(productList);
 	}
 
 	/**
@@ -379,32 +305,16 @@ public class ProductInfoHandler {
 	@ResponseBody
 	@RequestMapping(value = "/shareProductUrl", method = RequestMethod.POST)
 	public ResultMsg shareProductUrl(
-			@RequestParam(value = "productId", required = false) Integer productId,
+			@RequestParam(value = "productId") Integer productId,
 			HttpServletRequest request
 			) throws Exception {
-		ResultMsg msg = new ResultMsg();
-		msg.setResultCode(ResultInfo.ERRORCODE);
-		
 		Member member = WechatUtils.getUserBySession(request);
-		if (member == null || member.getUserOpenid() == null) {
-			msg.setMessage(ResultInfo.loginOutError);
-			return msg;
-		}
-		if (productId == null) {
-			msg.setMessage(ResultInfo.paramFormatError);
-			return msg;
-		}
-		
-		StringBuffer buffer = new StringBuffer(NameUtils.getConfig("WECHAT_PRODUCT_SHARE_URL"));
-		buffer.append("?shareUser=" + StaticInfo.md5.encrypt(member.getUserOpenid()));
-		buffer.append("&productId=" + StaticInfo.md5.encrypt(productId.toString()));
-		buffer.append("&isShare=true&isProduct=true&isEnable=true"); // 是否分享,是否为产品,是否启动
-		
-		msg.setData(buffer.toString());
-		msg.setStatus(true);
-		msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-		msg.setResultCode(ResultInfo.SUCCESSCODE);
-		return msg;
+		// 是否分享,是否为产品,是否启动
+		String buffer = NameUtils.getConfig("WECHAT_PRODUCT_SHARE_URL") +
+				"?shareUser=" + StaticInfo.md5.encrypt(member.getUserOpenid()) +
+				"&productId=" + StaticInfo.md5.encrypt(productId.toString()) +
+				"&isShare=true&isProduct=true&isEnable=true";
+		return ResultMsg.SUCCESS().setData(buffer);
 	}
 	
 	/**
@@ -415,15 +325,10 @@ public class ProductInfoHandler {
 	 * @throws ServletException
 	 * @throws IOException
 	 */
+	@Deprecated
 	@RequestMapping(value = "/desc", method = RequestMethod.GET)
-	public void productDesc(
-			@RequestParam("productId") Integer productId,
+	public void productDesc(@RequestParam("productId") Integer productId,
 			HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		// 校验数据
-		if (productId == null || "".equals(productId)) {
-			request.getRequestDispatcher(NameUtils.getConfig("WECHAT_SHOP_PRODUCT_LIST_PAGE")).forward(request, response);return;
-		}
-		
 		//如果是分享 则绑定关系
 		Member member = WechatUtils.getUserBySession(request);
 		String shareOpenid = request.getParameter("shareOpenid");
@@ -431,8 +336,6 @@ public class ProductInfoHandler {
 			memberService.buildChildUser(shareOpenid, member,1,1);
 		}
 		request.getRequestDispatcher(NameUtils.getConfig("WECHAT_SHOP_PRODUCT_DESC_PAGE")).forward(request, response);
-		//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_PRODUCT_DESC_PAGE"));
-		return;
 	}
 	
 	
@@ -442,6 +345,7 @@ public class ProductInfoHandler {
 	 * @param request
 	 * @param response
 	 */
+	@Deprecated
 	@RequestMapping(value = "/toLeasepProductDetails", method = RequestMethod.GET)
 	public void toLeasepProductDetails(
 			@RequestParam("productId") Integer productId,
@@ -455,6 +359,7 @@ public class ProductInfoHandler {
 	/**
 	 * 获取租赁产品详情
 	 */
+	@Deprecated
 	@RequestMapping(value = "/leasepProductDetails", method = RequestMethod.POST)
 	@ResponseBody
 	public ResultMsg leasepProductDetails(@RequestParam("productId") Integer productId,

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/CouponTypeHandler.java

@@ -54,7 +54,7 @@ public class CouponTypeHandler {
 	/**
 	 * 领取优惠券的锁
 	 */
-	private Object lock = new Object();
+	private final Object lock = new Object();
 
 	/**
 	 * 分页查询优惠券类型列表<当前用户可领取的> 2016年7月6日
@@ -69,42 +69,30 @@ public class CouponTypeHandler {
 			HttpServletRequest req,
 			@RequestParam(value = "pageSize", defaultValue = "6", required = false) Integer pageSize,
 			@RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO) {
-		ResultMsg rm = new ResultMsg();
+		// 查询当前登陆的用户
+		Member member = memberService.getMemberByUserOpenId(WechatUtils.getUserBySession(req).getUserOpenid());
+		// 返回的中介数据
 		List<CouponType> typeList = new ArrayList<CouponType>();
 		Map<String, Object> map = new HashMap<String, Object>();
-
 		// 去掉已经领取过的
 		CouponItemDto couponItemDto = new CouponItemDto();
-
-		Member member = WechatUtils.getUserBySession(req);
-		member = memberService.getMemberByUserOpenId(member.getUserOpenid());
-
 		String typeIdStr = req.getParameter("typeId");
-		logger.info("----------typeIdStr-----------" + typeIdStr);
-		if (typeIdStr.indexOf("?") > -1) {
+		if (typeIdStr.contains("?")) {
 			typeIdStr = StringUtils.split(typeIdStr, "?")[0];
 		}
 		int couponTypeId = Integer.parseInt(typeIdStr);
-
 		// 如果当前用户来自金牌会员，并且优惠券的ID为400元，那么屏蔽
-		int templateId = systemService.selectOneShopRuleById(114).getRuleNum()
-				.intValue();
+		int templateId = systemService.selectOneShopRuleById(114).getRuleNum().intValue();
 		if (member.getTemplateId() == templateId) {
 			map.put("typeList", typeList);
-			rm.setData(map);
-			rm.setStatus(true);
-			rm.setResultCode(ResultInfo.SUCCESSCODE);
-			rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-			return rm;
+			return ResultMsg.SUCCESS().setData(map);
 		}
 
-		CouponType couponType = couponTypeService
-				.getCouponTypeById(couponTypeId);
+		CouponType couponType = couponTypeService.getCouponTypeById(couponTypeId);
 		typeList.add(couponType);
 
 		couponItemDto.setUseropenid(member.getUserOpenid());
-		List<CouponItemDto> itemList = couponItemService
-				.getCouponItemDtoList(couponItemDto);
+		List<CouponItemDto> itemList = couponItemService.getCouponItemDtoList(couponItemDto);
 		Iterator<CouponType> it = typeList.iterator();
 		while (it.hasNext()) {
 			CouponType cType = (CouponType) it.next();
@@ -142,11 +130,7 @@ public class CouponTypeHandler {
 		}
 
 		map.put("typeList", typeList);
-		rm.setData(map);
-		rm.setStatus(true);
-		rm.setResultCode(ResultInfo.SUCCESSCODE);
-		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-		return rm;
+		return ResultMsg.SUCCESS().setData(map);
 	}
 
 	/**
@@ -157,14 +141,8 @@ public class CouponTypeHandler {
 	@RequestMapping("/getCoupon")
 	@ResponseBody
 	public ResultMsg getCoupon(HttpServletRequest req,
-			@RequestParam(value = "couponId", required = false) Integer couponId) {
+			@RequestParam(value = "couponId") Integer couponId) {
 		ResultMsg rm = new ResultMsg();
-		if (couponId == null) {
-			rm.setStatus(false);
-			rm.setResultCode(ResultInfo.ERRORCODE);
-			rm.setMessage(NameUtils.getConfig("ERRORINFO"));
-		}
-
 		Member member = WechatUtils.getUserBySession(req);
 		member = memberService.getMemberByUserOpenId(member.getUserOpenid());
 		synchronized (lock) {
@@ -208,7 +186,7 @@ public class CouponTypeHandler {
 		// 券使用条件为必须关注时，用户没关注则返回
 		if (couponType.getCouponIsConcern() == 1
 				&& member.getUserStatus() != null
-				&& member.getUserStatus().intValue() != 2) {
+				&& member.getUserStatus() != 2) {
 			rm.setMessage("请先关注公众号!");
 			return rm;
 		}
@@ -250,14 +228,16 @@ public class CouponTypeHandler {
 		couponItem.setCouponUseStatus(1); // 使用状态:未使用
 		Date endDate = DateTimeUtil.addHour(DateTimeUtil.now(),
 				couponType.getCouponLimitHours()); // 券的过期时间
-		if (endDate.before(couponType.getCouponEndDate())) { // 券的过期时间早于此类型券的截止时间则取券的过期时间
+		if (endDate.before(couponType.getCouponEndDate())) {
+			// 券的过期时间早于此类型券的截止时间则取券的过期时间
 			couponItem.setCouponUseEndDate(endDate);
-		} else { // 券的过期时间晚于此类型券的截止时间则取此类型券的截止时间
+		} else {
+			// 券的过期时间晚于此类型券的截止时间则取此类型券的截止时间
 			couponItem.setCouponUseEndDate(couponType.getCouponEndDate());
 		}
 		Integer j = couponItemService.insertCouponItem(couponItem);
 
-		if (i > 0 && j != null && j.intValue() > 0) {
+		if (i > 0 && j != null && j > 0) {
 			rm.setStatus(true);
 			rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
 			rm.setData(couponItem);
@@ -293,28 +273,6 @@ public class CouponTypeHandler {
 		openid = member.getUserOpenid();
 
 		CouponItemDto cDto = new CouponItemDto();
-		cDto.setUseropenid(openid);
-//		if ("1".equals(useStatus)) { // 未使用的优惠券
-//			cDto.setCouponUseStatus(Integer.parseInt(useStatus));
-//			cDto.setBeginDate(new Date());
-//		} else if ("2".equals(useStatus)) { // 已使用的优惠券
-//			cDto.setCouponUseStatus(Integer.parseInt(useStatus));
-//			cDto.setCouponReduce(7); // 加上了订单是待支付 即couponUseStatus是7的优惠券
-//		} else if ("3".equals(useStatus)) { // 已过期的优惠券
-//			cDto.setEndDate(new Date());
-//			cDto.setCouponItemRemark("4"); // 需去掉已经使用的优惠券
-//		}
-//		if ("10".equals(useStatus)) {
-//			//优惠券
-//			cDto.setCouponUseStatus(0);
-//			cDto.setCouponType(10);
-//			cDto.setBeginDate(new Date());
-//		}else if("11".equals(useStatus)){
-//			//兑换券
-//			cDto.setCouponUseStatus(0);
-//			cDto.setCouponType(11);
-//			cDto.setBeginDate(new Date());
-//		}
 		cDto.setCouponUseStatus(1);
 		cDto.setCouponVipExclusive(Integer.valueOf(useStatus));
 		cDto.setBeginDate(new Date());
@@ -324,12 +282,8 @@ public class CouponTypeHandler {
 		list = couponItemService.getCouponItemDtoList(cDto);
 
 		Date now = new Date();
-		for (CouponItemDto itemDto : list) { 	// 为了在全部优惠券页面区分已过期的优惠券，使之不能使用
-//			itemDto.setCouponItemRemark(ResultInfo.COUPONITEMSTATUS_NORMAL);
-//			if (itemDto.getCouponUseEndDate() != null
-//					&& itemDto.getCouponUseEndDate().before(now)) {
-//				itemDto.setCouponItemRemark(ResultInfo.COUPONITEMSTATUS_PASSED);
-//			}
+		for (CouponItemDto itemDto : list) {
+			// 为了在全部优惠券页面区分已过期的优惠券，使之不能使用
 			if(itemDto.getCouponType().equals(3)){
 				Exchange exchange = new Exchange();
 				exchange.setCouponId(itemDto.getCouponId());
@@ -389,7 +343,7 @@ public class CouponTypeHandler {
 			// 券使用条件为必须关注时，用户没关注则返回
 			if (cType.getCouponIsConcern() == 1
 					&& member.getUserStatus() != null
-					&& member.getUserStatus().intValue() != 2) {
+					&& member.getUserStatus() != 2) {
 				it.remove();
 				count--;
 				continue;
@@ -520,7 +474,7 @@ public class CouponTypeHandler {
 		}
 		// 判断是否为金牌会员下线，如果是，则以优惠价显示，如果不是则按原价显示
 		if (user.getUserDealers() != null && user.getTemplateId() != null
-				&& templateId == user.getTemplateId().intValue()
+				&& templateId == user.getTemplateId()
 				&& user.getUserResType() == 3) {
 			rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
 			rm.setStatus(true);

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/drp/AdminWithDrp.java

@@ -85,7 +85,7 @@ import com.iamberry.wechat.tools.ResultInfo;
  * @author 欧阳明
  * @date 2016-4-21
  */
-
+@Deprecated
 @Controller
 @RequestMapping("/admin/drp")
 public class AdminWithDrp {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/drp/DrpAgentHandler.java

@@ -18,7 +18,7 @@ import com.iamberry.wechat.face.drp.PlaceInfoService;
  * @author 欧阳明
  * @date 2016-4-21
  */
-
+@Deprecated
 @Controller
 @RequestMapping("/agent/drp")
 public class DrpAgentHandler {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/drp/DrpWeChatHandler.java

@@ -39,6 +39,7 @@ import com.iamberry.wechat.tools.ValidatorUtil;
  * @description 分销链接 跳转
  * @date  2016-4-26
  */
+@Deprecated
 @Controller
 @RequestMapping("/wechat/drp")
 public class DrpWeChatHandler {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/drp/PlaceInfoHandler.java

@@ -42,6 +42,7 @@ import com.iamberry.wechat.tools.ResultInfo;
  * @author 欧阳明
  * @Date 2016-04-20
  */
+@Deprecated
 @Controller
 @RequestMapping("/wechat/placeInfo")
 public class PlaceInfoHandler {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/drp/PlaceLogsHandler.java

@@ -16,6 +16,7 @@ import com.iamberry.wechat.tools.ResultInfo;
  * @author 欧阳明
  * @Date 2016-04-20
  */
+@Deprecated
 @Controller
 @RequestMapping("/wechat/placeLogs")
 public class PlaceLogsHandler {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/drp/PlaceWithDrawalsLogsHandler.java

@@ -23,7 +23,7 @@ import com.iamberry.wechat.tools.ValidationUtils;
  * @author 欧阳明
  *
  */
-
+@Deprecated
 @Controller
 @RequestMapping("/wechat/WithDrawalsLogs")
 public class PlaceWithDrawalsLogsHandler {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/flow/TemplateFlowInfoHandler.java

@@ -22,7 +22,7 @@ import com.iamberry.wechat.face.drp.DrpRoleInfoService;
 import com.iamberry.wechat.face.flow.TemplateFlowInfoService;
 import com.iamberry.wechat.face.flow.TemplateInfoService;
 import com.iamberry.wechat.face.porduct.ProductTypeService;
-
+@Deprecated
 @Controller
 @RequestMapping("/admin/templateFlow")
 public class TemplateFlowInfoHandler {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/flow/TemplateInfoHandler.java

@@ -17,7 +17,7 @@ import com.iamberry.wechat.core.entity.product.ProductType;
 import com.iamberry.wechat.face.flow.TemplateFlowInfoService;
 import com.iamberry.wechat.face.flow.TemplateInfoService;
 import com.iamberry.wechat.face.porduct.ProductTypeService;
-
+@Deprecated
 @Controller
 @RequestMapping("/admin/template")
 public class TemplateInfoHandler {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/game/GameHandler.java

@@ -27,6 +27,7 @@ import com.iamberry.wechat.face.game.GameService;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
 @Controller
+@Deprecated
 @RequestMapping("/wechat/game")
 public class GameHandler {
 

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/giftCard/AgentInfoHandler.java

@@ -22,6 +22,7 @@ import com.iamberry.wechat.tools.StrUtils;
  * 2017年2月16日
  * @author muzx
  */
+@Deprecated
 @Controller
 @RequestMapping("/wechat/agent_pay")
 public class AgentInfoHandler {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/lease/LeaseMachineHandler.java

@@ -23,7 +23,7 @@ import com.iamberry.wechat.face.lease.LeaseMachineService;
 import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
-
+@Deprecated
 @Controller
 @RequestMapping("/wechat/machine")
 public class LeaseMachineHandler {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/lease/LeaseOrderHandler.java

@@ -35,7 +35,7 @@ import com.iamberry.wechat.tools.OrderNOUtil;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.tools.ValidatorUtil;
-
+@Deprecated
 @Controller
 @RequestMapping("/wechat/leaseOrder")
 public class LeaseOrderHandler {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/member/MemberHandler.java

@@ -36,6 +36,7 @@ import com.iamberry.wechat.tools.StaticInfo;
  * 	   		@author: 张应真
  *	    @createDate: 2016年4月21日
  */
+@Deprecated
 @Controller
 @RequestMapping("/wechat/member")
 public class MemberHandler {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/member/WithdrawHandler.java

@@ -37,6 +37,7 @@ import com.iamberry.wechat.tools.ValidatorUtil;
  * Update Date:2016年4月21日
  */
 @Controller
+@Deprecated
 @RequestMapping("/wechat/withdraw")
 public class WithdrawHandler {
 	

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/official/ProspectusHandler.java

@@ -19,6 +19,7 @@ import java.util.List;
 /**
  * @author Administrator
  */
+@Deprecated
 @Controller
 public class ProspectusHandler {