Просмотр исходного кода

Merge branch 'master' of https://git.coding.net/aft/AFT.git

albertshaw лет назад: 8
Родитель
Сommit
80299d00f9

+ 6 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -213,6 +213,12 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 
+	@RequestMapping(value = "/admin/userOrder", method = RequestMethod.GET)
+	public ModelAndView adminUserOrder(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/admin/userOrder");
+		return modelview;
+	}
+
 	@RequestMapping(value = "/portal/search/achievement", method = RequestMethod.GET)
 	public ModelAndView portalSearchAchievement(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/search/achievement");

+ 2 - 1
src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml

@@ -138,7 +138,8 @@
 		payment_value=#{paymentValue},
 		order_state=#{orderState},
 		payment_time=#{paymentTime},
-		payment_type=#{paymentType}
+		payment_type=#{paymentType},
+		payment_id=#{paymentId} 
 		WHERE id=#{id}
 	</update>
 

+ 7 - 6
src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java

@@ -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));
 	}
 

+ 2 - 9
src/main/java/com/goafanti/memberGrade/controller/MemberGradeFrontController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.MemberOrder;
-import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.memberGrade.service.MemberGradeService;
@@ -40,14 +39,8 @@ public class MemberGradeFrontController extends BaseApiController {
 	 */
 	@RequestMapping(value = "/selectMemberOrder", method = RequestMethod.GET)
 	public Result selectMemberOrder(String pageNo, String pageSize) {
-		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);

+ 16 - 0
src/main/webapp/WEB-INF/views/admin/userOrder.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>科技思想页</title>
+	<link th:href="${staticHost+'/admin/userOrder.css'}" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/admin/userOrder.js'}"></script>
+	</div>
+</body>
+</html>