|
|
@@ -2,11 +2,13 @@ package com.goafanti.memberGrade.controller;
|
|
|
|
|
|
import java.text.ParseException;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.util.Assert;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
@@ -16,12 +18,14 @@ 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.enums.OrderState;
|
|
|
import com.goafanti.common.model.MemberOrder;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.LoggerUtils;
|
|
|
import com.goafanti.memberGrade.bo.MemberGrade;
|
|
|
import com.goafanti.memberGrade.bo.MemberGradeBO;
|
|
|
import com.goafanti.memberGrade.service.MemberGradeService;
|
|
|
+import com.goafanti.memberGrade.service.MemberOrderService;
|
|
|
|
|
|
/**
|
|
|
* 会员等级管理 后台
|
|
|
@@ -33,7 +37,9 @@ import com.goafanti.memberGrade.service.MemberGradeService;
|
|
|
@RequestMapping(value = "/api/admin/member")
|
|
|
public class MemberGradeController extends BaseApiController {
|
|
|
@Autowired
|
|
|
- private MemberGradeService memberGradeService;
|
|
|
+ private MemberGradeService memberGradeService;
|
|
|
+ @Autowired
|
|
|
+ private MemberOrderService memberOrderService;
|
|
|
|
|
|
/**
|
|
|
* 查询全部信息
|
|
|
@@ -140,22 +146,31 @@ public class MemberGradeController extends BaseApiController {
|
|
|
* @return
|
|
|
*/
|
|
|
@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, String paymentId) {
|
|
|
- Map<String, Object> umap = new HashMap<>();
|
|
|
- umap.put("userId", userId);
|
|
|
- umap.put("lvl", memberRank);
|
|
|
- Map<String, Object> map = new HashMap<>();
|
|
|
- map.put("id", id);
|
|
|
- map.put("menberType", memberRank);
|
|
|
- map.put("validMonth", validMonth);
|
|
|
- map.put("paymentValue", paymentValue);
|
|
|
- map.put("orderState", orderState);
|
|
|
- map.put("paymentTime", paymentTime);
|
|
|
- map.put("paymentType", paymentType);
|
|
|
- map.put("paymentId", paymentId);
|
|
|
- memberGradeService.updateMemberOrder(map, umap);
|
|
|
- return res().data(1);
|
|
|
+ public Result updateMemberOrder(Long id, String memberRank, String validMonth, String paymentValue,
|
|
|
+ String orderState, String paymentTime, String paymentType, String userId, String paymentId) {
|
|
|
+ MemberOrder mo = memberOrderService.getById(id);
|
|
|
+ Assert.notNull(mo, "找不到订单");
|
|
|
+ mo.setOrderState(OrderState.getStatus(orderState).getCode());
|
|
|
+ try {
|
|
|
+ Integer month = Integer.parseInt(validMonth);
|
|
|
+ mo.setValidMonth(month);
|
|
|
+ mo.setMenberType(Integer.parseInt(memberRank));
|
|
|
+ if (OrderState.isPayed(OrderState.getStatus(mo.getOrderState()))) {
|
|
|
+ Assert.hasText(paymentId, "已支付订单信息不完整");
|
|
|
+ Assert.hasText(paymentType, "已支付订单信息不完整");
|
|
|
+ Assert.hasText(paymentTime, "已支付订单信息不完整");
|
|
|
+ mo.setPaymentId(paymentId);
|
|
|
+ mo.setPaymentType(paymentType);
|
|
|
+ mo.setPaymentValue(Double.parseDouble(paymentValue));
|
|
|
+ Date payTime = DateUtils.parseDate(paymentTime, AFTConstants.YYYYMMDDHHMMSS);
|
|
|
+ Date validTime = DateUtils.addMonths(payTime, month);
|
|
|
+ mo.setValidTime(validTime);
|
|
|
+ mo.setPaymentTime(payTime);
|
|
|
+ }
|
|
|
+ } catch (ParseException e) {
|
|
|
+ return res().error(buildError("", "参数错误"));
|
|
|
+ }
|
|
|
+ return res().data(memberOrderService.update(mo));
|
|
|
}
|
|
|
|
|
|
/**
|