feats

src/main/java/com/yunzhi/marketing/common/WorkWxUtils.java

@@ -3,6 +3,7 @@ package com.yunzhi.marketing.common;
 import com.alibaba.fastjson.JSONObject;
 import com.yunzhi.marketing.config.WorkConfig;
 import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl;
 import me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,19 +34,24 @@ public class WorkWxUtils {
             throw new Exception("房间号或者人员openid不能为空");
         }
 
-        String url = "/cgi-bin/living/get_living_code";
-        JSONObject params = new JSONObject();
-        params.put("livingid", livingid);
-        params.put("openid", openid);
+        try {
+            String url = wxCpService.getWxCpConfigStorage().getApiUrl("/cgi-bin/living/get_living_code");
+            JSONObject params = new JSONObject();
+            params.put("livingid", livingid);
+            params.put("openid", openid);
 
-        String response = wxCpService.post(url, params.toJSONString());
-        JSONObject result = JSONObject.parseObject(response);
-
-        String errmsg = result.getString("errmsg");
-        if ("ok".equals(errmsg)) {
+            String response = wxCpService.post(url, params.toJSONString());
+            JSONObject result = JSONObject.parseObject(response);
             return result.getString("living_code");
-        } else {
-            throw new Exception(String.format("获取直播凭证失败: %s", errmsg));
+        } catch (WxErrorException e) {
+            if (90601 == e.getError().getErrorCode()) {
+                throw new Exception("直播房间不存在");
+            } else {
+                throw new Exception(String.format("获取直播凭证失败: %s", e.getError().getErrorMsg()));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw e;
         }
     }
 }

src/main/java/com/yunzhi/marketing/xlk/dto/VideoDTO.java

@@ -60,4 +60,8 @@ public class VideoDTO implements Serializable {
     @TableField("WEIGHT")
     private Integer weight;
 
+    /**
+     * 是否新房
+     */
+    private Boolean isNewHouse;
 }