调整接口

platform-api/src/main/java/com/platform/api/ApiBrandController.java

@@ -244,11 +244,11 @@ public class ApiBrandController extends ApiBaseAction {
     @ApiOperation(value = "增加访问次数")
     @IgnoreAuth
     @GetMapping("increaseViewCount")
-    public Object increaseViewCount(@RequestParam String brandId,@RequestParam(required = false) Integer type) {
+    public Object increaseViewCount(@RequestParam Integer brandId,@RequestParam(required = false) Integer type) {
         if(!(ObjectUtils.isEmpty(type) || type == 21 || type == 31)) {
-            return toResponsSuccess(brandService.increaseViewCount(brandId));
+            return toResponsSuccess(brandService.increaseViewCount(brandId+""));
         }
-        BrandVo brandVo = brandService.queryByScene(brandId);
+        BrandVo brandVo = brandService.queryObject(brandId);
         return toResponsSuccess(zhiHouseService.increaseViewCount(brandVo.getSceneNum()));
     }
 

platform-api/src/main/java/com/platform/api/ApiCartController.java

@@ -122,8 +122,36 @@ public class ApiCartController extends ApiBaseAction {
      */
     @ApiOperation(value = "获取购物车信息")
     @PostMapping("index")
-    public Object index(@LoginUser UserVo loginUser) {
-        return toResponsSuccess(getCart(loginUser));
+    public Object index() {
+        Map<String, Object> resultObj = new HashMap();
+        //查询列表数据
+        Map param = new HashMap();
+        param.put("user_id", getUserId());
+        List<CartVo> cartList = cartService.queryList(param);
+        //获取购物车统计信息
+        Integer goodsCount = 0;
+        BigDecimal goodsAmount = BigDecimal.ZERO.setScale(2 , RoundingMode.HALF_UP);
+        Integer checkedGoodsCount = 0;
+        BigDecimal checkedGoodsAmount = BigDecimal.ZERO.setScale(2 , RoundingMode.HALF_UP);
+        for (CartVo cartItem : cartList) {
+            goodsCount += cartItem.getNumber();
+            goodsAmount = goodsAmount.add(cartItem.getRetail_price().multiply(new BigDecimal(cartItem.getNumber())));
+            if (null != cartItem.getChecked() && 1 == cartItem.getChecked()) {
+                checkedGoodsCount += cartItem.getNumber();
+                checkedGoodsAmount = checkedGoodsAmount.add(cartItem.getRetail_price().multiply(new BigDecimal(cartItem.getNumber())));
+            }
+            //这里还会去修改商品的价格
+            updateGoodsPrice(cartItem);
+        }
+
+        resultObj.put("cartList", cartList);
+        Map<String, Object> cartTotal = new HashMap();
+        cartTotal.put("goodsCount", goodsCount);
+        cartTotal.put("goodsAmount", goodsAmount);
+        cartTotal.put("checkedGoodsCount", checkedGoodsCount);
+        cartTotal.put("checkedGoodsAmount", checkedGoodsAmount);
+        resultObj.put("cartTotal", cartTotal);
+        return toResponsSuccess(resultObj);
     }
 
     private String[] getSpecificationIdsArray(String ids) {

platform-api/src/main/java/com/platform/api/ApiOrderController.java

@@ -61,8 +61,8 @@ public class ApiOrderController extends ApiBaseAction {
      */
     @ApiOperation(value = "个人订单所有状态信息（主要是数量）")
     @PostMapping("index")
-    public Object index(@LoginUser UserVo loginUser) {
-        long userId = loginUser.getUserId();
+    public Object index() {
+        long userId = getUserId();
         List<Map<String ,Object>> resultList = new ArrayList<>();
         //代付款
         long waitForPay = orderService.countOrderInfo(userId , OrderStatusEnum.WAIT_FOR_PAY.getCode());

platform-api/src/main/java/com/platform/api/ApiUserController.java

@@ -162,11 +162,8 @@ public class ApiUserController extends ApiBaseAction {
     }
     @ApiOperation(value = "获取当前用户挂在的店铺列表")
     @PostMapping("getAdminBrands")
-    public Result getAdminBrands(@LoginUser UserVo loginUser) {
-        if(null == loginUser){
-            return Result.failure("登录信息缺失");
-        }
-        List<Map<String , Object>> brandList = myApiTmBrandAdminService.getUserBrand(loginUser.getUserId());
+    public Result getAdminBrands() {
+        List<Map<String , Object>> brandList = myApiTmBrandAdminService.getUserBrand(getUserId());
          return  Result.success("成功" , brandList);
     }
 

platform-api/src/main/java/com/platform/interceptor/AuthorizationInterceptor.java

@@ -1,17 +1,6 @@
 package com.platform.interceptor;
 
-import com.platform.annotation.IgnoreAuth;
-import com.platform.entity.TokenEntity;
-import com.platform.service.TokenService;
-import com.platform.utils.ApiRRException;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * 权限(Token)验证
@@ -22,57 +11,8 @@ import javax.servlet.http.HttpServletResponse;
  * @date 2017-03-23 15:38
  */
 @Component
-public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
-    @Autowired
-    private TokenService tokenService;
-
+public class AuthorizationInterceptor{
     public static final String LOGIN_USER_KEY = "LOGIN_USER_KEY";
     public static final String LOGIN_TOKEN_KEY = "X-Nideshop-Token";
 
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-
-        //支持跨域请求
-        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
-        response.setHeader("Access-Control-Max-Age", "3600");
-        response.setHeader("Access-Control-Allow-Credentials", "true");
-        response.setHeader("Access-Control-Allow-Headers", "x-requested-with,X-Nideshop-Token,X-URL-PATH");
-        response.setHeader("Access-Control-Allow-Origin", request.getHeader("Origin"));
-
-        IgnoreAuth annotation;
-        if (handler instanceof HandlerMethod) {
-            annotation = ((HandlerMethod) handler).getMethodAnnotation(IgnoreAuth.class);
-        } else {
-            return true;
-        }
-
-        //如果有@IgnoreAuth注解，则不验证token
-        if (annotation != null) {
-            return true;
-        }
-
-        //从header中获取token
-        String token = request.getHeader(LOGIN_TOKEN_KEY);
-        //如果header中不存在token，则从参数中获取token
-        if (StringUtils.isBlank(token)) {
-            token = request.getParameter(LOGIN_TOKEN_KEY);
-        }
-
-        //token为空
-        if (StringUtils.isBlank(token)) {
-            throw new ApiRRException("请先登录", 401);
-        }
-
-        //查询token信息
-        TokenEntity tokenEntity = tokenService.queryByToken(token);
-        if (tokenEntity == null || tokenEntity.getExpireTime().getTime() < System.currentTimeMillis()) {
-            throw new ApiRRException("token失效，请重新登录", 401);
-        }
-
-        //设置userId到request里，后续根据userId，获取用户信息
-        request.setAttribute(LOGIN_USER_KEY, tokenEntity.getUserId());
-
-        return true;
-    }
 }

platform-api/src/main/java/com/platform/resolver/LoginUserHandlerMethodArgumentResolver.java

@@ -1,48 +0,0 @@
-package com.platform.resolver;
-
-import com.platform.annotation.LoginUser;
-import com.platform.entity.UserVo;
-import com.platform.interceptor.AuthorizationInterceptor;
-import com.platform.service.ApiUserService;
-import org.springframework.core.MethodParameter;
-import org.springframework.web.bind.support.WebDataBinderFactory;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.method.support.ModelAndViewContainer;
-
-/**
- * 有@LoginUser注解的方法参数，注入当前登录用户
- *
- * @author lipengjun
- * @email 939961241@qq.com
- * @gitee https://gitee.com/fuyang_lipengjun/platform
- * @date 2017-03-23 22:02
- */
-public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
-    private ApiUserService userService;
-
-    public void setUserService(ApiUserService userService) {
-        this.userService = userService;
-    }
-
-    @Override
-    public boolean supportsParameter(MethodParameter parameter) {
-        return parameter.getParameterType().isAssignableFrom(UserVo.class) && parameter.hasParameterAnnotation(LoginUser.class);
-    }
-
-    @Override
-    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer container,
-                                  NativeWebRequest request, WebDataBinderFactory factory) throws Exception {
-        //获取用户ID
-        Object object = request.getAttribute(AuthorizationInterceptor.LOGIN_USER_KEY, RequestAttributes.SCOPE_REQUEST);
-        if (object == null) {
-            return null;
-        }
-
-        //获取用户信息
-        UserVo user = userService.queryObject((Long) object);
-
-        return user;
-    }
-}

platform-api/src/main/resources/platform-api.xml

@@ -8,24 +8,6 @@
      	http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd">
 
     <mvc:annotation-driven>
-        <mvc:argument-resolvers>
-            <bean class="com.platform.resolver.LoginUserHandlerMethodArgumentResolver">
-                <property name="userService" ref="apiUserService"></property>
-            </bean>
-        </mvc:argument-resolvers>
-
     </mvc:annotation-driven>
-
-    <mvc:interceptors>
-        <mvc:interceptor>
-            <mvc:mapping path="/api/**"/>
-            <mvc:exclude-mapping path="/api/goods/detail" />
-            <mvc:exclude-mapping path="/api/search/index" />
-            <ref bean="authorizationInterceptor"/>
-        </mvc:interceptor>
-    </mvc:interceptors>
-
     <bean id="apiUserService" class="com.platform.service.ApiUserService"/>
-
-    <bean id="authorizationInterceptor" class="com.platform.interceptor.AuthorizationInterceptor"/>
 </beans>