From d1a584f3d5a8b82e60d94dd758e74e9347f0bc34 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 1 Aug 2018 20:04:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/BabyCheckController.java | 5 +++-- .../lyms/platform/operate/web/facade/BabyCheckFacade.java | 13 ++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index 1504554..d947678 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -117,9 +117,10 @@ public class BabyCheckController extends BaseController{ @RequestMapping(value = "/queryChooseBabys", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse queryChooseBabys(HttpServletRequest request,@RequestParam(required = false)String vcCardNo,@RequestParam(required = false)String cardNo, String coupon){ + public BaseObjectResponse queryChooseBabys(HttpServletRequest request,@RequestParam(required = false)String vcCardNo, + @RequestParam(required = false)String cardNo, String coupon, @RequestParam(required = false)String ynStatus){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo, loginState.getId(), coupon); + return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo, loginState.getId(), coupon,ynStatus); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index c96d3c5..df243ef 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -977,7 +977,7 @@ public class BabyCheckFacade { * @param coupon * @return */ - public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo, Integer userId, String coupon) { + public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo, Integer userId, String coupon,String ynStatus) { Map map = new HashMap(); @@ -1000,8 +1000,15 @@ public class BabyCheckFacade { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setPhoneOrcardNo(StringUtils.isEmpty(cardNo) ? null : cardNo); //手机号码或者身份证号码 babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo); - babyQuery.setYn(YnEnums.YES.getId()); - // babyQuery.setDataStatus(false); + if (StringUtils.isNotEmpty(ynStatus)) + { + babyQuery.setDataStatus(false); + } + else + { + babyQuery.setYn(YnEnums.YES.getId()); + } + /** 处理优惠券查询 */ if (StringUtils.isNotEmpty(coupon)) { -- 1.8.3.1