以旧换新

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

@@ -49,7 +49,7 @@
 				AND CI.COUPON_USE_STATUS != 2
 			</if>
 		</where>
-		ORDER BY CI.COUPON_RECEIVE_DATE DESC
+		ORDER BY CT.coupon_reduce DESC,CI.COUPON_RECEIVE_DATE DESC
 		<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
 	     LIMIT ${page.recordBegin},${page.pageSize}
 	    </if>

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

@@ -437,7 +437,39 @@ public class CouponTypeHandler {
 		return rm;
 	}
 
+	/**
+	 *  以旧换新 - 是否领取过了
+	 * 用户领取优惠券接口
+	 * @return
+	 */
+	@RequestMapping("/isRecCouRen")
+	@ResponseBody
+	public ResultMsg isRecCouRen(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());
+
+		CouponItemDto couponItemDto = new CouponItemDto();
+		couponItemDto.setCouponId(couponId);
+		couponItemDto.setUseropenid(member.getUserOpenid());
+		List<CouponItemDto> couponItemDtoList = couponItemService.getCouponItemDtoList(couponItemDto);
+		if(couponItemDtoList != null && couponItemDtoList.size() > 0){
+			rm.setStatus(true);
+			rm.setData(couponItemDtoList.size());
+			rm.setMessage("查询成功");
+		}else{
+			rm.setStatus(false);
+			rm.setResultCode(ResultInfo.ERRORCODE);
+			rm.setMessage("查询失败！请重试或在微信公众号咨询客服");
+		}
+		return rm;
+	}
 
 	/**
 	 *  以旧换新
@@ -471,7 +503,7 @@ public class CouponTypeHandler {
 					couponItem.setCouponUseStatus(1);	//使用状态:未使用
 
 					Calendar calendar = Calendar.getInstance();
-					calendar.set(2019,3,15);
+					calendar.set(2019,3,18);
 					calendar.set(Calendar.HOUR_OF_DAY,23);
 					calendar.set(Calendar.MINUTE,59);
 					calendar.set(Calendar.SECOND,58);