Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

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

@@ -557,23 +557,32 @@ public class CouponTypeHandler {
 			return resultMsg;
 		}
 
-		CouponItem couponItem = new CouponItem();
-		couponItem.setCouponId(couponTypeList.get(0).getCouponId());
-		Calendar calendar = Calendar.getInstance();
-		calendar.add(Calendar.YEAR,1);
-		couponItem.setCouponUseEndDate(calendar.getTime());//领取后一年有效
-		couponItem.setCouponReceiveDate(new Date());
-		couponItem.setCouponItemUseropenid(memberInfo.getUserOpenid());
-		couponItem.setCouponUseStatus(1);
-		couponItem.setCouponIsDonation(2);
-		couponItem.setCouponItemRemark("新人优惠券");
-		if(couponItemService.insertCouponItem(couponItem) > 0){
-			resultMsg.setResultCode(ResultInfo.SUCCESSCODE);
-			resultMsg.setStatus(true);
-		}else{
+		Integer msg = couponItemService.getIsReceive(memberInfo.getUserOpenid());
+		if(msg > 0){
 			resultMsg.setResultCode(ResultInfo.ERRORCODE);
 			resultMsg.setStatus(false);
+			resultMsg.setMessage("领取失败，该用户已领取过优惠券");
+			return resultMsg;
+		}else{
+			CouponItem couponItem = new CouponItem();
+			couponItem.setCouponId(couponTypeList.get(0).getCouponId());
+			Calendar calendar = Calendar.getInstance();
+			calendar.add(Calendar.YEAR,1);
+			couponItem.setCouponUseEndDate(calendar.getTime());//领取后一年有效
+			couponItem.setCouponReceiveDate(new Date());
+			couponItem.setCouponItemUseropenid(memberInfo.getUserOpenid());
+			couponItem.setCouponUseStatus(1);
+			couponItem.setCouponIsDonation(2);
+			couponItem.setCouponItemRemark("新人优惠券");
+			if(couponItemService.insertCouponItem(couponItem) > 0){
+				resultMsg.setResultCode(ResultInfo.SUCCESSCODE);
+				resultMsg.setStatus(true);
+			}else{
+				resultMsg.setResultCode(ResultInfo.ERRORCODE);
+				resultMsg.setStatus(false);
+			}
 		}
+
 		return resultMsg;
 	}
 }