feats

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

@@ -78,6 +78,11 @@ public class CommConstant {
      */
     public final static String FAVOR_ACTIVITY = "activity";
 
+    /**
+     * 课程点赞
+     */
+    public final static String FAVOR_CURRICULUM = "curriculum";
+
 
     /**
      * 兑换商品
@@ -923,4 +928,12 @@ public class CommConstant {
      * 系统参数  通知消息次时间间隔
      */
     public static final String SYSPARAM_NOTICE_MESSAGE_INTERVAL = "notice_message_interval";
+
+
+    /**
+     * 课程授权人员类型
+     */
+    public static final String CURRICULUM_TYPE_AGENT = "1";
+    public static final String CURRICULUM_TYPE_COUSULTANT = "2";
+    public static final String CURRICULUM_TYPE_COUSULTANT_AND_AGENT = "3";
 }

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

@@ -11,6 +11,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 @Slf4j
 @Component
 @EnableConfigurationProperties(WorkConfig.class)
@@ -31,12 +35,22 @@ public class WorkWxUtils {
     }
 
     /**
-     * 获取房间ID
+     * 依据手机号获取人员信息
+     * @param mobile
+     * @return
+     * @throws WxErrorException
+     */
+    public String getUserByPhone(String mobile) throws WxErrorException {
+        return wxCpService.getUserService().getUserId(mobile);
+    }
+
+    /**
+     * 获取人员直播房间列表
      * @param userId
      * @return
      * @throws Exception
      */
-    public JSONObject getLastLivingInfo(String userId) throws Exception {
+    public List<JSONObject> getLivingRoomsOfUser(String userId) throws Exception {
         if (StringUtils.isEmpty(userId)) {
             throw new Exception("未指定用户ID");
         }
@@ -44,21 +58,24 @@ public class WorkWxUtils {
         try {
             JSONObject params = new JSONObject();
             params.put("userid", userId);
-            params.put("limit", 10);
-            JSONObject result = post("/cgi-bin/living/get_user_all_livingid", params);
-            JSONArray lst = result.getJSONArray("livingid_list");
-            String livingId = lst.size() > 0 ? (String) lst.get(0) : null;
+            params.put("limit", 20);
+            JSONObject response = post("/cgi-bin/living/get_user_all_livingid", params);
+            JSONArray lst = response.getJSONArray("livingid_list");
 
-            if (!StringUtils.isEmpty(livingId)) {
-                JSONObject res = post("/cgi-bin/living/get_living_info?livingid="+StringUtils.urlEncode(livingId), null);
-                JSONObject liveInfo = res.getJSONObject("living_info");
-                if (null != liveInfo) {
-                    liveInfo.put("livingid", livingId);
+            List<JSONObject> rtn = new ArrayList<>();
+            if (lst.size() > 0) {
+                for (int i = 0; i < lst.size(); i++) {
+                    String livingId = lst.get(i).toString();
+                    JSONObject res = post("/cgi-bin/living/get_living_info?livingid="+StringUtils.urlEncode(livingId), null);
+                    JSONObject liveInfo = res.getJSONObject("living_info");
+                    if (null != liveInfo) {
+                        liveInfo.put("livingid", livingId);
+                        rtn.add(liveInfo);
+                    }
                 }
-                return  liveInfo;
             }
 
-            return null;
+            return rtn;
         } catch (WxErrorException e) {
             if (90601 == e.getError().getErrorCode()) {
                 throw new Exception("直播房间不存在");
@@ -71,6 +88,36 @@ public class WorkWxUtils {
         }
     }
 
+    /**
+     * 获取房间信息
+     * @param livingId
+     * @return
+     * @throws Exception
+     */
+    public JSONObject getLivingInfoById(String livingId) throws Exception {
+        if (StringUtils.isEmpty(livingId)) {
+            throw new Exception("未指定房间ID");
+        }
+
+        try {
+            JSONObject res = post("/cgi-bin/living/get_living_info?livingid="+StringUtils.urlEncode(livingId), null);
+            JSONObject liveInfo = res.getJSONObject("living_info");
+            if (null != liveInfo) {
+                liveInfo.put("livingid", livingId);
+            }
+            return  liveInfo;
+        } 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;
+        }
+    }
+
     /**
      * 获取直播授权码
      * @param livingid
@@ -87,8 +134,8 @@ public class WorkWxUtils {
             JSONObject params = new JSONObject();
             params.put("livingid", livingid);
             params.put("openid", openid);
-            JSONObject result = post("/cgi-bin/living/get_living_code", params);
-            return result.getString("living_code");
+            JSONObject response = post("/cgi-bin/living/get_living_code", params);
+            return response.getString("living_code");
         } catch (WxErrorException e) {
             if (90601 == e.getError().getErrorCode()) {
                 throw new Exception("直播房间不存在");

src/main/java/com/yunzhi/marketing/controller/TaLiveActivityController.java

@@ -307,16 +307,16 @@ public class TaLiveActivityController extends BaseController {
     }
 
     @GetMapping("/wx/taLiveActivity/work/livingCode")
-    public ResponseBean getWorkLivingCode(@RequestParam("user") String user,
+    public ResponseBean getWorkLivingCode(@RequestParam("livingId") String livingId,
                                           HttpServletRequest request) {
         String openid = getOpenId(request);
         try {
-            JSONObject liveInfo = workWxUtils.getLastLivingInfo(user);
+            JSONObject liveInfo = workWxUtils.getLivingInfoById(livingId);
             if (null == liveInfo) {
                 return ResponseBean.error("未找到直播房间", ResponseBean.ERROR_UNAVAILABLE);
             }
 
-            String livingCode = workWxUtils.getLivingCode(liveInfo.getString("livingid"), openid);
+            String livingCode = workWxUtils.getLivingCode(livingId, openid);
             liveInfo.put("livingCode", livingCode);
 
             return ResponseBean.success(liveInfo);
@@ -324,4 +324,11 @@ public class TaLiveActivityController extends BaseController {
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
+
+    @GetMapping("/admin/taLiveActivity/work/rooms")
+    public ResponseBean getWorkLivingRooms(@RequestParam("phone") String phone,
+                                          HttpServletRequest request) throws Exception {
+        String userid = workWxUtils.getUserByPhone(phone);
+        return ResponseBean.success(workWxUtils.getLivingRoomsOfUser(userid));
+    }
 }

src/main/java/com/yunzhi/marketing/service/ITaSaveService.java

@@ -24,4 +24,5 @@ public interface ITaSaveService extends IService<TaSave> {
     List<String> getTargesOfPerson(String personId, String tagertType);
 
     TaSave getInfoBy(String personId, String tagertType, String savedTarget);
+
 }

src/main/java/com/yunzhi/marketing/service/impl/TaUvServiceImpl.java

@@ -12,6 +12,7 @@ import com.yunzhi.marketing.mapper.TaPersonMapper;
 import com.yunzhi.marketing.mapper.TaUvMapper;
 import com.yunzhi.marketing.service.ITaUvService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.xlk.mapper.CurriculumMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -37,6 +38,9 @@ public class TaUvServiceImpl extends ServiceImpl<TaUvMapper, TaUv> implements IT
     @Autowired
     TaBuildingMapper buildingMapper;
 
+    @Autowired
+    CurriculumMapper curriculumMapper;
+
     @Override
     public ResponseBean saveData(String openid, String typeOf, String id) {
         List<TaPerson> persons = getPersonsByOpenId(openid);
@@ -84,10 +88,14 @@ public class TaUvServiceImpl extends ServiceImpl<TaUvMapper, TaUv> implements IT
         }
 
         // 如果是点赞置业, 则人员点赞 + 1
-        if (typeOf.equals(CommConstant.FAVOR_CONSULTANT)) {
+        if (CommConstant.FAVOR_CONSULTANT.equals(typeOf)) {
             taPersonMapper.setFieldIncrement(id,"hot_num", 1);
         }
 
+        if (CommConstant.FAVOR_CURRICULUM.equals(typeOf)) {
+            curriculumMapper.setFieldIncrement(id,"look_num", 1);
+        }
+
         return ResponseBean.success("");
     }
 

src/main/java/com/yunzhi/marketing/xlk/controller/CurriculumController.java

@@ -6,9 +6,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.entity.TaSave;
 import com.yunzhi.marketing.service.ITaPersonService;
+import com.yunzhi.marketing.service.ITaSaveService;
+import com.yunzhi.marketing.service.ITaUvService;
 import com.yunzhi.marketing.xlk.dto.CurriculumDTO;
 import com.yunzhi.marketing.xlk.entity.Brand;
 import com.yunzhi.marketing.xlk.entity.Video;
@@ -54,6 +58,12 @@ public class CurriculumController extends BaseController {
     @Autowired
     public ITaPersonService taPersonService;
 
+    @Autowired
+    public ITaUvService iTaUvService;
+
+    @Autowired
+    public ITaSaveService iTaSaveService;
+
 
     /**
      * 分页查询列表
@@ -199,22 +209,16 @@ public class CurriculumController extends BaseController {
     @ApiOperation(value = "wx-查询课程表列表", notes = "wx-查询课程表列表")
     @RequestMapping(value="/wx/curriculum",method= RequestMethod.GET)
     public ResponseBean wxCurriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                       @RequestParam(value ="name",required = false) String name,
-                                       @RequestParam(value ="roleId",required = false) Integer roleId,
-                                       @RequestHeader("authorization") String token, HttpServletRequest request){
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value ="name",required = false) String name,
+                                         @RequestHeader("authorization") String token,
+                                         HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        TaPerson person = taPersonService.getById(getPersonId(request));
         try {
             //使用分页插件
             IPage<Curriculum> pg = new Page<>(pageNum, pageSize);
-            LambdaQueryWrapper<Curriculum> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(Curriculum::getOrgId,getOrgId(request));
-            queryWrapper.eq(!StringUtils.isEmpty(name),Curriculum::getName,name);
-            queryWrapper.eq(null != roleId,Curriculum::getRoleId,roleId);
-            queryWrapper.orderByDesc(Curriculum::getWeight);
-            queryWrapper.orderByDesc(Curriculum::getCreatedTime);
-
-            IPage<Curriculum> result = iCurriculumService.page(pg, queryWrapper);
+            IPage<Curriculum> result = iCurriculumService.getWxList(pg, name, person);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -233,8 +237,8 @@ public class CurriculumController extends BaseController {
     @ApiOperation(value = "wx-查询我收藏的课程表列表", notes = "wx-查询我收藏的课程表列表")
     @RequestMapping(value="/wx/curriculum/save",method= RequestMethod.GET)
     public ResponseBean saveCurriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                         @RequestHeader("authorization") String token, HttpServletRequest request){
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
 
@@ -261,12 +265,23 @@ public class CurriculumController extends BaseController {
     @ApiOperation(value = "wx-根据id查询课程表详情", notes = "wx-根据id查询课程表详情")
     @RequestMapping(value="/wx/curriculum/{id}",method= RequestMethod.GET)
     public ResponseBean curriculum(@PathVariable String id,
-                                      @RequestHeader("authorization") String token, HttpServletRequest request){
+                                   @RequestHeader("authorization") String token,
+                                   HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             Curriculum curriculum = iCurriculumService.getById(id);
-            curriculum.setLookNum(curriculum.getLookNum() + 1);
-            iCurriculumService.updateById(curriculum);
+            TaPerson person = taPersonService.getById(getPersonId(request));
+
+            if (!checkRights(person.getPersonType(), curriculum.getRoleId())) {
+                return ResponseBean.error("您暂无权限查看当前课程", ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+            TaSave taSave = iTaSaveService.getInfoBy(getPersonId(request), CommConstant.FAVOR_CURRICULUM, id);
+            curriculum.setIsSaved(null != taSave);
+
+            // 记录 UV
+            iTaUvService.saveData(getOpenId(request), CommConstant.FAVOR_CURRICULUM, id);
+
             responseBean.addSuccess(curriculum);
         }catch (Exception e){
             e.printStackTrace();
@@ -275,4 +290,21 @@ public class CurriculumController extends BaseController {
         }
         return responseBean;
     }
+
+    private boolean checkRights(String personType, String requireRole) {
+        if (null == requireRole) {
+            return false;
+        }
+
+        switch (requireRole) {
+            case CommConstant.CURRICULUM_TYPE_COUSULTANT_AND_AGENT:
+                return CommConstant.PERSON_ESTATE_CHANNEL.equals(personType) || CommConstant.PERSON_REALTY_CONSULTANT.equals(personType);
+            case CommConstant.CURRICULUM_TYPE_COUSULTANT:
+                return CommConstant.PERSON_REALTY_CONSULTANT.equals(personType);
+            case CommConstant.CURRICULUM_TYPE_AGENT:
+                return CommConstant.PERSON_ESTATE_CHANNEL.equals(personType);
+            default:
+                return false;
+        }
+    }
 }

src/main/java/com/yunzhi/marketing/xlk/entity/Curriculum.java

@@ -113,5 +113,9 @@ public class Curriculum implements java.io.Serializable {
      */
     private Integer isPublish;
 
-
+    /**
+     * 是否收藏
+     */
+    @TableField(exist = false)
+    private Boolean isSaved;
 }

src/main/java/com/yunzhi/marketing/xlk/mapper/CurriculumMapper.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 课程表  Mapper 接口
@@ -17,5 +19,9 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface CurriculumMapper extends BaseMapper<Curriculum> {
 
+    IPage<Curriculum> getWxList(IPage<Curriculum> pg, @Param("orgId") Integer orgId, @Param("name") String name, @Param("roleList") List<String> roleList);
+
     IPage<Curriculum> selectMySaveList(IPage<Curriculum> pg,@Param("personId") String personId);
+
+    int setFieldIncrement(@Param("curriculumId") String curriculumId, @Param("field") String field, @Param("increment") int increment);
 }

src/main/java/com/yunzhi/marketing/xlk/service/ICurriculumService.java

@@ -24,4 +24,6 @@ public interface ICurriculumService extends IService<Curriculum> {
      * @return
      */
     IPage<Curriculum> selectMySaveList(Integer pageNum, Integer pageSize, TaPerson person);
+
+    IPage<Curriculum> getWxList(IPage<Curriculum> pg, String name, TaPerson person);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/CurriculumServiceImpl.java

@@ -2,6 +2,7 @@ package com.yunzhi.marketing.xlk.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.xlk.entity.Curriculum;
 import com.yunzhi.marketing.xlk.mapper.CurriculumMapper;
@@ -10,6 +11,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.xlk.vo.SearchHouseVO;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 课程表  服务实现类
@@ -35,4 +39,21 @@ public class CurriculumServiceImpl extends ServiceImpl<CurriculumMapper, Curricu
         IPage<Curriculum> result = this.baseMapper.selectMySaveList(pg,person.getPersonId());
         return result;
     }
+
+    @Override
+    public IPage<Curriculum> getWxList(IPage<Curriculum> pg, String name, TaPerson person) {
+        List<String> roleList = new ArrayList<>();
+        if (CommConstant.PERSON_REALTY_CONSULTANT.equals(person.getPersonType())) {
+            roleList.add(CommConstant.CURRICULUM_TYPE_COUSULTANT);
+            roleList.add(CommConstant.CURRICULUM_TYPE_COUSULTANT_AND_AGENT);
+        } else if (CommConstant.PERSON_ESTATE_CHANNEL.equals(person.getPersonType())) {
+            roleList.add(CommConstant.CURRICULUM_TYPE_AGENT);
+            roleList.add(CommConstant.CURRICULUM_TYPE_COUSULTANT_AND_AGENT);
+        } else {
+            roleList.add("*");
+        }
+
+        IPage<Curriculum> result = this.baseMapper.getWxList(pg, person.getOrgId(), name, roleList);
+        return result;
+    }
 }

src/main/resources/mapper/xlk/CurriculumMapper.xml

@@ -1,15 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.marketing.xlk.mapper.CurriculumMapper">
+    <update id="setFieldIncrement">
+        UPDATE xlk_curriculum
+        SET ${field} = IFNULL(${field}, 0) + #{increment}
+        WHERE curriculum_id = #{curriculumId}
+    </update>
 
     <select id="selectMySaveList" resultType="com.yunzhi.marketing.xlk.entity.Curriculum">
+        SELECT
+            x.*
+        FROM
+            ta_save t
+                LEFT JOIN xlk_curriculum x ON t.save_id = x.curriculum_id
+        WHERE
+            t.saved_target = "curriculum"
+          AND t.person_id = #{personId}
+    </select>
+
+    <select id="getWxList" resultType="com.yunzhi.marketing.xlk.entity.Curriculum">
         SELECT
         x.*
         FROM
-        ta_save t
-        LEFT JOIN xlk_curriculum x ON t.save_id = x.curriculum_id
+        xlk_curriculum x
         WHERE
-        t.saved_target = "curriculum"
-        AND t.person_id = #{personId}
+        x.ORG_ID = #{orgId}
+        AND x.is_publish = 1
+        <if test="name != null and name != ''">
+            AND x.`name` like concat('%', #{name},'%')
+        </if>
+        AND x.role_id in
+        <foreach collection="roleList" item="role" open="(" close=")" separator=",">
+            #{role}
+        </foreach>
+        ORDER BY x.WEIGHT DESC, CREATED_TIME DESC
     </select>
 </mapper>