修改bug

iamberry-common-web/src/main/java/com/iamberry/common/web/SimpleCORSFilter.java

@@ -38,6 +38,7 @@ public class SimpleCORSFilter implements Filter {
 		origins.add("s.iamberry.com");
 		origins.add("www.aiberletech.com");
 		origins.add("h5.iamberry.com:801");
+		origins.add("h5.iamberry.com:8848");
 	}
 	
     public void init(FilterConfig filterConfig) throws ServletException {

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

@@ -1,11 +1,6 @@
 package com.iamberry.wechat.handles.coupon;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -441,5 +436,64 @@ public class CouponTypeHandler {
 		rm.setMessage(ResultInfo.SUCCESSINFO);
 		return rm;
 	}
+
+
+
+	/**
+	 *  以旧换新
+	 * 用户领取优惠券接口
+	 * @return
+	 */
+	@RequestMapping("/recCouRen")
+	@ResponseBody
+	public ResultMsg recCouRen(HttpServletRequest req,@RequestParam(value="couponId", required=false)Integer couponId){
+		ResultMsg rm = new ResultMsg();
+		if(couponId == null){
+			rm.setStatus(false);
+			rm.setResultCode(ResultInfo.ERRORCODE);
+			rm.setMessage("未查询到该优惠券！");
+		}
+
+		Member member = wechatUtils.getUserBySession(req);
+		member = memberService.getMemberByUserOpenId(member.getUserOpenid());
+
+		try {
+			synchronized (lock) {
+				CouponType couponType = couponTypeService.getCouponTypeById(couponId);
+				rm = checkCoupon(member, couponType);
+				if(rm.isStatus()){
+					//减少总数
+					int i = couponTypeService.updateCouponTypeForItem(couponType.getCouponId());
+					//增加单张优惠券
+					CouponItem couponItem = new CouponItem();
+					couponItem.setCouponItemUseropenid(member.getUserOpenid());
+					couponItem.setCouponId(couponType.getCouponId());
+					couponItem.setCouponUseStatus(1);	//使用状态:未使用
+
+					Calendar calendar = Calendar.getInstance();
+					calendar.set(2019,3,15);
+					calendar.set(Calendar.HOUR_OF_DAY,23);
+					calendar.set(Calendar.MINUTE,59);
+					calendar.set(Calendar.SECOND,58);
+					couponItem.setCouponUseEndDate(calendar.getTime());
+
+					Integer j = couponItemService.insertCouponItem(couponItem);
+
+					rm.setStatus(true);
+					rm.setResultCode(ResultInfo.SUCCESSCODE);
+					rm.setMessage("领取成功！");
+					return rm;
+				}else{
+					return rm;
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		rm.setStatus(false);
+		rm.setResultCode(ResultInfo.ERRORCODE);
+		rm.setMessage("领取失败！请重试或在微信公众号咨询客服");
+		return rm;
+	}
 	
 }

iamberry-wechat-web/src/main/resources/iamberry-wechat-web-ioc.xml

@@ -54,7 +54,7 @@
 	<bean id="loadResultInfo" class="com.iamberry.wechat.tools.loadResultUtil" lazy-init="false"></bean>
     
 	<!-- 开启注解启动定时器 -->
-    <task:annotation-driven/>
+    <!--<task:annotation-driven/>-->
 
 	<!-- spring监控 -->
 	<bean id="druid-stat-interceptor" class="com.alibaba.druid.support.spring.stat.DruidStatInterceptor">

iamberry-wechat-web/src/main/resources/jdbc.properties

@@ -12,9 +12,9 @@ jdbc.initialPoolSize=3
 #jdbc.url=jdbc:mysql://192.168.1.254:3306/iamberry?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
 #jdbc.url=jdbc:mysql://192.168.1.2:3306/iamberry?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false
 
-#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com:3306/test_iamberry?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=iamberry
-#jdbc.password=iamberry123
+jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/test_iamberry?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.username=iamberry
+jdbc.password=iamberry123
 
 ### Development
 #jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/berry?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
@@ -23,9 +23,9 @@ jdbc.initialPoolSize=3
 ###  end ######
 
 ### Development
-jdbc.url=jdbc:mysql://192.168.1.254:3306/aiberle?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-jdbc.username=root
-jdbc.password=root
+#jdbc.url=jdbc:mysql://192.168.1.254:3306/aiberle?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#jdbc.username=root
+#jdbc.password=root
 ###  end ######
 
 jdbc.pool.init=1