|
|
@@ -100,8 +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=getPageNo(pageNo);
|
|
|
- Integer pSize=getPageSize(pageSize);
|
|
|
+ Integer pNo = getPageNo(pageNo);
|
|
|
+ Integer pSize = getPageSize(pageSize);
|
|
|
Integer pNos = (pNo - 1) * pSize;
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("pNos", pNos);
|
|
|
@@ -111,7 +111,7 @@ public class MemberGradeController extends BaseApiController {
|
|
|
map.put("nickname", nickname);
|
|
|
map.put("orderState", orderState);
|
|
|
map.put("startTimes", startTime);
|
|
|
- if(endTime!=null){
|
|
|
+ if (endTime != null) {
|
|
|
try {
|
|
|
map.put("endTimes", DateUtils.addDays(DateUtils.parseDate(endTime, AFTConstants.YYYYMMDD), 1));
|
|
|
} catch (ParseException e) {
|
|
|
@@ -141,10 +141,10 @@ public class MemberGradeController extends BaseApiController {
|
|
|
*/
|
|
|
@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) {
|
|
|
+ Integer orderState, String paymentTime, String paymentType, String userId, String paymentId) {
|
|
|
Map<String, Object> umap = new HashMap<>();
|
|
|
- umap.put("userId",userId);
|
|
|
- umap.put("lvl",memberRank);
|
|
|
+ umap.put("userId", userId);
|
|
|
+ umap.put("lvl", memberRank);
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("id", id);
|
|
|
map.put("menberType", memberRank);
|
|
|
@@ -153,6 +153,7 @@ public class MemberGradeController extends BaseApiController {
|
|
|
map.put("orderState", orderState);
|
|
|
map.put("paymentTime", paymentTime);
|
|
|
map.put("paymentType", paymentType);
|
|
|
+ map.put("paymentId", paymentId);
|
|
|
return res().data(memberGradeService.updateMemberOrder(map, umap));
|
|
|
}
|
|
|
|