fix 新增 邀请制

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

@@ -177,11 +177,16 @@ public class CmsUserController{
 
                     account = accountMapper.selectOne(Wrappers.lambdaQuery(Account.class).eq(Account::getAccount, ticket.getAccount()).eq(Account::getTitle,ticket.getPlatName()));
                     Integer months = orders.getMonths();
-                    if(months >= 12){
-                        months = 13;
-                    }
+
                     if(goodsDon != null){
                         GoodsDonSku sku = skuMapper.selectOne(Wrappers.lambdaQuery(GoodsDonSku.class).eq(GoodsDonSku::getGoodsId, goodsDon.getId()).eq(GoodsDonSku::getMonths, months));
+                        if(sku == null){
+                            if(months >= 12){
+                                months = 13;
+                            }
+                            sku = skuMapper.selectOne(Wrappers.lambdaQuery(GoodsDonSku.class).eq(GoodsDonSku::getGoodsId, goodsDon.getId()).eq(GoodsDonSku::getMonths, months));
+                        }
+
                         GroupsTrips groupsTrips = new GroupsTrips();
                         groupsTrips.setAccountId(account.getId());
                         groupsTrips.setSkuId(sku.getId());
@@ -261,9 +266,7 @@ public class CmsUserController{
                         .orderByDesc(NetflixOrders::getId)
                         .last(" limit 1"));
                 Integer months = order.getMonths();
-                if(order.getMonths() >= 12){
-                    months = 13;
-                }
+
                 GoodsDon goodsDon = goodsDonMapper.selectOne(Wrappers.lambdaQuery(GoodsDon.class).eq(GoodsDon::getTitle, order.getPlatName()));
                 if(goodsDon == null){
                     continue;
@@ -277,11 +280,29 @@ public class CmsUserController{
                      sku = skuMapper.selectOne(Wrappers.lambdaQuery(GoodsDonSku.class)
                             .eq(GoodsDonSku::getGoodsId, goodsDon.getId()).like(GoodsDonSku::getSpecVal,ticketType)
                             .eq(GoodsDonSku::getMonths, months));
+
+                    if(sku == null){
+                        if(order.getMonths() >= 12){
+                            months = 13;
+                        }
+                        sku = skuMapper.selectOne(Wrappers.lambdaQuery(GoodsDonSku.class)
+                                .eq(GoodsDonSku::getGoodsId, goodsDon.getId()).like(GoodsDonSku::getSpecVal,ticketType)
+                                .eq(GoodsDonSku::getMonths, months));
+
+                    }
                 }else {
                      sku = skuMapper.selectOne(Wrappers.lambdaQuery(GoodsDonSku.class)
                             .eq(GoodsDonSku::getGoodsId, goodsDon.getId())
                             .eq(GoodsDonSku::getMonths, months));
+                    if(sku == null){
+                        if(order.getMonths() >= 12){
+                            months = 13;
+                        }
+                        sku = skuMapper.selectOne(Wrappers.lambdaQuery(GoodsDonSku.class)
+                                .eq(GoodsDonSku::getGoodsId, goodsDon.getId())
+                                .eq(GoodsDonSku::getMonths, months));
 
+                    }
                 }
                 Account account = new Account();
                 account.setAccount(ticket.getPlatName() + map.get(ticket.getPlatName()).get() + "@yhlxj.vip" );
@@ -325,11 +346,13 @@ public class CmsUserController{
                     relation.setAccount(orderByUserId.getAddAccount());
                     relation.setNum(i);
                     relationMapper.insert(relation);
-                    HomeGroup homeGroup = new HomeGroup();
-                    homeGroup.setRelationId(relation.getId());
-                    homeGroup.setAccountId(account.getId());
-                    homeGroup.setStatus(orderByUserId.getIsVisit().equals("已邀请") ? "invited" : "uninvited");
-                    homeGroupMapper.insert(homeGroup);
+                    if (orderByUserId.getIsVisit().equals("已邀请")) {
+                        HomeGroup homeGroup = new HomeGroup();
+                        homeGroup.setRelationId(relation.getId());
+                        homeGroup.setAccountId(account.getId());
+                        homeGroup.setStatus("invited");
+                        homeGroupMapper.insert(homeGroup);
+                    }
                 }
                 for (Integer i = filter.size() + 1; i <= groupsTrips.getNum(); i++) {
                     GroupsRelation relation = new GroupsRelation();