|
@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
import org.springframework.web.context.request.RequestAttributes;
|
|
import org.springframework.web.context.request.RequestAttributes;
|
|
import org.springframework.web.context.request.RequestContextHolder;
|
|
import org.springframework.web.context.request.RequestContextHolder;
|
|
|
|
+import org.springframework.web.servlet.ModelAndView;
|
|
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
|
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
@@ -81,7 +82,7 @@ public class PromoCodeController extends BaseController {
|
|
* 列表
|
|
* 列表
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
- public String agencyList(Long code,String isUse,Pageable pageable, ModelMap model) {
|
|
|
|
|
|
+ public ModelAndView agencyList(Long code,String isUse,Pageable pageable, ModelMap model) {
|
|
|
|
|
|
if (code != null) {
|
|
if (code != null) {
|
|
pageable.getFilters().add(Filter.eq("code", code));
|
|
pageable.getFilters().add(Filter.eq("code", code));
|
|
@@ -103,7 +104,7 @@ public class PromoCodeController extends BaseController {
|
|
model.addAttribute("code", code);
|
|
model.addAttribute("code", code);
|
|
model.addAttribute("page", promoCodeService.findPage(pageable));
|
|
model.addAttribute("page", promoCodeService.findPage(pageable));
|
|
model.addAttribute("currentAdmin", adminService.getCurrent());
|
|
model.addAttribute("currentAdmin", adminService.getCurrent());
|
|
- return "/admin/promoCode/list";
|
|
|
|
|
|
+ return new ModelAndView("/admin/promoCode/list");
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|