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

# Conflicts:
#	src/main/java/com/huiju/estateagents/config/FadadaProperties.java
#	src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java
#	src/main/resources/application-blue.yml
#	src/main/resources/application-green.yml

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.16</version>
+	<version>v3.5.18</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

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

@@ -591,6 +591,7 @@ public class CommConstant {
      */
     public static final String LOGIN_TYPE_CENTER = "center";
 
+
     /**
      * 查看分享者活动类型 h5
      */

src/main/java/com/huiju/estateagents/config/FadadaProperties.java

@@ -16,4 +16,5 @@ public class FadadaProperties {
     private String companyNotify;
     private String authReturnUrl;
     private String authNotifyUrl;
+    private String signNotify;
 }

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

@@ -207,11 +207,12 @@ public class MiniAppController extends BaseController {
             miniResp.put("name", miniapp.getName());
             miniResp.put("tpls", miniAppService.getTpls(appid));
 
-            //如果是分享进来且没有进入过小程序，给分享人发放积分
-            QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
-            personQueryWrapper.eq("mini_openid", session.getOpenid());
-            personQueryWrapper.eq("org_id", orgId);
-            int count = taPersonService.count(personQueryWrapper);
+            // 2020年3月30日 与曹建芳讨论 去掉此规则
+//            //如果是分享进来且没有进入过小程序，给分享人发放积分
+//            QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
+//            personQueryWrapper.eq("mini_openid", session.getOpenid());
+//            personQueryWrapper.eq("org_id", orgId);
+//            int count = taPersonService.count(personQueryWrapper);
 
             TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);
             if (null == taPerson) {
@@ -241,7 +242,8 @@ public class MiniAppController extends BaseController {
             // 增加积分线程
             ExecutorService threadPool = Executors.newCachedThreadPool();
             threadPool.execute(() -> {
-                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
+//                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
+                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender)) {
                     // 校验是否点击过此人的分享
                     boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
                     if (checkPoint) {

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

@@ -659,69 +659,7 @@ public class TaRaiseRecordController extends BaseController {
     public ResponseBean wxGetRaiseRecordById(@PathVariable Integer raiseRecordId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            //获取认筹单信息
-            TaRaiseRecord taRaiseRecord = iTaRaiseRecordService.getById(raiseRecordId);
-
-            String personId = getPersonId(request);
-            //认筹表数据
-            TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
-            taRaise.setRaisePrice(taRaise.getRaisePrice());
-            //置业顾问信息
-            TaUser consultantInfo = taUserService.getById(taRaiseRecord.getUserId());
-            if (null != consultantInfo) {
-                //职业顾问信息
-                TaPerson consultantPerson = taPersonService.getOne(new QueryWrapper<TaPerson>().eq("user_id", taRaiseRecord.getUserId()));
-                if (null != consultantPerson) {
-                    consultantInfo.setConsultantPersonId(consultantPerson.getPersonId());
-                }
-            }
-
-            taRaiseRecord.setConsultantInfo(consultantInfo);
-            //房源与认筹单关系图
-            List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
-
-            //房源信息
-            List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
-
-            //我的认筹和锁定
-            houseList.forEach(e -> {
-                taRaiseHouseList.forEach(r -> {
-                    //我的认筹
-                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus()) && personId.equals(e.getHouseLockingPerson())) {
-                        e.setMineLocked("mine");
-                    }
-                });
-
-                //塞入户型信息
-                if (!StringUtils.isEmpty(e.getApartmentId())) {
-                    TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(e.getApartmentId());
-                    e.setApartmentName(buildingApartment.getApartmentName());
-                    e.setInsideArea(buildingApartment.getInsideArea());
-                    e.setBuildingArea(buildingApartment.getBuildingArea());
-                    //塞入户型图信息
-                    List<String> apartMentIds = new ArrayList<>();
-                    apartMentIds.add(e.getApartmentId());
-                    List<TaBuildingImg> apartMentList = taBuildingImgService.getAparemnetList(apartMentIds);
-                    e.setApartmentImgList(apartMentList);
-                }
-            });
-
-            Map<String, Object> map = new HashMap<>();
-            map.put("refundOrder", null);
-            //订单信息
-            TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
-            if (null != taOrder) {
-                //退费信息
-                TaOrder refundOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("parent_order_id", taOrder.getOrderId()));
-                map.put("refundOrder", refundOrder);
-            }
-            map.put("taRaiseRecord", taRaiseRecord);
-            map.put("taRaiseHouseList", taRaiseHouseList);
-            map.put("houseList", houseList);
-            map.put("taOrder", taOrder);
-
-            map.put("taRaise", taRaise);
-            responseBean.addSuccess(map);
+            responseBean = iTaRaiseRecordService.wxGetRaiseRecordById(raiseRecordId, getPersonId(request), getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("微信端获取认筹单详细信息 -=- {}", e.toString());

src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java

@@ -13,6 +13,10 @@ import com.huiju.estateagents.eContract.entity.TaContract;
 import com.huiju.estateagents.eContract.service.ITaCompanySealService;
 import com.huiju.estateagents.config.FadadaProperties;
 import com.huiju.estateagents.eContract.service.ITaContractService;
+import com.huiju.estateagents.eContract.entity.TaContractUser;
+import com.huiju.estateagents.eContract.service.ITaCompanySealService;
+import com.huiju.estateagents.config.FadadaProperties;
+import com.huiju.estateagents.eContract.service.ITaContractUserService;
 import com.huiju.estateagents.sample.entity.TaH5Demand;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -63,6 +67,8 @@ public class TaCompanyController extends BaseController {
     @Autowired
     private ITaContractService iTaContractService;
 
+    public ITaContractUserService iTaContractUserService;
+
     /**
      * 条件查询企业列表
      *
@@ -415,17 +421,31 @@ public class TaCompanyController extends BaseController {
      *
      */
     @RequestMapping(value = "/fadd/company", method = RequestMethod.POST)
-    public void faddCompanyNitify(@RequestParam String companyName,
-                                  @RequestParam String transactionNo,
-                                  @RequestParam String authenticationType,
-                                  @RequestParam String status,
+    public void faddCompanyNotify(@RequestParam(value = "serialNo",required = false) String serialNo,
+                                  @RequestParam(value = "authenticationType",required = false) String authenticationType,
+                                  @RequestParam(value = "status",required = false) String status,
                                   HttpServletRequest request) {
-        logger.info("企业认证回调函数参数:公司名称{},交易号{}，认证类型{}，状态，{}",companyName,transactionNo,authenticationType,status);
-        QueryWrapper<TaCompany> taCompanyQueryWrapper = new QueryWrapper<>();
-        taCompanyQueryWrapper.eq("certified_serial_number",transactionNo);
-        TaCompany taCompany = iTaCompanyService.getOne(taCompanyQueryWrapper);
-        taCompany.setStatus(Integer.valueOf(status));
-        iTaCompanyService.updateById(taCompany);
+        logger.info("企业认证回调函数参数:交易号{}，认证类型{}，状态，{}, 人员名称{}",serialNo,authenticationType,status);
+        //企业认证
+        if ("2".equals(authenticationType)){
+            QueryWrapper<TaCompany> taCompanyQueryWrapper = new QueryWrapper<>();
+            taCompanyQueryWrapper.eq("certified_serial_number",serialNo);
+            TaCompany taCompany = iTaCompanyService.getOne(taCompanyQueryWrapper);
+
+            try {
+                //更新企业状态
+                iTaCompanyService.updateCompanyInfoByFdd(taCompany.getCompanyId());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }else if ("1".equals(authenticationType)){
+            QueryWrapper<TaContractUser> taContractUserQueryWrapper = new QueryWrapper<>();
+            taContractUserQueryWrapper.eq("certified_serial_number",serialNo);
+            TaContractUser taContractUser = iTaContractUserService.getOne(taContractUserQueryWrapper);
+            taContractUser.setStatus(Integer.valueOf(status));
+            taContractUser.setAuthStatus("autoSign");
+            iTaContractUserService.updateById(taContractUser);
+        }
     }
 
     /**
@@ -469,4 +489,22 @@ public class TaCompanyController extends BaseController {
         responseBean.addSuccess((Object)res);
         return responseBean;
     }
+
+
+    /**
+     * 手动签署回调函数
+     *
+     */
+    @RequestMapping(value = "/fadd/sign", method = RequestMethod.POST)
+    public void faddSignNotify(@RequestParam(value = "transaction_id ",required = false) String transaction_id,
+                                  @RequestParam(value = "contract_id ",required = false) String contract_id,
+                                  @RequestParam(value = "result_code",required = false) String result_code,
+                                  @RequestParam(value = "result_desc",required = false) String result_desc,
+                                  @RequestParam(value = "download_url",required = false) String download_url,
+                                  @RequestParam(value = "viewpdf_url",required = false) String viewpdf_url,
+                                  @RequestParam(value = "timestamp",required = false) String timestamp,
+                                  @RequestParam(value = "msg_digest",required = false) String msg_digest,
+                                  HttpServletRequest request) {
+        logger.info("企业认证回调函数参数:交易号 {},合同编号 {}，签章结果代码 {}，签章结果描述 ，{}, 下载地址{}, 查看地址 {},请求时间 {}, 摘要 {} ",transaction_id,contract_id,result_code,result_desc,download_url,viewpdf_url,timestamp,msg_digest);
+    }
 }

src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyOrgController.java

@@ -188,11 +188,12 @@ public class TaCompanyOrgController extends BaseController {
                                           String companyName,
                                           String companyCode,
                                           String certifiedStatus,
+                                          Integer companyStatus,
                                           String orgName,
                                           String miniAppName) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaCompanyOrgService.listCompanyOrg(pageNum, pageSize, companyName, companyCode, certifiedStatus, orgName, miniAppName);
+            responseBean = iTaCompanyOrgService.listCompanyOrg(pageNum, pageSize, companyName, companyCode, certifiedStatus,companyStatus, orgName, miniAppName);
             logger.info("TaCompanyOrgController.listCompanyOrg 返回结果：{}", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             logger.error("TaCompanyOrgController.listCompanyOrg 异常：", e);

src/main/java/com/huiju/estateagents/eContract/controller/TaContractController.java

@@ -274,7 +274,7 @@ public class TaContractController extends BaseController {
 
 
     /**
-     * 自动签署合同
+     * 手动签署合同
      */
     @RequestMapping(value = "/wx/contract/manual", method = RequestMethod.POST)
     public ResponseBean manualContract(@RequestBody TaContract taContract, HttpServletRequest request) {
@@ -295,4 +295,6 @@ public class TaContractController extends BaseController {
         }
         return responseBean;
     }
+
+
 }

src/main/java/com/huiju/estateagents/eContract/entity/TaCompanyOrg.java

@@ -3,15 +3,17 @@ package com.huiju.estateagents.eContract.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 企业和组织关系表 
+ * 企业和组织关系表
  * </p>
  *
  * @author fxf
@@ -75,4 +77,10 @@ public class TaCompanyOrg implements Serializable {
     @TableField(exist = false)
     private String miniAppName;
 
+    /**
+     * 认证公司状态
+     */
+    @TableField(exist = false)
+    private Integer companyStatus;
+
 }

src/main/java/com/huiju/estateagents/eContract/entity/TaContractBusiness.java

@@ -115,6 +115,7 @@ public class TaContractBusiness implements Serializable {
     @TableField(exist = false)
     private List<TaContractBusiness> contractBusinessList;
 
+    @TableField(exist = false)
     private String contractTemplateAddress;
 
     @TableField(exist = false)

src/main/java/com/huiju/estateagents/eContract/mapper/TaCompanyOrgMapper.java

@@ -33,6 +33,7 @@ public interface TaCompanyOrgMapper extends BaseMapper<TaCompanyOrg> {
                                           @Param("companyName") String companyName,
                                           @Param("companyCode") String companyCode,
                                           @Param("certifiedStatus") String certifiedStatus,
+                                          @Param("companyStatus") Integer companyStatus,
                                           @Param("orgName") String orgName,
                                           @Param("miniAppName") String miniAppName);
 }

src/main/java/com/huiju/estateagents/eContract/service/ITaCompanyOrgService.java

@@ -22,9 +22,10 @@ public interface ITaCompanyOrgService extends IService<TaCompanyOrg> {
      * @param companyName     企业名称
      * @param companyCode     企业编号
      * @param certifiedStatus 实名认证状态
+     * @param companyStatus   企业状态
      * @param orgName         组织名称
      * @param miniAppName     小程序名称
      * @return
      */
-    ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyCode, String certifiedStatus, String orgName, String miniAppName);
+    ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyCode, String certifiedStatus, Integer companyStatus, String orgName, String miniAppName);
 }

src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanyOrgServiceImpl.java

@@ -24,12 +24,13 @@ public class TaCompanyOrgServiceImpl extends ServiceImpl<TaCompanyOrgMapper, TaC
     @Autowired
     private TaCompanyOrgMapper taCompanyOrgMapper;
 
-    public ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyCode, String certifiedStatus, String orgName, String miniAppName) {
+    public ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyCode, String certifiedStatus,
+                                       Integer companyStatus, String orgName, String miniAppName) {
         ResponseBean responseBean = new ResponseBean();
 
         // 组装分页
         IPage<TaCompanyOrg> pg = new Page<>(pageNum, pageSize);
-        pg = taCompanyOrgMapper.listCompanyAndOrg(pg,companyName,companyCode,certifiedStatus,orgName,miniAppName);
+        pg = taCompanyOrgMapper.listCompanyAndOrg(pg, companyName, companyCode, certifiedStatus, companyStatus, orgName, miniAppName);
         responseBean.addSuccess(pg);
         return responseBean;
     }

src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractServiceImpl.java

@@ -173,8 +173,8 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         req.setSign_keyword(taContractBusiness.getCustomerKeywords());
         req.setKeyword_strategy(taContractBusiness.getCustomerStrategy());
         req.setDoc_title(taContractBusiness.getContractTemplateName());
-        req.setReturn_url("www.baidu.com");
-        req.setNotify_url("www.baidu.com");
+        req.setReturn_url("/onlineSelling/pages/raiseMoney/signResult");
+        req.setNotify_url(fadadaProperties.getSignNotify());
         String signUrl = base.invokeExtSign(req);
         return signUrl;
     }

src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractUserServiceImpl.java

@@ -85,8 +85,8 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         String customer_id = jsonObject.getString("data");
         String verifyed_way = "0";
         String page_modify = "1";
-        String notify_url = "https://www.baidu.com";
-        String return_url= "https://www.baidu.com"+"?raiseRecordId=" + taRaiseRecord.getRaiseRecordId();
+        String notify_url = fadadaProperties.getCompanyNotify();
+        String return_url= "/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId();
         String customer_ident_type = "0";
         String personResult = personverify.invokePersonVerifyUrl(customer_id,verifyed_way,
                 page_modify,notify_url,return_url,null,customer_ident_type,
@@ -99,6 +99,7 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
             newContractUser.setCertifiedAddress(url);
             newContractUser.setCertifiedSerialNumber(JSON.parseObject(data).getString("transactionNo"));
         }
+        newContractUser.setStatus(0);
         newContractUser.setAuthStatus(CommConstant.CERTIFIED_STATUS_CERTIFICATION);
         newContractUser.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
         taContractUserMapper.insert(newContractUser);

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

@@ -251,4 +251,10 @@ public class TaRaiseRecord implements Serializable {
      */
     @TableField(exist = false)
     private Integer refundedOrderId;
+
+    /**
+     * 是否展示签署合同 1是 0否
+     */
+    @TableField(exist = false)
+    private Integer showContract;
 }

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

@@ -23,5 +23,5 @@ public interface TaShareMapper extends BaseMapper<TaShare> {
 
     List<TaShare> listLiveShare(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("shareType")String shareType, @Param("phone")String phone, @Param("liveActivityId")Integer liveActivityId);
 
-    List<Map<String, Object>> statTopShare(@Param("targetType") String targetType, @Param("targetId") String targetId, @Param("top") Integer top);
+    List<Map<String, Object>> statTopShare(@Param("orgId") Integer orgId, @Param("targetType") String targetType, @Param("targetId") String targetId, @Param("top") Integer top);
 }

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

@@ -101,5 +101,13 @@ public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
      * @param houseLockingStatus
      * @return
      */
-    Boolean updateHouseLockingStatus(Integer raiseRecordId, String houseLockingStatus,String personId);
+    Boolean updateHouseLockingStatus(Integer raiseRecordId, String houseLockingStatus, String personId);
+
+    /**
+     * 获取认筹单详情-微信端
+     *
+     * @param raiseRecordId
+     * @return
+     */
+    ResponseBean wxGetRaiseRecordById(Integer raiseRecordId, String personId,Integer orgId);
 }

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

@@ -29,10 +29,12 @@ public interface ITaShareService extends IService<TaShare> {
 
     /**
      * 统计分享 Top
+     *
+     * @param orgId
      * @param targetType
      * @param targetId
      * @param top
      * @return
      */
-    List<Map<String, Object>> statTopShare(String targetType, String targetId, Integer top);
+    List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top);
 }

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

@@ -13,11 +13,13 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.impl.TaUserServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.SMSUtils;
+import com.huiju.estateagents.eContract.entity.TaContract;
+import com.huiju.estateagents.eContract.entity.TaContractBusiness;
+import com.huiju.estateagents.eContract.service.ITaContractBusinessService;
+import com.huiju.estateagents.eContract.service.ITaContractService;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
-import com.huiju.estateagents.po.TaHousingResourcesPO;
-import com.huiju.estateagents.service.ITaRaiseRecordService;
-import com.huiju.estateagents.service.ITaUvService;
+import com.huiju.estateagents.service.*;
 import jodd.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -26,9 +28,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -76,6 +82,30 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
     @Autowired
     SMSUtils smsUtils;
 
+    @Autowired
+    private ITaRaiseService taRaiseService;
+
+    @Autowired
+    private ITaOrderService taOrderService;
+
+    @Autowired
+    private ITaBuildingImgService taBuildingImgService;
+
+    @Autowired
+    private ITaRaiseHouseService taRaiseHouseService;
+
+    @Autowired
+    private ITaHousingResourcesService taHousingResourcesService;
+
+    @Autowired
+    private ITaBuildingApartmentService taBuildingApartmentService;
+
+    @Autowired
+    private ITaContractService iTaContractService;
+
+    @Autowired
+    private ITaContractBusinessService iTaContractBusinessService;
+
     @Override
     public ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO, Integer pageNumber, Integer pageSize) {
         logger.info("TaRaiseRecordServiceImpl.listRaiseRecordByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(requestBO), pageNumber, pageSize);
@@ -320,4 +350,107 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         logger.info("TaRaiseRecordServiceImpl.updateHouseLockingStatus 接收参数:raiseRecordId:{},houseLockingStatus:{}", raiseRecordId, houseLockingStatus);
         return taHousingResourcesMapper.updateHouseLockingStatus(raiseRecordId, houseLockingStatus, personId);
     }
+
+    @Override
+    public ResponseBean wxGetRaiseRecordById(Integer raiseRecordId, String personId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        //获取认筹单信息
+        TaRaiseRecord taRaiseRecord = getById(raiseRecordId);
+
+        //认筹表数据
+        TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
+        taRaise.setRaisePrice(taRaise.getRaisePrice());
+        //置业顾问信息
+        TaUser consultantInfo = taUserService.getById(taRaiseRecord.getUserId());
+        if (null != consultantInfo) {
+            //职业顾问信息
+            TaPerson consultantPerson = taPersonService.getOne(new QueryWrapper<TaPerson>().eq("user_id", taRaiseRecord.getUserId()));
+            if (null != consultantPerson) {
+                consultantInfo.setConsultantPersonId(consultantPerson.getPersonId());
+            }
+        }
+
+        taRaiseRecord.setConsultantInfo(consultantInfo);
+        //房源与认筹单关系图
+        List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
+
+        //房源信息
+        List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
+
+        //我的认筹和锁定
+        houseList.forEach(e -> {
+            taRaiseHouseList.forEach(r -> {
+                //我的认筹
+                if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus()) && personId.equals(e.getHouseLockingPerson())) {
+                    e.setMineLocked("mine");
+                }
+            });
+
+            //塞入户型信息
+            if (!StringUtils.isEmpty(e.getApartmentId())) {
+                TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(e.getApartmentId());
+                e.setApartmentName(buildingApartment.getApartmentName());
+                e.setInsideArea(buildingApartment.getInsideArea());
+                e.setBuildingArea(buildingApartment.getBuildingArea());
+                //塞入户型图信息
+                List<String> apartMentIds = new ArrayList<>();
+                apartMentIds.add(e.getApartmentId());
+                List<TaBuildingImg> apartMentList = taBuildingImgService.getAparemnetList(apartMentIds);
+                e.setApartmentImgList(apartMentList);
+            }
+        });
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("refundOrder", null);
+        //订单信息
+        TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
+        if (null != taOrder) {
+            //退费信息
+            TaOrder refundOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("parent_order_id", taOrder.getOrderId()));
+            map.put("refundOrder", refundOrder);
+        }
+
+        // 是否展示签署合同入口
+        if (CommConstant.STATUS_NORMAL == taRaiseRecord.getStatus() || CommConstant.PAY_STATUS_PAID == taRaiseRecord.getPayStatus()) {
+            // 是否有认筹业务合同配置
+            QueryWrapper<TaContractBusiness> taContractBusinessQueryWrapper = new QueryWrapper<>();
+            taContractBusinessQueryWrapper.eq("target_id", raiseRecordId);
+            taContractBusinessQueryWrapper.eq("org_id", orgId);
+            taContractBusinessQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            TaContractBusiness taContractBusiness = iTaContractBusinessService.getOne(taContractBusinessQueryWrapper);
+            if (taContractBusiness != null) {
+                // 是否有有关联的认筹合同
+                QueryWrapper<TaContract> taContractQueryWrapper = new QueryWrapper<>();
+                taContractQueryWrapper.eq("org_id", orgId);
+                taContractQueryWrapper.eq("company_id", taContractBusiness.getCompanyId());
+                taContractQueryWrapper.eq("target_id", taRaiseRecord.getRaiseId());
+                taContractQueryWrapper.eq("person_id", personId);
+                TaContract taContract = iTaContractService.getOne(taContractQueryWrapper);
+                if (taContract != null) {
+                    if (taContract.getCustomerTime() == null) {
+                        taRaiseRecord.setShowContract(1);
+                    } else {
+                        taRaiseRecord.setShowContract(0);
+                        map.put("taContract", taContract);
+                    }
+                } else {
+                    taRaiseRecord.setShowContract(0);
+                }
+            } else {
+                taRaiseRecord.setShowContract(0);
+            }
+        } else {
+            taRaiseRecord.setShowContract(0);
+        }
+
+        map.put("taRaiseRecord", taRaiseRecord);
+        map.put("taRaiseHouseList", taRaiseHouseList);
+        map.put("houseList", houseList);
+        map.put("taOrder", taOrder);
+
+        map.put("taRaise", taRaise);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
 }

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

@@ -10,7 +10,6 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.*;
-import com.huiju.estateagents.service.ITaNewsService;
 import com.huiju.estateagents.service.ITaShareService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -216,8 +215,8 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     }
 
     @Override
-    public List<Map<String, Object>> statTopShare(String targetType, String targetId, Integer top) {
-        return taShareMapper.statTopShare(targetType, targetId, top);
+    public List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top) {
+        return taShareMapper.statTopShare(orgId, targetType, targetId, top);
     }
 
     List<TaPerson> getPersonsByOpenId(String openid) {

src/main/java/com/huiju/estateagents/third/controller/TaThirdPartyMiniappConfigController.java

@@ -227,8 +227,14 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
             @RequestParam (required = false, defaultValue = "10") Integer top
     ) {
         // 暂时没有任何校验
+        QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_type", CommConstant.TARGET_TYPE_H5);
+        queryWrapper.eq("target_id", h5Id);
+        queryWrapper.last("limit 1");
 
-        List<Map<String, Object>> res = taShareService.statTopShare("h5_share", h5Id, top);
+        TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(queryWrapper);
+
+        List<Map<String, Object>> res = taShareService.statTopShare(taThirdPartyMiniappConfig.getOrgId(), "h5_share", h5Id, top);
         return ResponseBean.success(res);
     }
 }

src/main/resources/application-blue.yml

@@ -86,4 +86,5 @@ fadada:
   serveHost: "https://testapi.fadada.com:8443/api/"
   companyNotify: "https://dev.pawoma.cn/api/fadd/company"
   authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
-  authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
+  authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
+  signNotify: "https://dev.pawoma.cn/api/fadd/sign"

src/main/resources/application-dev.yml

@@ -1,74 +0,0 @@
-server:
-  port: 8080
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: estateagents
-    url: jdbc:mysql://47.101.36.130:3306/estateagents_3.5.1_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wxd6f47a9bb3052175
-    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: 营销云
-
-  visitor:
-    code: "0501"

src/main/resources/application-green.yml

@@ -86,4 +86,5 @@ fadada:
   serveHost: "https://testapi.fadada.com:8443/api/"
   companyNotify: "https://dev.pawoma.cn/api/fadd/company"
   authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
-  authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
+  authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
+  signNotify: "https://dev.pawoma.cn/api/fadd/sign"

src/main/resources/application-gzysd.yml

@@ -1,129 +0,0 @@
-<<<<<<< HEAD
-server:
-  port: 8009
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_17?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wxe3b1e683853800b5
-    secret: 207dd6d0f807b2dd0d41b57a8184365f
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: IywdSfNPegeg5GB3Q-TVieSYD9DA0im8eI-hF_u0i-4
-      keywords: 6
-ali:
-  accessKeyId: LTAIkc75dpkJw8Lb
-  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: estateagents
-    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: AI智慧案场
-
-  visitor:
-    code: "0501"
-=======
-server:
-  port: 8009
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_gzysd?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
-wx:
-  miniapp:
-    appid: wxe3b1e683853800b5
-    secret: 207dd6d0f807b2dd0d41b57a8184365f
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: IVWM-wpzSNV6CyXeSBGBgRku2lRrZ-3x4vXRILQpHM0
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: IywdSfNPegeg5GB3Q-TVieSYD9DA0im8eI-hF_u0i-4
-
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-
->>>>>>> ac499f2ddc4d4469098e59fff8bbe310779f7be3

src/main/resources/application-hj.yml

@@ -1,52 +0,0 @@
-server:
-  port: 8011
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_hj?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
-wx:
-  miniapp:
-    appid: wx03aca9d7d9b0b7f1
-    secret: f85aa21010204969b0f9a16f81de8a4b
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: Dflyeuyy76tCpam6OfVMblBaiog9fBt4NGAxbLPQ6AI
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: BDrgtJK9zul0gtHhHwY31x7kDH8BWGJxKvkj1wPzB4E
-
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-

src/main/resources/application-jj.yml

@@ -1,52 +0,0 @@
-server:
-  port: 8013
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_jj?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
-wx:
-  miniapp:
-    appid: wx7183d7d918a426d3
-    secret: d06320d36d0b706f981da20b796c5875
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: 80jdxzuPITEffVNC1KD1IGvbOxGkipTJlrxPosQrz0s
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: UbuzqEqULHf_NAZHay_3RJPGHm1g11YYU2R66ASq5Uw
-
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-

src/main/resources/application-nj.yml

@@ -1,75 +0,0 @@
-server:
-  port: 8007
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_nj?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wx1a3e5f7d0139285e
-    secret: 06d3db7f27ea08481effd509aa4dcb57
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: wO59V2ARIEXsoYaX1AlB9HK_SqUlnJzZq_X-xeYS1rU
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: wO59V2ARIEXsoYaX1AlB9HK_SqUlnJzZq_X-xeYS1rU
-
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: AI智慧案场
-
-  visitor:
-    code: "0501"

src/main/resources/application-prod-blue.yml

@@ -89,4 +89,5 @@ fadada:
   appSecret: ""
   version: "2.0"
   serveHost: "https://testapi.fadada.com:8443/api/"
-  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  signNotify: "https://dev.pawoma.cn/api/fadd/sign"

src/main/resources/application-prod-green.yml

@@ -89,4 +89,5 @@ fadada:
   appSecret: ""
   version: "2.0"
   serveHost: "https://testapi.fadada.com:8443/api/"
-  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  signNotify: "https://dev.pawoma.cn/api/fadd/sign"

src/main/resources/application-rc.yml

@@ -1,74 +0,0 @@
-server:
-  port: 8005
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_test?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wxe9e01aa4a3568f52
-    secret: f1d70000e55f221976b95a43084042b0
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: FikibBOSwA_v0Ud80o9t_06kAUjn5TRd60
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: 8b0kuLCKzPeu1MUBfpLT9DhysqMl2LSWNYqluycvGm8
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: AI智慧案场
-
-  visitor:
-    code: "0501"

src/main/resources/application-v3.yml

@@ -1,58 +0,0 @@
-server:
-  port: 8080
-spring:
-  application:
-    name: estateagents
-  datasource:
-   username: estateagents
-   password: DQ@0lW##kBb2+-jPZ
-   url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.0?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-   driver-class-name: com.mysql.cj.jdbc.Driver
-   initial-size: 10 # 初始化连接数
-   max-active: 20 # 最大连接数
-   min-idle: 8 # 最小空闲数
-   max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: 营销云
-
-  visitor:
-    code: "0501"

src/main/resources/application-xs.yml

@@ -1,74 +0,0 @@
-server:
-  port: 8003
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents2?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wx09cd665abf378db7
-    secret: a6cbd778272c87426952b5a1f8449698
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: thSzcSAhIHiZZuCdydBsoB-dSa_g72vHgqo9e_CltNM
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: iJLceA_zp1fq9xnL4yV8IOwWGeFHebCO-HxNtcPYLoA
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: AI智慧案场
-
-  visitor:
-    code: "0501"

src/main/resources/mapper/TaShareMapper.xml

@@ -53,27 +53,30 @@
 
     <select id="statTopShare" resultType="java.util.Map">
         SELECT
-            *
+            a.top,
+            s.person_id AS sharePerson,
+            s.nickname,
+            s.avatarurl,
+            IFNULL( s.tel, s.phone ) AS phone
         FROM
         (
             SELECT
-                t.share_person as sharePerson,
-                s.nickname,
-                s.avatarurl,
-                IFNULL(s.tel,s.phone) as phone,
+                t.share_person,
                 COUNT( 1 ) AS top
             FROM
                 ta_share_person_from t
-                LEFT JOIN ta_person s ON t.org_id = s.org_id and (t.share_person = s.person_id or t.share_person = s.user_id)
             WHERE
-                t.target_type = #{targetType}
+                t.org_id = #{orgId}
+                AND t.target_type = #{targetType}
                 AND t.target_id = #{targetId}
                 AND t.is_first_time = 1
-        GROUP BY
+            GROUP BY
                 t.share_person
-        ) AS t
             ORDER BY
-            t.top DESC
+                COUNT( 1 ) DESC
             LIMIT #{top}
+        ) a
+        LEFT JOIN ta_person s ON s.org_id = #{orgId}
+            AND ( a.share_person = s.person_id OR a.share_person = s.user_id )
     </select>
 </mapper>

src/main/resources/mapper/eContract/TaCompanyOrgMapper.xml

@@ -8,6 +8,7 @@
             t2.company_name,
             t2.company_code,
             t2.certified_status,
+            t2.status companyStatus,
             t3.`name` orgName,
             t4.`name` miniAppName
         FROM
@@ -16,10 +17,13 @@
             LEFT JOIN ta_org t3 ON t.org_id = t3.org_id
             LEFT JOIN ta_miniapp t4 ON t3.org_id = t4.org_id
         WHERE
-            t2.`status` = 1
+            t2.`status` != -1
             <if test = "companyName != null and companyName != ''">
                 AND t2.company_name like CONCAT('%',#{companyName} , '%')
             </if>
+            <if test = "companyStatus != null and companyStatus != ''">
+                AND t2.`status` = #{companyStatus}
+            </if>
             <if test = "companyCode != null and companyCode != ''">
                 AND t2.company_code like CONCAT('%',#{companyCode} , '%')
             </if>