|
|
@@ -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,16 +111,17 @@ 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<>();
|
|
|
- maps.put("List", list);
|
|
|
+ maps.put("list", list);
|
|
|
maps.put("countWhere", countWhere);
|
|
|
maps.put("pNo", pNo);
|
|
|
return res().data(maps);
|
|
|
@@ -145,7 +139,7 @@ public class MemberGradeController extends BaseApiController {
|
|
|
* @param paymentType
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value = "/updateMemberOrder", method = RequestMethod.GET)
|
|
|
+ @RequestMapping(value = "/updateMemberOrder", method = RequestMethod.POST)
|
|
|
public Result updateMemberOrder(Long id, int memberRank, Integer validMonth, Double paymentValue,
|
|
|
Integer orderState, String paymentTime, String paymentType,String userId) {
|
|
|
Map<String, Object> umap = new HashMap<>();
|