fix

netflix-dao/src/main/java/com/cyksj/model/request/GiftCardReceiveReq.java

@@ -3,6 +3,8 @@ package com.cyksj.model.request;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotEmpty;
+
 /*
  *项目名: yhlxj
  *文件名: GiftCardReceiveReq
@@ -12,5 +14,11 @@ import lombok.Setter;
 @Getter
 @Setter
 public class GiftCardReceiveReq {
+
+	@NotEmpty
+	private String code;
+
+	private Long userId;
+
 	private Long relationId;
 }

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -1498,15 +1498,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			//新增空车队发送模板消息
 			TASK_POOL.execute(() -> {
 				groupsFuncService.createNewGroupsTrips(sku);
-//				try {
-//					List<CustomerService> customerServices = customerServiceMapper.selectList(null);
-//					for (CustomerService customerService : customerServices) {
-//						log.info("发送客服{}空车位通知消息", customerService.getNickName());
-//						templateCommonService.emptySendMsgNotify(order, customerService.getOpenId());
-//					}
-//				} catch (Exception e) {
-//					log.error("发送{}空车位模板消息至客服失败:{}", order.getGoodsId(), e);
-//				}
 			});
 		}
 	}

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -166,7 +166,7 @@ public class GroupRelationController {
     public Result<List<UserTicketView>> getUserTicketView() {
         long userId = StpUserUtil.getLoginIdAsLong();
         List<Long> userIds = userBindRelationService.getRelationUserIdList(userId, null);
-        List<UserTicketView> ticketViews = beanSearcher.searchAll(UserTicketView.class, MapUtils.builder()
+        List<UserTicketView> ticketViews = beanSearcher.searchAll(UserTicketView.class, MapUtils.flatBuilder(request.getParameterMap())
                 .field(UserTicketView::getUserId, userIds).op(Operator.InList)
                 .field(RenewalView::getStatus, List.of("validity", "outside")).op(Operator.InList)
                 .orderBy(UserTicketView::getRelationId).asc()

netflix-web/src/main/java/com/cyksj/web/controller/user/UserController.java

@@ -387,11 +387,11 @@ public class UserController {
     /**
      * 领取他人礼品卡
      */
-    @PostMapping("/receive/giftCard/{code}")
-    public Result<String> receiveGiftCardByRc(@PathVariable String code, @RequestBody GiftCardReceiveReq req) {
+    @PostMapping("/receive/giftCard")
+    public Result<String> receiveGiftCardByRc(@RequestBody GiftCardReceiveReq req) {
         long userId = StpUserUtil.getLoginIdAsLong();
         Long relationId = req.getRelationId();
-        userService.receiveGiftCardByRc(userId, code, relationId);
+        userService.receiveGiftCardByRc(userId, req.getCode(), relationId);
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }
 }