diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderDetailsReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderDetailsReturnVo.java index 7867e55..d6b03ea 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderDetailsReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderDetailsReturnVo.java @@ -44,6 +44,8 @@ public class PlayOrderDetailsReturnVo { */ private String clerkNickname; + private String acceptBy; + /** * 店员头像 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOrderInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOrderInfoController.java index 00c0da1..aaaadcc 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOrderInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOrderInfoController.java @@ -18,14 +18,17 @@ import com.starry.admin.modules.weichat.entity.order.PlayOrderInfoContinueQueryV import com.starry.admin.modules.weichat.entity.order.PlayOrderInfoRandomQueryVo; import com.starry.admin.modules.weichat.entity.order.PlayRewardOrderQueryVo; import com.starry.common.result.R; +import com.starry.common.utils.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; + import java.time.LocalDateTime; import javax.annotation.Resource; + import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; @@ -52,8 +55,7 @@ public class WxOrderInfoController { /** * 续单申请-店员发起 * - * @param vo - * 续单申请提交对象 + * @param vo 续单申请提交对象 */ @ApiOperation(value = "店员申请续单", notes = "店员为当前订单发起续单申请") @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "非本人订单;无法续单"), @@ -91,8 +93,7 @@ public class WxOrderInfoController { /** * 店员查询随机单列表 * - * @param vo - * 随机单列表查询对象 + * @param vo 随机单列表查询对象 * @return 订单列表 */ @ApiOperation(value = "查询随机单列表", notes = "店员查询可接的随机订单列表") @@ -108,8 +109,7 @@ public class WxOrderInfoController { /** * 店员查询随机单详情 * - * @param id - * 订单ID + * @param id 订单ID * @return 订单列表 */ @ApiOperation(value = "查询随机单详情", notes = "店员查询随机订单的详细信息") @@ -123,14 +123,19 @@ public class WxOrderInfoController { if (vo == null) { throw new CustomException("订单不存在"); } + if (StringUtils.isNotEmpty(vo.getAcceptBy()) && !vo.getAcceptBy().equals(ThreadLocalRequestDetail.getClerkUserInfo().getId())) { + vo.setWeiChatCode(""); + } + if(vo.getOrderStatus().equals("4")){ + vo.setWeiChatCode(""); + } return R.ok(vo); } /** * 店员查询打赏动态 * - * @param vo - * 打赏动态查询列表 + * @param vo 打赏动态查询列表 * @return 打赏动态列表 */ @ApiOperation(value = "店员查询打赏动态", notes = "店员查询打赏订单动态") @@ -157,8 +162,7 @@ public class WxOrderInfoController { /** * 顾客-分页查询续单列表 * - * @param vo - * PlayOrderInfoContinueQueryVo + * @param vo PlayOrderInfoContinueQueryVo * @return 续单历史 */ @ApiOperation(value = "查询续单列表", notes = "顾客分页查询续单申请列表")