直播关播回调 直播消息

fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -1300,7 +1300,10 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         }
         FsStoreProduct fsStoreProduct = fsStoreProductService.selectFsStoreProductById(param.getProductId());
         BigDecimal payPrice = fsStoreProduct.getPrice().multiply(new BigDecimal(param.getTotalNum()));
-        BigDecimal payDelivery = handleDeliveryMoney(param.getCityId(), fsStoreProduct, param.getTotalNum());
+        BigDecimal payDelivery = BigDecimal.ZERO;
+        if (param.getCityId() == null) {
+            payDelivery = handleDeliveryMoney(param.getCityId(), fsStoreProduct, param.getTotalNum());
+        }
 
 
         return LiveOrderComputeDTO.builder().payPrice(payPrice)

fs-service-system/src/main/resources/mapper/live/LiveMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.flv_hls_url, a.create_time, a.create_by, a.update_by, a.update_time, a.remark,config_json, b.video_url from live
         a
         left join live_video b on a.live_id = b.live_id
-        where 1=1 and is_del = 0 and is_show = 1 and status in (2,4) and b.video_type = 1
+        where 1=1 and is_del = 0 and is_show = 1 and status in (2,4) and b.video_type in (1,2)
 
         order by create_time desc
     </select>
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join live_company_code c on a.live_id = c.live_id
             and c.company_id = #{companyId}
             and c.company_user_id = #{companyUserId}
-        where 1=1 and is_del = 0 and  b.video_type = 1
+        where 1=1 and is_del = 0 and  b.video_type in (1,2)
         <if test="companyId != null "> and (a.company_id = #{companyId} or a.company_id is null )</if>
         <if test="talentId != null "> and talent_id = #{talentId}</if>
         <if test="liveName != null  and liveName != ''"> and live_name like concat('%', #{liveName}, '%')</if>

fs-service-system/src/main/resources/mapper/live/LiveMsgMapper.xml

@@ -28,17 +28,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="msg != null  and msg != ''"> and msg = #{msg}</if>
         </where>
-        order by create_time
+        order by create_time desc
     </select>
 
     <select id="selectLiveMsgByMsgId" parameterType="Long" resultMap="LiveMsgResult">
         <include refid="selectLiveMsgVo"/>
         where msg_id = #{msgId}
+        order by create_time desc
     </select>
 
     <select id="selectLiveMsgByMsgIdAndCompanyIdAndCompanyUserId" resultMap="LiveMsgResult">
         <include refid="selectLiveMsgVo"/>
         where msg_id = #{msgId} and company_id = #{companyId} and company_user_id = #{companyUserId}
+        order by create_time desc
     </select>
 
     <insert id="insertLiveMsg" parameterType="LiveMsg" useGeneratedKeys="true" keyProperty="msgId">

fs-service-system/src/main/resources/mapper/live/LiveOrderMapper.xml

@@ -93,7 +93,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.use_integral,	a.pay_integral,	a.back_integral,	a.is_edit_money,	b.product_info as product_introduce
         FROM
             live_order a LEFT JOIN fs_store_product b ON a.product_id = b.product_id
-        order by a.create_time desc
     </sql>
 
     <select id="selectLiveOrderList" parameterType="LiveOrder" resultMap="LiveOrderResult">
@@ -434,5 +433,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where 1=1
         <if test="timeOptions != 'all'">and a.create_time >= #{createTime}</if>
         <if test="liveId != null">and a.live_id = #{liveId}</if>
+
+        order by a.create_time desc
     </select>
 </mapper>

fs-user-app/src/main/java/com/fs/app/controller/LiveController.java

@@ -203,7 +203,6 @@ public class LiveController extends AppBaseController {
 		live.setLiveId(Long.valueOf(params.get("stream_id")));
 		live.setStatus(3);
 		live.setFinishTime(LocalDateTime.now());
-		live.setLiveType(2);
 		liveService.updateLive(live);
 		return R.ok();
 //		{app=200149.push.tlivecloud.com, appid=1319721001, appname=live, channel_id=673,