fix 兑换码平台规格;车位满座字段去除

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

@@ -89,12 +89,6 @@ public class GroupsTrips {
     @DbField("gt.available_num")
     private Integer availableNum;
 
-    /**
-     * 满座标识，true满座
-     */
-    @DbField("gt.is_full_seat")
-    private Boolean isFullSeat;
-
     /**
      * 状态
      */

netflix-dao/src/main/java/com/cyksj/model/views/UserDistributeViews.java

@@ -19,7 +19,7 @@ import java.util.Date;
 @Getter
 @Setter
 @SearchBean(tables = "user_distribute ud left join user u on u.id = ud.user_id",
-where = "ud.deleted is true")
+where = "ud.deleted is true and u.id is not null")
 public class UserDistributeViews {
 
 	@DbField("ud.id")

netflix-service/src/main/java/com/cyksj/service/exchange/impl/ExchangeCodeServiceImpl.java

@@ -83,6 +83,9 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
 		if (goodsDonSku == null) {
 			throw BusinessRuntimeException.getInstance("所选规格已被删除");
 		}
+		if (!goodsDonSku.getGoodsId().equals(exchangeCodeReq.getGoodsId())) {
+			throw BusinessRuntimeException.getInstance("规格与平台不匹配");
+		}
 		List<ExcelExchangeCodeData> data = new ArrayList<>(exchangeCodeReq.getNumber());
 		for (int i = 0; i < exchangeCodeReq.getNumber(); i++) {
 			StringBuilder sb = new StringBuilder(32);