微信直播功能：直播间接口

b2b2c/b2b2c-core/src/main/java/com/slodon/b2b2c/core/util/FileUploadUtil.java

@@ -0,0 +1,136 @@
+package com.slodon.b2b2c.core.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.*;
+import java.io.*;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.security.cert.X509Certificate;
+import java.util.UUID;
+
+/**
+ * @Classname: FileUploadUtil
+ * @Description: 上传文件工具类：https请求使用postUploadSSL，http使用postUpload。主逻辑参照：https://www.cnblogs.com/yfrs/p/uploadbyjavacode.html
+ * @author: 流泪兔兔头
+ */
+public class FileUploadUtil {
+
+    private static final Logger log = LoggerFactory.getLogger(FileUploadUtil.class);
+
+    /**
+     * @Title: postUploadSSL
+     * @Description: https上传文件方法
+     * @param url      请求接口
+     * @param file     文件实体
+     * @param fileName 文件名
+     * @author: 流泪兔兔头
+     */
+    public static String postUploadSSL(String url, File file, String fileName) {
+        StringBuilder result = new StringBuilder();
+        try {
+            SSLContext sc = SSLContext.getInstance("SSL");
+            sc.init(null, new TrustManager[]{new TrustAnyTrustManager()}, new java.security.SecureRandom());
+            URL console = new URL(url);
+            HttpsURLConnection conn = (HttpsURLConnection) console.openConnection();
+            // 构建请求头
+            conn.setRequestMethod("POST");
+            conn.setRequestProperty("accept", "*/*");
+            conn.setRequestProperty("connection", "Keep-Alive");
+            conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+            conn.setRequestProperty("Charset", "UTF-8");
+            conn.setDoInput(true);
+            conn.setDoOutput(true);
+            conn.setUseCaches(false);
+
+            // 设置输出流
+            String newLine = "\r\n";
+            String boundaryPrefix = "--";
+            String boundary = "----" + UUID.randomUUID().toString();
+            conn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
+            OutputStream out = conn.getOutputStream();
+            StringBuilder sb = new StringBuilder();
+
+            // 构建请求体
+            sb.append(newLine);
+            sb.append(boundaryPrefix);
+            sb.append(boundary);
+            sb.append(newLine);
+            String nameTmp = file.getName();
+            String typeName = nameTmp.substring(nameTmp.lastIndexOf("."));
+            sb.append("Content-Disposition: form-data; name=\"media\";filename=\"").append(fileName).append(typeName).append("\";filelength=").append(file.length());
+            sb.append("Content-Type: application/octet-stream");
+            sb.append(newLine);
+            sb.append(newLine);
+
+            out.write(sb.toString().getBytes());
+            FileInputStream in = new FileInputStream(file);
+            byte[] bufferOut = new byte[1024];
+            int bytes = 0;
+            while ((bytes = in.read(bufferOut)) != -1) {
+                out.write(bufferOut, 0, bytes);
+            }
+            in.close();
+            byte[] end_data = (newLine + boundaryPrefix + boundary + boundaryPrefix + newLine).getBytes();
+            out.write(end_data);
+            out.flush();
+            out.close();
+
+            // 配置SSL
+            conn.setSSLSocketFactory(sc.getSocketFactory());
+            conn.setHostnameVerifier(new TrustAnyHostnameVerifier());
+            conn.connect();
+
+            // 读取请求返回信息
+            InputStream is = conn.getInputStream();
+            BufferedReader br = new BufferedReader(new InputStreamReader(is));
+            String ret = "";
+            while ((ret = br.readLine()) != null) {
+                if (!ret.trim().equals("")) {
+                    result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8));
+                }
+            }
+            log.info("recv - {}", result);
+            conn.disconnect();
+            br.close();
+            is.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("文件上传失败{}", e.getMessage());
+        }
+        return result.toString();
+    }
+
+    /**
+     * @Title: TrustAnyTrustManager
+     * @Description: SSL用证书信任管理器
+     * @author: 流泪兔兔头
+     */
+    private static class TrustAnyTrustManager implements X509TrustManager {
+        @Override
+        public void checkClientTrusted(X509Certificate[] chain, String authType) {
+        }
+
+        @Override
+        public void checkServerTrusted(X509Certificate[] chain, String authType) {
+        }
+
+        @Override
+        public X509Certificate[] getAcceptedIssuers() {
+            return new X509Certificate[]{};
+        }
+    }
+
+    /**
+     * @Title: TrustAnyHostnameVerifier
+     * @Description: SSL用主机名验证
+     * @author: 流泪兔兔头
+     */
+    private static class TrustAnyHostnameVerifier implements HostnameVerifier {
+        @Override
+        public boolean verify(String hostname, SSLSession session) {
+            return true;
+        }
+    }
+}

b2b2c/b2b2c-core/src/main/java/com/slodon/b2b2c/core/util/HttpClientUtil.java

@@ -132,7 +132,8 @@ public class HttpClientUtil {
 
     /**
      * post请求json 原本
-     *  提交类型是表单，由于是旧代码不敢修改 application/x-www-form-urlencoded
+     * 提交类型是表单，由于是旧代码不敢修改 application/x-www-form-urlencoded
+     *
      * @param url
      * @param json
      * @return
@@ -173,8 +174,6 @@ public class HttpClientUtil {
             }
         } catch (UnsupportedCharsetException e) {
             e.printStackTrace();
-        } catch (ClientProtocolException e) {
-            throw e;
         } catch (ParseException e) {
             e.printStackTrace();
         } catch (IOException e) {

b2b2c/b2b2c-entity/src/main/java/com/slodon/b2b2c/enums/WxLiveGoodsEnum.java

@@ -0,0 +1,30 @@
+package com.slodon.b2b2c.enums;
+
+public enum WxLiveGoodsEnum {
+    ADD("商品添加并提审","https://api.weixin.qq.com/wxaapi/broadcast/goods/add?access_token="),
+    ;
+
+    private String explain;
+    private String url;
+
+    WxLiveGoodsEnum(String explain, String url) {
+        this.explain = explain;
+        this.url = url;
+    }
+
+    public String getExplain() {
+        return explain;
+    }
+
+    public void setExplain(String explain) {
+        this.explain = explain;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}

b2b2c/b2b2c-entity/src/main/java/com/slodon/b2b2c/enums/WxLiveUrlEnum.java

@@ -1,13 +1,20 @@
 package com.slodon.b2b2c.enums;
 
 public enum WxLiveUrlEnum {
+    ACCESS_TOKEN_URL("获取access_token地址","https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="),
+    TEMP_UPLOAD("上传临时文件","https://api.weixin.qq.com/cgi-bin/media/upload?access_token=ACCESS_TOKEN&type=TYPE"),
     ADD_LIVE("创建直播间","https://api.weixin.qq.com/wxaapi/broadcast/room/create?access_token="),
     GET_LIVE_LIST("获取直播间列表","https://api.weixin.qq.com/wxa/business/getliveinfo?access_token="),
     GET_LIVE_PLAYBACK("获取直播间回放","https://api.weixin.qq.com/wxa/business/getliveinfo?access_token="),
     ADD_LIVE_GOODS("直播间导入商品","https://api.weixin.qq.com/wxaapi/broadcast/room/addgoods?access_token="),
     DEL_LIVE("删除直播间","https://api.weixin.qq.com/wxaapi/broadcast/room/deleteroom?access_token="),
     EDIT_LIVE("编辑直播间","https://api.weixin.qq.com/wxaapi/broadcast/room/editroom?access_token="),
-    GET_PUSH_LIVE("获取直播间推流地址","https://api.weixin.qq.com/wxaapi/broadcast/room/getpushurl?access_token=")
+    GET_PUSH_LIVE("获取直播间推流地址","https://api.weixin.qq.com/wxaapi/broadcast/room/getpushurl?access_token="),
+    GET_SHARED_CODE("获取直播间分享二维码","https://api.weixin.qq.com/wxaapi/broadcast/room/getsharedcode?access_token="),
+    UPDATE_FEED_PUBLIC("开启/关闭直播间官方收录","https://api.weixin.qq.com/wxaapi/broadcast/room/updatefeedpublic?access_token="),
+    UPDATE_REPLAY("开启/关闭回放功能","https://api.weixin.qq.com/wxaapi/broadcast/room/updatereplay?access_token="),
+    UPDATE_KF("开启/关闭客服功能","https://api.weixin.qq.com/wxaapi/broadcast/room/updatekf?access_token="),
+    UPDATE_COMMENT("开启/关闭直播间全局禁言","https://api.weixin.qq.com/wxaapi/broadcast/room/updatecomment?access_token="),
     ;
 
     private String explain;

b2b2c/b2b2c-entity/src/main/java/com/slodon/b2b2c/errors/WxCodeError.java

@@ -0,0 +1,128 @@
+package com.slodon.b2b2c.errors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class WxCodeError {
+    public static Map<String,String> WX_CODE = new HashMap<>();
+
+    public WxCodeError() {
+        initWxCode();
+        initWxLiveCode();//直播错误码添加
+    }
+
+    private void initWxLiveCode() {
+        WX_CODE.put("1","未创建直播间");
+        WX_CODE.put("1003","商品 id 不存在");
+        WX_CODE.put("47001","入参格式不符合规范");
+        WX_CODE.put("200002","入参错误");
+        WX_CODE.put("300001","禁止创建/更新商品 或 禁止编辑&更新房间");
+        WX_CODE.put("300002","名称长度不符合规则");
+        WX_CODE.put("300006","图片上传失败（如 mediaID过期）");
+        WX_CODE.put("300022","此房间号不存在");
+        WX_CODE.put("300023","房间状态 拦截（当前房间状态不允许此操作）");
+        WX_CODE.put("300024","商品不存在");
+        WX_CODE.put("300025","商品审核未通过");
+        WX_CODE.put("300026","房间商品数量已经满额");
+        WX_CODE.put("300027","导入商品失败");
+        WX_CODE.put("300028","房间名称违规");
+        WX_CODE.put("300029","主播昵称违规");
+        WX_CODE.put("300030","主播微信号不合法");
+        WX_CODE.put("300031","直播间封面图不合规");
+        WX_CODE.put("300032","直播间分享图违规");
+        WX_CODE.put("300033","添加商品超过直播间上限");
+        WX_CODE.put("300034","主播微信昵称长度不符合要求");
+        WX_CODE.put("300035","主播微信号不存在");
+        WX_CODE.put("300036","主播微信号未实名认证");
+        WX_CODE.put("300037","购物直播频道封面图不合规");
+        WX_CODE.put("300038","未在小程序管理后台配置客服");
+        WX_CODE.put("300039","主播副号微信号不合法");
+        WX_CODE.put("300040","名称含有非限定字符（含有特殊字符）");
+        WX_CODE.put("300041","创建者微信号不合法");
+        WX_CODE.put("300042","推流中禁止编辑房间");
+        WX_CODE.put("300043","每天只允许一场直播开启关注");
+        WX_CODE.put("300044","商品没有讲解视频");
+        WX_CODE.put("300045","讲解视频未生成");
+        WX_CODE.put("300046","讲解视频生成失败");
+        WX_CODE.put("300047","已有商品正在推送，请稍后再试");
+        WX_CODE.put("300048","拉取商品列表失败");
+        WX_CODE.put("300049","商品推送过程中不允许上下架");
+        WX_CODE.put("300050","排序商品列表为空");
+        WX_CODE.put("300051","解析 JSON 出错");
+        WX_CODE.put("300052","已下架的商品无法推送");
+        WX_CODE.put("300053","直播间未添加此商品");
+        WX_CODE.put("500001","副号不合规");
+        WX_CODE.put("500002","副号未实名");
+        WX_CODE.put("500003","已经设置过副号了，不能重复设置");
+        WX_CODE.put("500004","不能设置重复的副号");
+        WX_CODE.put("500005","副号不能和主号重复");
+        WX_CODE.put("600001","用户已被添加为小助手");
+        WX_CODE.put("600002","找不到用户");
+        WX_CODE.put("9410000","直播间列表为空");
+        WX_CODE.put("9410001","获取房间失败");
+        WX_CODE.put("9410002","获取商品失败");
+        WX_CODE.put("9410003","获取回放失败");
+    }
+
+    private void initWxCode(){
+        WX_CODE.put("-1","系统繁忙");
+        WX_CODE.put("0","请求成功");
+        WX_CODE.put("40001","验证失败");
+        WX_CODE.put("40002","不合法的凭证类型");
+        WX_CODE.put("40003","不合法的OpenID");
+        WX_CODE.put("40004","不合法的媒体文件类型");
+        WX_CODE.put("40005","不合法的文件类型");
+        WX_CODE.put("40006","不合法的文件大小");
+        WX_CODE.put("40007","不合法的媒体文件id");
+        WX_CODE.put("40008","不合法的消息类型");
+        WX_CODE.put("40009","不合法的图片文件大小");
+        WX_CODE.put("40010","不合法的语音文件大小");
+        WX_CODE.put("40011","不合法的视频文件大小");
+        WX_CODE.put("40012","不合法的缩略图文件大小");
+        WX_CODE.put("40013","不合法的APPID");
+        WX_CODE.put("40014","不合法的access_token");
+        WX_CODE.put("40015","不合法的菜单类型");
+        WX_CODE.put("40016","不合法的按钮个数");
+        WX_CODE.put("40017","不合法的按钮个数");
+        WX_CODE.put("40018","不合法的按钮名字长度");
+        WX_CODE.put("40019","不合法的按钮KEY长度");
+        WX_CODE.put("40020","不合法的按钮URL长度");
+        WX_CODE.put("40021","不合法的菜单版本号");
+        WX_CODE.put("40022","不合法的子菜单级数");
+        WX_CODE.put("40023","不合法的子菜单按钮个数");
+        WX_CODE.put("40024","不合法的子菜单按钮类型");
+        WX_CODE.put("40025","不合法的子菜单按钮名字长度");
+        WX_CODE.put("40026","不合法的子菜单按钮KEY长度");
+        WX_CODE.put("40027","不合法的子菜单按钮URL长度");
+        WX_CODE.put("40028","不合法的自定义菜单使用用户");
+        WX_CODE.put("41001","缺少access_token参数");
+        WX_CODE.put("41002","缺少appid参数");
+        WX_CODE.put("41003","缺少refresh_token参数");
+        WX_CODE.put("41004","缺少secret参数");
+        WX_CODE.put("41005","缺少多媒体文件数据");
+        WX_CODE.put("41006","缺少media_id参数");
+        WX_CODE.put("41007","缺少子菜单数据");
+        WX_CODE.put("42001","access_token超时");
+        WX_CODE.put("43001","需要GET请求");
+        WX_CODE.put("43002","需要POST请求");
+        WX_CODE.put("43003","需要HTTPS请求");
+        WX_CODE.put("44001","多媒体文件为空");
+        WX_CODE.put("44002","POST的数据包为空");
+        WX_CODE.put("44003","图文消息内容为空");
+        WX_CODE.put("45001","多媒体文件大小超过限制");
+        WX_CODE.put("45002","消息内容超过限制");
+        WX_CODE.put("45003","标题字段超过限制");
+        WX_CODE.put("45004","描述字段超过限制");
+        WX_CODE.put("45005","链接字段超过限制");
+        WX_CODE.put("45006","图片链接字段超过限制");
+        WX_CODE.put("45007","语音播放时间超过限制");
+        WX_CODE.put("45008","图文消息超过限制");
+        WX_CODE.put("45009","接口调用超过限制");
+        WX_CODE.put("45010","创建菜单个数超过限制");
+        WX_CODE.put("46001","不存在媒体数据");
+        WX_CODE.put("46002","不存在的菜单版本");
+        WX_CODE.put("46003","不存在的菜单数据");
+        WX_CODE.put("40029","登录多次导致code重复/appid和secret对应不上，不是同一个小程序");
+    }
+
+}

b2b2c/b2b2c-entity/src/main/java/com/slodon/b2b2c/live/dto/LiveBroadcastDto.java

@@ -9,13 +9,21 @@ import java.io.Serializable;
 public class LiveBroadcastDto implements Serializable {
     @ApiModelProperty("直播间id")
     private String roomId;
+    @ApiModelProperty("商户ID")
+    private String vendorId;
     @ApiModelProperty(value = "直播间名字，最短3个汉字，最长17个汉字，1个汉字相当于2个字符",required = true)
     private String name;
     @ApiModelProperty(value = "背景图，填入mediaID（mediaID获取后，三天内有效）",required = true)
     private String coverImg;
+    @ApiModelProperty(value = "背景图 相对路径",required = true)
+    private String coverImgPath;
     @ApiModelProperty(value = "直播计划开始时间（开播时间需要在当前时间的10分钟后 并且 开始时间不能在 6 个月后）",required = true)
-    private Long startTime;
+    private String startTimeStr;
     @ApiModelProperty(value = "直播计划结束时间（开播时间和结束时间间隔不得短于30分钟，不得超过24小时）",required = true)
+    private String endTimeStr;
+    @ApiModelProperty(value = "直播计划开始时间（开播时间需要在当前时间的10分钟后 并且 开始时间不能在 6 个月后）")
+    private Long startTime;
+    @ApiModelProperty(value = "直播计划结束时间（开播时间和结束时间间隔不得短于30分钟，不得超过24小时）")
     private Long endTime;
     @ApiModelProperty(value = "主播昵称，最短2个汉字，最长15个汉字，1个汉字相当于2个字符",required = true)
     private String anchorName;
@@ -27,12 +35,16 @@ public class LiveBroadcastDto implements Serializable {
     private String createrWechat;
     @ApiModelProperty(value = "分享图，填入mediaID",required = true)
     private String shareImg;
+    @ApiModelProperty(value = "分享图 相对路径",required = true)
+    private String shareImgPath;
     @ApiModelProperty(value = "购物直播频道封面图，填入mediaID",required = true)
     private String feedsImg;
+    @ApiModelProperty(value = "购物直播频道封面图 相对路径",required = true)
+    private String feedsImgPath;
     @ApiModelProperty("是否开启官方收录 【1: 开启，0：关闭】，默认开启收录")
     private Integer isFeedsPublic;
     @ApiModelProperty(value = "直播间类型 【1: 推流，0：手机直播】",required = true)
-    private Integer type;
+    private Integer type = 0;
     @ApiModelProperty(value = "是否关闭点赞 【0：开启，1：关闭】（若关闭，观众端将隐藏点赞按钮，直播开始后不允许开启）",required = true)
     private Integer closeLike;
     @ApiModelProperty(value = "是否关闭货架 【0：开启，1：关闭】（若关闭，观众端将隐藏商品货架，直播开始后不允许开启）",required = true)
@@ -47,4 +59,7 @@ public class LiveBroadcastDto implements Serializable {
     private Integer closeKf;
 
 
+    //==========================微信接口需要装换的参数==============================
+    @ApiModelProperty("id")
+    private Integer id;
 }

b2b2c/b2b2c-entity/src/main/java/com/slodon/b2b2c/live/dto/LiveBroadcastEditDto.java

@@ -1,50 +0,0 @@
-package com.slodon.b2b2c.live.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class LiveBroadcastEditDto implements Serializable {
-    @ApiModelProperty("直播间id")
-    private Integer id;
-    @ApiModelProperty(value = "直播间名字，最短3个汉字，最长17个汉字，1个汉字相当于2个字符",required = true)
-    private String name;
-    @ApiModelProperty(value = "背景图，填入mediaID（mediaID获取后，三天内有效）",required = true)
-    private String coverImg;
-    @ApiModelProperty(value = "直播计划开始时间（开播时间需要在当前时间的10分钟后 并且 开始时间不能在 6 个月后）",required = true)
-    private Long startTime;
-    @ApiModelProperty(value = "直播计划结束时间（开播时间和结束时间间隔不得短于30分钟，不得超过24小时）",required = true)
-    private Long endTime;
-    @ApiModelProperty(value = "主播昵称，最短2个汉字，最长15个汉字，1个汉字相当于2个字符",required = true)
-    private String anchorName;
-    @ApiModelProperty(value = "主播微信号，如果未实名认证，需要先前往“小程序直播”小程序进行实名验证,",required = true)
-    private String anchorWechat;
-    @ApiModelProperty("主播副号微信号，如果未实名认证，需要先前往“小程序直播”小程序进行实名验证 ")
-    private String subAnchorWechat;
-    @ApiModelProperty("创建者微信号，不传入则此直播间所有成员可见。传入则此房间仅创建者、管理员、超管、直播间主播可见")
-    private String createrWechat;
-    @ApiModelProperty(value = "分享图，填入mediaID",required = true)
-    private String shareImg;
-    @ApiModelProperty(value = "购物直播频道封面图，填入mediaID",required = true)
-    private String feedsImg;
-    @ApiModelProperty("是否开启官方收录 【1: 开启，0：关闭】，默认开启收录")
-    private Integer isFeedsPublic;
-    @ApiModelProperty(value = "直播间类型 【1: 推流，0：手机直播】",required = true)
-    private Integer type;
-    @ApiModelProperty(value = "是否关闭点赞 【0：开启，1：关闭】（若关闭，观众端将隐藏点赞按钮，直播开始后不允许开启）",required = true)
-    private Integer closeLike;
-    @ApiModelProperty(value = "是否关闭货架 【0：开启，1：关闭】（若关闭，观众端将隐藏商品货架，直播开始后不允许开启）",required = true)
-    private Integer closeGoods;
-    @ApiModelProperty(value = "是否关闭评论 【0：开启，1：关闭】（若关闭，观众端将隐藏评论入口，直播开始后不允许开启）",required = true)
-    private Integer closeComment;
-    @ApiModelProperty("是否关闭回放 【0：开启，1：关闭】默认关闭回放（直播开始后允许开启）")
-    private Integer closeReplay;
-    @ApiModelProperty("是否关闭分享 【0：开启，1：关闭】默认开启分享（直播开始后不允许修改）")
-    private Integer closeShare;
-    @ApiModelProperty("是否关闭客服 【0：开启，1：关闭】 默认关闭客服（直播开始后允许开启）")
-    private Integer closeKf;
-
-
-}

b2b2c/b2b2c-entity/src/main/java/com/slodon/b2b2c/live/dto/LiveGoodsInfoDto.java

@@ -0,0 +1,31 @@
+package com.slodon.b2b2c.live.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class LiveGoodsInfoDto implements Serializable {
+    @ApiModelProperty(value = "填入mediaID 图片 mediaID 的获取，https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/New_temporary_materials.html",required = true)
+    private String coverImgUrl;
+    @ApiModelProperty(value = "商品名称，最长14个汉字，1个汉字相当于2个字符",required = true)
+    private String name;
+    @ApiModelProperty(value = "价格类型，1：一口价（只需要传入price，price2不传） 2：价格区间（price字段为左边界，price2字段为右边界，price和price2必传） 3：显示折扣价（price字段为原价，price2字段为现价， price和price2必传）",required = true)
+    private Number priceType;
+    @ApiModelProperty(value = "数字，最多保留两位小数，单位元",required = true)
+    private Number price;
+    @ApiModelProperty("数字，最多保留两位小数，单位元")
+    private Number price2;
+    @ApiModelProperty(value = "商品详情页的小程序路径，路径参数存在 url 的，该参数的值需要进行 encode 处理再填入",required = true)
+    private String url;
+    @ApiModelProperty("当商品为第三方小程序的商品则填写为对应第三方小程序的appid，自身小程序商品则为")
+    private String thirdPartyAppid;
+
+
+    //==========================微信接口需要装换的参数==============================
+    @ApiModelProperty("商品ID")
+    private Integer goodsId;
+    @ApiModelProperty("审核单ID")
+    private Integer auditId;
+}

b2b2c/b2b2c-entity/src/main/java/com/slodon/b2b2c/live/example/LiveBroadcastExample.java

@@ -10,10 +10,14 @@ import java.io.Serializable;
 public class LiveBroadcastExample implements Serializable {
     @ApiModelProperty("直播间id")
     private String roomId;
+    @ApiModelProperty("商户ID")
+    private String vendorId;
     @ApiModelProperty(value = "直播间名字，最短3个汉字，最长17个汉字，1个汉字相当于2个字符",required = true)
     private String name;
     @ApiModelProperty(value = "背景图，填入mediaID（mediaID获取后，三天内有效）",required = true)
     private String coverImg;
+    @ApiModelProperty(value = "背景图 相对路径",required = true)
+    private String coverImgPath;
     @ApiModelProperty(value = "直播计划开始时间（开播时间需要在当前时间的10分钟后 并且 开始时间不能在 6 个月后）",required = true)
     private Long startTime;
     @ApiModelProperty(value = "直播计划结束时间（开播时间和结束时间间隔不得短于30分钟，不得超过24小时）",required = true)
@@ -28,8 +32,12 @@ public class LiveBroadcastExample implements Serializable {
     private String createrWechat;
     @ApiModelProperty(value = "分享图，填入mediaID",required = true)
     private String shareImg;
+    @ApiModelProperty(value = "分享图 相对路径",required = true)
+    private String shareImgPath;
     @ApiModelProperty(value = "购物直播频道封面图，填入mediaID",required = true)
     private String feedsImg;
+    @ApiModelProperty(value = "购物直播频道封面图 相对路径",required = true)
+    private String feedsImgPath;
     @ApiModelProperty("是否开启官方收录 【1: 开启，0：关闭】，默认开启收录")
     private Integer isFeedsPublic;
     @ApiModelProperty(value = "直播间类型 【1: 推流，0：手机直播】",required = true)

b2b2c/b2b2c-entity/src/main/java/com/slodon/b2b2c/live/pojo/LiveBroadcast.java

@@ -9,10 +9,14 @@ import java.io.Serializable;
 public class LiveBroadcast implements Serializable {
     @ApiModelProperty("直播间id")
     private String roomId;
+    @ApiModelProperty("商户ID")
+    private String vendorId;
     @ApiModelProperty(value = "直播间名字，最短3个汉字，最长17个汉字，1个汉字相当于2个字符",required = true)
     private String name;
     @ApiModelProperty(value = "背景图，填入mediaID（mediaID获取后，三天内有效）",required = true)
     private String coverImg;
+    @ApiModelProperty(value = "背景图 相对路径",required = true)
+    private String coverImgPath;
     @ApiModelProperty(value = "直播计划开始时间（开播时间需要在当前时间的10分钟后 并且 开始时间不能在 6 个月后）",required = true)
     private Long startTime;
     @ApiModelProperty(value = "直播计划结束时间（开播时间和结束时间间隔不得短于30分钟，不得超过24小时）",required = true)
@@ -27,12 +31,16 @@ public class LiveBroadcast implements Serializable {
     private String createrWechat;
     @ApiModelProperty(value = "分享图，填入mediaID",required = true)
     private String shareImg;
+    @ApiModelProperty(value = "分享图 相对路径",required = true)
+    private String shareImgPath;
     @ApiModelProperty(value = "购物直播频道封面图，填入mediaID",required = true)
     private String feedsImg;
+    @ApiModelProperty(value = "购物直播频道封面图 相对路径",required = true)
+    private String feedsImgPath;
     @ApiModelProperty("是否开启官方收录 【1: 开启，0：关闭】，默认开启收录")
     private Integer isFeedsPublic = 1;
     @ApiModelProperty(value = "直播间类型 【1: 推流，0：手机直播】",required = true)
-    private Integer type;
+    private Integer type = 0;
     @ApiModelProperty(value = "是否关闭点赞 【0：开启，1：关闭】（若关闭，观众端将隐藏点赞按钮，直播开始后不允许开启）",required = true)
     private Integer closeLike;
     @ApiModelProperty(value = "是否关闭货架 【0：开启，1：关闭】（若关闭，观众端将隐藏商品货架，直播开始后不允许开启）",required = true)

b2b2c/b2b2c-entity/src/main/java/com/slodon/b2b2c/live/vo/LivesVO.java

@@ -11,6 +11,54 @@ public class LivesVO {
     private String roomId;
     @ApiModelProperty(value = "直播间名字，最短3个汉字，最长17个汉字，1个汉字相当于2个字符",required = true)
     private String name;
+    @ApiModelProperty(value = "背景图，填入mediaID（mediaID获取后，三天内有效）",required = true)
+    private String coverImg;
+    @ApiModelProperty(value = "背景图 相对路径",required = true)
+    private String coverImgPath;
+    @ApiModelProperty(value = "背景图 绝对路径")
+    private String coverImgUrl;
+    @ApiModelProperty(value = "直播计划开始时间（开播时间需要在当前时间的10分钟后 并且 开始时间不能在 6 个月后）",required = true)
+    private String startTimeStr;
+    @ApiModelProperty(value = "直播计划结束时间（开播时间和结束时间间隔不得短于30分钟，不得超过24小时）",required = true)
+    private String endTimeStr;
+    @ApiModelProperty(value = "直播计划开始时间（开播时间需要在当前时间的10分钟后 并且 开始时间不能在 6 个月后）",hidden = true)
+    private Long startTime;
+    @ApiModelProperty(value = "直播计划结束时间（开播时间和结束时间间隔不得短于30分钟，不得超过24小时）",hidden = true)
+    private Long endTime;
     @ApiModelProperty(value = "主播昵称，最短2个汉字，最长15个汉字，1个汉字相当于2个字符",required = true)
     private String anchorName;
+    @ApiModelProperty(value = "主播微信号，如果未实名认证，需要先前往“小程序直播”小程序进行实名验证,",required = true)
+    private String anchorWechat;
+    @ApiModelProperty("主播副号微信号，如果未实名认证，需要先前往“小程序直播”小程序进行实名验证 ")
+    private String subAnchorWechat;
+    @ApiModelProperty("创建者微信号，不传入则此直播间所有成员可见。传入则此房间仅创建者、管理员、超管、直播间主播可见")
+    private String createrWechat;
+    @ApiModelProperty(value = "分享图，填入mediaID",required = true)
+    private String shareImg;
+    @ApiModelProperty(value = "分享图 相对路径",required = true)
+    private String shareImgPath;
+    @ApiModelProperty(value = "分享图 绝对路径")
+    private String shareImgUrl;
+    @ApiModelProperty(value = "购物直播频道封面图，填入mediaID",required = true)
+    private String feedsImg;
+    @ApiModelProperty(value = "购物直播频道封面图 相对路径",required = true)
+    private String feedsImgPath;
+    @ApiModelProperty(value = "购物直播频道封面图 绝对路径")
+    private String feedsImgUrl;
+    @ApiModelProperty("是否开启官方收录 【1: 开启，0：关闭】，默认开启收录")
+    private Integer isFeedsPublic = 1;
+    @ApiModelProperty(value = "直播间类型 【1: 推流，0：手机直播】",required = true)
+    private Integer type;
+    @ApiModelProperty(value = "是否关闭点赞 【0：开启，1：关闭】（若关闭，观众端将隐藏点赞按钮，直播开始后不允许开启）",required = true)
+    private Integer closeLike;
+    @ApiModelProperty(value = "是否关闭货架 【0：开启，1：关闭】（若关闭，观众端将隐藏商品货架，直播开始后不允许开启）",required = true)
+    private Integer closeGoods;
+    @ApiModelProperty(value = "是否关闭评论 【0：开启，1：关闭】（若关闭，观众端将隐藏评论入口，直播开始后不允许开启）",required = true)
+    private Integer closeComment;
+    @ApiModelProperty("是否关闭回放 【0：开启，1：关闭】默认关闭回放（直播开始后允许开启）")
+    private Integer closeReplay = 1;
+    @ApiModelProperty("是否关闭分享 【0：开启，1：关闭】默认开启分享（直播开始后不允许修改）")
+    private Integer closeShare = 0;
+    @ApiModelProperty("是否关闭客服 【0：开启，1：关闭】 默认关闭客服（直播开始后允许开启）")
+    private Integer closeKf = 1;
 }

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/common/UploadController.java

@@ -51,7 +51,8 @@ public class UploadController {
                             "goods==商品图片;video==商品视频;appeal==申诉图片;complain==投诉图片;" +
                             "setting==系统设置图片;sellerDeco==商户装修图片;adminBrand==品牌图片;" +
                             "sellerApply==入驻图片;logo==商家logo;adminDeco==装修图片;afterSale==售后申请图片;" +
-                            "evaluate==评价图片", paramType = "formData", required = true)
+                            "evaluate==评价图片;tempImg==wx临时图片"
+                            , paramType = "formData", required = true)
     })
     @PostMapping(value = "upload", consumes = "multipart/*", headers = "content-type=multipart/form-data")
     public JsonResult uploadImg(MultipartFile file, String source) throws Exception {

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/live/LiveBroadAdminController.java

@@ -0,0 +1,127 @@
+package com.slodon.b2b2c.controller.live;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.slodon.b2b2c.controller.common.UploadController;
+import com.slodon.b2b2c.core.constant.ResponseConst;
+import com.slodon.b2b2c.core.controller.BaseController;
+import com.slodon.b2b2c.core.response.JsonResult;
+import com.slodon.b2b2c.core.response.PageVO;
+import com.slodon.b2b2c.core.response.PagerInfo;
+import com.slodon.b2b2c.core.response.SldResponse;
+import com.slodon.b2b2c.core.util.*;
+import com.slodon.b2b2c.enums.WxLiveUrlEnum;
+import com.slodon.b2b2c.live.dto.LiveBroadcastDto;
+import com.slodon.b2b2c.live.example.LiveBroadcastExample;
+import com.slodon.b2b2c.live.pojo.LiveBroadcast;
+import com.slodon.b2b2c.live.vo.LivesVO;
+import com.slodon.b2b2c.model.live.LiveBroadModel;
+import com.slodon.b2b2c.seller.pojo.Vendor;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.PropertyUtils;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Api(tags = "admin-微信直播管理")
+@RestController
+@Slf4j
+@RequestMapping("v3/live/admin/broad")
+public class LiveBroadAdminController extends BaseController {
+
+    private final static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+    @Resource
+    private LiveBroadModel liveBroadModel;
+
+    private String getToken() throws Exception {
+        String appId = stringRedisTemplate.opsForValue().get("login_wx_mini_appid");
+        String secret = stringRedisTemplate.opsForValue().get("login_wx_mini_appsecret");
+        String access_token_resp = HttpClientUtil.httpGet(WxLiveUrlEnum.ACCESS_TOKEN_URL.getUrl() + appId + "&secret=" + secret);
+        String access_token = JSON.parseObject(access_token_resp).getString("access_token");
+        AssertUtil.notEmpty(access_token, "微信认证失败");
+        System.out.println("结果access_token: "+access_token);
+        return access_token;
+    }
+
+    @ApiOperation("获取直播列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "直播名称", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
+            @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
+    })
+    @GetMapping("/list")
+    public JsonResult<PageVO<LivesVO>> getList(HttpServletRequest request, String name) {
+
+        PagerInfo pager = WebUtil.handlerPagerInfo(request);
+        LiveBroadcastExample example = new LiveBroadcastExample();
+        example.setName(name);
+        List<LiveBroadcast> livesList = liveBroadModel.getLivesList(example, pager);
+        List<LivesVO> livesVOS = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(livesList)) {
+            livesList.forEach(node->{
+                LivesVO vo = new LivesVO();
+                try {
+                    PropertyUtils.copyProperties(vo,node);
+                    vo.setStartTimeStr(sdf.format(node.getStartTime()*1000));
+                    vo.setEndTimeStr(sdf.format(node.getEndTime()*1000));
+                    vo.setCoverImgUrl(FileUrlUtil.getFileUrl(vo.getCoverImgPath(), null));
+                    vo.setFeedsImgUrl(FileUrlUtil.getFileUrl(vo.getFeedsImgPath(), null));
+                    vo.setShareImgUrl(FileUrlUtil.getFileUrl(vo.getShareImgPath(), null));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                livesVOS.add(vo);
+            });
+        }
+        return SldResponse.success(new PageVO<>(livesVOS, pager));
+    }
+
+    @ApiOperation("获取直播间列表及直播间信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "start", value = "起始房间，0表示从第1个房间开始拉取", paramType = "query"),
+            @ApiImplicitParam(name = "limit", value = "每次拉取的房间数量，建议100以内", paramType = "query")
+    })
+    @GetMapping("/wxGetLiveInfoList")
+    public JsonResult wxGetLiveInfoList(HttpServletRequest request, Integer start,Integer limit) {
+        try {
+            String access_token = getToken();
+            //校验
+            String url = WxLiveUrlEnum.GET_LIVE_LIST.getUrl()+access_token;
+            Map map = new HashMap();
+            map.put("start",start);
+            map.put("limit",limit);
+            String reStr = HttpClientUtil.sendJsonPostNew(url,JSON.toJSONString(map));
+            JSONObject jsonObject = JSONObject.parseObject(reStr);
+            String errCode = jsonObject.getString("errcode");
+            if (!"0".equals(errCode)){
+                log.warn("获取直播间列表及直播间信息："+reStr);
+                return SldResponse.fail(jsonObject.getString("errmsg"));
+            }
+            return SldResponse.success(reStr);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SldResponse.success("查询失败");
+    }
+
+}

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/live/LiveBroadController.java

@@ -3,21 +3,22 @@ package com.slodon.b2b2c.controller.live;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.slodon.b2b2c.controller.common.UploadController;
+import com.slodon.b2b2c.core.constant.ResponseConst;
 import com.slodon.b2b2c.core.controller.BaseController;
 import com.slodon.b2b2c.core.response.JsonResult;
 import com.slodon.b2b2c.core.response.PageVO;
 import com.slodon.b2b2c.core.response.PagerInfo;
 import com.slodon.b2b2c.core.response.SldResponse;
-import com.slodon.b2b2c.core.util.AssertUtil;
-import com.slodon.b2b2c.core.util.HttpClientUtil;
-import com.slodon.b2b2c.core.util.WebUtil;
+import com.slodon.b2b2c.core.util.*;
 import com.slodon.b2b2c.enums.WxLiveUrlEnum;
+import com.slodon.b2b2c.errors.WxCodeError;
 import com.slodon.b2b2c.live.dto.LiveBroadcastDto;
-import com.slodon.b2b2c.live.dto.LiveBroadcastEditDto;
 import com.slodon.b2b2c.live.example.LiveBroadcastExample;
 import com.slodon.b2b2c.live.pojo.LiveBroadcast;
 import com.slodon.b2b2c.live.vo.LivesVO;
 import com.slodon.b2b2c.model.live.LiveBroadModel;
+import com.slodon.b2b2c.seller.pojo.Vendor;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -26,79 +27,199 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Api(tags = "admin-微信直播管理")
 @RestController
 @Slf4j
-@RequestMapping("v3/live/broad")
+@RequestMapping("v3/live/seller/broad")
 public class LiveBroadController extends BaseController {
-    private final String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=";//获取access_token地址
+
+    private final static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     @Resource
     private StringRedisTemplate stringRedisTemplate;
     @Resource
     private LiveBroadModel liveBroadModel;
+    @Resource
+    private UploadController uploadController;
 
     private String getToken() throws Exception {
         String appId = stringRedisTemplate.opsForValue().get("login_wx_mini_appid");
         String secret = stringRedisTemplate.opsForValue().get("login_wx_mini_appsecret");
-        String access_token_resp = HttpClientUtil.httpGet(ACCESS_TOKEN_URL + appId + "&secret=" + secret);
+        String access_token_resp = HttpClientUtil.httpGet(WxLiveUrlEnum.ACCESS_TOKEN_URL.getUrl() + appId + "&secret=" + secret);
         String access_token = JSON.parseObject(access_token_resp).getString("access_token");
         AssertUtil.notEmpty(access_token, "微信认证失败");
         System.out.println("结果access_token: "+access_token);
         return access_token;
     }
+    @ApiOperation("添加临时素材")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "multipartFile", value = "文件", paramType = "formData", required = true)
+    })
+    @PostMapping(value = "upload", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public JsonResult mediaUpload(HttpServletRequest request,MultipartFile multipartFile) {
+        HashMap<String, Object> resultMap = new HashMap<>();
+        try {
+            //先保存到本地
+            JsonResult uploadImg = uploadController.uploadImg(multipartFile, "tempImg");
+            resultMap = (HashMap<String, Object>) uploadImg.getData();
+            String access_token = getToken();
+            //校验
+            String url = WxLiveUrlEnum.TEMP_UPLOAD.getUrl();
+            url = url.replace("ACCESS_TOKEN",access_token).replace("TYPE","image");
+            File file = MultipartFileToFile(multipartFile);
+            String result = FileUploadUtil.postUploadSSL(url, file, file.getName());
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            resultMap.put("mediaId",jsonObject.getString("media_id"));
+//            resultMap.put("url",jsonObject.getString("media_id"));
+//            resultMap.put("path",jsonObject.getString("media_id"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return SldResponse.success(resultMap);
+    }
+    /**
+     * 将MultipartFile转换为File
+     * @param multiFile
+     * @return
+     */
+    public static File MultipartFileToFile(MultipartFile multiFile) {
+        // 获取文件名
+        String fileName = multiFile.getOriginalFilename();
+        // 获取文件后缀
+        String prefix = fileName.substring(fileName.lastIndexOf("."));
+        // 若须要防止生成的临时文件重复,能够在文件名后添加随机码
+        try {
+            File file = File.createTempFile(fileName, prefix);
+            multiFile.transferTo(file);
+            return file;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 
-//    @ApiOperation("添加临时素材")
-//    @PostMapping("/mediaUpload")
-//    public JsonResult mediaUpload(HttpServletRequest request, @RequestBody LiveBroadcastDto liveBroadcastDto) {
-//        try {
-//            String access_token = getToken();
-//            //校验
-//            String url = "https://api.weixin.qq.com/wxaapi/broadcast/room/create?access_token="+access_token;
-//            String reStr = HttpClientUtil.sendJsonPostNew(url,JSON.toJSONString(liveBroadcastDto));
-//            JSONObject jsonObject = JSONObject.parseObject(reStr);
-//            String errCode = jsonObject.getString("errcode");
-//            if (!"0".equals(errCode)){
-//                log.warn("直播间添加失败原因："+reStr);
-//                return SldResponse.success("添加失败");
-//            }
-//            liveBroadcastDto.setRoomId(String.valueOf(jsonObject.get("roomId")));
-//            liveBroadModel.broadcastRoomCreate(liveBroadcastDto);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        return SldResponse.success("添加成功");
-//    }
 
     @ApiOperation("添加直播间")
     @PostMapping("/wxBroadcastRoomCreate")
-    public JsonResult wxBroadcastRoomCreate(HttpServletRequest request, @RequestBody LiveBroadcastDto liveBroadcastDto) {
+    public JsonResult wxBroadcastRoomCreate(HttpServletRequest request,LiveBroadcastDto liveBroadcastDto) {
+        HashMap<String, String> resultMap = new HashMap<>();
         try {
-            String access_token = getToken();
+            Vendor vendor = UserUtil.getUser(request, Vendor.class);
+            if (vendor == null || vendor.getVendorId() == null){
+                return SldResponse.fail("获取商户id失败");
+            }
+            liveBroadcastDto.setVendorId(String.valueOf(vendor.getVendorId()));
             //校验
+            checkParam(liveBroadcastDto,resultMap);
+            if (String.valueOf(ResponseConst.STATE_FAIL).equals(resultMap.get("state").toString())){
+                return SldResponse.fail(resultMap.get("msg"));
+            }
+            //获取token
+            String access_token = getToken();
             String url = WxLiveUrlEnum.ADD_LIVE.getUrl()+access_token;
             String reStr = HttpClientUtil.sendJsonPostNew(url,JSON.toJSONString(liveBroadcastDto));
             JSONObject jsonObject = JSONObject.parseObject(reStr);
             String errCode = jsonObject.getString("errcode");
             if (!"0".equals(errCode)){
                 log.warn("直播间添加失败原因："+reStr);
-                return SldResponse.success("添加失败");
+                return jsonObject.getString("qrcode_url") != null
+                        ? SldResponse.fail("qrcode_url")
+                        : SldResponse.fail( WxCodeError.WX_CODE.get(errCode));
             }
             liveBroadcastDto.setRoomId(String.valueOf(jsonObject.get("roomId")));
             liveBroadModel.broadcastRoomCreate(liveBroadcastDto);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return SldResponse.success("添加成功");
+        return SldResponse.success(resultMap);
+    }
+
+    private void checkParam(LiveBroadcastDto liveBroadcastDto, HashMap<String, String> resultMap) throws ParseException {
+        resultMap.put("state","255");
+        if(liveBroadcastDto==null){
+            resultMap.put("msg","请填写参数");
+            return;
+        }
+        if(liveBroadcastDto.getName() == null || liveBroadcastDto.getName().length() < 3 || liveBroadcastDto.getName().length() > 17){
+            resultMap.put("msg","直播间名字，最短3个汉字，最长17个汉字");
+            return;
+        }
+        if(liveBroadcastDto.getCoverImg() == null){
+            resultMap.put("msg","背景图必填");
+            return;
+        }
+        if(liveBroadcastDto.getStartTimeStr() == null || liveBroadcastDto.getEndTimeStr() == null){
+            resultMap.put("msg","开始和结束时间必填");
+            return;
+        }
+        if(liveBroadcastDto.getAnchorName() == null || liveBroadcastDto.getAnchorName().length() < 2 || liveBroadcastDto.getAnchorName().length() > 15){
+            resultMap.put("msg","主播昵称，最短2个汉字，最长15个汉字");
+            return;
+        }
+        if(liveBroadcastDto.getAnchorWechat() == null){
+            resultMap.put("msg","主播微信号不能为空");
+            return;
+        }
+        if(liveBroadcastDto.getShareImg() == null){
+            resultMap.put("msg","分享图必填");
+            return;
+        }
+        if(liveBroadcastDto.getFeedsImg() == null){
+            resultMap.put("msg","购物直播频道封面图必填");
+            return;
+        }
+        if(liveBroadcastDto.getType() == null){
+            liveBroadcastDto.setType(0);
+        }
+        if(liveBroadcastDto.getCloseLike() == null){
+            resultMap.put("msg","是否关闭点赞必填");
+            return;
+        }
+        if(liveBroadcastDto.getCloseGoods() == null){
+            resultMap.put("msg","是否关闭货架必填");
+            return;
+        }
+        if(liveBroadcastDto.getCloseComment() == null){
+            resultMap.put("msg","是否关闭评论必填");
+            return;
+        }
+        if(liveBroadcastDto.getCloseKf() == null){
+            resultMap.put("msg","是否关闭客服必填");
+            return;
+        }
+        Date startTimeDate = sdf.parse(liveBroadcastDto.getStartTimeStr());
+        Date endTimeDate = sdf.parse(liveBroadcastDto.getEndTimeStr());
+        Long startTime = startTimeDate.getTime() / 1000;
+        Long endTime = endTimeDate.getTime() / 1000;
+
+        if (startTime-System.currentTimeMillis()/1000<600){
+            resultMap.put("msg","开始时间需要在当前时间的10分钟后 并且 开始时间不能在 6 个月后");
+            return;
+        }
+        if (endTime-startTime<1800 || endTime-startTime>86400  ){
+            resultMap.put("msg","开播时间和结束时间间隔不得短于30分钟，不得超过24小时");
+            return;
+        }
+        liveBroadcastDto.setStartTime(startTimeDate.getTime() / 1000);
+        liveBroadcastDto.setEndTime(endTimeDate.getTime() / 1000);
+
+
+        resultMap.put("state","200");
     }
 
     @ApiOperation("获取直播列表")
@@ -109,17 +230,28 @@ public class LiveBroadController extends BaseController {
     })
     @GetMapping("/list")
     public JsonResult<PageVO<LivesVO>> getList(HttpServletRequest request, String name) {
+        Vendor vendor = UserUtil.getUser(request, Vendor.class);
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         LiveBroadcastExample example = new LiveBroadcastExample();
         example.setName(name);
+        if (vendor != null && vendor.getVendorId() != null){
+            example.setVendorId(String.valueOf(vendor.getVendorId()));
+        }
         List<LiveBroadcast> livesList = liveBroadModel.getLivesList(example, pager);
         List<LivesVO> livesVOS = new ArrayList<>();
         if (!CollectionUtils.isEmpty(livesList)) {
             livesList.forEach(node->{
                 LivesVO vo = new LivesVO();
-                vo.setName(node.getName());
-                vo.setAnchorName(node.getAnchorName());
-                vo.setRoomId(node.getRoomId());
+                try {
+                    PropertyUtils.copyProperties(vo,node);
+                    vo.setStartTimeStr(sdf.format(node.getStartTime()*1000));
+                    vo.setEndTimeStr(sdf.format(node.getEndTime()*1000));
+                    vo.setCoverImgUrl(FileUrlUtil.getFileUrl(vo.getCoverImgPath(), null));
+                    vo.setFeedsImgUrl(FileUrlUtil.getFileUrl(vo.getFeedsImgPath(), null));
+                    vo.setShareImgUrl(FileUrlUtil.getFileUrl(vo.getShareImgPath(), null));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 livesVOS.add(vo);
             });
         }
@@ -141,6 +273,12 @@ public class LiveBroadController extends BaseController {
             map.put("start",start);
             map.put("limit",limit);
             String reStr = HttpClientUtil.sendJsonPostNew(url,JSON.toJSONString(map));
+            JSONObject jsonObject = JSONObject.parseObject(reStr);
+            String errCode = jsonObject.getString("errcode");
+            if (!"0".equals(errCode)){
+                log.warn("获取直播间列表及直播间信息："+reStr);
+                return SldResponse.fail(WxCodeError.WX_CODE.get(errCode));
+            }
             return SldResponse.success(reStr);
         } catch (Exception e) {
             e.printStackTrace();
@@ -188,7 +326,11 @@ public class LiveBroadController extends BaseController {
             map.put("ids",ids);
             map.put("roomId",roomId);
             String reStr = HttpClientUtil.sendJsonPostNew(url,JSON.toJSONString(map));
-            return SldResponse.success(reStr);
+            JSONObject jsonObject = JSONObject.parseObject(reStr);
+            String errCode = jsonObject.getString("errcode");
+            if (!"0".equals(errCode)){
+                return SldResponse.fail(WxCodeError.WX_CODE.get(errCode));
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -206,30 +348,48 @@ public class LiveBroadController extends BaseController {
             //校验
             String url = WxLiveUrlEnum.DEL_LIVE.getUrl()+access_token;
             String reStr = HttpClientUtil.sendJsonPostNew(url,JSON.toJSONString(new HashMap<>().put("id",roomId)));
-            return SldResponse.success(reStr);
+            JSONObject jsonObject = JSONObject.parseObject(reStr);
+            String errCode = jsonObject.getString("errcode");
+            if (!"0".equals(errCode)){
+                return SldResponse.fail(WxCodeError.WX_CODE.get(errCode));
+            }
+            liveBroadModel.wxDelLive(roomId);
+            return SldResponse.success("删除成功");
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return SldResponse.success("查询失败");
+        return SldResponse.success("删除失败");
     }
 
     @ApiOperation("编辑直播间")
     @PostMapping("/wxBroadcastRoomEdit")
-    public JsonResult wxBroadcastRoomEdit(HttpServletRequest request, @RequestBody LiveBroadcastEditDto liveBroadcastEditDto) {
+    public JsonResult wxBroadcastRoomEdit(HttpServletRequest request, LiveBroadcastDto liveBroadcastDto) {
         try {
-            String access_token = getToken();
             //校验
+            HashMap<String, String> resultMap = new HashMap<>();
+            checkParam(liveBroadcastDto,resultMap);
+            if ("255".equals(resultMap.get("state"))){
+                return SldResponse.fail(resultMap.get("msg"));
+            }
+            if (StringUtils.isEmpty(liveBroadcastDto.getRoomId())){
+                return SldResponse.fail("直播间id不能为空");
+            }
+            String access_token = getToken();
             String url = WxLiveUrlEnum.EDIT_LIVE.getUrl()+access_token;
-            String reStr = HttpClientUtil.sendJsonPostNew(url,JSON.toJSONString(liveBroadcastEditDto));
+            liveBroadcastDto.setId(Integer.valueOf(liveBroadcastDto.getRoomId()));
+            String reStr = HttpClientUtil.sendJsonPostNew(url,JSON.toJSONString(liveBroadcastDto));
             JSONObject jsonObject = JSONObject.parseObject(reStr);
             String errCode = jsonObject.getString("errcode");
+
             if (!"0".equals(errCode)){
                 log.warn("直播间编辑失败原因："+reStr);
-                return SldResponse.success("编辑失败");
+                return jsonObject.getString("qrcode_url") != null
+                        ? SldResponse.fail("qrcode_url")
+                        : SldResponse.fail( WxCodeError.WX_CODE.get(errCode));
             }
+
             LiveBroadcast live_broadcast = new LiveBroadcast();
-            PropertyUtils.copyProperties(live_broadcast,liveBroadcastEditDto);
-            live_broadcast.setRoomId(String.valueOf(liveBroadcastEditDto.getId()));
+            PropertyUtils.copyProperties(live_broadcast,liveBroadcastDto);
             liveBroadModel.broadcastRoomEdit(live_broadcast);
         } catch (Exception e) {
             e.printStackTrace();
@@ -246,20 +406,152 @@ public class LiveBroadController extends BaseController {
         try {
             String access_token = getToken();
             //校验
-            String url = WxLiveUrlEnum.GET_PUSH_LIVE.getUrl()+access_token;
-            String reStr = HttpClientUtil.sendJsonPostNew(url,JSON.toJSONString(new HashMap<>().put("id",roomId)));
+            String url = WxLiveUrlEnum.GET_PUSH_LIVE.getUrl()+access_token+"&roomId"+roomId;
+            String reStr = HttpClientUtil.sendGet(url);
+            JSONObject jsonObject = JSONObject.parseObject(reStr);
+            String errCode = jsonObject.getString("errcode");
+            if (!"0".equals(errCode)){
+                return SldResponse.fail(WxCodeError.WX_CODE.get(errCode));
+            }
             return SldResponse.success(reStr);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return SldResponse.success("查询失败");
+        return SldResponse.success("查询成功");
+    }
+
+    @ApiOperation("获取直播间分享二维码")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roomId", value = "房间ID", paramType = "query"),
+    })
+    @GetMapping("/getSharedCode")
+    public JsonResult getSharedCode(HttpServletRequest request,Integer roomId) {
+        try {
+            String access_token = getToken();
+            //校验
+            String url = WxLiveUrlEnum.GET_SHARED_CODE.getUrl()+access_token+"&roomId"+roomId;
+            String reStr = HttpClientUtil.sendGet(url);
+            JSONObject jsonObject = JSONObject.parseObject(reStr);
+            String errCode = jsonObject.getString("errcode");
+            if (!"0".equals(errCode)){
+                return SldResponse.fail(WxCodeError.WX_CODE.get(errCode));
+            }
+            return SldResponse.success(reStr);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SldResponse.success("查询成功");
+    }
+
+    @ApiOperation("开启/关闭直播间官方收录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roomId", value = "房间ID", paramType = "query"),
+            @ApiImplicitParam(name = "isFeedsPublic", value = "是否开启官方收录 【1: 开启，0：关闭】", paramType = "query"),
+    })
+    @GetMapping("/updateFeedPublic")
+    public JsonResult updateFeedPublic(HttpServletRequest request,Integer roomId,Integer isFeedsPublic) {
+        try {
+            String access_token = getToken();
+            //校验
+            String url = WxLiveUrlEnum.UPDATE_FEED_PUBLIC.getUrl()+access_token;
+            HashMap<Object, Object> hashMap = new HashMap<>();
+            hashMap.put("roomId",roomId);
+            hashMap.put("isFeedsPublic",isFeedsPublic);
+            String reStr = HttpClientUtil.sendJsonPostNew(url,JSON.toJSONString(hashMap));
+            JSONObject jsonObject = JSONObject.parseObject(reStr);
+            String errCode = jsonObject.getString("errcode");
+            if (!"0".equals(errCode)){
+                return SldResponse.fail(WxCodeError.WX_CODE.get(errCode));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SldResponse.success("成功");
+    }
+
+    @ApiOperation("开启/关闭回放功能")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roomId", value = "房间ID", paramType = "query"),
+            @ApiImplicitParam(name = "closeReplay", value = "是否关闭回放 【0：开启，1：关闭】", paramType = "query"),
+    })
+    @GetMapping("/updateReplay")
+    public JsonResult updateReplay(HttpServletRequest request,Integer roomId,Integer closeReplay) {
+        try {
+            String access_token = getToken();
+            //校验
+            String url = WxLiveUrlEnum.UPDATE_REPLAY.getUrl()+access_token;
+            HashMap<Object, Object> hashMap = new HashMap<>();
+            hashMap.put("roomId",roomId);
+            hashMap.put("closeReplay",closeReplay);
+            String reStr = HttpClientUtil.sendJsonPostNew(url,JSON.toJSONString(hashMap));
+            JSONObject jsonObject = JSONObject.parseObject(reStr);
+            String errCode = jsonObject.getString("errcode");
+            if (!"0".equals(errCode)){
+                return SldResponse.fail(WxCodeError.WX_CODE.get(errCode));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SldResponse.success("成功");
+    }
+
+    @ApiOperation("开启/关闭客服功能")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roomId", value = "房间ID", paramType = "query"),
+            @ApiImplicitParam(name = "closeKf", value = "是否关闭客服 【0：开启，1：关闭】", paramType = "query"),
+    })
+    @GetMapping("/updateKf")
+    public JsonResult updateKf(HttpServletRequest request,Integer roomId,Integer closeKf) {
+        try {
+            String access_token = getToken();
+            //校验
+            String url = WxLiveUrlEnum.UPDATE_KF.getUrl()+access_token;
+            HashMap<Object, Object> hashMap = new HashMap<>();
+            hashMap.put("roomId",roomId);
+            hashMap.put("closeKf",closeKf);
+            String reStr = HttpClientUtil.sendJsonPostNew(url,JSON.toJSONString(hashMap));
+            JSONObject jsonObject = JSONObject.parseObject(reStr);
+            String errCode = jsonObject.getString("errcode");
+            if (!"0".equals(errCode)){
+                return SldResponse.fail(WxCodeError.WX_CODE.get(errCode));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SldResponse.success("成功");
+    }
+
+    @ApiOperation("开启/关闭直播间全局禁言")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roomId", value = "房间ID", paramType = "query"),
+            @ApiImplicitParam(name = "banComment", value = "1-禁言，0-取消禁言", paramType = "query"),
+    })
+    @GetMapping("/updateComment")
+    public JsonResult updateComment(HttpServletRequest request,Integer roomId,Integer banComment) {
+        try {
+            String access_token = getToken();
+            //校验
+            String url = WxLiveUrlEnum.UPDATE_COMMENT.getUrl()+access_token;
+            HashMap<Object, Object> hashMap = new HashMap<>();
+            hashMap.put("roomId",roomId);
+            hashMap.put("banComment",banComment);
+            String reStr = HttpClientUtil.sendJsonPostNew(url,JSON.toJSONString(hashMap));
+            JSONObject jsonObject = JSONObject.parseObject(reStr);
+            String errCode = jsonObject.getString("errcode");
+            if (!"0".equals(errCode)){
+                return SldResponse.fail(WxCodeError.WX_CODE.get(errCode));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SldResponse.success("成功");
     }
 
-    public static void main(String[] args) {
-        Map map = new HashMap();
-        map.put("start",1);
-        map.put("limit",10);
-        System.out.println(JSON.toJSONString(map));
+    public static void main(String[] args) throws Exception {
+        String a = "s";
+        System.out.println(a.length());
+        String b = "是";
+        System.out.println(b.length());
     }
 
 }

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/live/LiveGoodsController.java

@@ -0,0 +1,103 @@
+package com.slodon.b2b2c.controller.live;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.slodon.b2b2c.controller.common.UploadController;
+import com.slodon.b2b2c.core.constant.ResponseConst;
+import com.slodon.b2b2c.core.controller.BaseController;
+import com.slodon.b2b2c.core.response.JsonResult;
+import com.slodon.b2b2c.core.response.PageVO;
+import com.slodon.b2b2c.core.response.PagerInfo;
+import com.slodon.b2b2c.core.response.SldResponse;
+import com.slodon.b2b2c.core.util.*;
+import com.slodon.b2b2c.enums.WxLiveGoodsEnum;
+import com.slodon.b2b2c.enums.WxLiveUrlEnum;
+import com.slodon.b2b2c.errors.WxCodeError;
+import com.slodon.b2b2c.live.dto.LiveBroadcastDto;
+import com.slodon.b2b2c.live.example.LiveBroadcastExample;
+import com.slodon.b2b2c.live.pojo.LiveBroadcast;
+import com.slodon.b2b2c.live.vo.LivesVO;
+import com.slodon.b2b2c.model.live.LiveBroadModel;
+import com.slodon.b2b2c.seller.pojo.Vendor;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.PropertyUtils;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Api(tags = "admin-微信商品管理")
+@RestController
+@Slf4j
+@RequestMapping("v3/live/seller/goods")
+public class LiveGoodsController extends BaseController {
+
+    private final static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+    @Resource
+    private LiveBroadModel liveBroadModel;
+    @Resource
+    private UploadController uploadController;
+
+    private String getToken() throws Exception {
+        String appId = stringRedisTemplate.opsForValue().get("login_wx_mini_appid");
+        String secret = stringRedisTemplate.opsForValue().get("login_wx_mini_appsecret");
+        String access_token_resp = HttpClientUtil.httpGet(WxLiveUrlEnum.ACCESS_TOKEN_URL.getUrl() + appId + "&secret=" + secret);
+        String access_token = JSON.parseObject(access_token_resp).getString("access_token");
+        AssertUtil.notEmpty(access_token, "微信认证失败");
+        System.out.println("结果access_token: "+access_token);
+        return access_token;
+    }
+
+    @ApiOperation("商品添加并提审")
+    @PostMapping("/add")
+    public JsonResult wxBroadcastRoomCreate(HttpServletRequest request,LiveBroadcastDto liveBroadcastDto) {
+        HashMap<String, String> resultMap = new HashMap<>();
+        try {
+            Vendor vendor = UserUtil.getUser(request, Vendor.class);
+            if (vendor == null || vendor.getVendorId() == null){
+                return SldResponse.fail("获取商户id失败");
+            }
+            liveBroadcastDto.setVendorId(String.valueOf(vendor.getVendorId()));
+            if (String.valueOf(ResponseConst.STATE_FAIL).equals(resultMap.get("state").toString())){
+                return SldResponse.fail(resultMap.get("msg"));
+            }
+            //获取token
+            String access_token = getToken();
+            String url = WxLiveGoodsEnum.ADD.getUrl()+access_token;
+            String reStr = HttpClientUtil.sendJsonPostNew(url,JSON.toJSONString(liveBroadcastDto));
+            JSONObject jsonObject = JSONObject.parseObject(reStr);
+            String errCode = jsonObject.getString("errcode");
+            if (!"0".equals(errCode)){
+                log.warn("直播间添加失败原因："+reStr);
+                return jsonObject.getString("qrcode_url") != null
+                        ? SldResponse.fail("qrcode_url")
+                        : SldResponse.fail( WxCodeError.WX_CODE.get(errCode));
+            }
+            liveBroadcastDto.setRoomId(String.valueOf(jsonObject.get("roomId")));
+            liveBroadModel.broadcastRoomCreate(liveBroadcastDto);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SldResponse.success(resultMap);
+    }
+
+}

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/enums/UploadSourceEnum.java

@@ -28,8 +28,11 @@ public enum UploadSourceEnum {
     ADMIN_BRAND("adminBrand", "admin/brand", UploadConst.BUCKET_NAME_IMAGE, "品牌图片"),//品牌图片
     SETTING("setting", "admin/setting", UploadConst.BUCKET_NAME_IMAGE, "系统设置图片"),//系统设置图片
     ADMIN_DECO("adminDeco", "admin/deco", UploadConst.BUCKET_NAME_IMAGE, "装修图片"),//装修图片
-    FRIEND_PARTNER("friendPartner", "admin/friend", UploadConst.BUCKET_NAME_IMAGE, "合作伙伴图片");//合作伙伴图片
+    FRIEND_PARTNER("friendPartner", "admin/friend", UploadConst.BUCKET_NAME_IMAGE, "合作伙伴图片"),//合作伙伴图片
 
+    //wx直播相关
+    TEMP_IMG("tempImg", "member/tempImg", UploadConst.BUCKET_NAME_IMAGE, "wx临时图片"),//wx临时图片
+    ;
     /**
      * source-enum
      */

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/model/live/LiveBroadModel.java

@@ -51,4 +51,12 @@ public class LiveBroadModel {
         }
         return goodsList;
     }
+
+    public void wxDelLive(Integer roomId) {
+        liveBroadWriteMapper.deleteByPrimaryKey(roomId);
+    }
+
+    public LiveBroadcast getLiveInfo(String roomId) {
+        return liveBroadWriteMapper.getByPrimaryKey(roomId);
+    }
 }

b2b2c/b2b2c-web/src/main/resources/mapper/read/Live/LiveBroadReadMapper.xml

@@ -3,9 +3,10 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.live.LiveBroadWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.live.pojo.LiveBroadcast">
     <id column="roomId" property="roomId" />
-    <result column="name" property="name" />
+    <result column="vendorId" property="vendorId" />
     <result column="name" property="name" />
     <result column="coverImg" property="coverImg" />
+    <result column="coverImgPath" property="coverImgPath" />
     <result column="startTime" property="startTime" />
     <result column="endTime" property="endTime" />
     <result column="anchorName" property="anchorName" />
@@ -13,7 +14,9 @@
     <result column="subAnchorWechat" property="subAnchorWechat" />
     <result column="createrWechat" property="createrWechat" />
     <result column="shareImg" property="shareImg" />
+    <result column="shareImgPath" property="shareImgPath" />
     <result column="feedsImg" property="feedsImg" />
+    <result column="feedsImgPath" property="feedsImgPath" />
     <result column="isFeedsPublic" property="isFeedsPublic" />
     <result column="type" property="type" />
     <result column="closeLike" property="closeLike" />
@@ -30,12 +33,18 @@
       <if test="roomId != null">
         roomId,
       </if>
+      <if test="vendorId != null">
+        vendorId,
+      </if>
       <if test="name != null">
         name,
       </if>
       <if test="coverImg != null">
         coverImg,
       </if>
+      <if test="coverImgPath != null">
+        coverImgPath,
+      </if>
       <if test="startTime != null">
         startTime,
       </if>
@@ -57,9 +66,15 @@
       <if test="shareImg != null">
         shareImg,
       </if>
+      <if test="shareImgPath != null">
+        shareImgPath,
+      </if>
       <if test="feedsImg != null">
         feedsImg,
       </if>
+      <if test="feedsImgPath != null">
+        feedsImgPath,
+      </if>
       <if test="isFeedsPublic != null">
         isFeedsPublic,
       </if>
@@ -95,61 +110,73 @@
     <if test="example != null">
       <trim prefix="WHERE" prefixOverrides="AND|OR">
         <if test="example.roomId != null">
-          AND roomId = ${example.roomId}
+          AND roomId = #{example.roomId}
+        </if>
+        <if test="example.vendorId != null">
+          AND vendorId = #{example.vendorId}
         </if>
         <if test="example.name != null">
           AND name like concat('%',#{example.name},'%')
         </if>
         <if test="example.coverImg != null">
-          AND coverImg = ${example.coverImg}
+          AND coverImg = #{example.coverImg}
+        </if>
+        <if test="example.coverImgPath != null">
+          AND coverImgPath = #{example.coverImgPath}
         </if>
         <if test="example.startTime != null">
-          AND startTime = ${example.startTime}
+          AND startTime = #{example.startTime}
         </if>
         <if test="example.endTime != null">
-          AND endTime = ${example.endTime}
+          AND endTime = #{example.endTime}
         </if>
         <if test="example.anchorName != null">
-          AND anchorName = ${example.anchorName}
+          AND anchorName = #{example.anchorName}
         </if>
         <if test="example.anchorWechat != null">
-          AND anchorWechat = ${example.anchorWechat}
+          AND anchorWechat = #{example.anchorWechat}
         </if>
         <if test="example.subAnchorWechat != null">
-          AND subAnchorWechat = ${example.subAnchorWechat}
+          AND subAnchorWechat = #{example.subAnchorWechat}
         </if>
         <if test="example.createrWechat != null">
-          AND createrWechat = ${example.createrWechat}
+          AND createrWechat = #{example.createrWechat}
         </if>
         <if test="example.shareImg != null">
-          AND shareImg = ${example.shareImg}
+          AND shareImg = #{example.shareImg}
+        </if>
+        <if test="example.shareImgPath != null">
+          AND shareImgPath = #{example.shareImgPath}
         </if>
         <if test="example.feedsImg != null">
-          AND feedsImg = ${example.feedsImg}
+          AND feedsImg = #{example.feedsImg}
+        </if>
+        <if test="example.feedsImgPath != null">
+          AND feedsImgPath = #{example.feedsImgPath}
         </if>
         <if test="example.isFeedsPublic != null">
-          AND isFeedsPublic = ${example.isFeedsPublic}
+          AND isFeedsPublic = #{example.isFeedsPublic}
         </if>
         <if test="example.type != null">
-          AND type = ${example.type}
+          AND type = #{example.type}
         </if>
         <if test="example.closeLike != null">
-          AND closeLike = ${example.closeLike}
+          AND closeLike = #{example.closeLike}
         </if>
         <if test="example.closeGoods != null">
-          AND closeGoods = ${example.closeGoods}
+          AND closeGoods = #{example.closeGoods}
         </if>
         <if test="example.closeComment != null">
-          AND closeComment = ${example.closeComment}
+          AND closeComment = #{example.closeComment}
         </if>
         <if test="example.closeReplay != null">
-          AND closeReplay = ${example.closeReplay}
+          AND closeReplay = #{example.closeReplay}
         </if>
         <if test="example.closeShare != null">
-          AND closeShare = ${example.closeShare}
+          AND closeShare = #{example.closeShare}
         </if>
         <if test="example.closeKf != null">
-          AND closeKf = ${example.closeKf}
+          AND closeKf = #{example.closeKf}
         </if>
 
       </trim>
@@ -160,11 +187,11 @@
     ORDER BY roomId DESC
   </sql>
   <sql id="orderByOther">
-    order by ${example.orderBy}
+    order by #{example.orderBy}
   </sql>
   <!--分组条件-->
   <sql id="groupBy">
-    group by ${example.groupBy}
+    group by #{example.groupBy}
   </sql>
   <!--分页条件-->
   <sql id="limit">
@@ -226,7 +253,7 @@
   <!--查询符合条件的记录(指定字段)-->
   <select id="listFieldsByExample" resultMap="resultMap">
     SELECT
-      ${fields}
+      #{fields}
     FROM live_broadcast
     <include refid="whereCondition" />
     <if test="example.groupBy != null">
@@ -244,7 +271,7 @@
   <!--分页查询符合条件的记录(指定字段)-->
   <select id="listFieldsPageByExample" resultMap="resultMap">
     SELECT
-      ${fields}
+      #{fields}
     FROM live_broadcast
     <include refid="whereCondition" />
     <if test="example.groupBy != null">
@@ -271,68 +298,80 @@
     <include refid="pkWhere" />
   </delete>
   <!--插入一条记录-->
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.slodon.b2b2c.live.pojo.LiveBroadcast" useGeneratedKeys="true">
+  <insert id="insert" keyColumn="roomId" keyProperty="roomId" parameterType="com.slodon.b2b2c.live.pojo.LiveBroadcast" useGeneratedKeys="true">
     INSERT INTO live_broadcast(
     <include refid="columns" />
     )
     VALUES(
     <trim suffixOverrides=",">
       <if test="roomId != null">
-        ${roomId},
+        #{roomId},
+      </if>
+      <if test="vendorId != null">
+        #{vendorId},
       </if>
       <if test="name != null">
-        ${name},
+        #{name},
       </if>
       <if test="coverImg != null">
-        ${coverImg},
+        #{coverImg},
+      </if>
+      <if test="coverImgPath != null">
+        #{coverImgPath},
       </if>
       <if test="startTime != null">
-        ${startTime},
+        #{startTime},
       </if>
       <if test="endTime != null">
-        ${endTime},
+        #{endTime},
       </if>
       <if test="anchorName != null">
-        ${anchorName},
+        #{anchorName},
       </if>
       <if test="anchorWechat != null">
-        ${anchorWechat},
+        #{anchorWechat},
       </if>
       <if test="subAnchorWechat != null">
-        ${subAnchorWechat},
+        #{subAnchorWechat},
       </if>
       <if test="createrWechat != null">
-        ${createrWechat},
+        #{createrWechat},
       </if>
       <if test="shareImg != null">
-        ${shareImg},
+        #{shareImg},
+      </if>
+      <if test="shareImgPath != null">
+        #{shareImgPath},
       </if>
       <if test="feedsImg != null">
-        ${feedsImg},
+        #{feedsImg},
+      </if>
+      <if test="feedsImgPath != null">
+        #{feedsImgPath},
       </if>
       <if test="isFeedsPublic != null">
-        ${isFeedsPublic},
+        #{isFeedsPublic},
       </if>
       <if test="type != null">
-        ${type},
+        #{type},
       </if>
       <if test="closeLike != null">
-        ${closeLike},
+        #{closeLike},
       </if>
       <if test="closeGoods != null">
-        ${closeGoods},
+        #{closeGoods},
       </if>
       <if test="closeComment != null">
-        ${closeComment},
+        #{closeComment},
       </if>
       <if test="closeReplay != null">
-        ${closeReplay},
+        #{closeReplay},
       </if>
       <if test="closeShare != null">
-        ${closeShare},
+        #{closeShare},
       </if>
       <if test="closeKf != null">
-        ${closeKf},
+        #{closeKf},
       </if>
 
     </trim>
@@ -345,12 +384,18 @@
       <if test="record.roomId != null">
         AND roomId = #{record.roomId},
       </if>
+      <if test="record.vendorId != null">
+        AND vendorId = #{record.vendorId},
+      </if>
       <if test="record.name != null">
         AND name = #{record.name},
       </if>
       <if test="record.coverImg != null">
         AND coverImg = #{record.coverImg},
       </if>
+      <if test="record.coverImgPath != null">
+        AND coverImgPath = #{record.coverImgPath},
+      </if>
       <if test="record.startTime != null">
         AND startTime = #{record.startTime},
       </if>
@@ -372,9 +417,15 @@
       <if test="record.shareImg != null">
         AND shareImg = #{record.shareImg},
       </if>
+      <if test="record.shareImgPath != null">
+        AND shareImgPath = #{record.shareImgPath},
+      </if>
       <if test="record.feedsImg != null">
         AND feedsImg = #{record.feedsImg},
       </if>
+      <if test="record.feedsImgPath != null">
+        AND feedsImgPath = #{record.feedsImgPath},
+      </if>
       <if test="record.isFeedsPublic != null">
         AND isFeedsPublic = #{record.isFeedsPublic},
       </if>
@@ -407,62 +458,68 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE live_broadcast
     <trim prefix="SET" suffixOverrides=",">
-      <if test="roomId != null">
-        roomId = #{roomId}
-      </if>
       <if test="name != null">
-        name = #{name}
+        name = #{name},
       </if>
       <if test="coverImg != null">
-        coverImg = #{coverImg}
+        coverImg = #{coverImg},
+      </if>
+      <if test="coverImgPath != null">
+        coverImgPath = #{coverImgPath},
       </if>
       <if test="startTime != null">
-        startTime = #{startTime}
+        startTime = #{startTime},
       </if>
       <if test="endTime != null">
-        endTime = #{endTime}
+        endTime = #{endTime},
       </if>
       <if test="anchorName != null">
-        anchorName = #{anchorName}
+        anchorName = #{anchorName},
       </if>
       <if test="anchorWechat != null">
-        anchorWechat = #{anchorWechat}
+        anchorWechat = #{anchorWechat},
       </if>
       <if test="subAnchorWechat != null">
-        subAnchorWechat = #{subAnchorWechat}
+        subAnchorWechat = #{subAnchorWechat},
       </if>
       <if test="createrWechat != null">
-        createrWechat = #{createrWechat}
+        createrWechat = #{createrWechat},
       </if>
       <if test="shareImg != null">
-        shareImg = #{shareImg}
+        shareImg = #{shareImg},
+      </if>
+      <if test="shareImgPath != null">
+        shareImgPath = #{shareImgPath},
       </if>
       <if test="feedsImg != null">
-        feedsImg = #{feedsImg}
+        feedsImg = #{feedsImg},
+      </if>
+      <if test="feedsImgPath != null">
+        feedsImgPath = #{feedsImgPath},
       </if>
       <if test="isFeedsPublic != null">
-        isFeedsPublic = #{isFeedsPublic}
+        isFeedsPublic = #{isFeedsPublic},
       </if>
       <if test="type != null">
-        type = #{type}
+        type = #{type},
       </if>
       <if test="closeLike != null">
-        closeLike = #{closeLike}
+        closeLike = #{closeLike},
       </if>
       <if test="closeGoods != null">
-        closeGoods = #{closeGoods}
+        closeGoods = #{closeGoods},
       </if>
       <if test="closeComment != null">
-        closeComment = #{closeComment}
+        closeComment = #{closeComment},
       </if>
       <if test="closeReplay != null">
-        closeReplay = #{closeReplay}
+        closeReplay = #{closeReplay},
       </if>
       <if test="closeShare != null">
-        closeShare = #{closeShare}
+        closeShare = #{closeShare},
       </if>
       <if test="closeKf != null">
-        closeKf = #{closeKf}
+        closeKf = #{closeKf},
       </if>
     </trim>
     WHERE roomId = #{roomId}

b2b2c/b2b2c-web/src/main/resources/mapper/write/Live/LiveBroadWriteMapper.xml

@@ -3,9 +3,10 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.live.LiveBroadWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.live.pojo.LiveBroadcast">
     <id column="roomId" property="roomId" />
-    <result column="name" property="name" />
+    <result column="vendorId" property="vendorId" />
     <result column="name" property="name" />
     <result column="coverImg" property="coverImg" />
+    <result column="coverImgPath" property="coverImgPath" />
     <result column="startTime" property="startTime" />
     <result column="endTime" property="endTime" />
     <result column="anchorName" property="anchorName" />
@@ -13,7 +14,9 @@
     <result column="subAnchorWechat" property="subAnchorWechat" />
     <result column="createrWechat" property="createrWechat" />
     <result column="shareImg" property="shareImg" />
+    <result column="shareImgPath" property="shareImgPath" />
     <result column="feedsImg" property="feedsImg" />
+    <result column="feedsImgPath" property="feedsImgPath" />
     <result column="isFeedsPublic" property="isFeedsPublic" />
     <result column="type" property="type" />
     <result column="closeLike" property="closeLike" />
@@ -30,12 +33,18 @@
       <if test="roomId != null">
         roomId,
       </if>
+      <if test="vendorId != null">
+        vendorId,
+      </if>
       <if test="name != null">
         name,
       </if>
       <if test="coverImg != null">
         coverImg,
       </if>
+      <if test="coverImgPath != null">
+        coverImgPath,
+      </if>
       <if test="startTime != null">
         startTime,
       </if>
@@ -57,9 +66,15 @@
       <if test="shareImg != null">
         shareImg,
       </if>
+      <if test="shareImgPath != null">
+        shareImgPath,
+      </if>
       <if test="feedsImg != null">
         feedsImg,
       </if>
+      <if test="feedsImgPath != null">
+        feedsImgPath,
+      </if>
       <if test="isFeedsPublic != null">
         isFeedsPublic,
       </if>
@@ -95,61 +110,73 @@
     <if test="example != null">
       <trim prefix="WHERE" prefixOverrides="AND|OR">
         <if test="example.roomId != null">
-          AND roomId = ${example.roomId}
+          AND roomId = #{example.roomId}
+        </if>
+        <if test="example.vendorId != null">
+          AND vendorId = #{example.vendorId}
         </if>
         <if test="example.name != null">
           AND name like concat('%',#{example.name},'%')
         </if>
         <if test="example.coverImg != null">
-          AND coverImg = ${example.coverImg}
+          AND coverImg = #{example.coverImg}
+        </if>
+        <if test="example.coverImgPath != null">
+          AND coverImgPath = #{example.coverImgPath}
         </if>
         <if test="example.startTime != null">
-          AND startTime = ${example.startTime}
+          AND startTime = #{example.startTime}
         </if>
         <if test="example.endTime != null">
-          AND endTime = ${example.endTime}
+          AND endTime = #{example.endTime}
         </if>
         <if test="example.anchorName != null">
-          AND anchorName = ${example.anchorName}
+          AND anchorName = #{example.anchorName}
         </if>
         <if test="example.anchorWechat != null">
-          AND anchorWechat = ${example.anchorWechat}
+          AND anchorWechat = #{example.anchorWechat}
         </if>
         <if test="example.subAnchorWechat != null">
-          AND subAnchorWechat = ${example.subAnchorWechat}
+          AND subAnchorWechat = #{example.subAnchorWechat}
         </if>
         <if test="example.createrWechat != null">
-          AND createrWechat = ${example.createrWechat}
+          AND createrWechat = #{example.createrWechat}
         </if>
         <if test="example.shareImg != null">
-          AND shareImg = ${example.shareImg}
+          AND shareImg = #{example.shareImg}
+        </if>
+        <if test="example.shareImgPath != null">
+          AND shareImgPath = #{example.shareImgPath}
         </if>
         <if test="example.feedsImg != null">
-          AND feedsImg = ${example.feedsImg}
+          AND feedsImg = #{example.feedsImg}
+        </if>
+        <if test="example.feedsImgPath != null">
+          AND feedsImgPath = #{example.feedsImgPath}
         </if>
         <if test="example.isFeedsPublic != null">
-          AND isFeedsPublic = ${example.isFeedsPublic}
+          AND isFeedsPublic = #{example.isFeedsPublic}
         </if>
         <if test="example.type != null">
-          AND type = ${example.type}
+          AND type = #{example.type}
         </if>
         <if test="example.closeLike != null">
-          AND closeLike = ${example.closeLike}
+          AND closeLike = #{example.closeLike}
         </if>
         <if test="example.closeGoods != null">
-          AND closeGoods = ${example.closeGoods}
+          AND closeGoods = #{example.closeGoods}
         </if>
         <if test="example.closeComment != null">
-          AND closeComment = ${example.closeComment}
+          AND closeComment = #{example.closeComment}
         </if>
         <if test="example.closeReplay != null">
-          AND closeReplay = ${example.closeReplay}
+          AND closeReplay = #{example.closeReplay}
         </if>
         <if test="example.closeShare != null">
-          AND closeShare = ${example.closeShare}
+          AND closeShare = #{example.closeShare}
         </if>
         <if test="example.closeKf != null">
-          AND closeKf = ${example.closeKf}
+          AND closeKf = #{example.closeKf}
         </if>
 
       </trim>
@@ -160,11 +187,11 @@
     ORDER BY roomId DESC
   </sql>
   <sql id="orderByOther">
-    order by ${example.orderBy}
+    order by #{example.orderBy}
   </sql>
   <!--分组条件-->
   <sql id="groupBy">
-    group by ${example.groupBy}
+    group by #{example.groupBy}
   </sql>
   <!--分页条件-->
   <sql id="limit">
@@ -226,7 +253,7 @@
   <!--查询符合条件的记录(指定字段)-->
   <select id="listFieldsByExample" resultMap="resultMap">
     SELECT
-    ${fields}
+    #{fields}
     FROM live_broadcast
     <include refid="whereCondition" />
     <if test="example.groupBy != null">
@@ -244,7 +271,7 @@
   <!--分页查询符合条件的记录(指定字段)-->
   <select id="listFieldsPageByExample" resultMap="resultMap">
     SELECT
-    ${fields}
+    #{fields}
     FROM live_broadcast
     <include refid="whereCondition" />
     <if test="example.groupBy != null">
@@ -271,68 +298,80 @@
     <include refid="pkWhere" />
   </delete>
   <!--插入一条记录-->
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.slodon.b2b2c.live.pojo.LiveBroadcast" useGeneratedKeys="true">
+  <insert id="insert" keyColumn="roomId" keyProperty="roomId" parameterType="com.slodon.b2b2c.live.pojo.LiveBroadcast" useGeneratedKeys="true">
     INSERT INTO live_broadcast(
     <include refid="columns" />
     )
     VALUES(
     <trim suffixOverrides=",">
       <if test="roomId != null">
-        ${roomId},
+        #{roomId},
+      </if>
+      <if test="vendorId != null">
+        #{vendorId},
       </if>
       <if test="name != null">
-        ${name},
+        #{name},
       </if>
       <if test="coverImg != null">
-        ${coverImg},
+        #{coverImg},
+      </if>
+      <if test="coverImgPath != null">
+        #{coverImgPath},
       </if>
       <if test="startTime != null">
-        ${startTime},
+        #{startTime},
       </if>
       <if test="endTime != null">
-        ${endTime},
+        #{endTime},
       </if>
       <if test="anchorName != null">
-        ${anchorName},
+        #{anchorName},
       </if>
       <if test="anchorWechat != null">
-        ${anchorWechat},
+        #{anchorWechat},
       </if>
       <if test="subAnchorWechat != null">
-        ${subAnchorWechat},
+        #{subAnchorWechat},
       </if>
       <if test="createrWechat != null">
-        ${createrWechat},
+        #{createrWechat},
       </if>
       <if test="shareImg != null">
-        ${shareImg},
+        #{shareImg},
+      </if>
+      <if test="shareImgPath != null">
+        #{shareImgPath},
       </if>
       <if test="feedsImg != null">
-        ${feedsImg},
+        #{feedsImg},
+      </if>
+      <if test="feedsImgPath != null">
+        #{feedsImgPath},
       </if>
       <if test="isFeedsPublic != null">
-        ${isFeedsPublic},
+        #{isFeedsPublic},
       </if>
       <if test="type != null">
-        ${type},
+        #{type},
       </if>
       <if test="closeLike != null">
-        ${closeLike},
+        #{closeLike},
       </if>
       <if test="closeGoods != null">
-        ${closeGoods},
+        #{closeGoods},
       </if>
       <if test="closeComment != null">
-        ${closeComment},
+        #{closeComment},
       </if>
       <if test="closeReplay != null">
-        ${closeReplay},
+        #{closeReplay},
       </if>
       <if test="closeShare != null">
-        ${closeShare},
+        #{closeShare},
       </if>
       <if test="closeKf != null">
-        ${closeKf},
+        #{closeKf},
       </if>
 
     </trim>
@@ -345,12 +384,18 @@
       <if test="record.roomId != null">
         AND roomId = #{record.roomId},
       </if>
+      <if test="record.vendorId != null">
+        AND vendorId = #{record.vendorId},
+      </if>
       <if test="record.name != null">
         AND name = #{record.name},
       </if>
       <if test="record.coverImg != null">
         AND coverImg = #{record.coverImg},
       </if>
+      <if test="record.coverImgPath != null">
+        AND coverImgPath = #{record.coverImgPath},
+      </if>
       <if test="record.startTime != null">
         AND startTime = #{record.startTime},
       </if>
@@ -372,9 +417,15 @@
       <if test="record.shareImg != null">
         AND shareImg = #{record.shareImg},
       </if>
+      <if test="record.shareImgPath != null">
+        AND shareImgPath = #{record.shareImgPath},
+      </if>
       <if test="record.feedsImg != null">
         AND feedsImg = #{record.feedsImg},
       </if>
+      <if test="record.feedsImgPath != null">
+        AND feedsImgPath = #{record.feedsImgPath},
+      </if>
       <if test="record.isFeedsPublic != null">
         AND isFeedsPublic = #{record.isFeedsPublic},
       </if>
@@ -407,62 +458,68 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE live_broadcast
     <trim prefix="SET" suffixOverrides=",">
-      <if test="roomId != null">
-        roomId = #{roomId}
-      </if>
       <if test="name != null">
-        name = #{name}
+        name = #{name},
       </if>
       <if test="coverImg != null">
-        coverImg = #{coverImg}
+        coverImg = #{coverImg},
+      </if>
+      <if test="coverImgPath != null">
+        coverImgPath = #{coverImgPath},
       </if>
       <if test="startTime != null">
-        startTime = #{startTime}
+        startTime = #{startTime},
       </if>
       <if test="endTime != null">
-        endTime = #{endTime}
+        endTime = #{endTime},
       </if>
       <if test="anchorName != null">
-        anchorName = #{anchorName}
+        anchorName = #{anchorName},
       </if>
       <if test="anchorWechat != null">
-        anchorWechat = #{anchorWechat}
+        anchorWechat = #{anchorWechat},
       </if>
       <if test="subAnchorWechat != null">
-        subAnchorWechat = #{subAnchorWechat}
+        subAnchorWechat = #{subAnchorWechat},
       </if>
       <if test="createrWechat != null">
-        createrWechat = #{createrWechat}
+        createrWechat = #{createrWechat},
       </if>
       <if test="shareImg != null">
-        shareImg = #{shareImg}
+        shareImg = #{shareImg},
+      </if>
+      <if test="shareImgPath != null">
+        shareImgPath = #{shareImgPath},
       </if>
       <if test="feedsImg != null">
-        feedsImg = #{feedsImg}
+        feedsImg = #{feedsImg},
+      </if>
+      <if test="feedsImgPath != null">
+        feedsImgPath = #{feedsImgPath},
       </if>
       <if test="isFeedsPublic != null">
-        isFeedsPublic = #{isFeedsPublic}
+        isFeedsPublic = #{isFeedsPublic},
       </if>
       <if test="type != null">
-        type = #{type}
+        type = #{type},
       </if>
       <if test="closeLike != null">
-        closeLike = #{closeLike}
+        closeLike = #{closeLike},
       </if>
       <if test="closeGoods != null">
-        closeGoods = #{closeGoods}
+        closeGoods = #{closeGoods},
       </if>
       <if test="closeComment != null">
-        closeComment = #{closeComment}
+        closeComment = #{closeComment},
       </if>
       <if test="closeReplay != null">
-        closeReplay = #{closeReplay}
+        closeReplay = #{closeReplay},
       </if>
       <if test="closeShare != null">
-        closeShare = #{closeShare}
+        closeShare = #{closeShare},
       </if>
       <if test="closeKf != null">
-        closeKf = #{closeKf}
+        closeKf = #{closeKf},
       </if>
     </trim>
     WHERE roomId = #{roomId}

b2b2c/b2b2c-web/src/test/com/slodon/b2b2c/controller/job/ScheduleTaskControllerTest.java

@@ -1,20 +0,0 @@
-package com.slodon.b2b2c.controller.job;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class ScheduleTaskControllerTest {
-
-    @Autowired
-    private ScheduleTaskController taskController;
-
-    @Test
-    public void getJobSystemSendStockWarnRemind(){
-        taskController.jobSystemSendStockWarnRemind();
-    }
-}

b2b2c/sql/建表语句.sql

@@ -2,7 +2,9 @@ DROP TABLE IF EXISTS live_broadcast;
 CREATE TABLE live_broadcast  (
   roomId varchar(50) NOT NULL COMMENT '房间ID' ,
   name varchar(50) NOT NULL COMMENT '直播间名字，最短3个汉字，最长17个汉字，1个汉字相当于2个字符',
-  coverImg varchar(50) NOT NULL COMMENT '背景图，填入mediaID（mediaID获取后，三天内有效）；图片 mediaID 的获取，请参考以下文档： https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/New_temporary_materials.html；直播间背景图，图片规则：建议像素1080*1920，大小不超过2M',
+  coverImg varchar(50) NOT NULL COMMENT '背景图，填入mediaID（mediaID获取后，三天内有效）；图片 mediaID 的获取，请参考以下文档： https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/
+  New_temporary_materials.html；直播间背景图，图片规则：建议像素1080*1920，大小不超过2M',
+  coverImgPath varchar(50) NOT NULL COMMENT '背景图 本地相对路径',
   startTime bigint(20) NOT NULL COMMENT '直播计划开始时间（开播时间需要在当前时间的10分钟后 并且 开始时间不能在 6 个月后）',
   endTime bigint(20) NOT NULL COMMENT '直播计划结束时间（开播时间和结束时间间隔不得短于30分钟，不得超过24小时）',
   anchorName varchar(50) NOT NULL COMMENT '主播昵称，最短2个汉字，最长15个汉字，1个汉字相当于2个字符',
@@ -10,7 +12,9 @@ CREATE TABLE live_broadcast  (
   subAnchorWechat varchar(50)  COMMENT '主播副号微信号，如果未实名认证，需要先前往“小程序直播”小程序进行实名验证, 小程序二维码链接：https://res.wx.qq.com/op_res/9rSix1dhHfK4rR049JL0PHJ7TpOvkuZ3mE0z7Ou_Etvjf-w1J_jVX0rZqeStLfwh',
   createrWechat varchar(50)  COMMENT '创建者微信号，不传入则此直播间所有成员可见。传入则此房间仅创建者、管理员、超管、直播间主播可见',
   shareImg varchar(50) NOT NULL COMMENT '分享图，填入mediaID（mediaID获取后，三天内有效）；图片 mediaID 的获取，请参考以下文档： https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/New_temporary_materials.html；直播间分享图，图片规则：建议像素800*640，大小不超过1M；',
+  shareImgPath varchar(50) NOT NULL COMMENT '分享图 本地相对路径',
   feedsImg varchar(50) NOT NULL COMMENT '购物直播频道封面图，填入mediaID（mediaID获取后，三天内有效）；图片 mediaID 的获取，请参考以下文档： https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/New_temporary_materials.html; 购物直播频道封面图，图片规则：建议像素800*800，大小不超过100KB；',
+  feedsImgPath varchar(50) NOT NULL COMMENT '购物直播频道封面图 本地相对路径',
   isFeedsPublic int(11) NOT NULL DEFAULT 1 COMMENT '是否开启官方收录 【1: 开启，0：关闭】，默认开启收录',
   type  int(11) NOT NULL  COMMENT '直播间类型 【1: 推流，0：手机直播】',
   closeLike int(11) NOT NULL  COMMENT '是否关闭点赞 【0：开启，1：关闭】（若关闭，观众端将隐藏点赞按钮，直播开始后不允许开启）',
@@ -19,5 +23,6 @@ CREATE TABLE live_broadcast  (
   closeReplay int(11) NOT NULL DEFAULT 1 COMMENT '是否关闭回放 【0：开启，1：关闭】默认关闭回放（直播开始后允许开启）',
   closeShare  int(11) NOT NULL DEFAULT 0 COMMENT '是否关闭分享 【0：开启，1：关闭】默认开启分享（直播开始后不允许修改）',
   closeKf int(11) NOT NULL DEFAULT 1 COMMENT '是否关闭客服 【0：开启，1：关闭】 默认关闭客服（直播开始后允许开启）',
+  liveStatus int(11) NOT NULL DEFAULT 0 COMMENT '直播间状态。101：直播中，102：未开始，103已结束，104禁播，105：暂停，106：异常，107：已过期',
   PRIMARY KEY (roomId) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '直播信息表' ROW_FORMAT = Dynamic;

b2b2c/sql/项目修改语句.sql

@@ -18,4 +18,21 @@ update sys_setting set value = '647d35cc24fc7996003168d44ea91a43' where name = '
 update sys_setting set value='acAcsnklknskfnslalcn134643sljlda' where title='微信apikey';
 update sys_setting set value='wx43aba958092afe0c' where title='微信appid';
 update sys_setting set value='647d35cc24fc7996003168d44ea91a43' where title='微信appSecret';
-update sys_setting set value='1489871402' where title='微信商户号';
+update sys_setting set value='1489871402' where title='微信商户号';
+
+--添加直播
+update vendor_resources set state = 2 where resources_id in(471,472,473);
+INSERT INTO `vendor_resources`
+select max(resources_id)+1 resources_id,0, '/', '直播', '2020-12-30 17:31:52', 1, 1, '/' from vendor_resources;
+INSERT INTO `vendor_resources`
+select max(resources_id)+1 resources_id,max(resources_id), '/', '直播', '2020-12-30 17:32:45', 1, 2, '/live' from vendor_resources;
+INSERT INTO `vendor_resources`
+select max(resources_id)+1 resources_id,max(resources_id), '/', '直播列表', '2020-12-30 17:33:30', 1, 3, '/live/decorate_live' from vendor_resources;
+
+-- 根据vendor_resources 配置
+-- INSERT INTO `b2b2c`.`vendor_resources_roles`
+-- select max(resources_roles_id)+1 resources_roles_id,680, 2,'2021-04-22 15:25:28' from vendor_resources_roles ;
+-- INSERT INTO `b2b2c`.`vendor_resources_roles`
+-- select max(resources_roles_id)+1 resources_roles_id,681, 2,'2021-04-22 15:25:28' from vendor_resources_roles ;
+-- INSERT INTO `b2b2c`.`vendor_resources_roles`
+-- select max(resources_roles_id)+1 resources_roles_id,682, 2,'2021-04-22 15:25:28' from vendor_resources_roles ;