MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseAddBo.java

@@ -82,5 +82,6 @@ public class CourseAddBo {
     /** 优选生成 0否 1是 */
     @ApiModelProperty("优选生成 0否 1是")
     private Integer firstChoice;
-
+    @ApiModelProperty("视频标签：1保利威 2腾讯")
+    private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterAddBo.java

@@ -55,4 +55,6 @@ public class CourseChapterAddBo {
     private String importNo;
     @ApiModelProperty("公共标识：1公共章 0非公共章")
     private Integer commonSign;
+    @ApiModelProperty("视频标签：1保利威 2腾讯")
+    private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterEditBo.java

@@ -67,4 +67,6 @@ public class CourseChapterEditBo {
 
     @ApiModelProperty("公共标识：1公共章 0非公共章")
     private Integer commonSign;
+    @ApiModelProperty("视频标签：1保利威 2腾讯")
+    private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterQueryBo.java

@@ -75,4 +75,6 @@ public class CourseChapterQueryBo extends BaseEntity {
 	/** 导入编号 */
 	@ApiModelProperty("导入编号")
 	private String importNo;
+	@ApiModelProperty("视频标签：1保利威 2腾讯")
+	private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseEditBo.java

@@ -100,5 +100,7 @@ public class CourseEditBo {
     /** 优选生成 0否 1是 */
     @ApiModelProperty("优选生成 0否 1是")
     private Integer firstChoice;
+    @ApiModelProperty("视频标签：1保利威 2腾讯")
+    private Integer viewSign;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseModuleAddBo.java

@@ -66,5 +66,6 @@ public class CourseModuleAddBo {
     /** 证书模板ID */
     @ApiModelProperty("证书模板ID")
     private Long certificateTpId;
-
+    @ApiModelProperty("视频标签：1保利威 2腾讯")
+    private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseModuleEditBo.java

@@ -78,5 +78,6 @@ public class CourseModuleEditBo {
     private Long certificateTpId;
     @ApiModelProperty("公共标识：1公共章 0非公共章")
     private Integer commonSign;
-
+    @ApiModelProperty("视频标签：1保利威 2腾讯")
+    private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseModuleQueryBo.java

@@ -72,4 +72,6 @@ public class CourseModuleQueryBo extends BaseEntity {
 	/** 赠送卷ID */
 	@ApiModelProperty("赠送卷ID")
 	private Long freeExamId;
+	@ApiModelProperty("视频标签：1保利威 2腾讯")
+	private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseQueryBo.java

@@ -147,4 +147,7 @@ public class CourseQueryBo extends BaseEntity {
 	private Integer studyFinishStatus;
 
 	private List<Long> orderGoodsIds;
+
+	@ApiModelProperty("视频标签：1保利威 2腾讯")
+	private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSectionQueryBo.java

@@ -104,4 +104,6 @@ public class CourseSectionQueryBo extends BaseEntity {
 	/** 讲师ID */
 	@ApiModelProperty("讲师ID")
 	private Long teacherId;
+	@ApiModelProperty("视频标签：1保利威 2腾讯")
+	private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/Course.java

@@ -74,6 +74,8 @@ private static final long serialVersionUID=1L;
     private Long oId;
     /** 优选生成 0否 1是 */
     private Integer firstChoice;
+    /** 视频标签：1保利威 2腾讯*/
+    private Integer viewSign;
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseChapter.java

@@ -55,4 +55,6 @@ private static final long serialVersionUID=1L;
     /** 公共标识：1公共章 0非公共章 */
     private String commonSign;
 
+    /** 视频标签：1保利威 2腾讯*/
+    private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseModule.java

@@ -63,5 +63,6 @@ private static final long serialVersionUID=1L;
     private Long certificateTpId;
     /** 公共标识：1公共章 0非公共章 */
     private String commonSign;
-
+    /** 视频标签：1保利威 2腾讯*/
+    private Integer viewSign;
 }

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/course/vo/CourseChapterVo.java

@@ -87,5 +87,6 @@ public class CourseChapterVo {
 	private Integer commonSign;
 	@ApiModelProperty("节总时间")
 	private Long totalTime;
-
+	@ApiModelProperty("视频标签：1保利威 2腾讯")
+	private Integer viewSign;
 }

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

@@ -66,4 +66,6 @@ public class CourseModuleChapterVo {
 			"" +
 			"")
 	private Integer sectionNum;
+	@ApiModelProperty("视频标签：1保利威 2腾讯")
+	private Long viewSign;
 }

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

@@ -99,4 +99,6 @@ public class CourseModuleVo {
 	@ApiModelProperty("公共标识：1公共章 0非公共章")
 	private Integer commonSign;
 
+	@ApiModelProperty("视频标签：1保利威 2腾讯")
+	private Integer viewSign;
 }

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

@@ -121,5 +121,7 @@ public class CourseVo {
 	@Excel(name = "优选生成 0否 1是")
 	@ApiModelProperty("优选生成 0否 1是")
 	private Integer firstChoice;
+	@ApiModelProperty("视频标签：1保利威 2腾讯")
+	private Integer viewSign;
 
 }

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

@@ -503,9 +503,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 if (ObjectUtils.isNotNull(item.getOrderReceived())){
                     orderPractical = orderPractical.add(item.getOrderReceived());
                 }
-                if (ObjectUtils.isNotNull(item.getPretaxBrokerage())){
-                    orderPractical = orderPractical.subtract(item.getPretaxBrokerage());
-                }
                 if (ObjectUtils.isNotNull(item.getOrderRefunded())){
                     orderPractical = orderPractical.subtract(item.getOrderRefunded());
                 }
@@ -1229,7 +1226,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 +1275,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()));

zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterMapper.xml

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="importNo" column="import_no"/>
         <result property="commonSign" column="common_sign"/>
+        <result property="viewSign" column="view_sign"/>
         <collection property="businessList" column="chapter_id" select="findBusinessList"/>
         <collection property="moduleList" column="chapter_id" select="findModuleList"/>
         <collection property="courseList" column="chapter_id" select="findCourseList"/>
@@ -149,6 +150,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="importNo != null and importNo != ''">
             AND c.import_no = #{importNo}
         </if>
+        <if test="viewSign != null and viewSign != ''">
+            AND c.view_sign = #{viewSign}
+        </if>
         <if test="name != null and name != ''">
             AND c.name like concat('%', #{name}, '%')
         </if>

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -58,6 +58,7 @@
         <result property="subjectName" column="subject_name"/>
         <result property="courseShow" column="course_show"/>
         <result property="firstChoice" column="first_choice"/>
+        <result property="viewSign" column="view_sign"/>
         <collection property="goodsList" column="course_id" select="findGoodsList"/>
     </resultMap>
 
@@ -319,6 +320,9 @@
         <if test="businessId != null and businessId != ''">
             AND c.business_id = #{businessId}
         </if>
+        <if test="viewSign != null and viewSign != ''">
+            AND c.view_sign = #{viewSign}
+        </if>
         <if test="prefixName != null and prefixName != ''">
             AND c.prefix_name like concat('%', #{prefixName}, '%')
         </if>

zhongzheng-system/src/main/resources/mapper/modules/course/CourseModuleChapterMapper.xml

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="publishStatus" column="publish_status"/>
         <result property="sectionNum" column="section_num"/>
+        <result property="viewSign" column="view_sign"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseUserModuleChapterVo" id="CourseUserModuleChapterVo">

zhongzheng-system/src/main/resources/mapper/modules/course/CourseModuleMapper.xml

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="certificateTypeId" column="certificate_type_id"/>
         <result property="certificateId" column="certificate_id"/>
         <result property="certificateTpId" column="certificate_tp_id"/>
+        <result property="viewSign" column="view_sign"/>
         <collection property="businessList" column="module_id" select="findBusinessList" />
         <collection property="courseList" column="module_id" select="findCourseList"/>
     </resultMap>
@@ -146,6 +147,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="moduleName != null and moduleName != ''">
             AND c.module_name like concat('%', #{moduleName}, '%')
         </if>
+        <if test="viewSign != null and viewSign != ''">
+            AND c.view_sign = #{viewSign}
+        </if>
         <if test="prefixName != null and prefixName != ''">
             AND c.prefix_name like concat('%', #{prefixName}, '%')
         </if>

zhongzheng-system/src/main/resources/mapper/modules/course/CourseSectionMapper.xml

@@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="realLiveEndTime" column="real_live_end_time"/>
         <result property="realDuration" column="real_duration"/>
         <result property="teacherId" column="teacher_id"/>
+        <result property="viewSign" column="view_sign"/>
         <collection property="businessList" column="section_id" select="findBusinessList"/>
         <collection property="chapterList" column="section_id" select="findChapterList"/>
       <!--  <collection property="moduleList" javaType="java.util.List" resultMap="CourseModuleChapterListResult"/>
@@ -147,6 +148,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="sectionType != null and sectionType != ''">
             AND c.section_type = #{sectionType}
         </if>
+        <if test="viewSign != null and viewSign != ''">
+            AND c.view_sign = #{viewSign}
+        </if>
         <if test="prefixName != null and prefixName != ''">
             AND c.prefix_name like concat('%', #{prefixName}, '%')
         </if>

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -119,7 +119,7 @@
             AND vto.invoice_status = #{invoiceStatus}
         </if>
         <if test="orderOrg != null and orderOrg != ''">
-            AND vto.order_org LIKE CONCAT( '%', #{orderOrg}, '%' )
+            AND vto.order_org  = #{orderOrg}
         </if>
         <if test="purchaseOrg != null and purchaseOrg != ''">
             AND vto.purchase_org LIKE CONCAT( '%', #{purchaseOrg}, '%' )
@@ -167,9 +167,16 @@
         </if>
         <if test="studentCheckStatus != null">
             AND (vto.order_from != 1
-                AND (SELECT COUNT(too.order_sn)
-                FROM top_old_order_goods too
-                WHERE vto.order_sn = too.order_sn AND too.rel_sign_id IS NOT NULL AND too.check_status = #{studentCheckStatus}) > 0)
+            AND (
+            SELECT
+            too.check_status
+            FROM
+            top_old_order_goods too
+            WHERE
+            vto.order_sn = too.order_sn
+            AND too.rel_sign_id IS NOT NULL
+            ORDER BY too.order_goods_id DESC
+            LIMIT 1 ) = #{studentCheckStatus}
         </if>
         <if test="orderSnList != null and orderSnList.size()!=0 ">
             AND vto.order_sn in
@@ -224,7 +231,7 @@
             </foreach>
         </if>
         <if test="orderOrg != null and orderOrg != ''">
-            AND ot.order_org LIKE CONCAT( '%', #{orderOrg}, '%' )
+            AND ot.order_org = #{orderOrg}
         </if>
         <if test="purchaseOrg != null and purchaseOrg != ''">
             AND ot.purchase_org LIKE CONCAT( '%', #{purchaseOrg}, '%' )
@@ -266,9 +273,17 @@
             AND ot.finish_status = #{finishStatus}
         </if>
         <if test="studentCheckStatus != null">
-            AND (SELECT COUNT(too.order_sn)
-            FROM top_old_order_goods too
-            WHERE ot.order_sn = too.order_sn AND too.rel_sign_id IS NOT NULL AND too.check_status = #{studentCheckStatus}) > 0
+            AND (vto.order_from != 1
+            AND (
+            SELECT
+            too.check_status
+            FROM
+            top_old_order_goods too
+            WHERE
+            vto.order_sn = too.order_sn
+            AND too.rel_sign_id IS NOT NULL
+            ORDER BY too.order_goods_id DESC
+            LIMIT 1 ) = #{studentCheckStatus}
         </if>
         <if test="refundStartTime != null or refundEndTime != null">
             AND (SELECT COUNT(*)
@@ -357,8 +372,11 @@
                 #{item}
             </foreach>
         </if>
-        <if test="orderOrg != null and orderOrg != ''">
-            AND 'C端云学堂' LIKE CONCAT( '%', #{orderOrg}, '%' )
+        <if test="orderOrg != null and orderOrg != '' and orderOrg == 'C端云学堂线上'">
+            AND o.input_order_sn IS NULL
+        </if>
+        <if test="orderOrg != null and orderOrg != '' and orderOrg == 'C端云学堂线下'">
+            AND o.input_order_sn IS NOT NULL
         </if>
         <if test="checkStartTime != null and checkStartTime != ''">
             AND o.pay_time <![CDATA[ >= ]]> #{checkStartTime}