fix 添加主账号字段返回;appleTv唯一账号车队

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

@@ -40,9 +40,18 @@ public class OrderDonView {
     @DbField("o.relation_id")
     private Long relationId;
 
+    @DbField("gr.groups_id")
+    private Long groupsId;
+
     @DbField("gr.account")
     private String account;
 
+    /**
+     * 主账号
+     */
+    @DbIgnore
+    private String gtAccount;
+
     @DbField("g.type")
     private Integer goodsDonType;
 

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

@@ -20,11 +20,14 @@ import com.cyksj.mapper.manage.exchange.ExchangeCodeMapper;
 import com.cyksj.mapper.market.draw.LuckyDrawRecordMapper;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.excel.ExcelExchangeCodeData;
+import com.cyksj.model.manage.views.AccountView;
 import com.cyksj.model.request.ExchangeCodeReq;
 import com.cyksj.model.request.ExchangeCodeTicket;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.exchange.ExchangeCodeService;
 import com.cyksj.service.template.TemplateCommonService;
+import com.ejlchina.searcher.BeanSearcher;
+import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -73,6 +76,8 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
 
 	private final TemplateCommonService templateCommonService;
 
+	private final BeanSearcher beanSearcher;
+
 	@Override
 	@Transactional(rollbackFor = Throwable.class)
 	public List<ExcelExchangeCodeData> createExchangeCode(ExchangeCodeReq exchangeCodeReq) {
@@ -336,8 +341,20 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
 		groups.setSkuId(sku.getId());
 		groups.setNum(sku.getNum());
 		groups.setAvailableNum(sku.getNum());
-		groups.setStatus(GroupsTrips.Status.waiting);
-		groups.setRemark("等待设置账号");
+		if (sku.getGoodsId() == 23) {
+			AccountView accountView = beanSearcher.searchFirst(AccountView.class, MapUtils.builder().field(AccountView::getGoodsId, 23).onlySelect(AccountView::getId).build());
+			if (accountView != null) {
+				groups.setAccountId(accountView.getId());
+				groups.setStatus(GroupsTrips.Status.validity);
+				groups.setRemark("已设置唯一账号");
+			}else {
+				groups.setStatus(GroupsTrips.Status.waiting);
+				groups.setRemark("等待设置账号");
+			}
+		} else {
+			groups.setStatus(GroupsTrips.Status.waiting);
+			groups.setRemark("等待设置账号");
+		}
 		groupsMapper.insert(groups);
 		relation.setGroupsId(groups.getId());
 		relation.setNum(1);

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

@@ -44,6 +44,7 @@ import com.cyksj.model.dto.AliPayParams;
 import com.cyksj.model.dto.CouponPopularizeDto;
 import com.cyksj.model.dto.H5JsPayParams;
 import com.cyksj.model.entity.*;
+import com.cyksj.model.manage.views.AccountView;
 import com.cyksj.model.manage.views.OrderDonView;
 import com.cyksj.model.request.OrderAttach;
 import com.cyksj.model.request.OrderPayRequest;
@@ -1495,14 +1496,26 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 	/**
 	 * 新增空车队
 	 */
-	private GroupsRelation createNewGroupsTrips(GoodsDonSku sku,Boolean isNeedRelationId) {
+	private GroupsRelation createNewGroupsTrips(GoodsDonSku sku, Boolean isNeedRelationId) {
 		//新增车次
 		GroupsTrips groups = new GroupsTrips();
 		groups.setSkuId(sku.getId());
 		groups.setNum(sku.getNum());
 		groups.setAvailableNum(sku.getNum());
-		groups.setStatus(GroupsTrips.Status.waiting);
-		groups.setRemark("等待设置账号");
+		if (sku.getGoodsId() == 23) {
+			AccountView accountView = beanSearcher.searchFirst(AccountView.class, MapUtils.builder().field(AccountView::getGoodsId, 23).onlySelect(AccountView::getId).build());
+			if (accountView != null) {
+				groups.setAccountId(accountView.getId());
+				groups.setStatus(GroupsTrips.Status.validity);
+				groups.setRemark("已设置唯一账号");
+			}else {
+				groups.setStatus(GroupsTrips.Status.waiting);
+				groups.setRemark("等待设置账号");
+			}
+		} else {
+			groups.setStatus(GroupsTrips.Status.waiting);
+			groups.setRemark("等待设置账号");
+		}
 		groupsMapper.insert(groups);
 		GroupsRelation relation = new GroupsRelation();
 		relation.setGroupsId(groups.getId());

netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -103,7 +103,7 @@ public class GoodsDonController {
             });
             data.setSpecs(beanSearcher.searchFirst(GoodsDonSpec.class, MapUtils.builder().field(GoodsDonSpec::getGoodsId, data.getId()).build()));
             data.setSkuList(beanSearcher.searchAll(GoodsDonSku.class, MapUtils.builder().field(GoodsDonSku::getGoodsId, data.getId()).field(GoodsDonSku::getStatus, true).build()));
-            if (data.getId() != 17) {
+            if (data.getId() != 17 && data.getId() != 23) {
                 data.setSold(data.getSold() + randomNum);
             }
             SearchResult<OrderComment> orderComments = beanSearcher.search(OrderComment.class,

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

@@ -18,6 +18,7 @@ import com.cyksj.model.excel.ExcelOrderDonData;
 import com.cyksj.model.excel.ExcelRealGoodsUserInterestData;
 import com.cyksj.model.excel.ExcelRealGoodsUserInterestHasPaymentData;
 import com.cyksj.model.manage.request.ReqSetLogisticsPost;
+import com.cyksj.model.manage.views.AccountView;
 import com.cyksj.model.manage.views.OrderDonView;
 import com.cyksj.model.request.RealGoodsServiceReq;
 import com.cyksj.model.request.UserRealGoodsInterestReq;
@@ -88,6 +89,10 @@ public class CmsOrderController {
                 data.setCouponName(couponMapper.getCouponNameByCouponUserId(data.getCouponUserId()));
                 data.setCouponMoney(data.getCouponMoney() == null ? BigDecimal.ZERO : data.getCouponMoney());
             }
+            Optional.ofNullable(data.getGroupsId()).ifPresent(groupsId->{
+	            AccountView accountView = beanSearcher.searchFirst(AccountView.class, MapUtils.builder().field(AccountView::getGroupsId, groupsId).onlySelect(AccountView::getAccount).build());
+	            Optional.ofNullable(accountView).ifPresent(account -> data.setGtAccount(account.getAccount()));
+            });
         });
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }