提交：直播状态，后台录单

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -667,6 +667,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 itemImport.setRealname(user.getRealname());
                 itemImport.setIdCard(user.getIdCard());
                 successList.add(itemImport);
+                //如果学员公司信息不一样则更新公司信息
+                if (StringUtils.isNotBlank(itemImport.getCompanyName()) &&
+                        (StringUtils.isBlank(user.getCompanyName()) || !user.getCompanyName().equals(itemImport.getCompanyName()))){
+                    user.setCompanyName(itemImport.getCompanyName());
+                    updateById(user);
+                }
                 continue;
             }
             User user2 = getOne(new LambdaQueryWrapper<User>()
@@ -679,6 +685,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 itemImport.setRealname(user2.getRealname());
                 itemImport.setTelphone(user2.getTelphone());
                 successList.add(itemImport);
+                //如果学员公司信息不一样则更新公司信息
+                if (StringUtils.isNotBlank(itemImport.getCompanyName()) &&
+                        (StringUtils.isBlank(user.getCompanyName()) || !user.getCompanyName().equals(itemImport.getCompanyName()))){
+                    user.setCompanyName(itemImport.getCompanyName());
+                    updateById(user);
+                }
                 continue;
             }
             User inertData = new User();
@@ -691,6 +703,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             inertData.setSex(1);
             inertData.setIdCard(itemImport.getIdCard());
             inertData.setRealname(itemImport.getRealname());
+            if (StringUtils.isNotBlank(itemImport.getCompanyName())) {
+                inertData.setCompanyName(itemImport.getCompanyName());
+            }
             inertData.setStatus(1);
             inertData.setRegisterPlat("3");
             inertData.setAvatar(Constants.DEFAULT_AVATAR);

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseLiveVo.java

@@ -42,6 +42,9 @@ public class CourseLiveVo implements Serializable {
     @ApiModelProperty("直播流地址")
     private String liveUrl;
 
+    @ApiModelProperty("频道的观看页状态，取值为：live（直播中）、end（直播结束）、playback（回放中）、waiting（等待直播）")
+    private String watchStatus;
+
     @ApiModelProperty("直播开始时间")
     private Long liveStartTime;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -41,6 +41,8 @@ import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderListVo;
 import com.zhongzheng.modules.order.vo.OrderUserGoodsVo;
+import com.zhongzheng.modules.polyv.bo.PolyvLiveQueryBo;
+import com.zhongzheng.modules.polyv.service.IPolyvLiveService;
 import com.zhongzheng.modules.user.bo.UserExamGoodsQueryBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
 import com.zhongzheng.modules.user.domain.User;
@@ -48,6 +50,8 @@ import com.zhongzheng.modules.user.service.IUserExamGoodsService;
 import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.service.IUserSubscribeService;
+import net.polyv.common.v1.util.StringUtils;
+import net.polyv.live.v1.entity.channel.operate.LiveChannelBasicInfoResponse;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -112,6 +116,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     @Autowired
     private ICourseSectionService courseSectionService;
 
+    @Autowired
+    private IPolyvLiveService ployvLiveService;
+
     @Override
     public OrderGoodsVo queryById(Long orderGoodsId) {
         OrderGoods db = this.baseMapper.selectById(orderGoodsId);
@@ -520,6 +527,28 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
             return new TableDataInfo<>();
         }
         List<CourseLiveVo> list = page.getRecords().stream().map(item -> BeanUtil.copyProperties(item, CourseLiveVo.class)).collect(Collectors.toList());
+        //获取保利威直播状态
+        Set<String> setUrl = list.stream().filter(x -> StringUtils.isNotBlank(x.getLiveUrl())).map(CourseLiveVo::getLiveUrl).collect(Collectors.toSet());
+        List<LiveChannelBasicInfoResponse> result = setUrl.stream().map(url -> {
+            PolyvLiveQueryBo bo = new PolyvLiveQueryBo();
+            bo.setChannelId(url);
+            LiveChannelBasicInfoResponse response = new LiveChannelBasicInfoResponse();
+            try {
+                response = ployvLiveService.GetChannelBasicInfo(bo);
+            } catch (Exception e) {
+//                throw new CustomException("获取保利威直播状态失败");
+                response.setChannelId(url);
+                response.setWatchStatus("waiting");
+            }
+            return response;
+        }).collect(Collectors.toList());
+        list.forEach(item -> {
+            for (LiveChannelBasicInfoResponse response : result) {
+                if (StringUtils.isNotBlank(item.getLiveUrl()) && item.getLiveUrl().equals(response.getChannelId())){
+                    item.setWatchStatus(response.getWatchStatus());
+                }
+            }
+        });
         TableDataInfo<CourseLiveVo> info = new TableDataInfo<>();
         info.setTotal(page.getTotal());
         info.setRows(list);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserImportAddBo.java

@@ -24,10 +24,10 @@ public class UserImportAddBo {
     @Excel(name = "*学员身份证号码")
     @ApiModelProperty("身份证号")
     private String idCard;
-    /** 身份证号 */
-    @Excel(name = "*所在公司")
+    /** 所在公司 */
+    @Excel(name = "所在公司")
     @ApiModelProperty("所在公司")
-    private String company;
+    private String companyName;
     /** 手机号码 */
     @Excel(name = "*手机号码")
     @ApiModelProperty("手机号码")