jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 13 additions and 5 deletions

...	...	@@ -117,9 +117,10 @@
117	117	@RequestMapping(value = "/queryChooseBabys", method = RequestMethod.GET)
118	118	@ResponseBody
119	119	@TokenRequired
120		- public BaseObjectResponse queryChooseBabys(HttpServletRequest request,@RequestParam(required = false)String vcCardNo,@RequestParam(required = false)String cardNo, String coupon){
	120	+ public BaseObjectResponse queryChooseBabys(HttpServletRequest request,@RequestParam(required = false)String vcCardNo,
	121	+ @RequestParam(required = false)String cardNo, String coupon, @RequestParam(required = false)String ynStatus){
121	122	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
122		- return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo, loginState.getId(), coupon);
	123	+ return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo, loginState.getId(), coupon,ynStatus);
123	124	}
124	125
125	126

...	...	@@ -977,7 +977,7 @@
977	977	* @param coupon
978	978	* @return
979	979	*/
980		- public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo, Integer userId, String coupon) {
	980	+ public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo, Integer userId, String coupon,String ynStatus) {
981	981
982	982
983	983	Map map = new HashMap();
...	...	@@ -1000,8 +1000,15 @@
1000	1000	BabyModelQuery babyQuery = new BabyModelQuery();
1001	1001	babyQuery.setPhoneOrcardNo(StringUtils.isEmpty(cardNo) ? null : cardNo); //手机号码或者身份证号码
1002	1002	babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo);
1003		- babyQuery.setYn(YnEnums.YES.getId());
1004		- // babyQuery.setDataStatus(false);
	1003	+ if (StringUtils.isNotEmpty(ynStatus))
	1004	+ {
	1005	+ babyQuery.setDataStatus(false);
	1006	+ }
	1007	+ else
	1008	+ {
	1009	+ babyQuery.setYn(YnEnums.YES.getId());
	1010	+ }
	1011	+
1005	1012
1006	1013	/** 处理优惠券查询 */
1007	1014	if (StringUtils.isNotEmpty(coupon)) {