直播代码

fs-admin/src/main/java/com/fs/live/controller/LiveController.java

@@ -1,4 +1,4 @@
-package com.fs.live.controller.controller;
+package com.fs.live.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -7,8 +7,12 @@ import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.company.domain.CompanyUser;
+import com.fs.course.domain.FsUserTalent;
+import com.fs.course.service.IFsUserTalentService;
 import com.fs.live.domain.Live;
 import com.fs.live.service.ILiveService;
+import com.fs.live.vo.LiveListVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +31,8 @@ import java.util.Map;
 public class LiveController extends BaseController {
     @Autowired
     private ILiveService liveService;
+    @Autowired
+    private IFsUserTalentService fsUserTalentService;
 
     /**
      * 查询直播列表
@@ -110,4 +116,37 @@ public class LiveController extends BaseController {
     public Integer updateLiveIsAudit(@RequestBody Live live) {
         return liveService.updateLive(live);
     }
+
+    /**
+     * 批量上下架视频
+     */
+    @PostMapping("/handleShelfOrUn")
+    public R handleShelfOrUn(@RequestBody LiveListVo listVo) {
+        return liveService.handleShelfOrUnAdmin(listVo);
+    }
+
+    /**
+     * 批量删除视频
+     */
+    @PostMapping("/handleDeleteSelected")
+    public R handleDeleteSelected(@RequestBody LiveListVo listVo) {
+        return liveService.handleDeleteSelectedAdmin(listVo);
+    }
+    /**
+     * 校验上传的身份证信息
+     */
+    @PostMapping("/verifyIdInfo")
+    public R verifyIdInfo(@RequestBody Map<String, String> payload) {
+        return liveService.verifyIdInfo(payload);
+    }
+
+    /**
+     * 获取达人详细信息
+     */
+    @GetMapping(value = "/selectCompanyTalent")
+    public TableDataInfo selectCompanyTalent()
+    {
+        List<FsUserTalent> list = fsUserTalentService.selectAllCompanyTalent();
+        return getDataTable(list);
+    }
 }

fs-admin/src/main/java/com/fs/live/controller/LiveGoodsController.java

@@ -14,6 +14,7 @@ import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.ICompanyUserService;
 import com.fs.live.domain.LiveGoods;
 import com.fs.live.service.ILiveGoodsService;
+import com.fs.live.vo.LiveGoodsListVo;
 import com.fs.live.vo.LiveGoodsVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -139,4 +140,20 @@ public class LiveGoodsController extends BaseController
     {
         return liveGoodsService.getStoreByLiveId(liveId, key);
     }
+
+    /**
+     * 批量上下架视频
+     */
+    @PostMapping("/handleShelfOrUn")
+    public R handleShelfOrUn(@RequestBody LiveGoodsListVo listVo) {
+        return liveGoodsService.handleShelfOrUnAdmin(listVo);
+    }
+
+    /**
+     * 批量删除视频
+     */
+    @PostMapping("/handleDeleteSelected")
+    public R handleDeleteSelected(@RequestBody LiveGoodsListVo listVo) {
+        return liveGoodsService.handleDeleteSelectedAdmin(listVo);
+    }
 }

fs-admin/src/main/java/com/fs/live/controller/LiveOrderController.java

@@ -6,11 +6,21 @@ import java.util.Map;
 import cn.hutool.core.util.StrUtil;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.StringUtils;
+import com.fs.erp.domain.ErpDeliverys;
+import com.fs.erp.domain.ErpOrderQuery;
+import com.fs.erp.dto.ErpOrderQueryRequert;
+import com.fs.erp.dto.ErpOrderQueryResponse;
+import com.fs.erp.service.IErpOrderService;
+import com.fs.his.config.FsSysConfig;
 import com.fs.his.domain.FsStoreOrder;
 import com.fs.his.dto.ExpressInfoDTO;
 import com.fs.his.enums.ShipperCodeEnum;
 import com.fs.his.service.IFsExpressService;
+import com.fs.his.utils.ConfigUtil;
 import com.fs.live.enums.LiveOrderCancleReason;
+import com.fs.live.vo.LiveGoodsVo;
+import com.fs.live.vo.LiveOrderVo;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -49,6 +59,17 @@ public class LiveOrderController extends BaseController
     @Autowired
     private IFsExpressService expressService;
 
+    @Autowired
+    private ConfigUtil configUtil;
+
+    @Autowired
+    @Qualifier("erpOrderServiceImpl")
+    private IErpOrderService gyOrderService;
+
+    @Autowired
+    @Qualifier("wdtErpOrderServiceImpl")
+    private IErpOrderService wdtOrderService;
+
     /**
      * 查询订单列表
      */
@@ -84,6 +105,7 @@ public class LiveOrderController extends BaseController
         return AjaxResult.success(liveOrderService.selectLiveOrderByOrderId(orderId));
     }
 
+
     /**
      * 新增订单
      */
@@ -166,5 +188,81 @@ public class LiveOrderController extends BaseController
         return R.ok().put("reason",allCodeDescMap).put("data",byId);
     }
 
+    /**
+     * 按照时间粒度返回订单
+     * */
+    @GetMapping(value = "/getLiveOrderTimeGranularity")
+    public R getLiveOrderTimeGranularity(LiveOrderVo liveOrder){
+        return liveOrderService.getLiveOrderTimeGranularity(liveOrder);
+    }
+
+    @Log(title = "同步物流", businessType = BusinessType.UPDATE)
+    @GetMapping(value = "/syncExpress/{id}")
+    public R syncExpress(@PathVariable("id") Long id) {
+        return liveOrderService.syncExpress(id);
+    }
+
+    @Log(title = "同步管易物流单号", businessType = BusinessType.UPDATE)
+    @PreAuthorize("@ss.hasPermi('store:storeOrder:updateErpOrder')")
+    @PostMapping("/updateErpOrder")
+    public R updateErpOrder( @RequestBody LiveOrder param) {
+        LiveOrder order = liveOrderService.selectLiveOrderByOrderId(String.valueOf(param.getOrderId()));
+        ErpOrderQueryRequert request = new ErpOrderQueryRequert();
+        IErpOrderService erpOrderService = getErpService();
+        request.setCode(order.getExtendOrderId());
+        ErpOrderQueryResponse response = erpOrderService.getOrder(request);
+        if(response.getOrders()!=null&&response.getOrders().size()>0){
+            for(ErpOrderQuery orderQuery : response.getOrders()){
+                if(orderQuery.getDeliverys()!=null&&orderQuery.getDeliverys().size()>0){
+                    for(ErpDeliverys delivery:orderQuery.getDeliverys()){
+                        if(delivery.getDelivery()&& StringUtils.isNotEmpty(delivery.getMail_no())){
+                            //更新商订单状态
+                            liveOrderService.updateDeliveryOrder(param.getOrderId(), delivery.getMail_no(),delivery.getExpress_code(),delivery.getExpress_name());
+                            return R.ok();
+                        }
+                    }
+
+                }
+            }
+        }
+        return R.error("未查询到快递信息");
+    }
+    private IErpOrderService getErpService() {
+        FsSysConfig sysConfig = configUtil.getSysConfig();
+        Integer erpOpen = sysConfig.getErpOpen();
+        if (erpOpen != null && erpOpen == 1){
+            //判断erp类型
+            Integer erpType = sysConfig.getErpType();
+            if (erpType != null){
+                IErpOrderService erpOrderService = null;
+                if (erpType == 1){
+                    //管易
+                    erpOrderService =  gyOrderService;
+                } else if (erpType == 2){
+                    //旺店通
+                    erpOrderService =  wdtOrderService;
+                }
+                return erpOrderService;
+
+
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 查询订单商品列表
+     */
+
+    @GetMapping("/ltemlist/{orderId}")
+    public TableDataInfo ltemlist(@PathVariable("orderId") String orderId)
+    {
+        List<LiveGoodsVo> list = liveOrderService.selectLiveOrderItemList(orderId);
+        return getDataTable(list);
+    }
+
+
+
+
 
 }

fs-company/src/main/java/com/fs/company/controller/live/LiveController.java

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServlet;
 import java.util.List;
 import java.util.Map;
 

fs-service/src/main/java/com/fs/course/mapper/FsUserTalentMapper.java

@@ -74,4 +74,7 @@ public interface FsUserTalentMapper
 
     @Select("select * from fs_user_talent where user_id=#{userId}")
     FsUserTalent selectTalentByUserId(@Param("userId") String userId);
+
+    @Select("select * from fs_user_talent ")
+    List<FsUserTalent> selectAllCompanyTalent();
 }

fs-service/src/main/java/com/fs/course/service/IFsUserTalentService.java

@@ -71,4 +71,6 @@ public interface IFsUserTalentService
 
 
     FsUserTalent selectTalentByUserId(String userId);
+
+    List<FsUserTalent> selectAllCompanyTalent();
 }

fs-service/src/main/java/com/fs/course/service/impl/FsUserTalentServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fs.course.service.impl;
 
+import java.util.Collections;
 import java.util.List;
 import com.fs.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -113,4 +114,9 @@ public class FsUserTalentServiceImpl implements IFsUserTalentService
     public FsUserTalent selectTalentByUserId(String userId) {
         return fsUserTalentMapper.selectTalentByUserId(userId);
     }
+
+    @Override
+    public List<FsUserTalent> selectAllCompanyTalent() {
+        return fsUserTalentMapper.selectAllCompanyTalent();
+    }
 }

fs-service/src/main/java/com/fs/live/domain/LiveSensitiveWords.java

@@ -27,7 +27,7 @@ public class LiveSensitiveWords{
     /** 敏感词添加时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "敏感词添加时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdAt;
+    private Date createTime;
 
 
 }

fs-service/src/main/java/com/fs/live/mapper/LiveGoodsMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.common.core.domain.R;
 import com.fs.his.domain.FsStoreProduct;
 import com.fs.live.domain.LiveGoods;
 import com.fs.live.domain.LiveOrder;
@@ -134,4 +135,8 @@ public interface LiveGoodsMapper extends BaseMapper<LiveGoods>{
 
     @Select("select distinct store_id from live_goods where live_id = #{liveId}")
     List<Long> selectStoreIdsByLiveId(@Param("liveId") Long liveId);
+
+    R handleShelfOrUnAdmin(@Param("listVo") LiveGoodsListVo listVo);
+
+    R handleDeleteSelectedAdmin(@Param("listVo") LiveGoodsListVo listVo);
 }

fs-service/src/main/java/com/fs/live/mapper/LiveMapper.java

@@ -98,4 +98,9 @@ public interface LiveMapper extends BaseMapper<Live>
      * @return 直播间
      */
     Live selectLiveOne(String s);
+
+
+    int handleShelfOrUnAdmin(@Param("liveVo") LiveListVo listVo);
+
+    int handleDeleteSelectedAdmin(@Param("liveVo") LiveListVo listVo);
 }

fs-service/src/main/java/com/fs/live/service/ILiveGoodsService.java

@@ -112,4 +112,8 @@ public interface ILiveGoodsService extends IService<LiveGoods>{
     Long getStoreIdByLiveId(Long liveId);
 
     List<FsStoreProduct> selectStoreProducts(LiveGoods storeId);
+
+    R handleShelfOrUnAdmin(LiveGoodsListVo listVo);
+
+    R handleDeleteSelectedAdmin(LiveGoodsListVo listVo);
 }

fs-service/src/main/java/com/fs/live/service/ILiveService.java

@@ -148,4 +148,8 @@ public interface ILiveService extends IService<Live>
      * 开始直播
      */
     R startLive(Live live);
+
+    R handleShelfOrUnAdmin(LiveListVo listVo);
+
+    R handleDeleteSelectedAdmin(LiveListVo listVo);
 }

fs-service/src/main/java/com/fs/live/service/impl/LiveGoodsServiceImpl.java

@@ -250,4 +250,14 @@ public class LiveGoodsServiceImpl extends ServiceImpl<LiveGoodsMapper, LiveGoods
     public List<FsStoreProduct> selectStoreProducts(LiveGoods param) {
         return baseMapper.selectStoreProducts(param);
     }
+
+    @Override
+    public R handleShelfOrUnAdmin(LiveGoodsListVo listVo) {
+        return baseMapper.handleShelfOrUnAdmin(listVo);
+    }
+
+    @Override
+    public R handleDeleteSelectedAdmin(LiveGoodsListVo listVo) {
+        return baseMapper.handleDeleteSelectedAdmin(listVo);
+    }
 }

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

@@ -1079,7 +1079,7 @@ public class LiveOrderServiceImpl extends ServiceImpl<LiveOrderMapper, LiveOrder
         if(live == null) return R.error("直播不存在");
         FsStoreProduct fsStoreProduct = fsStoreProductService.selectFsStoreProductByProductId(liveOrder.getProductId());
         LiveGoods goods = liveGoodsMapper.selectLiveGoodsByProductId(liveOrder.getLiveId(), liveOrder.getProductId());
-        if(fsStoreProduct == null || goods == null) return R.error("商品不存在");
+        if(fsStoreProduct == null) return R.error("商品不存在");
         if(fsStoreProduct.getIsShow() == 0 || goods.getStatus() == 0) return R.error("商品已下架");
         if(fsStoreProduct.getStock() < Integer.parseInt(liveOrder.getTotalNum())) return R.error("库存不足");
 

fs-service/src/main/java/com/fs/live/service/impl/LiveSensitiveWordsServiceImpl.java

@@ -52,7 +52,7 @@ public class LiveSensitiveWordsServiceImpl extends ServiceImpl<LiveSensitiveWord
     @Override
     public int insertLiveSensitiveWords(LiveSensitiveWords liveSensitiveWords)
     {
-        liveSensitiveWords.setCreatedAt(new Date());
+        liveSensitiveWords.setCreateTime(new Date());
         return baseMapper.insertLiveSensitiveWords(liveSensitiveWords);
     }
 
@@ -65,7 +65,7 @@ public class LiveSensitiveWordsServiceImpl extends ServiceImpl<LiveSensitiveWord
     @Override
     public int updateLiveSensitiveWords(LiveSensitiveWords liveSensitiveWords)
     {
-        liveSensitiveWords.setCreatedAt(new Date());
+        liveSensitiveWords.setCreateTime(new Date());
         return baseMapper.updateLiveSensitiveWords(liveSensitiveWords);
     }
 

fs-service/src/main/java/com/fs/live/service/impl/LiveServiceImpl.java

@@ -429,6 +429,18 @@ public class LiveServiceImpl extends ServiceImpl<LiveMapper, Live> implements IL
         return R.ok();
     }
 
+    @Override
+    public R handleShelfOrUnAdmin(LiveListVo listVo) {
+        liveMapper.handleShelfOrUnAdmin(listVo);
+        return R.ok();
+    }
+
+    @Override
+    public R handleDeleteSelectedAdmin(LiveListVo listVo) {
+        liveMapper.handleDeleteSelectedAdmin(listVo);
+        return R.ok();
+    }
+
     /**
      * 构建FFmpeg推流命令
      */

fs-service/src/main/java/com/fs/live/vo/LiveGoodsListVo.java

@@ -13,6 +13,9 @@ import java.util.List;
 public class LiveGoodsListVo {
     List<Long> goodsIds;
     Integer status;
+    Integer liveId;
+
+
     /**
      * 企业ID
      */

fs-service/src/main/resources/mapper/live/LiveGoodsMapper.xml

@@ -197,12 +197,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectProductListByOrder" parameterType="com.fs.live.domain.LiveOrder" resultType="com.fs.live.vo.LiveGoodsVo">
 
         select lg.goods_id,sp.img_url,sp.product_name,sp.price,sp.stock,sp.sales,lg.status,sp.product_id,sp.ot_price, sp.store_id
-        from live_goods lg
-        INNER JOIN fs_store_product sp
+        from fs_store_product sp
+        INNER JOIN live_goods lg
         ON lg.store_id = sp.store_id AND lg.product_id = sp.product_id
 
         <where>
-            lg.live_id = #{liveId} and lg.product_id = #{productId}
+            sp.product_id = #{productId}
         </where>
     </select>
 
@@ -219,4 +219,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.liveId != null "> and g.live_id = #{params.liveId}</if>
     </select>
 
+    <update id="updateBatchList" parameterType="com.fs.live.vo.LiveGoodsListVo">
+        update live_goods set status = #{listVo.status} where live_id = #{listVo.liveId} and goods_id in
+        <foreach item="goodsId" collection="listVo.goodsIds" open="(" separator="," close=")">
+            #{goodsId}
+        </foreach>
+    </update>
+
+    <delete id="deleteBatchList" parameterType="com.fs.live.vo.LiveGoodsListVo">
+        delete from live_goods
+        WHERE live_id = #{listVo.liveId} and goods_id IN
+        <foreach item="goodsId" collection="listVo.goodsIds" open="(" separator="," close=")">
+            #{goodsId}
+        </foreach>
+    </delete>
+
 </mapper>

fs-service/src/main/resources/mapper/live/LiveLotteryConfMapper.xml

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="liveId != null "> and live_id = #{liveId}</if>
             <if test="require != null "> and `require` = #{require}</if>
             <if test="desc != null  and desc != ''"> and `desc` = #{desc}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="createTime != null "> and create_time >= #{createTime} and create_time &lt; date_add(#{createTime}, interval 1 day)</if>
             <if test="lotteryStatus != null "> and lottery_status = #{lotteryStatus}</if>
         </where>
     </select>

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

@@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="rtmpUrl != null  and rtmpUrl != ''"> and rtmp_url = #{rtmpUrl}</if>
         <if test="flvHlsUrl != null  and flvHlsUrl != ''"> and flv_hls_url = #{flvHlsUrl}</if>
         <if test="isAudit != null  and isAudit != ''"> and is_audit = #{isAudit}</if>
+        order by create_time desc
     </select>
 
     <select id="selectLiveByLiveId" parameterType="Long" resultMap="LiveResult">
@@ -201,4 +202,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{liveId}
         </foreach>
     </update>
+
+    <update id="handleShelfOrUnAdmin" parameterType="com.fs.live.vo.LiveListVo">
+        update live set is_show = #{liveVo.isShow},status = 3,finish_time = NOW() where  live_id in
+        <foreach item="liveId" collection="liveVo.liveIds" open="(" separator="," close=")">
+            #{liveId}
+        </foreach>
+    </update>
+
+    <update id="handleDeleteSelectedAdmin" parameterType="com.fs.live.vo.LiveListVo">
+        update live set is_del = 1
+        WHERE  live_id IN
+        <foreach item="liveId" collection="liveVo.liveIds" open="(" separator="," close=")">
+            #{liveId}
+        </foreach>
+    </update>
 </mapper>

fs-service/src/main/resources/mapper/live/LiveSensitiveWordsMapper.xml

@@ -7,18 +7,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="LiveSensitiveWords" id="LiveSensitiveWordsResult">
         <result property="wordId"    column="word_id"    />
         <result property="word"    column="word"    />
-        <result property="createdAt"    column="created_at"    />
+        <result property="createTime"    column="create_time"    />
     </resultMap>
 
     <sql id="selectLiveSensitiveWordsVo">
-        select word_id, word, created_at from live_sensitive_words
+        select word_id, word, create_time from live_sensitive_words
     </sql>
 
     <select id="selectLiveSensitiveWordsList" parameterType="LiveSensitiveWords" resultMap="LiveSensitiveWordsResult">
         <include refid="selectLiveSensitiveWordsVo"/>
         <where>
             <if test="word != null  and word != ''"> and word = #{word}</if>
-            <if test="createdAt != null "> and created_at = #{createdAt}</if>
+            <if test="createTime != null ">and create_time >= #{createTime} and create_time &lt; date_add(#{createTime}, interval 1 day)</if>
         </where>
     </select>
 
@@ -31,11 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into live_sensitive_words
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="word != null and word != ''">word,</if>
-            <if test="createdAt != null">created_at,</if>
+            <if test="createTime != null">create_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="word != null and word != ''">#{word},</if>
-            <if test="createdAt != null">#{createdAt},</if>
+            <if test="createTime != null">#{createTime},</if>
          </trim>
     </insert>
 
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update live_sensitive_words
         <trim prefix="SET" suffixOverrides=",">
             <if test="word != null and word != ''">word = #{word},</if>
-            <if test="createdAt != null">created_at = #{createdAt},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
         </trim>
         where word_id = #{wordId}
     </update>