用户提货订单详情增加用户昵称

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/UserDeliverOrderMgrController.java

@@ -103,11 +103,10 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		if (null == order || StringUtils.isBlank(order.getOrderId())) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
-		LambdaQueryWrapper<UserDeliverOrder> queryWrapper = new LambdaQueryWrapper<UserDeliverOrder>();
-		queryWrapper.eq(UserDeliverOrder::getOrderId, order.getOrderId());
-		UserDeliverOrder userDeliverOrder = userDeliverOrderService.getOne(queryWrapper);
-		UserDeliverOrderVO userDeliverOrderVO = mapperFacade.map(userDeliverOrder, UserDeliverOrderVO.class);
-		
+		UserDeliverOrderVO userDeliverOrderVO = userDeliverOrderService.selectUserDeliverOrderVo(order.getOrderId());
+		if(null == userDeliverOrderVO || StringUtils.isBlank(userDeliverOrderVO.getOrderId())) {
+			return error(ErrorCodeEnum.ERROR_CODE_1001);
+		}
 		List<UserDeliverOrderItem> orderItems = userDeliverOrderItemService.list(new LambdaQueryWrapper<UserDeliverOrderItem>()
 				.eq(UserDeliverOrderItem::getOrderId, userDeliverOrderVO.getOrderId()));
 		

mp-service/src/main/java/com/qs/mp/user/mapper/UserDeliverOrderMapper.java

@@ -34,4 +34,13 @@ public interface UserDeliverOrderMapper extends BaseMapper<UserDeliverOrder> {
 	 * @return
 	 */
 	public int selectUserDeliverOrderCount(@Param(Constants.WRAPPER) Wrapper<UserDeliverOrder> wrapper);
+	
+	
+	/**
+	 * 获取用户提货订单信息VO
+	 * 
+	 * @param wrapper
+	 * @return
+	 */
+	public UserDeliverOrderVO selectUserDeliverOrderVo(@Param("orderId") String orderId);
 }

mp-service/src/main/java/com/qs/mp/user/service/IUserDeliverOrderService.java

@@ -67,6 +67,15 @@ public interface IUserDeliverOrderService extends IService<UserDeliverOrder> {
 	public int selectUserDeliverOrderCount(Wrapper<UserDeliverOrder> wrapper);
 	
 	
+	/**
+	 * 获取用户提货订单信息VO
+	 * 
+	 * @param wrapper
+	 * @return
+	 */
+	public UserDeliverOrderVO selectUserDeliverOrderVo(String orderId);
+	
+	
 	/**
 	 * 用户提货订单发货
 	 * @param orderId

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -171,4 +171,11 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
 		}
 		return false;
 	}
+
+	@Override
+	public UserDeliverOrderVO selectUserDeliverOrderVo(String orderId) {
+		return getBaseMapper().selectUserDeliverOrderVo(orderId);
+	}
+	
+	
 }

mp-service/src/main/resources/mapper/user/UserDeliverOrderMapper.xml

@@ -46,5 +46,14 @@
 		${ew.customSqlSegment}
 	</select>
 	
+	 <!-- 查询用户提货订单列表 -->
+    <select id="selectUserDeliverOrderVo" resultType="com.qs.mp.user.domain.vo.UserDeliverOrderVO">
+		select t1.* , t2.nick_name nickName
+		from mp_user_deliver_order t1
+		left join sys_user t2 on t1.user_id = t2.user_id
+		where t1.order_id = #{orderId}
+	</select>
+	
+	
 
 </mapper>