Merge remote-tracking branch 'origin/dev' into dev

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

@@ -148,12 +148,6 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 	 * @return
 	 */
 	public ObjectRestResponse getUserOrder(UserOrderDto userOrderDto) {
-		String token = request.getHeader("Authorization");
-		AppUserDTO appUserDTO = userFeign.userDetailByToken(token).getData();
-		if (appUserDTO == null) {
-			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
-		}
-		userOrderDto.setUserId(appUserDTO.getUserid());
 		Query query = new Query(userOrderDto);
 		Example example = new Example(OrderInfo.class);
 		Example orderItemExample = new Example(OrderItem.class);

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

 package com.upyuns.platform.rs.website.controller.web;
 
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.OrderInfoBiz;
@@ -11,11 +13,14 @@ import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("orderInfo/web")
-public class OrderInfoWebController extends BaseController<OrderInfoBiz,OrderInfo> {
+public class OrderInfoWebController extends BaseController<OrderInfoBiz,OrderInfo> implements UserRestInterface {
 
 	@Autowired
 	ConfirmOrderService confirmOrderService;
 
+	@Autowired
+	UserFeign userFeign;
+
 	@PostMapping(value = "confirmOrder")
 	public ObjectRestResponse confirmOrder(@RequestBody ConfirmOrderDto confirmOrderDto) {
 		return confirmOrderService.confirmOrderInfo(confirmOrderDto);
@@ -28,6 +33,7 @@ public class OrderInfoWebController extends BaseController<OrderInfoBiz,OrderInf
 
 	@GetMapping(value = "getOrderList")
 	public ObjectRestResponse getUserOrder(UserOrderDto userOrderDto) {
+		userOrderDto.setUserId(getAppUser().getUserid());
 		return baseBiz.getUserOrder(userOrderDto);
 	}
 
@@ -61,4 +67,8 @@ public class OrderInfoWebController extends BaseController<OrderInfoBiz,OrderInf
 		return baseBiz.setAddressOrInvoice(orderInfoDto);
 	}
 
+	@Override
+	public UserFeign getUserFeign() {
+		return userFeign;
+	}
 }
\ No newline at end of file