|
|
@@ -1,11 +1,7 @@
|
|
|
package com.goafanti.memberGrade.controller;
|
|
|
|
|
|
-import java.text.DateFormat;
|
|
|
import java.text.ParseException;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
-import java.util.Calendar;
|
|
|
-import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -18,8 +14,11 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
+import com.goafanti.common.constant.AFTConstants;
|
|
|
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;
|
|
|
@@ -104,7 +103,6 @@ public class MemberGradeController extends BaseApiController {
|
|
|
Integer orderState, String startTime, String endTime) {
|
|
|
Integer pNo = 1;
|
|
|
Integer pSize = 10;
|
|
|
- String da = null;
|
|
|
if (StringUtils.isNumeric(pageSize)) {
|
|
|
pSize = Integer.parseInt(pageSize);
|
|
|
}
|
|
|
@@ -120,20 +118,12 @@ public class MemberGradeController extends BaseApiController {
|
|
|
map.put("nickname", nickname);
|
|
|
map.put("orderState", orderState);
|
|
|
map.put("startTimes", startTime);
|
|
|
- if (endTime != null) {
|
|
|
- DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
- try {
|
|
|
- Date date = df.parse(endTime);
|
|
|
- Calendar calendar = Calendar.getInstance();
|
|
|
- calendar.setTime(date);
|
|
|
- calendar.add(Calendar.DAY_OF_MONTH, 1);
|
|
|
- da = df.format(calendar.getTime());
|
|
|
- } catch (ParseException e) {
|
|
|
- // TODO Auto-generated catch block
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
+ try {
|
|
|
+ map.put("endTimes", DateUtils.addDays(DateUtils.parseDate(endTime, AFTConstants.YYYYMMDD), 1));
|
|
|
+ } catch (ParseException e) {
|
|
|
+ LoggerUtils.error(this.getClass(), "ffff", e);
|
|
|
}
|
|
|
- map.put("endTimes", da);
|
|
|
+
|
|
|
List<MemberOrder> list = memberGradeService.selectMemberOrderBa(map);
|
|
|
int countWhere = memberGradeService.countMemberOrderWhere(map);
|
|
|
Map<String, Object> maps = new HashMap<>();
|