代码调整

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

@@ -12,6 +12,7 @@ import com.yunzhi.marketing.center.taUser.service.ITaUserService;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.SMSUtils;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.dto.PersonMarketingDTO;
 import com.yunzhi.marketing.entity.TaChannel;
 import com.yunzhi.marketing.entity.TaChannelPerson;
 import com.yunzhi.marketing.entity.TaPerson;
@@ -22,6 +23,8 @@ import com.yunzhi.marketing.service.TaChannelPersonService;
 import com.yunzhi.marketing.service.TaChannelService;
 import com.yunzhi.marketing.third.entity.TaThirdPartyMiniappConfig;
 import com.yunzhi.marketing.third.service.ITaThirdPartyMiniappConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
@@ -43,6 +46,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "微信用户表", tags = "xlk-微信用户表")
 public class TaPersonController extends BaseController {
     @Autowired
     ITaPersonService taPersonService;
@@ -377,6 +381,17 @@ public class TaPersonController extends BaseController {
         return null;
     }
 
+    /**
+     * 成为驻场顾问
+     *
+     */
+    @ApiOperation(value = "wx-成为驻场顾问", notes = "admin-成为驻场顾问")
+    @PostMapping("/wx/marketing")
+    public ResponseBean marketing(@RequestBody PersonMarketingDTO marketingDTO, HttpServletRequest request) {
+        // 当前人员
+        String openid = getOpenId(request);
+        return taPersonService.marketing(marketingDTO,openid);
+    }
 
     /**
      *

src/main/java/com/yunzhi/marketing/dto/PersonMarketingDTO.java

@@ -0,0 +1,9 @@
+package com.yunzhi.marketing.dto;
+
+import lombok.Data;
+
+@Data
+public class PersonMarketingDTO {
+
+    private String marketingCode;
+}

src/main/java/com/yunzhi/marketing/entity/TaBuilding.java

@@ -365,6 +365,11 @@ public class TaBuilding implements Serializable {
     /** 供暖 */
     private String heatingSupply ;
 
+    /**
+     * 驻场code
+     */
+    private String marketingCode;
+
     /**
      * 项目亮点封面
      */

src/main/java/com/yunzhi/marketing/po/LiveAndVideoVO.java

@@ -20,4 +20,6 @@ public class LiveAndVideoVO {
     private String type;
 
     private String kind;
+
+    private String images;
 }

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

@@ -4,6 +4,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.dto.PersonMarketingDTO;
 import com.yunzhi.marketing.entity.TaCustomerFrom;
 import com.yunzhi.marketing.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -121,4 +122,12 @@ public interface ITaPersonService extends IService<TaPerson> {
                    TaCustomerFrom customerFrom) throws Exception;
 
     ResponseBean updateUserPhoto(String photoUrl, String openId);
+
+    /**
+     * 成为驻场顾问
+     * @param marketingDTO
+     * @param openid
+     * @return
+     */
+    ResponseBean marketing(PersonMarketingDTO marketingDTO, String openid);
 }

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

@@ -2,6 +2,7 @@ package com.yunzhi.marketing.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -126,6 +127,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private IExtendContentService iExtendContentService;
 
+    private String MARKETING_CODE;
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -574,6 +576,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setStatus(2);
         building.setOrgId(orgId);
         building.setName(building.getBuildingName());
+        // 生成楼盘驻场码
+        getMyMarktingCode();
+        building.setMarketingCode(MARKETING_CODE);
         if (taBuildingMapper.insert(building) < 1) {
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -681,6 +686,22 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         return ResponseBean.success("");
     }
 
+    /**
+     * 生成六位推荐码 重复重新生成
+     * @return
+     */
+    private void getMyMarktingCode() {
+        String code = String.valueOf((int) ((Math.random() * 9 + 1) * Math.pow(10, 5)));
+        // 查询这个code 在库里存不存在
+        LambdaQueryWrapper<TaBuilding> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaBuilding::getMarketingCode,code);
+        List<TaBuilding> userInfos = taBuildingMapper.selectList(queryWrapper);
+        if (userInfos.size() > 0){
+            getMyMarktingCode();
+        }
+        MARKETING_CODE = code;
+    }
+
     @Override
     public ResponseBean buildingdelete(String id, Integer orgId) {
         TaBuilding building = new TaBuilding();

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

@@ -2,6 +2,7 @@ package com.yunzhi.marketing.service.impl;
 
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,6 +15,7 @@ import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.DateUtils;
 import com.yunzhi.marketing.common.MD5Utils;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.dto.PersonMarketingDTO;
 import com.yunzhi.marketing.event.EventBus;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.entity.*;
@@ -1292,4 +1294,40 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         responseBean.addSuccess("修改成功");
         return responseBean;
     }
+
+    /**
+     * 成为驻场顾问
+     *
+     * @param marketingDTO
+     * @param openid
+     * @return
+     */
+    @Override
+    public ResponseBean marketing(PersonMarketingDTO marketingDTO, String openid) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaPerson taPerson = taPersons.get(0);
+
+        // 校验marketingCode 是否正确
+        LambdaQueryWrapper<TaBuilding> taBuildingLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        taBuildingLambdaQueryWrapper.eq(TaBuilding::getMarketingCode,marketingDTO.getMarketingCode());
+        TaBuilding taBuilding = taBuildingMapper.selectOne(taBuildingLambdaQueryWrapper);
+        if (null == taBuilding){
+            return ResponseBean.error("不合法的驻场码", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        // 成为驻场顾问并绑定楼盘
+        taPerson.setPersonType("marketing");
+        taPersonMapper.updateById(taPerson);
+
+        TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+        taPersonBuilding.setBuildingId(taBuilding.getBuildingId());
+        taPersonBuilding.setPersonId(taPerson.getPersonId());
+        taPersonBuilding.setCreateDate(LocalDateTime.now());
+        taPersonBuildingMapper.insert(taPersonBuilding);
+
+        return ResponseBean.success("绑定成功");
+    }
 }

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -76,6 +76,7 @@
             t.live_activity_title AS title,
             t.live_start_date AS start_time,
             t.live_end_date AS end_time,
+            t.detail_img as images,
             a.building_name,
             b.NAME AS city_name,
             "live" as type
@@ -93,6 +94,7 @@
             t.NAME AS title,
             t.CREATED_TIME AS startTime,
             t.CREATED_TIME AS endTime,
+            t.vide_img as images,
             a.building_name,
             b.NAME AS city_name,
             "video" as type