yuhaitao14 7 years ago
parent
commit
9aabd538d5

+ 4 - 3
shop/src/main/java/com/zskk/shop/controller/GlobalErrorController.java

@@ -28,7 +28,7 @@ import com.zskk.shop.exception.ErrorConstant;
 import com.zskk.shop.exception.ZSKKException;
 import com.zskk.shop.utils.LogUtil;
 
-//@ControllerAdvice  
+@ControllerAdvice  
 public class GlobalErrorController {
 	
 	@Value("${zskk.uccenter}")
@@ -61,7 +61,7 @@ public class GlobalErrorController {
 				}
 			}
 			
-			String errorPath = "/error/500";
+			String errorPath = "/error";
 			ModelAndView mv = new ModelAndView(errorPath);
 			mv.addObject("msg", e.getMessage());
 			return mv;
@@ -69,7 +69,8 @@ public class GlobalErrorController {
 			//JS请求 返回JSON数据
 			headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
 			if (e instanceof ZSKKException){
-				return new HttpEntity<String>(JSON.toJSONString(new ControllerResult(e)), headers);
+				ZSKKException exception = (ZSKKException)e;
+				return new HttpEntity<String>(JSON.toJSONString(new ControllerResult(exception.getError())), headers);
 			}else{
 				return new HttpEntity<String>(JSON.toJSONString(new ControllerResult(ErrorConstant.SERVER_ERROR)), headers);
 			}

+ 0 - 107
shop/src/main/java/com/zskk/shop/controller/ShopErrorController.java

@@ -1,107 +0,0 @@
-/**
-* @版权信息 (@copyright Copyright 2017-XXXX JDJR.COM All Right Reserved);
-* @see
-* @author 于海涛 京东金融【技术研发部-证券及营销平台研发部-营销平台研发部】
-* @version 1.0
-* @date 2018年6月7日
-*/
-
-package com.zskk.shop.controller;
-
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.web.AbstractErrorController;
-import org.springframework.boot.autoconfigure.web.ErrorAttributes;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.alibaba.fastjson.JSON;
-import com.zskk.shop.exception.ErrorConstant;
-import com.zskk.shop.exception.ZSKKError;
-import com.zskk.shop.exception.ZSKKException;
-import com.zskk.shop.utils.LogUtil;
-
-@Controller
-public class ShopErrorController extends AbstractErrorController {
-	@Value("${zskk.uccenter}")
-	private String uccenter;
-	
-	@Value("${zskk.myhost}")
-	private String myhost;
-	
-	public ShopErrorController(ErrorAttributes errorAttributes) {
-		super(errorAttributes);
-	}
-
-	@Override
-	public String getErrorPath() {
-		return "error";
-	}
-
-	@RequestMapping(produces = "text/html")
-	public ModelAndView errorHtml(HttpServletRequest request, HttpServletResponse response) {
-		Map<String, Object> error 	= this.getErrorAttributes(request, Boolean.TRUE);
-		String exception 			= (String)error.get("exception");
-		String message				= (String)error.get("message");
-		if (ZSKKException.class.getName().equals(exception)){
-			ZSKKError errorObj = JSON.parseObject(message, ZSKKError.class);
-			if (errorObj.getCode() == ErrorConstant.NO_LOGIN_ERROR.getCode()){
-				return new ModelAndView("redirect:" + uccenter + "/login/authorize?redirect=" + this.getRequestUrl(request));
-			}else{
-				ModelAndView model = new ModelAndView(this.getErrorPath());
-				model.addObject("code", errorObj.getCode());
-				model.addObject("msg", errorObj.getMsg());
-				return model;
-			}
-		}else{
-			ModelAndView model = new ModelAndView(this.getErrorPath());
-			model.addObject("code", ErrorConstant.SERVER_ERROR.getCode());
-			model.addObject("msg", ErrorConstant.SERVER_ERROR.getMsg());
-			return model;
-		}
-		
-	}
-
-	@RequestMapping
-	@ResponseBody
-	public ResponseEntity<Map<String, Object>> error(HttpServletRequest request) {
-		Map<String, Object> error 	= this.getErrorAttributes(request, Boolean.TRUE);
-		String exception 			= (String)error.get("exception");
-		String message				= (String)error.get("message");
-		Map<String, Object> body = new HashMap<>();
-		if (ZSKKException.class.getName().equals(exception)){
-			ZSKKError errorObj = JSON.parseObject(message, ZSKKError.class);
-			body.put("code", errorObj.getCode());
-			body.put("msg", errorObj.getMsg());
-		}else{
-			body.put("code", ErrorConstant.SERVER_ERROR.getCode());
-			body.put("msg", ErrorConstant.SERVER_ERROR.getMsg());
-		}
-		return new ResponseEntity<Map<String,Object>>(body, HttpStatus.OK);
-
-	}
-
-	private String getRequestUrl(HttpServletRequest request){
-		try{
-			String path = request.getRequestURI();
-			String query = request.getQueryString();
-			String url = myhost + path + (query != null? "?" + query: "");
-			return URLEncoder.encode(url, "UTF-8");
-		}catch (Exception e) {
-			LogUtil.sysError(e.getMessage(), e);
-			return "";
-		}
-	}
-}

+ 1 - 3
shop/src/main/java/com/zskk/shop/controller/admin/GoodsManagerController.java

@@ -14,7 +14,6 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -29,7 +28,6 @@ import com.zskk.shop.dao.entry.GoodBase;
 import com.zskk.shop.dao.entry.GoodDescribe;
 import com.zskk.shop.dao.entry.GoodPrice;
 import com.zskk.shop.exception.ErrorConstant;
-import com.zskk.shop.exception.ZSKKError;
 import com.zskk.shop.exception.ZSKKException;
 import com.zskk.shop.service.GoodService;
 
@@ -96,7 +94,7 @@ public class GoodsManagerController extends AbstractController{
 		}
 		
 		if (status){ //设置为上线 验证数据
-			if (base.getPackageid().equals("")){
+			if ("0".equals(base.getPackageid())){
 				throw new ZSKKException(ErrorConstant.NO_SET_PACKAGE);
 			}
 			List<GoodDescribe> describes = goodService.queryGoodDescribes(base.getGid());

+ 1 - 1
shop/src/main/java/com/zskk/shop/service/GoodService.java

@@ -182,7 +182,7 @@ public class GoodService {
 		bean.setDescribe(base.getDescribe());
 		bean.setIcon(base.getIcon());
 		bean.setPackageid(base.getPackageid());
-		bean.setPackageName(bean.getPackageName());
+		bean.setPackageName(base.getPackageName());
 		bean.setCtime(base.getCtime());
 		bean.setStatus(base.getStatus());
 		return bean;

+ 10 - 1
shop/static/manager/src/components/page/GoodsManager.vue

@@ -39,7 +39,16 @@
             </el-table-column>
             <el-table-column label="状态" prop="status" :formatter="statusFormater">
             </el-table-column>
-            <el-table-column label="绑定套餐" prop="packageName"></el-table-column>
+            <el-table-column label="绑定套餐" prop="packageName">
+                <template slot-scope="scope">
+                    <template v-if="scope.row.packageid === '0'">
+                        <el-button type="text" size="small" >去绑定</el-button>
+                    </template>
+                    <template v-else>
+                        <el-button type="text" size="small" >{{scope.row.packageName}}</el-button>
+                    </template>
+                </template>
+            </el-table-column>
             <el-table-column label="操作" width="250px">
                 <template slot-scope="scope">
                     <template v-if="scope.row.status == 0">