fix

netflix-dao/src/main/java/com/cyksj/model/entity/GroupsRelation.java

@@ -32,6 +32,10 @@ public class GroupsRelation extends BaseEntity {
      */
     private Status status;
 
+    /**
+     * 账号
+     */
+    private String account;
 
 
     @AllArgsConstructor

netflix-dao/src/main/java/com/cyksj/model/entity/GroupsTrips.java

@@ -20,6 +20,11 @@ import java.util.Date;
         "left join account a on a.id = gt.account_id ")
 public class GroupsTrips extends BaseEntity {
 
+
+    @DbField("gt.id")
+    @TableField(exist = false)
+    private Long groupId;
+
     /**
      * 商品skuid
      */
@@ -96,6 +101,14 @@ public class GroupsTrips extends BaseEntity {
     @DbField("gt.start_time")
     private Date startTime;
 
+    @DbField("gt.created_time")
+    @TableField(exist = false)
+    private Date createTime;
+
+    @DbField("a.expiry_time")
+    @TableField(exist = false)
+    private Date expiryTime;
+
 
 
     @AllArgsConstructor

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

@@ -45,4 +45,9 @@ public class OrderPayRequest {
      * 数量
      */
     private Integer num;
+
+    /**
+     * 提交账号
+     */
+    private String account;
 }

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

@@ -101,6 +101,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
             }
             groupsRelation.setUserId(user.getId());
             groupsRelationMapper.updateById(groupsRelation);
+            groupsRelation.setAccount(payRequest.getAccount());
             orderDon.setRelationId(groupsRelation.getId());
         }else {
             //TODO 如果没指定座位,等待逻辑确认
@@ -143,6 +144,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
                 }
                 groupsRelation.setUserId(user.getId());
                 groupsRelation.setStatus(GroupsRelation.Status.locking);
+                groupsRelation.setAccount(payRequest.getAccount());
                 groupsRelationMapper.updateById(groupsRelation);
                 orderDon.setRelationId(groupsRelation.getId());
             }

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

@@ -1,8 +1,11 @@
 package com.cyksj.web.controller.manage.group;
 
+import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.model.entity.GoodsDonSku;
 import com.cyksj.model.entity.GroupsTrips;
+import com.cyksj.service.mange.CmsGoodsDonSkuService;
 import com.cyksj.service.mange.CmsGroupService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
@@ -31,6 +34,8 @@ public class CmsGroupController {
 
     private final CmsGroupService groupService;
 
+    private final CmsGoodsDonSkuService skuService;
+
     @GetMapping("/get")
     public Result<SearchResult<GroupsTrips>> get(String account){
         SearchResult<GroupsTrips> search = beanSearcher.search(GroupsTrips.class, MapUtils.flatBuilder(request.getParameterMap())
@@ -41,6 +46,13 @@ public class CmsGroupController {
 
     @PostMapping("/post")
     public Result<String> add(@RequestBody GroupsTrips groups){
+        GoodsDonSku sku = skuService.getById(groups.getSkuId());
+        if (sku == null) {
+            throw new BusinessRuntimeException("该商品规格不存在！");
+        }
+        groups.setNum(sku.getNum());
+        groups.setAvailableNum(sku.getNum());
+
         groupService.save(groups);
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }