|
|
@@ -1,6 +1,11 @@
|
|
|
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;
|
|
|
@@ -54,7 +59,7 @@ public class MemberGradeController extends BaseApiController {
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value = "/delGrade", method = RequestMethod.GET)
|
|
|
+ @RequestMapping(value = "/delGrade", method = RequestMethod.POST)
|
|
|
public Result delGrade(int id) {
|
|
|
return res().data(memberGradeService.delGrade(id));
|
|
|
}
|
|
|
@@ -65,7 +70,7 @@ public class MemberGradeController extends BaseApiController {
|
|
|
* @param name
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value = "/addGradeName", method = RequestMethod.GET)
|
|
|
+ @RequestMapping(value = "/addGradeName", method = RequestMethod.POST)
|
|
|
public Result addGradeName(MemberGrade me) {
|
|
|
if (memberGradeService.selectRank(me) >= 1) {
|
|
|
Error e = new Error();
|
|
|
@@ -82,7 +87,7 @@ public class MemberGradeController extends BaseApiController {
|
|
|
* @param me
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value = "/addBusinessAndCost", method = RequestMethod.GET)
|
|
|
+ @RequestMapping(value = "/addBusinessAndCost", method = RequestMethod.POST)
|
|
|
public Result addBusinessAndCost(MemberGrade me) {
|
|
|
return res().data(memberGradeService.addBusinessAndCost(me));
|
|
|
}
|
|
|
@@ -95,10 +100,11 @@ public class MemberGradeController extends BaseApiController {
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/selectMemberOrderBa", method = RequestMethod.GET)
|
|
|
- public Result selectMemberOrderBa(String pageNo, String pageSize, Integer id, String mobile, String nickname,
|
|
|
+ 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;
|
|
|
+ String da = null;
|
|
|
if (StringUtils.isNumeric(pageSize)) {
|
|
|
pSize = Integer.parseInt(pageSize);
|
|
|
}
|
|
|
@@ -114,7 +120,20 @@ public class MemberGradeController extends BaseApiController {
|
|
|
map.put("nickname", nickname);
|
|
|
map.put("orderState", orderState);
|
|
|
map.put("startTimes", startTime);
|
|
|
- map.put("endTimes", endTime);
|
|
|
+ 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();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ map.put("endTimes", da);
|
|
|
List<MemberOrder> list = memberGradeService.selectMemberOrderBa(map);
|
|
|
int countWhere = memberGradeService.countMemberOrderWhere(map);
|
|
|
Map<String, Object> maps = new HashMap<>();
|
|
|
@@ -124,4 +143,30 @@ public class MemberGradeController extends BaseApiController {
|
|
|
return res().data(maps);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 后台会员更改
|
|
|
+ *
|
|
|
+ * @param id
|
|
|
+ * @param memberRank
|
|
|
+ * @param validMonth
|
|
|
+ * @param paymentValue
|
|
|
+ * @param orderState
|
|
|
+ * @param paymentTime
|
|
|
+ * @param paymentType
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/updateMemberOrder", method = RequestMethod.GET)
|
|
|
+ public Result updateMemberOrder(Long id, int memberRank, Integer validMonth, Double paymentValue,
|
|
|
+ Integer orderState, String paymentTime, String paymentType) {
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ map.put("id", id);
|
|
|
+ map.put("menberType", memberGradeService.selectMemberGradeId(memberRank));
|
|
|
+ map.put("validMonth", validMonth);
|
|
|
+ map.put("paymentValue", paymentValue);
|
|
|
+ map.put("orderState", orderState);
|
|
|
+ map.put("paymentTime", paymentTime);
|
|
|
+ map.put("paymentType", paymentType);
|
|
|
+ return res().data(memberGradeService.updateMemberOrder(map));
|
|
|
+ }
|
|
|
+
|
|
|
}
|