用户信息修改

rs-website/rs-website-api/pom.xml

@@ -12,6 +12,12 @@
     <groupId>com.upyuns.platform.rs</groupId>
     <artifactId>rs-website-api</artifactId>
     <version>2.0-rscp-SNAPSHOT</version>
-
+    <dependencies>
+        <dependency>
+            <groupId>com.github.wxiaoqi</groupId>
+            <artifactId>ace-admin-api</artifactId>
+            <version>2.0-rscp-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
 
 </project>
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/UserAddressBiz.java

@@ -2,12 +2,16 @@ package com.upyuns.platform.rs.website.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.upyuns.platform.rs.website.dto.UserAddressDto;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.upyuns.platform.rs.website.entity.UserAddress;
@@ -15,6 +19,8 @@ import com.upyuns.platform.rs.website.mapper.UserAddressMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -25,6 +31,12 @@ import java.util.List;
 @Service
 public class UserAddressBiz extends BaseBiz<UserAddressMapper, UserAddress> {
 
+	@Autowired
+	UserFeign userFeign;
+
+	@Autowired
+	HttpServletRequest request;
+
 	/**
 	 * 分页查询 用户地址信息
 	 * @param userAddressDto
@@ -55,6 +67,10 @@ public class UserAddressBiz extends BaseBiz<UserAddressMapper, UserAddress> {
 	 * @return
 	 */
 	public ObjectRestResponse addUpdate(UserAddress userAddress) {
+		AppUserDTO appUserVo = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
+		if (appUserVo == null) {
+			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+		}
 		if (userAddress == null) {
 			return ObjectRestResponse.paramIsEmpty();
 		}
@@ -75,12 +91,15 @@ public class UserAddressBiz extends BaseBiz<UserAddressMapper, UserAddress> {
 	/**
 	 * 查询用户所有收货地址
 	 *
-	 * @param userId
 	 * @return
 	 */
-	public List<UserAddress> getUserAddress(Long userId) {
+	public List<UserAddress> getUserAddress() {
+		AppUserDTO appUserVo = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
+		if (appUserVo == null) {
+			return new ArrayList<>();
+		}
 		Example example = new Example(UserAddress.class);
-		example.createCriteria().andEqualTo("userId", userId).andEqualTo("isDel", 0);
+		example.createCriteria().andEqualTo("userId", appUserVo.getUserid()).andEqualTo("isDel", 0);
 		return mapper.selectByExample(example);
 	}
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/UserAddressController.java

@@ -22,7 +22,7 @@ public class UserAddressController extends BaseController<UserAddressBiz,UserAdd
 	}
 
 	@GetMapping(value = "getUserAddress")
-	public ObjectRestResponse getUserAddress(Long userId) {
-		return ObjectRestResponse.succ(baseBiz.getUserAddress(userId));
+	public ObjectRestResponse getUserAddress() {
+		return ObjectRestResponse.succ(baseBiz.getUserAddress());
 	}
 }
\ No newline at end of file