Browse Source

会员更新

Administrator 8 years ago
parent
commit
2fda6e7782

+ 8 - 14
src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java

@@ -19,7 +19,6 @@ import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.MemberOrder;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.common.utils.StringUtils;
 import com.goafanti.memberGrade.bo.MemberGrade;
 import com.goafanti.memberGrade.bo.MemberGradeBO;
 import com.goafanti.memberGrade.service.MemberGradeService;
@@ -101,14 +100,8 @@ public class MemberGradeController extends BaseApiController {
 	@RequestMapping(value = "/selectMemberOrderBa", method = RequestMethod.GET)
 	public Result selectMemberOrderBa(String pageNo, String pageSize, Long id, String mobile, String nickname,
 			Integer orderState, String startTime, String endTime) {
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
+		Integer pNo=getPageNo(pageNo);
+		Integer pSize=getPageSize(pageSize);
 		Integer pNos = (pNo - 1) * pSize;
 		Map<String, Object> map = new HashMap<>();
 		map.put("pNos", pNos);
@@ -118,12 +111,13 @@ public class MemberGradeController extends BaseApiController {
 		map.put("nickname", nickname);
 		map.put("orderState", orderState);
 		map.put("startTimes", startTime);
-		try {
-			map.put("endTimes", DateUtils.addDays(DateUtils.parseDate(endTime, AFTConstants.YYYYMMDD), 1));
-		} catch (ParseException e) {
-			LoggerUtils.error(this.getClass(), "ffff", e);
+		if(endTime!=null){
+			try {
+				map.put("endTimes", DateUtils.addDays(DateUtils.parseDate(endTime, AFTConstants.YYYYMMDD), 1));
+			} catch (ParseException e) {
+				LoggerUtils.error(this.getClass(), "ffff", e);
+			}
 		}
-
 		List<MemberOrder> list = memberGradeService.selectMemberOrderBa(map);
 		int countWhere = memberGradeService.countMemberOrderWhere(map);
 		Map<String, Object> maps = new HashMap<>();

+ 2 - 2
src/main/java/com/goafanti/memberGrade/controller/MemberGradeFrontController.java

@@ -53,10 +53,10 @@ public class MemberGradeFrontController extends BaseApiController {
 		map.put("pNos", pNos);
 		map.put("pSize", pSize);
 		map.put("id", TokenManager.getUserId());
-		List<MemberOrder> lsit = memberGradeService.selectMemberOrder(map);
+		List<MemberOrder> list = memberGradeService.selectMemberOrder(map);
 		int count = memberGradeService.countMemberOrder(TokenManager.getUserId());
 		Map<String, Object> maps = new HashMap<>();
-		maps.put("lsit", lsit);
+		maps.put("list", list);
 		maps.put("count", count);
 		maps.put("pNo", pNo);
 		return res().data(maps);