Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

# Conflicts:
#	src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -154,6 +154,42 @@ public class CommConstant {
 
     //=================  首屏广告 / 轮播图 end =======================
 
+    /**
+     * 客户报备
+     */
+    public static final String CUSTOMER_REPORT = "1";
+
+    /**
+     * 客户到访
+     */
+    public static final String CUSTOMER_VISITE = "2";
+
+    /**
+     * 客户认购
+     */
+    public static final String CUSTOMER_PREORDER = "3";
+
+    /**
+     * 客户签约
+     */
+    public static final String CUSTOMER_SIGNED = "4";
+
+
+    /**
+     * 待审核
+     */
+    public static final Integer VERIFY_READY = 0;
+
+    /**
+     * 审核同意
+     */
+    public static final Integer VERIFY_AGREE = 1;
+
+    /**
+     * 审核不同意
+     */
+    public static final Integer VERIFY_DISAGREE = 2;
+
     //=================  客户入口类型 start =======================
     /*
     * 自主进入

src/main/java/com/huiju/estateagents/controller/TaCheckinController.java

@@ -97,7 +97,6 @@ public class TaCheckinController extends BaseController {
      */
     @RequestMapping(value="/wx/taCheckin/activity/{activity}",method= RequestMethod.POST)
     public ResponseBean taCheckinAdd(@PathVariable String activity, HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
@@ -123,8 +122,8 @@ public class TaCheckinController extends BaseController {
                     return ResponseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
                 }
             }
-
         }catch (Exception e){
+            e.printStackTrace();
             logger.error("taCheckinAdd -=- {}",e.toString());
             return ResponseBean.error("保存失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }

src/main/java/com/huiju/estateagents/entity/TaBuilding.java

@@ -160,22 +160,29 @@ public class TaBuilding implements Serializable {
 
     private String buildingType;
 
-    private String serviceBuilding;
+    private String serviceCompany;
 
     private String serviceFee;
 
     private String decoration;
 
-    private String receivedDate;
+    private LocalDateTime receivedDate;
 
-    private String rightsYear;
+    private String preSalePermit;
 
-    private String familyNum;
+    private Integer rightsYear;
+
+    private Integer familyNum;
 
     private String parkingRate;
 
     private String volumeRate;
 
+    private Integer favorNum;
+    private Integer pvNum;
+    private Integer saveNum;
+    private Integer shareNum;
+
 
     /**
      * 图片

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -220,5 +220,5 @@ public class TaPerson implements Serializable {
 
     private String language;
 
-
+    private Integer saveNum;
 }

src/main/java/com/huiju/estateagents/entity/TaRecommendCustomer.java

@@ -129,7 +129,7 @@ public class TaRecommendCustomer implements Serializable {
     @TableField(exist = false)
     private String consultTel;
 
-    private String verifyStatus;
+    private Integer verifyStatus;
 
     private String verifyRemark;
 

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

@@ -6,6 +6,7 @@ import com.huiju.estateagents.entity.TaBuilding;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -26,6 +27,8 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      */
     List<TaBuilding> buildingList(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code);
 
+    @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")
+    void setFieldNum(@Param("buildingId") String buildingId, @Param("field") String field, @Param("increment") int increment);
 
     List<TaBuilding> buildingAll();
 

src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -34,4 +35,5 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
     IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,String building);
 
 
+    TaRecommendCustomer newByPerson(TaPerson person);
 }

src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java

@@ -12,6 +12,7 @@ import com.huiju.estateagents.mapper.TaMiniFormidsMapper;
 import com.huiju.estateagents.mapper.TaMiniappQrcodeMapper;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaMiniFormidsService;
+import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +22,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+@Slf4j
 @Service
 public class MiniAppServiceImpl implements IMiniAppService {
 
@@ -168,6 +170,10 @@ public class MiniAppServiceImpl implements IMiniAppService {
         if (null == tpl) return ;
 
         String formid = taMiniFormidsService.getFormidBy(toUser, true);
+        if (StringUtils.isEmpty(formid)) {
+            log.error("發送消息失敗, 沒有有效的 formid");
+            return;
+        }
 
         WxMaTemplateMessage message = WxMaTemplateMessage.builder()
                 .templateId(tpl.getId())

src/main/java/com/huiju/estateagents/service/impl/TaMiniFormidsImpl.java

@@ -39,6 +39,7 @@ public class TaMiniFormidsImpl extends ServiceImpl<TaMiniFormidsMapper, TaMiniFo
     @Override
     public String getFormidBy(String openid, boolean... delete) {
         TaMiniFormids taMiniFormids = taMiniFormidsMapper.getFormidCanUse(openid);
+        if (null == taMiniFormids) return null;
 
         if (null != delete && delete.length > 0 && delete[0]) {
             QueryWrapper<TaMiniFormids> wrapper = new QueryWrapper<>();

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -16,6 +16,7 @@ import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -63,6 +64,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Autowired
     private TaPointsRecordsMapper taPointsRecordsMapper;
 
+    @Autowired
+    private ITaRecommendCustomerService iTaRecommendCustomerService;
+
     @Override
     public TaPerson mergePersonWxInfo(WxMaUserInfo userInfo) {
         // 先查询是否存在用户
@@ -113,18 +117,17 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             return null;
         }
 
-//        if (null == phone || "".equals(phone)) {
-//            return null;
-//        }
+        // 电话为空, 代表没有获取到电话
+        if (null == phone || "".equals(phone)) {
+            return null;
+        }
 
         String tel = person.getTel();
 
         UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
         wrapper.set("phone", phone);
         wrapper.set("person_type",CommConstant.PERSON_ESTATE_AGENT);
-//        wrapper.set(null == tel || "".equals(tel), "tel", phone);
         wrapper.eq("mini_openid", miniOpenid);
-//        wrapper.eq("person_type",null);
         wrapper.isNull("person_type");
         taPersonMapper.update(new TaPerson(), wrapper);
 
@@ -132,11 +135,14 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         if (null == tel || "".equals(tel)){
             person.setTel(phone);
         }
-    
+
+        iTaRecommendCustomerService.newByPerson(person);
+
         //查看是否领取过授权积分
         QueryWrapper<TaPointsRecords> taPointsRecordsQueryWrapper = new QueryWrapper<>();
+        taPointsRecordsQueryWrapper.eq("person_id", person.getPersonId());
         taPointsRecordsQueryWrapper.eq("change_type",CommConstant.POINTS_AUTHORIZE);
-        taPointsRecordsQueryWrapper.eq("person_id",person.getPersonId());
+
         List<TaPointsRecords> taPointsRecordsList = taPointsRecordsMapper.selectList(taPointsRecordsQueryWrapper);
         if (taPointsRecordsList.size() < 0){
             //发放积分

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -281,6 +281,64 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
         return taRecommendCustomerMapper.selectPage(page,queryWrapper);
+    }
+
+    @Override
+    public TaRecommendCustomer newByPerson(TaPerson person) {
+        // 没有手机号, 暂时不生成客户信息
+        String phone = StringUtils.ifNull(person.getTel(), person.getPhone());
+        if (StringUtils.isEmpty(phone)) {
+            return null;
+        }
+
+        // 已经存在的, 随机返回一条记录
+        List<TaRecommendCustomer> custs = getCustomerByPhone(phone);
+        if (null != custs && custs.size() > 0) {
+            return custs.get(0);
+        }
+
+        TaRecommendCustomer cust = new TaRecommendCustomer();
+        cust.setName(StringUtils.ifNull(person.getName(), person.getNickname()));
+        cust.setSex(null == person.getSex() ? str2Int(person.getGender()) : person.getSex());
+        cust.setPhone(phone);
+        cust.setPicture(StringUtils.ifNull(person.getPhoto(), person.getAvatarurl()));
+        cust.setCountry(person.getCountry());
+        cust.setCity(person.getCity());
+        cust.setProvince(person.getProvince());
+        // 审核同意
+        cust.setVerifyStatus(CommConstant.VERIFY_AGREE);
+        // 报备状态
+        cust.setStatus(CommConstant.CUSTOMER_REPORT);
+        // 当前日期
+        cust.setReportDate(LocalDateTime.now());
+
+        if (taRecommendCustomerMapper.insert(cust) > 0) {
+            return cust;
+        } else {
+            log.error("依据人员新增推荐客户失败");
+            return null;
+        }
+    }
+
+    private List<TaRecommendCustomer> getCustomerByPhone(String phone) {
+        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone", phone);
+        queryWrapper.gt("status", CommConstant.STATUS_DELETE);
+        queryWrapper.orderByDesc("report_date");
+
+        List<TaRecommendCustomer> custs = taRecommendCustomerMapper.selectList(queryWrapper);
+        return custs;
+    }
+
+    private Integer str2Int(String str) {
+        if (null == str) {
+            return null;
+        }
 
+        try {
+            return Integer.valueOf(str);
+        } catch (Exception e) {
+            return 0;
+        }
     }
 }

src/main/java/com/huiju/estateagents/service/impl/TaSaveServiceImpl.java

@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaSave;
-import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
-import com.huiju.estateagents.mapper.TaNewsMapper;
-import com.huiju.estateagents.mapper.TaPersonMapper;
-import com.huiju.estateagents.mapper.TaSaveMapper;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaSaveService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,6 +38,9 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
     @Autowired
     private TaNewsMapper taNewsMapper;
 
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
     @Autowired
     private TaBuildingDynamicMapper taBuildingDynamicMapper;
 
@@ -87,6 +88,11 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
             taBuildingDynamicMapper.setFieldNum(like, "save_num", 1);
         }
 
+        // 如果是項目收藏, 则 +1
+        if(typeOf.equals(CommConstant.FAVOR_PROJECT)) {
+            taBuildingMapper.setFieldNum(like, "save_num", 1);
+        }
+
         return ResponseBean.success("");
     }
 

src/main/java/com/huiju/estateagents/service/impl/TaShareServiceImpl.java

@@ -40,6 +40,9 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     @Autowired
     private TaPointsRecordsMapper taPointsRecordsMapper;
 
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
     @Autowired
     private TaBuildingDynamicMapper taBuildingDynamicMapper;
 
@@ -86,6 +89,11 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         if (typeOf == CommConstant.FAVOR_CONSULTANT) {
             taPersonMapper.setFieldIncrement(id,"share_num", 1);
         }
+
+        if(typeOf.equals(CommConstant.FAVOR_PROJECT)) {
+            taBuildingMapper.setFieldNum(id, "share_num", 1);
+        }
+
         //发放分享积分
         if (typeOf.equals(CommConstant.FAVOR_PROJECT)){
             QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();

src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8001
+  port: 8566
 spring:
   application:
     name: estateagents