submit

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

@@ -93,4 +93,7 @@ public class CourseChapterSectionVo {
 	@ApiModelProperty("直播地址")
 	private String liveUrl;
 
+	@ApiModelProperty("视频标签：1保利威 2腾讯")
+	private Integer viewSign;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -1229,7 +1229,13 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     //查询视图 v_top_order
                     TopOldOrderVo orderVo = baseMapper.queryById(query.getOrderSn());
                     if (orderVo.getOrderBase() == 1){
-                        list.forEach(item -> {
+                        TopOldOrder order = getOne(new LambdaQueryWrapper<TopOldOrder>().eq(TopOldOrder::getOrderSn, query.getOrderSn()));
+                        BigDecimal bonus = BigDecimal.ZERO;
+                        if (ObjectUtils.isNotNull(order.getPretaxBrokerage()) && order.getPretaxBrokerage().compareTo(BigDecimal.ZERO) > 0){
+                            bonus = order.getPretaxBrokerage().divide(new BigDecimal(list.size()),BigDecimal.ROUND_CEILING);
+                        }
+                        for (TopOldOrderGoodsListVo item : list) {
+                            item.setPretaxBrokerage(bonus);
                             User user = userService.getByCardNoTenant(EncryptHandler.decrypt(item.getUserCard()));
                             if (ObjectUtils.isNotNull(user)){
                                 Order orderOne = orderService.getOne(new LambdaQueryWrapper<Order>()
@@ -1272,7 +1278,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                             }else {
                                 item.setDivideRateStr(ObjectUtil.isNull(item.getDivideRate())?"0%":item.getDivideRate().toString());
                             }
-                        });
+                        }
                     }else {
                         // 老系统查询学习状态
                         TopOldOrder order = getOne(new LambdaQueryWrapper<TopOldOrder>().eq(TopOldOrder::getOrderSn, query.getOrderSn()));