Merge branch 'dev'

pom.xml

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

src/main/java/com/huiju/estateagents/bo/request/HousingRaiseRequestBO.java

@@ -0,0 +1,65 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 查询房源认筹记录请求实体
+ *
+ * @Auther: gusy
+ * @Date: 2020/2/28 01:01
+ */
+@Data
+public class HousingRaiseRequestBO {
+
+    private Integer orgId;
+
+    /**
+     * 销售批次ID
+     */
+    private Integer salesBatchId;
+
+    /**
+     * 房源ID
+     */
+    private Integer houseId;
+
+    /**
+     * 期名
+     */
+    private String termName;
+
+    /**
+     * 楼栋名
+     */
+    private String blockName;
+
+    /**
+     * 单元名
+     */
+    private String unitName;
+
+    /**
+     * 楼层名
+     */
+    private String floorName;
+
+    /**
+     * 房间名
+     */
+    private String roomName;
+
+    /**
+     * 户型Id
+     */
+    private String apartmentId;
+
+    /**
+     * 房源发布状态
+     */
+    private Integer status;
+
+    /**
+     * 房源锁定状态
+     */
+    private Integer lockingStatus;
+}

src/main/java/com/huiju/estateagents/bo/request/PresecretRecordRequestBO.java

@@ -0,0 +1,72 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 预选记录查询请求实体
+ *
+ * @Auther: gusy
+ * @Date: 2020/2/28 00:14
+ */
+@Data
+public class PresecretRecordRequestBO {
+
+    private Integer orgId;
+
+    private Integer salesBatchId;
+
+    /**
+     * 房源ID
+     */
+    private Integer houseId;
+
+    /**
+     * 期名
+     */
+    private String termName;
+
+    /**
+     * 楼栋名
+     */
+    private String blockName;
+
+    /**
+     * 单元名
+     */
+    private String unitName;
+
+    /**
+     * 楼层名
+     */
+    private String floorName;
+
+    /**
+     * 房间名
+     */
+    private String roomName;
+
+    /**
+     * 用户手机号
+     */
+    private String phone;
+
+    /**
+     * 户型Id
+     */
+    private String apartmentId;
+
+    /**
+     * 预选状态
+     */
+    private Integer status;
+
+    /**
+     * 修改开始时间
+     */
+    private String startTime;
+
+    /**
+     * 修改结束时间
+     */
+    private String endTime;
+}

src/main/java/com/huiju/estateagents/bo/request/RaiseOrderRequestBO.java

@@ -0,0 +1,75 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 查询认筹订单请求实体
+ *
+ * @Auther: gusy
+ * @Date: 2020/2/27 22:10
+ */
+@Data
+public class RaiseOrderRequestBO {
+
+    private Integer orgId;
+
+    /**
+     * 认筹ID
+     */
+    private Integer raiseId;
+
+    /**
+     * 订单表ID
+     */
+    private Integer orderId;
+
+    /**
+     * 订单表ID
+     */
+    private Integer refundedOrderId;
+
+    /**
+     * 认筹单表ID
+     */
+    private Integer raiseRecordId;
+
+    /**
+     * 认筹手机号
+     */
+    private String tel;
+
+    /**
+     * 用户手机号
+     */
+    private String personTel;
+
+    /**
+     * 微信流水号
+     */
+    private String transactionId;
+
+    /**
+     * 微信退款号
+     */
+    private String refundNo;
+
+    /**
+     * 支付状态
+     */
+    private String payStatus;
+
+    /**
+     * 开始时间
+     */
+    private String payStartTime;
+
+    /**
+     * 结束时间
+     */
+    private String payEndTime;
+
+    /**
+     * 微信订单号
+     */
+    private String tradeNo;
+}

src/main/java/com/huiju/estateagents/bo/request/RaiseRecordRequestBO.java

@@ -0,0 +1,95 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 认筹单记录查询请求实体
+ *
+ * @Auther: gusy
+ * @Date: 2020/2/27 18:39
+ */
+@Data
+public class RaiseRecordRequestBO {
+
+    private Integer orgId;
+
+    /**
+     * 房源ID
+     */
+    private String houseId;
+
+    /**
+     * 认筹表ID
+     */
+    private Integer raiseId;
+
+    /**
+     * 认筹单ID
+     */
+    private Integer raiseRecordId;
+
+    /**
+     * 期名
+     */
+    private String termName;
+
+    /**
+     * 楼栋名
+     */
+    private String blockName;
+
+    /**
+     * 单元名
+     */
+    private String unitName;
+
+    /**
+     * 楼层名
+     */
+    private String floorName;
+
+    /**
+     * 房间名
+     */
+    private String roomName;
+
+    /**
+     * 是否作废
+     */
+    private Integer status;
+
+    /**
+     * 房源锁定状态
+     */
+    private Integer lockingStatus;
+
+    /**
+     * 认筹手机号
+     */
+    private String tel;
+
+    /**
+     * 用户手机号
+     */
+    private String personTel;
+
+    /**
+     * 缴费状态
+     */
+    private String payStatus;
+
+    /**
+     * 缴费方式
+     */
+    private String payType;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+}

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserAuthMenuController.java

@@ -2,13 +2,11 @@ package com.huiju.estateagents.center.taUser.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonArray;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
 import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
-import com.huiju.estateagents.entity.TaRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -39,7 +37,7 @@ public class TaUserAuthMenuController extends BaseController {
                                          @RequestParam("pageSize")Integer pageSize,
                                          HttpServletRequest request){
         Integer userId = getUserId(request);
-        return iTaUserAuthMenuService.getMenuByUserId(pageNum,pageSize,userId.toString());
+        return iTaUserAuthMenuService.getMenuByUserId(pageNum,pageSize,userId.toString(), getOrgId(request));
     }
 
     /**
@@ -50,8 +48,8 @@ public class TaUserAuthMenuController extends BaseController {
      */
     @RequestMapping(value="/admin/menuList",method= RequestMethod.GET)
     public ResponseBean getMenuByRole(@RequestParam("pageNum")Integer pageNum,
-                                      @RequestParam("pageSize")Integer pageSize){
-        return iTaUserAuthMenuService.getAllMenu(pageNum, pageSize);
+                                      @RequestParam("pageSize")Integer pageSize, HttpServletRequest request){
+        return iTaUserAuthMenuService.getAllMenu(pageNum, pageSize, getOrgId(request), null);
     }
 
     /**

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -291,7 +291,7 @@ public class TaUserController extends BaseController {
         try {
             TaUser taUser = iTaUserService.getById(map.get("userId").toString());
             List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
-            ResponseBean authMenu = iTaUserAuthMenuService.getMenuByUserId(null, null, taUser.getUserId().toString());
+            ResponseBean authMenu = iTaUserAuthMenuService.getMenuByUserId(null, null, taUser.getUserId().toString(),taUser.getOrgId());
             ResponseBean authButton = iTaUserAuthButtonService.getButtonByUserId(null, null, taUser.getUserId().toString());
             taUser.setMenus((List<SysMenu>) authMenu.getData());
             taUser.setButtons((List<SysButtonInMenu>) authButton.getData());
@@ -299,7 +299,7 @@ public class TaUserController extends BaseController {
             taUser.setLoginPassword("");
 
             //获取所有菜单
-            List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null).getData();
+            List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId(), roles).getData();
             List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
 
             userMap.put("taUser", taUser);

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.center.taUser.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -116,6 +117,7 @@ public class TaUser implements Serializable {
     /**
      * 权重
      */
+    @TableField(strategy= FieldStrategy.IGNORED)
     private String weight;
 
     /**
@@ -218,4 +220,10 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private String confirmPassword;
+
+    /**
+     * 置业顾问的personid
+     */
+    @TableField(exist = false)
+    private String consultantPersonId;
 }

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserAuthMenuService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaRole;
 
 import java.util.List;
 
@@ -15,9 +16,9 @@ import java.util.List;
  */
 public interface ITaUserAuthMenuService extends IService<SysMenu> {
 
-    ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId);
+    ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId, Integer orgId);
 
-    ResponseBean getAllMenu(Integer pageNum, Integer pageSize);
+    ResponseBean getAllMenu(Integer pageNum, Integer pageSize, Integer orgId, List<TaRole> roles);
 
     ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList,String name,Integer orgid,List<SysButtonInMenu> sysButtonInMenuList);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -19,8 +19,8 @@ import java.util.Map;
  * @since 2019-09-11
  */
 public interface ITaUserService extends IService<TaUser> {
-	
-	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg, Integer channelId);
+
+    IPage<Map<String, Object>> getPageList(IPage<TaUser> pg, Integer channelId);
 
     TaUser newUserAndOrg(TaUser taUser, Integer channelId) throws Exception;
 
@@ -31,23 +31,25 @@ public interface ITaUserService extends IService<TaUser> {
     void turnUserOnOrNot(Integer id, boolean isOn, String plat) throws Exception;
 
     void resetPassword(Integer id, String newPass) throws Exception;
-    
+
     List<TaTags> getTagsList(TaUser e);
-    
+
     TaUser addAdminUser(TaUser taUser) throws Exception;
-    
+
     TaUser updateAdminUser(TaUser taUser) throws Exception;
 
     TaUser getAdminByAppID(String appid);
 
     /**
      * 查询所有城市
+     *
      * @return
      */
     ResponseBean cityTree();
 
     /**
      * 员工离职
+     *
      * @param userId
      * @param customerIdList
      * @param consultantUserId 置业顾问的userId
@@ -57,10 +59,20 @@ public interface ITaUserService extends IService<TaUser> {
 
     /**
      * 分页查询用户列表
+     *
      * @param pg
      * @param taUser
      * @param taPersonBuildingListByUserId
      * @return
      */
     IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 获取用户信息
+     *
+     * @param userId
+     * @param orgId
+     * @return
+     */
+    TaUser getUserInfoById(Integer userId, Integer orgId);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthMenuServiceImpl.java

@@ -1,25 +1,24 @@
 package com.huiju.estateagents.center.taUser.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserAuthMenuMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
-import com.huiju.estateagents.mapper.TaRoleButtonMapper;
-import com.huiju.estateagents.mapper.TaRoleMapper;
-import com.huiju.estateagents.mapper.TaRoleMenuMapper;
+import com.huiju.estateagents.mapper.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author weicc
@@ -44,24 +43,64 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
     @Autowired
     private TaRoleButtonMapper taRoleButtonMapper;
 
+    @Autowired
+    private TaAdvancedControllerMapper taAdvancedControllerMapper;
+
+    @Autowired
+    private SysAdvancedConfigRelationMapper sysAdvancedConfigRelationMapper;
+
     /**
      * 根据用户id获取授权菜单
      * @param pageNum
      * @param pageSize
      * @param userId
+     * @param orgId
      * @return
      */
     @Override
-    public ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId) {
-
-        List<SysMenu> records = taUserAuthMenuMapper.sysMenuListByUserId(userId);
+    public ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId, Integer orgId) {
+        List<SysMenu> records = new ArrayList<>();
+        List<SysMenu> menuList = taUserAuthMenuMapper.sysMenuListByUserId(userId);
+        records.addAll(menuList);
+        //添加高级配置的过滤条件
+        List<TaAdvancedController> taAdvancedControllerList = taAdvancedControllerMapper.selectList(new QueryWrapper<TaAdvancedController>().eq("org_id", orgId));
+
+        //需要过滤的菜单
+        QueryWrapper<SysAdvancedConfigRelation> sysAdvancedConfigRelationQueryWrapper = new QueryWrapper<>();
+        sysAdvancedConfigRelationQueryWrapper.eq("target_type",CommConstant.ADVANCED_TYPE_MENU);
+        sysAdvancedConfigRelationQueryWrapper.notIn(taAdvancedControllerList.size() > 0,"advanced_config_id",taAdvancedControllerList.stream().map(TaAdvancedController::getAdvancedConfigId).collect(Collectors.toList()));
+        List<SysAdvancedConfigRelation> sysAdvancedConfigRelations = sysAdvancedConfigRelationMapper.selectList(sysAdvancedConfigRelationQueryWrapper);
+        menuList.forEach(e -> {
+            sysAdvancedConfigRelations.forEach(s -> {
+                if (e.getMenuId() == Integer.valueOf(s.getTargetId())){
+                    records.remove(e);
+                }
+            });
+        });
         return ResponseBean.success(records);
     }
 
     @Override
-    public ResponseBean getAllMenu(Integer pageNum, Integer pageSize) {
-
-        List<SysMenu> records = taUserAuthMenuMapper.sysMenuListByRoleId();
+    public ResponseBean getAllMenu(Integer pageNum, Integer pageSize, Integer orgId, List<TaRole> userRoles) {
+        List<SysMenu> records = new ArrayList<>();
+        List<SysMenu> menuList = taUserAuthMenuMapper.sysMenuListByRoleId();
+        records.addAll(menuList);
+        //添加高级配置的过滤条件
+        List<TaAdvancedController> taAdvancedControllerList = taAdvancedControllerMapper.selectList(new QueryWrapper<TaAdvancedController>().eq("org_id", orgId));
+
+        //需要过滤的菜单
+        QueryWrapper<SysAdvancedConfigRelation> sysAdvancedConfigRelationQueryWrapper = new QueryWrapper<>();
+        sysAdvancedConfigRelationQueryWrapper.eq("target_type",CommConstant.ADVANCED_TYPE_MENU);
+        sysAdvancedConfigRelationQueryWrapper.notIn(taAdvancedControllerList.size() > 0,"advanced_config_id",taAdvancedControllerList.stream().map(TaAdvancedController::getAdvancedConfigId).collect(Collectors.toList()));
+        List<SysAdvancedConfigRelation> sysAdvancedConfigRelations = sysAdvancedConfigRelationMapper.selectList(sysAdvancedConfigRelationQueryWrapper);
+
+        List<TaRoleMenu> configRelationRoleMenuList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(userRoles) && CollectionUtils.isNotEmpty(sysAdvancedConfigRelations)){
+            QueryWrapper<TaRoleMenu> taRoleMenuQueryWrapper = new QueryWrapper<>();
+            taRoleMenuQueryWrapper.in("role_id", userRoles.stream().map(TaRole::getRoleId).collect(Collectors.toList()));
+            taRoleMenuQueryWrapper.in("menu_id", sysAdvancedConfigRelations.stream().map(SysAdvancedConfigRelation::getTargetId).collect(Collectors.toList()));
+            configRelationRoleMenuList = taRoleMenuMapper.selectList(taRoleMenuQueryWrapper);
+        }
 
         QueryWrapper<TaRoleMenu> queryWrapper = new QueryWrapper();
         List<TaRoleMenu> taRoleMenus = taRoleMenuMapper.selectList(queryWrapper);
@@ -73,6 +112,11 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
                     roles.add(taRoleMenu.getRoleId());
                 }
             }
+            for (TaRoleMenu taRoleMenu : configRelationRoleMenuList){
+                if (sysMenu.getMenuId().equals(taRoleMenu.getMenuId())){
+                    roles.remove(taRoleMenu.getRoleId());
+                }
+            }
             sysMenu.setRoles(roles);
         }
 

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

@@ -83,22 +83,22 @@ public class CommConstant {
      * 兑换商品
      */
     public final static String POINTS_CHANGE_GOODS = "goods";
-    
+
     /**
      * 签到
      */
     public final static String POINTS_CHANGE_CHECKIN = "checkin";
-    
+
     /**
      * 分享
      */
     public final static String POINTS_CHANGE_SHARE_POSTER = "share-poster";
-    
+
     /**
      * 授权手机号
      */
     public final static String POINTS_CHANGE_SIGNUP_AGENT = "signup-agent";
-    
+
     /**
      * 拼团
      */
@@ -142,14 +142,13 @@ public class CommConstant {
      * 未领取
      */
     public static final Integer STATUS_UNACCALIMED = 0;
-    
+
     /**
      * 成功
      */
     public static final String SUCCESS = "success";
 
 
-
     /**
      * 活动的当前状态1:进行中
      */
@@ -222,7 +221,7 @@ public class CommConstant {
     /**
      * 客户认购
      */
-    public static final Integer CUSTOMER_PREORDER = 3 ;
+    public static final Integer CUSTOMER_PREORDER = 3;
 
     /**
      * 客户签约
@@ -247,16 +246,16 @@ public class CommConstant {
 
     //=================  客户入口类型 start =======================
     /*
-    * 自主进入
-    * */
+     * 自主进入
+     * */
     public static final String ENTRY_VOLUNTEER = "volunteer";
     /*
     添加
     */
     public static final String ENTRY_INPUT = "input";
     /*
-    * 报备
-    * */
+     * 报备
+     * */
     public static final String ENTRY_VERIFY = "verify";
     //=================  客户入口类型 end =======================
 
@@ -423,39 +422,39 @@ public class CommConstant {
     public static final String POSTER_CONTENT_TYPE_NEWS = "news";
     //人员
     public static final String POSTER_CONTENT_TYPE_PERSON = "person";
-	
-	
-	public static final String GD_KEY = "c9fc664a9030aed2ec2183508c2ca476";
- 
-	//已参与微信端用
+
+
+    public static final String GD_KEY = "c9fc664a9030aed2ec2183508c2ca476";
+
+    //已参与微信端用
     public static final Integer ACTIVITY_STATUS_PARTNER = 3;
-    
+
     //发起者
-	public static final String HELP_STATUS_INITIATE = "Initiate";
-	
-	//助力活动
-	public static final Object HELP_ACTIVITY = "helpActivity";
-	
-	//分享活动
-	public static final Object GROUP_ACTIVITY = "groupActivity";
-	public static final String TARGET_TYPE_H5 = "H5";
+    public static final String HELP_STATUS_INITIATE = "Initiate";
+
+    //助力活动
+    public static final Object HELP_ACTIVITY = "helpActivity";
+
+    //分享活动
+    public static final Object GROUP_ACTIVITY = "groupActivity";
+    public static final String TARGET_TYPE_H5 = "H5";
     public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
     public static final String LIVE_ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"onlineSelling/pages/live/index\"}";
     public static final String DRAINAGE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/project/h5Page\"}";
     public static final String HOUSE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"onlineSelling/pages/houseList/index\"}";
-    
+
     /**
      * 消息通知
      * 必须存在表   td_miniapp_template_type 中
      */
     public static final String MESSAGE_CONTENT_OF_NOTICE = "notice";
-    
+
     /**
      * 助力通知
      * 必须存在表   td_miniapp_template_type 中
      */
     public static final String MESSAGE_CONTENT_OF_HELP = "help-result";
-    
+
     /**
      * 拼团通知
      * 必须存在表   td_miniapp_template_type 中
@@ -467,22 +466,22 @@ public class CommConstant {
      * 必须存在表   td_miniapp_template_type 中
      */
     public static final String MESSAGE_CONTENT_OF_HOUSE = "house";
-    
+
     /**
      * 活动以结束
      */
     public static final Integer ACTIVITY_STATUS_FINISH = 2;
-    
+
     /**
      * 客户统计类型：跟进客户
      */
-	public static final String CUSTOMER_TYPE_FOLLOW = "follow";
-    
+    public static final String CUSTOMER_TYPE_FOLLOW = "follow";
+
     /**
      * 客户统计类型：新增客户
      */
     public static final String CUSTOMER_TYPE_NEW = "new";
-    
+
     /**
      * 客户统计类型：到访客户
      */
@@ -509,12 +508,12 @@ public class CommConstant {
      * 户型图
      */
     public static final String BUILDING_IMG_APARMENT = "aparment";
-    
+
     /**
      * 高德地图url
      */
-	public static final String AMAP_HTTP = "https://restapi.amap.com/v3/geocode/regeo";
-    
+    public static final String AMAP_HTTP = "https://restapi.amap.com/v3/geocode/regeo";
+
     /**
      * 高德地图key
      */
@@ -637,4 +636,88 @@ public class CommConstant {
      */
     public static final String HOUSE_DETAIL_PATH = "onlineSelling/pages/detail/index?id=%s";
 
+    public static final String RAISE_DETAIL_PATH = "/onlineSelling/pages/raiseProfile/index?id=%s";
+
+    /**
+     * 已锁定
+     */
+    public static final String HOUSE_LOCKING_STATUS_LOCKED = "locked";
+
+    /**
+     * 未锁定
+     */
+    public static final String HOUSE_LOCKING_STATUS_UNLOCKED = "unlocked";
+
+    /**
+     * 房源订单
+     */
+    public static final String ORDER_TARGET_TYPE_HOUSE = "house";
+
+    /**
+     * 自动锁房
+     */
+    public static final String HOUSE_LOCKING_TYPE_AUTO = "auto";
+
+    /**
+     * 手动锁房
+     */
+    public static final String HOUSE_LOCKING_TYPE_MANUAL = "manual";
+
+    /**
+     * 正在缴费
+     */
+    public static final String PAY_STATUS_PAYING = "paying";
+
+    /**
+     * 未缴费
+     */
+    public static final String PAY_STATUS_UNPAID = "unpaid";
+
+    /**
+     * 已缴费
+     */
+    public static final String PAY_STATUS_PAID = "paid";
+
+    /**
+     * 已退费
+     */
+    public static final String PAY_STATUS_REFUNDED = "refunded";
+
+    /**
+     * 退款异常
+     */
+    public static final String PAY_STATUS_CHANGE = "change";
+
+
+    /**
+     * 已经取消支付
+     *
+     */
+    public static final String PAY_STATUS_CANCEL = "cancel";
+
+    /**
+     * 支付超时
+     *
+     */
+    public static final String PAY_STATUS_TIMEOUT = "timeout";
+
+    /**
+     * 最大认筹金额
+     */
+    public static final Integer MAX_RAISE_PRICE = 5000000;
+
+    /**
+     * 菜单
+     */
+    public static final Object ADVANCED_TYPE_MENU = "menu";
+
+    /**
+     * 线下缴费
+     */
+    public static final String PAY_TYPE_OFFLINE = "offLine";
+
+    /**
+     * 线下缴费
+     */
+    public static final String PAY_TYPE_ONLINE = "onLine";
 }

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

@@ -19,12 +19,12 @@ public class SMSUtils {
     // 短信服务配置
     SMSProperties smsProperties;
 
-    Map<String, Phone> allPhones;
+    Hashtable<String, Phone> allPhones;
 
     @Autowired
     public SMSUtils(SMSProperties properties) {
         smsProperties = properties;
-        allPhones = new HashMap<>();
+        allPhones = new Hashtable<>();
     }
 
     /**

src/main/java/com/huiju/estateagents/common/wxpay/IWXPayDomain.java

@@ -0,0 +1,42 @@
+package com.huiju.estateagents.common.wxpay;
+
+/**
+ * 域名管理，实现主备域名自动切换
+ */
+public abstract interface IWXPayDomain {
+    /**
+     * 上报域名网络状况
+     * @param domain 域名。 比如：api.mch.weixin.qq.com
+     * @param elapsedTimeMillis 耗时
+     * @param ex 网络请求中出现的异常。
+     *           null表示没有异常
+     *           ConnectTimeoutException，表示建立网络连接异常
+     *           UnknownHostException， 表示dns解析异常
+     */
+    abstract void report(final String domain, long elapsedTimeMillis, final Exception ex);
+
+    /**
+     * 获取域名
+     * @param config 配置
+     * @return 域名
+     */
+    abstract DomainInfo getDomain(final WXPayConfig config);
+
+    static class DomainInfo{
+        public String domain;       //域名
+        public boolean primaryDomain;     //该域名是否为主域名。例如:api.mch.weixin.qq.com为主域名
+        public DomainInfo(String domain, boolean primaryDomain) {
+            this.domain = domain;
+            this.primaryDomain = primaryDomain;
+        }
+
+        @Override
+        public String toString() {
+            return "DomainInfo{" +
+                    "domain='" + domain + '\'' +
+                    ", primaryDomain=" + primaryDomain +
+                    '}';
+        }
+    }
+
+}

src/main/java/com/huiju/estateagents/common/wxpay/WXPay.java

@@ -0,0 +1,689 @@
+package com.huiju.estateagents.common.wxpay;
+
+
+import java.util.HashMap;
+import java.util.Map;
+import com.huiju.estateagents.common.wxpay.WXPayConstants.SignType;
+
+public class WXPay {
+
+    private WXPayConfig config;
+    private SignType signType;
+    private boolean autoReport;
+    private boolean useSandbox;
+    private String notifyUrl;
+    private WXPayRequest wxPayRequest;
+
+    public WXPay(final WXPayConfig config) throws Exception {
+        this(config, null, true, false);
+    }
+
+    public WXPay(final WXPayConfig config, final boolean autoReport) throws Exception {
+        this(config, null, autoReport, false);
+    }
+
+
+    public WXPay(final WXPayConfig config, final boolean autoReport, final boolean useSandbox) throws Exception{
+        this(config, null, autoReport, useSandbox);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl) throws Exception {
+        this(config, notifyUrl, true, false);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl, final boolean autoReport) throws Exception {
+        this(config, notifyUrl, autoReport, false);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl, final boolean autoReport, final boolean useSandbox) throws Exception {
+        this.config = config;
+        this.notifyUrl = notifyUrl;
+        this.autoReport = autoReport;
+        this.useSandbox = useSandbox;
+        //if (useSandbox) {
+            this.signType = SignType.MD5;
+        //}
+        //else {
+        //    this.signType = SignType.HMACSHA256;
+        //}
+        this.wxPayRequest = new WXPayRequest(config);
+    }
+
+    private void checkWXPayConfig() throws Exception {
+        if (this.config == null) {
+            throw new Exception("config is null");
+        }
+        if (this.config.getAppID() == null || this.config.getAppID().trim().length() == 0) {
+            throw new Exception("appid in config is empty");
+        }
+        if (this.config.getMchID() == null || this.config.getMchID().trim().length() == 0) {
+            throw new Exception("appid in config is empty");
+        }
+        if (this.config.getCertStream() == null) {
+            throw new Exception("cert stream in config is empty");
+        }
+        if (this.config.getWXPayDomain() == null){
+            throw new Exception("config.getWXPayDomain() is null");
+        }
+
+        if (this.config.getHttpConnectTimeoutMs() < 10) {
+            throw new Exception("http connect timeout is too small");
+        }
+        if (this.config.getHttpReadTimeoutMs() < 10) {
+            throw new Exception("http read timeout is too small");
+        }
+
+    }
+
+    /**
+     * 向 Map 中添加 appid、mch_id、nonce_str、sign_type、sign <br>
+     * 该函数适用于商户适用于统一下单等接口，不适用于红包、代金券接口
+     *
+     * @param reqData
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> fillRequestData(Map<String, String> reqData) throws Exception {
+        reqData.put("appid", config.getAppID());
+        reqData.put("mch_id", config.getMchID());
+        reqData.put("nonce_str", WXPayUtil.generateNonceStr());
+        if (SignType.MD5.equals(this.signType)) {
+            reqData.put("sign_type", WXPayConstants.MD5);
+        }
+        else if (SignType.HMACSHA256.equals(this.signType)) {
+            reqData.put("sign_type", WXPayConstants.HMACSHA256);
+        }
+        reqData.put("sign", WXPayUtil.generateSignature(reqData, config.getKey(), this.signType));
+        return reqData;
+    }
+
+    /**
+     * 判断xml数据的sign是否有效，必须包含sign字段，否则返回false。
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return 签名是否有效
+     * @throws Exception
+     */
+    public boolean isResponseSignatureValid(Map<String, String> reqData) throws Exception {
+        // 返回数据的签名方式和请求中给定的签名方式是一致的
+        return WXPayUtil.isSignatureValid(reqData, this.config.getKey(), this.signType);
+    }
+
+    /**
+     * 判断支付结果通知中的sign是否有效
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return 签名是否有效
+     * @throws Exception
+     */
+    public boolean isPayResultNotifySignatureValid(Map<String, String> reqData) throws Exception {
+        String signTypeInData = reqData.get(WXPayConstants.FIELD_SIGN_TYPE);
+        SignType signType;
+        if (signTypeInData == null) {
+            signType = SignType.MD5;
+        }
+        else {
+            signTypeInData = signTypeInData.trim();
+            if (signTypeInData.length() == 0) {
+                signType = SignType.MD5;
+            }
+            else if (WXPayConstants.MD5.equals(signTypeInData)) {
+                signType = SignType.MD5;
+            }
+            else if (WXPayConstants.HMACSHA256.equals(signTypeInData)) {
+                signType = SignType.HMACSHA256;
+            }
+            else {
+                throw new Exception(String.format("Unsupported sign_type: %s", signTypeInData));
+            }
+        }
+        return WXPayUtil.isSignatureValid(reqData, this.config.getKey(), signType);
+    }
+
+
+    /**
+     * 不需要证书的请求
+     * @param urlSuffix String
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 超时时间，单位是毫秒
+     * @param readTimeoutMs 超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public String requestWithoutCert(String urlSuffix, Map<String, String> reqData,
+                                     int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String msgUUID = reqData.get("nonce_str");
+        String reqBody = WXPayUtil.mapToXml(reqData);
+
+        String resp = this.wxPayRequest.requestWithoutCert(urlSuffix, msgUUID, reqBody, connectTimeoutMs, readTimeoutMs, autoReport);
+        return resp;
+    }
+
+
+    /**
+     * 需要证书的请求
+     * @param urlSuffix String
+     * @param reqData 向wxpay post的请求数据  Map
+     * @param connectTimeoutMs 超时时间，单位是毫秒
+     * @param readTimeoutMs 超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public String requestWithCert(String urlSuffix, Map<String, String> reqData,
+                                  int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String msgUUID= reqData.get("nonce_str");
+        String reqBody = WXPayUtil.mapToXml(reqData);
+
+        String resp = this.wxPayRequest.requestWithCert(urlSuffix, msgUUID, reqBody, connectTimeoutMs, readTimeoutMs, this.autoReport);
+        return resp;
+    }
+
+    /**
+     * 处理 HTTPS API返回数据，转换成Map对象。return_code为SUCCESS时，验证签名。
+     * @param xmlStr API返回的XML格式数据
+     * @return Map类型数据
+     * @throws Exception
+     */
+    public Map<String, String> processResponseXml(String xmlStr) throws Exception {
+        String RETURN_CODE = "return_code";
+        String return_code;
+        Map<String, String> respData = WXPayUtil.xmlToMap(xmlStr);
+        if (respData.containsKey(RETURN_CODE)) {
+            return_code = respData.get(RETURN_CODE);
+        }
+        else {
+            throw new Exception(String.format("No `return_code` in XML: %s", xmlStr));
+        }
+
+        if (return_code.equals(WXPayConstants.FAIL)) {
+            return respData;
+        }
+        else if (return_code.equals(WXPayConstants.SUCCESS)) {
+           if (this.isResponseSignatureValid(respData)) {
+               return respData;
+           }
+           else {
+               throw new Exception(String.format("Invalid sign value in XML: %s", xmlStr));
+           }
+        }
+        else {
+            throw new Exception(String.format("return_code value %s is invalid in XML: %s", return_code, xmlStr));
+        }
+    }
+
+    /**
+     * 作用：提交刷卡支付<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> microPay(Map<String, String> reqData) throws Exception {
+        return this.microPay(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：提交刷卡支付<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> microPay(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_MICROPAY_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.MICROPAY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+    /**
+     * 提交刷卡支付，针对软POS，尽可能做成功
+     * 内置重试机制，最多60s
+     * @param reqData
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> microPayWithPos(Map<String, String> reqData) throws Exception {
+        return this.microPayWithPos(reqData, this.config.getHttpConnectTimeoutMs());
+    }
+
+    /**
+     * 提交刷卡支付，针对软POS，尽可能做成功
+     * 内置重试机制，最多60s
+     * @param reqData
+     * @param connectTimeoutMs
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> microPayWithPos(Map<String, String> reqData, int connectTimeoutMs) throws Exception {
+        int remainingTimeMs = 60*1000;
+        long startTimestampMs = 0;
+        Map<String, String> lastResult = null;
+        Exception lastException = null;
+
+        while (true) {
+            startTimestampMs = WXPayUtil.getCurrentTimestampMs();
+            int readTimeoutMs = remainingTimeMs - connectTimeoutMs;
+            if (readTimeoutMs > 1000) {
+                try {
+                    lastResult = this.microPay(reqData, connectTimeoutMs, readTimeoutMs);
+                    String returnCode = lastResult.get("return_code");
+                    if (returnCode.equals("SUCCESS")) {
+                        String resultCode = lastResult.get("result_code");
+                        String errCode = lastResult.get("err_code");
+                        if (resultCode.equals("SUCCESS")) {
+                            break;
+                        }
+                        else {
+                            // 看错误码，若支付结果未知，则重试提交刷卡支付
+                            if (errCode.equals("SYSTEMERROR") || errCode.equals("BANKERROR") || errCode.equals("USERPAYING")) {
+                                remainingTimeMs = remainingTimeMs - (int)(WXPayUtil.getCurrentTimestampMs() - startTimestampMs);
+                                if (remainingTimeMs <= 100) {
+                                    break;
+                                }
+                                else {
+                                    WXPayUtil.getLogger().info("microPayWithPos: try micropay again");
+                                    if (remainingTimeMs > 5*1000) {
+                                        Thread.sleep(5*1000);
+                                    }
+                                    else {
+                                        Thread.sleep(1*1000);
+                                    }
+                                    continue;
+                                }
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                    }
+                    else {
+                        break;
+                    }
+                }
+                catch (Exception ex) {
+                    lastResult = null;
+                    lastException = ex;
+                }
+            }
+            else {
+                break;
+            }
+        }
+
+        if (lastResult == null) {
+            throw lastException;
+        }
+        else {
+            return lastResult;
+        }
+    }
+
+
+
+    /**
+     * 作用：统一下单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> unifiedOrder(Map<String, String> reqData) throws Exception {
+        return this.unifiedOrder(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：统一下单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> unifiedOrder(Map<String, String> reqData,  int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_UNIFIEDORDER_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.UNIFIEDORDER_URL_SUFFIX;
+        }
+        if(this.notifyUrl != null) {
+            reqData.put("notify_url", this.notifyUrl);
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：查询订单<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> orderQuery(Map<String, String> reqData) throws Exception {
+        return this.orderQuery(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：查询订单<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据 int
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> orderQuery(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_ORDERQUERY_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.ORDERQUERY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：撤销订单<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> reverse(Map<String, String> reqData) throws Exception {
+        return this.reverse(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：撤销订单<br>
+     * 场景：刷卡支付<br>
+     * 其他：需要证书
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> reverse(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REVERSE_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REVERSE_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：关闭订单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> closeOrder(Map<String, String> reqData) throws Exception {
+        return this.closeOrder(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：关闭订单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> closeOrder(Map<String, String> reqData,  int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_CLOSEORDER_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.CLOSEORDER_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：申请退款<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refund(Map<String, String> reqData) throws Exception {
+        return this.refund(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：申请退款<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付<br>
+     * 其他：需要证书
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refund(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REFUND_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REFUND_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：退款查询<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refundQuery(Map<String, String> reqData) throws Exception {
+        return this.refundQuery(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：退款查询<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refundQuery(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REFUNDQUERY_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REFUNDQUERY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：对账单下载（成功时返回对账单数据，失败时返回XML格式数据）<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> downloadBill(Map<String, String> reqData) throws Exception {
+        return this.downloadBill(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：对账单下载<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付<br>
+     * 其他：无论是否成功都返回Map。若成功，返回的Map中含有return_code、return_msg、data，
+     *      其中return_code为`SUCCESS`，data为对账单数据。
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return 经过封装的API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> downloadBill(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_DOWNLOADBILL_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.DOWNLOADBILL_URL_SUFFIX;
+        }
+        String respStr = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs).trim();
+        Map<String, String> ret;
+        // 出现错误，返回XML数据
+        if (respStr.indexOf("<") == 0) {
+            ret = WXPayUtil.xmlToMap(respStr);
+        }
+        else {
+            // 正常返回csv数据
+            ret = new HashMap<String, String>();
+            ret.put("return_code", WXPayConstants.SUCCESS);
+            ret.put("return_msg", "ok");
+            ret.put("data", respStr);
+        }
+        return ret;
+    }
+
+
+    /**
+     * 作用：交易保障<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> report(Map<String, String> reqData) throws Exception {
+        return this.report(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：交易保障<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> report(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REPORT_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REPORT_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return WXPayUtil.xmlToMap(respXml);
+    }
+
+
+    /**
+     * 作用：转换短链接<br>
+     * 场景：刷卡支付、扫码支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> shortUrl(Map<String, String> reqData) throws Exception {
+        return this.shortUrl(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：转换短链接<br>
+     * 场景：刷卡支付、扫码支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> shortUrl(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_SHORTURL_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.SHORTURL_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：授权码查询OPENID接口<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> authCodeToOpenid(Map<String, String> reqData) throws Exception {
+        return this.authCodeToOpenid(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：授权码查询OPENID接口<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> authCodeToOpenid(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_AUTHCODETOOPENID_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.AUTHCODETOOPENID_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+} // end class

src/main/java/com/huiju/estateagents/common/wxpay/WXPayConfig.java

@@ -0,0 +1,103 @@
+package com.huiju.estateagents.common.wxpay;
+
+import java.io.InputStream;
+
+public abstract class WXPayConfig {
+
+
+
+    /**
+     * 获取 App ID
+     *
+     * @return App ID
+     */
+    abstract String getAppID();
+
+
+    /**
+     * 获取 Mch ID
+     *
+     * @return Mch ID
+     */
+    abstract String getMchID();
+
+
+    /**
+     * 获取 API 密钥
+     *
+     * @return API密钥
+     */
+    abstract String getKey();
+
+
+    /**
+     * 获取商户证书内容
+     *
+     * @return 商户证书内容
+     */
+    abstract InputStream getCertStream();
+
+    /**
+     * HTTP(S) 连接超时时间，单位毫秒
+     *
+     * @return
+     */
+    public int getHttpConnectTimeoutMs() {
+        return 6*1000;
+    }
+
+    /**
+     * HTTP(S) 读数据超时时间，单位毫秒
+     *
+     * @return
+     */
+    public int getHttpReadTimeoutMs() {
+        return 8*1000;
+    }
+
+    /**
+     * 获取WXPayDomain, 用于多域名容灾自动切换
+     * @return
+     */
+    abstract IWXPayDomain getWXPayDomain();
+
+    /**
+     * 是否自动上报。
+     * 若要关闭自动上报，子类中实现该函数返回 false 即可。
+     *
+     * @return
+     */
+    public boolean shouldAutoReport() {
+        return true;
+    }
+
+    /**
+     * 进行健康上报的线程的数量
+     *
+     * @return
+     */
+    public int getReportWorkerNum() {
+        return 6;
+    }
+
+
+    /**
+     * 健康上报缓存消息的最大数量。会有线程去独立上报
+     * 粗略计算：加入一条消息200B，10000消息占用空间 2000 KB，约为2MB，可以接受
+     *
+     * @return
+     */
+    public int getReportQueueMaxSize() {
+        return 10000;
+    }
+
+    /**
+     * 批量上报，一次最多上报多个数据
+     *
+     * @return
+     */
+    public int getReportBatchSize() {
+        return 10;
+    }
+
+}

src/main/java/com/huiju/estateagents/common/wxpay/WXPayConstants.java

@@ -0,0 +1,59 @@
+package com.huiju.estateagents.common.wxpay;
+
+import org.apache.http.client.HttpClient;
+
+/**
+ * 常量
+ */
+public class WXPayConstants {
+
+    public enum SignType {
+        MD5, HMACSHA256
+    }
+
+    public static final String DOMAIN_API = "api.mch.weixin.qq.com";
+    public static final String DOMAIN_API2 = "api2.mch.weixin.qq.com";
+    public static final String DOMAIN_APIHK = "apihk.mch.weixin.qq.com";
+    public static final String DOMAIN_APIUS = "apius.mch.weixin.qq.com";
+
+
+    public static final String FAIL     = "FAIL";
+    public static final String SUCCESS  = "SUCCESS";
+    public static final String HMACSHA256 = "HMAC-SHA256";
+    public static final String MD5 = "MD5";
+
+    public static final String FIELD_SIGN = "sign";
+    public static final String FIELD_SIGN_TYPE = "sign_type";
+
+    public static final String WXPAYSDK_VERSION = "WXPaySDK/3.0.9";
+    public static final String USER_AGENT = WXPAYSDK_VERSION +
+            " (" + System.getProperty("os.arch") + " " + System.getProperty("os.name") + " " + System.getProperty("os.version") +
+            ") Java/" + System.getProperty("java.version") + " HttpClient/" + HttpClient.class.getPackage().getImplementationVersion();
+
+    public static final String MICROPAY_URL_SUFFIX     = "/pay/micropay";
+    public static final String UNIFIEDORDER_URL_SUFFIX = "/pay/unifiedorder";
+    public static final String ORDERQUERY_URL_SUFFIX   = "/pay/orderquery";
+    public static final String REVERSE_URL_SUFFIX      = "/secapi/pay/reverse";
+    public static final String CLOSEORDER_URL_SUFFIX   = "/pay/closeorder";
+    public static final String REFUND_URL_SUFFIX       = "/secapi/pay/refund";
+    public static final String REFUNDQUERY_URL_SUFFIX  = "/pay/refundquery";
+    public static final String DOWNLOADBILL_URL_SUFFIX = "/pay/downloadbill";
+    public static final String REPORT_URL_SUFFIX       = "/payitil/report";
+    public static final String SHORTURL_URL_SUFFIX     = "/tools/shorturl";
+    public static final String AUTHCODETOOPENID_URL_SUFFIX = "/tools/authcodetoopenid";
+
+    // sandbox
+    public static final String SANDBOX_MICROPAY_URL_SUFFIX     = "/sandboxnew/pay/micropay";
+    public static final String SANDBOX_UNIFIEDORDER_URL_SUFFIX = "/sandboxnew/pay/unifiedorder";
+    public static final String SANDBOX_ORDERQUERY_URL_SUFFIX   = "/sandboxnew/pay/orderquery";
+    public static final String SANDBOX_REVERSE_URL_SUFFIX      = "/sandboxnew/secapi/pay/reverse";
+    public static final String SANDBOX_CLOSEORDER_URL_SUFFIX   = "/sandboxnew/pay/closeorder";
+    public static final String SANDBOX_REFUND_URL_SUFFIX       = "/sandboxnew/secapi/pay/refund";
+    public static final String SANDBOX_REFUNDQUERY_URL_SUFFIX  = "/sandboxnew/pay/refundquery";
+    public static final String SANDBOX_DOWNLOADBILL_URL_SUFFIX = "/sandboxnew/pay/downloadbill";
+    public static final String SANDBOX_REPORT_URL_SUFFIX       = "/sandboxnew/payitil/report";
+    public static final String SANDBOX_SHORTURL_URL_SUFFIX     = "/sandboxnew/tools/shorturl";
+    public static final String SANDBOX_AUTHCODETOOPENID_URL_SUFFIX = "/sandboxnew/tools/authcodetoopenid";
+
+}
+

src/main/java/com/huiju/estateagents/common/wxpay/WXPayReport.java

@@ -0,0 +1,265 @@
+package com.huiju.estateagents.common.wxpay;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * 交易保障
+ */
+public class WXPayReport {
+
+    public static class ReportInfo {
+
+        /**
+         * 布尔变量使用int。0为false， 1为true。
+         */
+
+        // 基本信息
+        private String version = "v1";
+        private String sdk = WXPayConstants.WXPAYSDK_VERSION;
+        private String uuid;  // 交易的标识
+        private long timestamp;   // 上报时的时间戳，单位秒
+        private long elapsedTimeMillis; // 耗时，单位 毫秒
+
+        // 针对主域名
+        private String firstDomain;  // 第1次请求的域名
+        private boolean primaryDomain; //是否主域名
+        private int firstConnectTimeoutMillis;  // 第1次请求设置的连接超时时间，单位 毫秒
+        private int firstReadTimeoutMillis;  // 第1次请求设置的读写超时时间，单位 毫秒
+        private int firstHasDnsError;  // 第1次请求是否出现dns问题
+        private int firstHasConnectTimeout; // 第1次请求是否出现连接超时
+        private int firstHasReadTimeout; // 第1次请求是否出现连接超时
+
+        public ReportInfo(String uuid, long timestamp, long elapsedTimeMillis, String firstDomain, boolean primaryDomain, int firstConnectTimeoutMillis, int firstReadTimeoutMillis, boolean firstHasDnsError, boolean firstHasConnectTimeout, boolean firstHasReadTimeout) {
+            this.uuid = uuid;
+            this.timestamp = timestamp;
+            this.elapsedTimeMillis = elapsedTimeMillis;
+            this.firstDomain = firstDomain;
+            this.primaryDomain = primaryDomain;
+            this.firstConnectTimeoutMillis = firstConnectTimeoutMillis;
+            this.firstReadTimeoutMillis = firstReadTimeoutMillis;
+            this.firstHasDnsError = firstHasDnsError?1:0;
+            this.firstHasConnectTimeout = firstHasConnectTimeout?1:0;
+            this.firstHasReadTimeout = firstHasReadTimeout?1:0;
+         }
+
+        @Override
+        public String toString() {
+            return "ReportInfo{" +
+                    "version='" + version + '\'' +
+                    ", sdk='" + sdk + '\'' +
+                    ", uuid='" + uuid + '\'' +
+                    ", timestamp=" + timestamp +
+                    ", elapsedTimeMillis=" + elapsedTimeMillis +
+                    ", firstDomain='" + firstDomain + '\'' +
+                    ", primaryDomain=" + primaryDomain +
+                    ", firstConnectTimeoutMillis=" + firstConnectTimeoutMillis +
+                    ", firstReadTimeoutMillis=" + firstReadTimeoutMillis +
+                    ", firstHasDnsError=" + firstHasDnsError +
+                    ", firstHasConnectTimeout=" + firstHasConnectTimeout +
+                    ", firstHasReadTimeout=" + firstHasReadTimeout +
+                    '}';
+        }
+
+        /**
+         * 转换成 csv 格式
+         *
+         * @return
+         */
+        public String toLineString(String key) {
+            String separator = ",";
+            Object[] objects = new Object[] {
+                version, sdk, uuid, timestamp, elapsedTimeMillis,
+                    firstDomain, primaryDomain, firstConnectTimeoutMillis, firstReadTimeoutMillis,
+                    firstHasDnsError, firstHasConnectTimeout, firstHasReadTimeout
+            };
+            StringBuffer sb = new StringBuffer();
+            for(Object obj: objects) {
+                sb.append(obj).append(separator);
+            }
+            try {
+                String sign = WXPayUtil.HMACSHA256(sb.toString(), key);
+                sb.append(sign);
+                return sb.toString();
+            }
+            catch (Exception ex) {
+                return null;
+            }
+
+        }
+
+    }
+
+    private static final String REPORT_URL = "http://report.mch.weixin.qq.com/wxpay/report/default";
+    // private static final String REPORT_URL = "http://127.0.0.1:5000/test";
+
+
+    private static final int DEFAULT_CONNECT_TIMEOUT_MS = 6*1000;
+    private static final int DEFAULT_READ_TIMEOUT_MS = 8*1000;
+
+    private LinkedBlockingQueue<String> reportMsgQueue = null;
+    private WXPayConfig config;
+    private ExecutorService executorService;
+
+    private volatile static WXPayReport INSTANCE;
+
+    private WXPayReport(final WXPayConfig config) {
+        this.config = config;
+        reportMsgQueue = new LinkedBlockingQueue<String>(config.getReportQueueMaxSize());
+
+        // 添加处理线程
+        executorService = Executors.newFixedThreadPool(config.getReportWorkerNum(), new ThreadFactory() {
+            public Thread newThread(Runnable r) {
+                Thread t = Executors.defaultThreadFactory().newThread(r);
+                t.setDaemon(true);
+                return t;
+            }
+        });
+
+        if (config.shouldAutoReport()) {
+            WXPayUtil.getLogger().info("report worker num: {}", config.getReportWorkerNum());
+            for (int i = 0; i < config.getReportWorkerNum(); ++i) {
+                executorService.execute(new Runnable() {
+                    public void run() {
+                        while (true) {
+                            // 先用 take 获取数据
+                            try {
+                                StringBuffer sb = new StringBuffer();
+                                String firstMsg = reportMsgQueue.take();
+                                WXPayUtil.getLogger().info("get first report msg: {}", firstMsg);
+                                String msg = null;
+                                sb.append(firstMsg); //会阻塞至有消息
+                                int remainNum = config.getReportBatchSize() - 1;
+                                for (int j=0; j<remainNum; ++j) {
+                                    WXPayUtil.getLogger().info("try get remain report msg");
+                                    // msg = reportMsgQueue.poll();  // 不阻塞了
+                                    msg = reportMsgQueue.take();
+                                    WXPayUtil.getLogger().info("get remain report msg: {}", msg);
+                                    if (msg == null) {
+                                        break;
+                                    }
+                                    else {
+                                        sb.append("\n");
+                                        sb.append(msg);
+                                    }
+                                }
+                                // 上报
+                                WXPayReport.httpRequest(sb.toString(), DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+                            }
+                            catch (Exception ex) {
+                                WXPayUtil.getLogger().warn("report fail. reason: {}", ex.getMessage());
+                            }
+                        }
+                    }
+                });
+            }
+        }
+
+    }
+
+    /**
+     * 单例，双重校验，请在 JDK 1.5及更高版本中使用
+     *
+     * @param config
+     * @return
+     */
+    public static WXPayReport getInstance(WXPayConfig config) {
+        if (INSTANCE == null) {
+            synchronized (WXPayReport.class) {
+                if (INSTANCE == null) {
+                    INSTANCE = new WXPayReport(config);
+                }
+            }
+        }
+        return INSTANCE;
+    }
+
+    public void report(String uuid, long elapsedTimeMillis,
+                       String firstDomain, boolean primaryDomain, int firstConnectTimeoutMillis, int firstReadTimeoutMillis,
+                       boolean firstHasDnsError, boolean firstHasConnectTimeout, boolean firstHasReadTimeout) {
+        long currentTimestamp = WXPayUtil.getCurrentTimestamp();
+        ReportInfo reportInfo = new ReportInfo(uuid, currentTimestamp, elapsedTimeMillis,
+                firstDomain, primaryDomain, firstConnectTimeoutMillis, firstReadTimeoutMillis,
+                firstHasDnsError, firstHasConnectTimeout, firstHasReadTimeout);
+        String data = reportInfo.toLineString(config.getKey());
+        WXPayUtil.getLogger().info("report {}", data);
+        if (data != null) {
+            reportMsgQueue.offer(data);
+        }
+    }
+
+
+    @Deprecated
+    private void reportSync(final String data) throws Exception {
+        httpRequest(data, DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+    }
+
+    @Deprecated
+    private void reportAsync(final String data) throws Exception {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    httpRequest(data, DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+                }
+                catch (Exception ex) {
+                    WXPayUtil.getLogger().warn("report fail. reason: {}", ex.getMessage());
+                }
+            }
+        }).start();
+    }
+
+    /**
+     * http 请求
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     * @throws Exception
+     */
+    private static String httpRequest(String data, int connectTimeoutMs, int readTimeoutMs) throws Exception{
+        BasicHttpClientConnectionManager connManager;
+        connManager = new BasicHttpClientConnectionManager(
+                RegistryBuilder.<ConnectionSocketFactory>create()
+                        .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                        .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                        .build(),
+                null,
+                null,
+                null
+        );
+        HttpClient httpClient = HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+
+        HttpPost httpPost = new HttpPost(REPORT_URL);
+
+        RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(readTimeoutMs).setConnectTimeout(connectTimeoutMs).build();
+        httpPost.setConfig(requestConfig);
+
+        StringEntity postEntity = new StringEntity(data, "UTF-8");
+        httpPost.addHeader("Content-Type", "text/xml");
+        httpPost.addHeader("User-Agent", WXPayConstants.USER_AGENT);
+        httpPost.setEntity(postEntity);
+
+        HttpResponse httpResponse = httpClient.execute(httpPost);
+        HttpEntity httpEntity = httpResponse.getEntity();
+        return EntityUtils.toString(httpEntity, "UTF-8");
+    }
+
+}

src/main/java/com/huiju/estateagents/common/wxpay/WXPayRequest.java

@@ -0,0 +1,256 @@
+package com.huiju.estateagents.common.wxpay;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.DefaultHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import java.io.InputStream;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+import java.security.KeyStore;
+import java.security.SecureRandom;
+
+public class WXPayRequest {
+    private WXPayConfig config;
+    public WXPayRequest(WXPayConfig config) throws Exception{
+
+        this.config = config;
+    }
+
+    /**
+     * 请求，只请求一次，不做重试
+     * @param domain
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @param useCert 是否使用证书，针对退款、撤销等操作
+     * @return
+     * @throws Exception
+     */
+    private String requestOnce(final String domain, String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean useCert) throws Exception {
+        BasicHttpClientConnectionManager connManager;
+        if (useCert) {
+            // 证书
+            char[] password = config.getMchID().toCharArray();
+            InputStream certStream = config.getCertStream();
+            KeyStore ks = KeyStore.getInstance("PKCS12");
+            ks.load(certStream, password);
+
+            // 实例化密钥库 & 初始化密钥工厂
+            KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+            kmf.init(ks, password);
+
+            // 创建 SSLContext
+            SSLContext sslContext = SSLContext.getInstance("TLS");
+            sslContext.init(kmf.getKeyManagers(), null, new SecureRandom());
+
+            SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(
+                    sslContext,
+                    new String[]{"TLSv1"},
+                    null,
+                    new DefaultHostnameVerifier());
+
+            connManager = new BasicHttpClientConnectionManager(
+                    RegistryBuilder.<ConnectionSocketFactory>create()
+                            .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                            .register("https", sslConnectionSocketFactory)
+                            .build(),
+                    null,
+                    null,
+                    null
+            );
+        }
+        else {
+            connManager = new BasicHttpClientConnectionManager(
+                    RegistryBuilder.<ConnectionSocketFactory>create()
+                            .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                            .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                            .build(),
+                    null,
+                    null,
+                    null
+            );
+        }
+
+        HttpClient httpClient = HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+
+        String url = "https://" + domain + urlSuffix;
+        HttpPost httpPost = new HttpPost(url);
+
+        RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(readTimeoutMs).setConnectTimeout(connectTimeoutMs).build();
+        httpPost.setConfig(requestConfig);
+
+        StringEntity postEntity = new StringEntity(data, "UTF-8");
+        httpPost.addHeader("Content-Type", "text/xml");
+        httpPost.addHeader("User-Agent", WXPayConstants.USER_AGENT + " " + config.getMchID());
+        httpPost.setEntity(postEntity);
+
+        HttpResponse httpResponse = httpClient.execute(httpPost);
+        HttpEntity httpEntity = httpResponse.getEntity();
+        return EntityUtils.toString(httpEntity, "UTF-8");
+
+    }
+
+
+    private String request(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean useCert, boolean autoReport) throws Exception {
+        Exception exception = null;
+        long elapsedTimeMillis = 0;
+        long startTimestampMs = WXPayUtil.getCurrentTimestampMs();
+        boolean firstHasDnsErr = false;
+        boolean firstHasConnectTimeout = false;
+        boolean firstHasReadTimeout = false;
+        IWXPayDomain.DomainInfo domainInfo = config.getWXPayDomain().getDomain(config);
+        if(domainInfo == null){
+            throw new Exception("WXPayConfig.getWXPayDomain().getDomain() is empty or null");
+        }
+        try {
+            String result = requestOnce(domainInfo.domain, urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, useCert);
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            config.getWXPayDomain().report(domainInfo.domain, elapsedTimeMillis, null);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+            return result;
+        }
+        catch (UnknownHostException ex) {  // dns 解析错误，或域名不存在
+            exception = ex;
+            firstHasDnsErr = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayUtil.getLogger().warn("UnknownHostException for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout
+            );
+        }
+        catch (ConnectTimeoutException ex) {
+            exception = ex;
+            firstHasConnectTimeout = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayUtil.getLogger().warn("connect timeout happened for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout
+            );
+        }
+        catch (SocketTimeoutException ex) {
+            exception = ex;
+            firstHasReadTimeout = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayUtil.getLogger().warn("timeout happened for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+        }
+        catch (Exception ex) {
+            exception = ex;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+        }
+        config.getWXPayDomain().report(domainInfo.domain, elapsedTimeMillis, exception);
+        throw exception;
+    }
+
+
+    /**
+     * 可重试的，非双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @return
+     */
+    public String requestWithoutCert(String urlSuffix, String uuid, String data, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, config.getHttpConnectTimeoutMs(), config.getHttpReadTimeoutMs(), false, autoReport);
+    }
+
+    /**
+     * 可重试的，非双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     */
+    public String requestWithoutCert(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs,  boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, false, autoReport);
+    }
+
+    /**
+     * 可重试的，双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @return
+     */
+    public String requestWithCert(String urlSuffix, String uuid, String data, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, config.getHttpConnectTimeoutMs(), config.getHttpReadTimeoutMs(), true, autoReport);
+    }
+
+    /**
+     * 可重试的，双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     */
+    public String requestWithCert(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, true, autoReport);
+    }
+}

src/main/java/com/huiju/estateagents/common/wxpay/WXPayUtil.java

@@ -0,0 +1,295 @@
+package com.huiju.estateagents.common.wxpay;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+import java.util.*;
+import com.huiju.estateagents.common.wxpay.WXPayConstants.SignType;
+
+
+public class WXPayUtil {
+
+    private static final String SYMBOLS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+    private static final Random RANDOM = new SecureRandom();
+
+    /**
+     * XML格式字符串转换为Map
+     *
+     * @param strXML XML字符串
+     * @return XML数据转换后的Map
+     * @throws Exception
+     */
+    public static Map<String, String> xmlToMap(String strXML) throws Exception {
+        try {
+            Map<String, String> data = new HashMap<String, String>();
+            DocumentBuilder documentBuilder = WXPayXmlUtil.newDocumentBuilder();
+            InputStream stream = new ByteArrayInputStream(strXML.getBytes("UTF-8"));
+            org.w3c.dom.Document doc = documentBuilder.parse(stream);
+            doc.getDocumentElement().normalize();
+            NodeList nodeList = doc.getDocumentElement().getChildNodes();
+            for (int idx = 0; idx < nodeList.getLength(); ++idx) {
+                Node node = nodeList.item(idx);
+                if (node.getNodeType() == Node.ELEMENT_NODE) {
+                    org.w3c.dom.Element element = (org.w3c.dom.Element) node;
+                    data.put(element.getNodeName(), element.getTextContent());
+                }
+            }
+            try {
+                stream.close();
+            } catch (Exception ex) {
+                // do nothing
+            }
+            return data;
+        } catch (Exception ex) {
+            WXPayUtil.getLogger().warn("Invalid XML, can not convert to map. Error message: {}. XML content: {}", ex.getMessage(), strXML);
+            throw ex;
+        }
+
+    }
+
+    /**
+     * 将Map转换为XML格式的字符串
+     *
+     * @param data Map类型数据
+     * @return XML格式的字符串
+     * @throws Exception
+     */
+    public static String mapToXml(Map<String, String> data) throws Exception {
+        org.w3c.dom.Document document = WXPayXmlUtil.newDocument();
+        org.w3c.dom.Element root = document.createElement("xml");
+        document.appendChild(root);
+        for (String key: data.keySet()) {
+            String value = data.get(key);
+            if (value == null) {
+                value = "";
+            }
+            value = value.trim();
+            org.w3c.dom.Element filed = document.createElement(key);
+            filed.appendChild(document.createTextNode(value));
+            root.appendChild(filed);
+        }
+        TransformerFactory tf = TransformerFactory.newInstance();
+        Transformer transformer = tf.newTransformer();
+        DOMSource source = new DOMSource(document);
+        transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        StringWriter writer = new StringWriter();
+        StreamResult result = new StreamResult(writer);
+        transformer.transform(source, result);
+        String output = writer.getBuffer().toString(); //.replaceAll("\n|\r", "");
+        try {
+            writer.close();
+        }
+        catch (Exception ex) {
+        }
+        return output;
+    }
+
+
+    /**
+     * 生成带有 sign 的 XML 格式字符串
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @return 含有sign字段的XML
+     */
+    public static String generateSignedXml(final Map<String, String> data, String key) throws Exception {
+        return generateSignedXml(data, key, SignType.MD5);
+    }
+
+    /**
+     * 生成带有 sign 的 XML 格式字符串
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @param signType 签名类型
+     * @return 含有sign字段的XML
+     */
+    public static String generateSignedXml(final Map<String, String> data, String key, SignType signType) throws Exception {
+        String sign = generateSignature(data, key, signType);
+        data.put(WXPayConstants.FIELD_SIGN, sign);
+        return mapToXml(data);
+    }
+
+
+    /**
+     * 判断签名是否正确
+     *
+     * @param xmlStr XML格式数据
+     * @param key API密钥
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(String xmlStr, String key) throws Exception {
+        Map<String, String> data = xmlToMap(xmlStr);
+        if (!data.containsKey(WXPayConstants.FIELD_SIGN) ) {
+            return false;
+        }
+        String sign = data.get(WXPayConstants.FIELD_SIGN);
+        return generateSignature(data, key).equals(sign);
+    }
+
+    /**
+     * 判断签名是否正确，必须包含sign字段，否则返回false。使用MD5签名。
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(Map<String, String> data, String key) throws Exception {
+        return isSignatureValid(data, key, SignType.MD5);
+    }
+
+    /**
+     * 判断签名是否正确，必须包含sign字段，否则返回false。
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @param signType 签名方式
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(Map<String, String> data, String key, SignType signType) throws Exception {
+        if (!data.containsKey(WXPayConstants.FIELD_SIGN) ) {
+            return false;
+        }
+        String sign = data.get(WXPayConstants.FIELD_SIGN);
+        return generateSignature(data, key, signType).equals(sign);
+    }
+
+    /**
+     * 生成签名
+     *
+     * @param data 待签名数据
+     * @param key API密钥
+     * @return 签名
+     */
+    public static String generateSignature(final Map<String, String> data, String key) throws Exception {
+        return generateSignature(data, key, SignType.MD5);
+    }
+
+    /**
+     * 生成签名. 注意，若含有sign_type字段，必须和signType参数保持一致。
+     *
+     * @param data 待签名数据
+     * @param key API密钥
+     * @param signType 签名方式
+     * @return 签名
+     */
+    public static String generateSignature(final Map<String, String> data, String key, SignType signType) throws Exception {
+        Set<String> keySet = data.keySet();
+        String[] keyArray = keySet.toArray(new String[keySet.size()]);
+        Arrays.sort(keyArray);
+        StringBuilder sb = new StringBuilder();
+        for (String k : keyArray) {
+            if (k.equals(WXPayConstants.FIELD_SIGN)) {
+                continue;
+            }
+            if (data.get(k).trim().length() > 0) // 参数值为空，则不参与签名
+                sb.append(k).append("=").append(data.get(k).trim()).append("&");
+        }
+        sb.append("key=").append(key);
+        if (SignType.MD5.equals(signType)) {
+            return MD5(sb.toString()).toUpperCase();
+        }
+        else if (SignType.HMACSHA256.equals(signType)) {
+            return HMACSHA256(sb.toString(), key);
+        }
+        else {
+            throw new Exception(String.format("Invalid sign_type: %s", signType));
+        }
+    }
+
+
+    /**
+     * 获取随机字符串 Nonce Str
+     *
+     * @return String 随机字符串
+     */
+    public static String generateNonceStr() {
+        char[] nonceChars = new char[32];
+        for (int index = 0; index < nonceChars.length; ++index) {
+            nonceChars[index] = SYMBOLS.charAt(RANDOM.nextInt(SYMBOLS.length()));
+        }
+        return new String(nonceChars);
+    }
+
+
+    /**
+     * 生成 MD5
+     *
+     * @param data 待处理数据
+     * @return MD5结果
+     */
+    public static String MD5(String data) throws Exception {
+        MessageDigest md = MessageDigest.getInstance("MD5");
+        byte[] array = md.digest(data.getBytes("UTF-8"));
+        StringBuilder sb = new StringBuilder();
+        for (byte item : array) {
+            sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+        }
+        return sb.toString().toUpperCase();
+    }
+
+    /**
+     * 生成 HMACSHA256
+     * @param data 待处理数据
+     * @param key 密钥
+     * @return 加密结果
+     * @throws Exception
+     */
+    public static String HMACSHA256(String data, String key) throws Exception {
+        Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
+        SecretKeySpec secret_key = new SecretKeySpec(key.getBytes("UTF-8"), "HmacSHA256");
+        sha256_HMAC.init(secret_key);
+        byte[] array = sha256_HMAC.doFinal(data.getBytes("UTF-8"));
+        StringBuilder sb = new StringBuilder();
+        for (byte item : array) {
+            sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+        }
+        return sb.toString().toUpperCase();
+    }
+
+    /**
+     * 日志
+     * @return
+     */
+    public static Logger getLogger() {
+        Logger logger = LoggerFactory.getLogger("wxpay java sdk");
+        return logger;
+    }
+
+    /**
+     * 获取当前时间戳，单位秒
+     * @return
+     */
+    public static long getCurrentTimestamp() {
+        return System.currentTimeMillis()/1000;
+    }
+
+    /**
+     * 获取当前时间戳，单位毫秒
+     * @return
+     */
+    public static long getCurrentTimestampMs() {
+        return System.currentTimeMillis();
+    }
+
+}

src/main/java/com/huiju/estateagents/common/wxpay/WXPayXmlUtil.java

@@ -0,0 +1,30 @@
+package com.huiju.estateagents.common.wxpay;
+
+import org.w3c.dom.Document;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+/**
+ * 2018/7/3
+ */
+public final class WXPayXmlUtil {
+    public static DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {
+        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        documentBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        documentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+        documentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+        documentBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+        documentBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        documentBuilderFactory.setXIncludeAware(false);
+        documentBuilderFactory.setExpandEntityReferences(false);
+
+        return documentBuilderFactory.newDocumentBuilder();
+    }
+
+    public static Document newDocument() throws ParserConfigurationException {
+        return newDocumentBuilder().newDocument();
+    }
+}

src/main/java/com/huiju/estateagents/common/wxpay/WxConfig.java

@@ -0,0 +1,107 @@
+package com.huiju.estateagents.common.wxpay;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * 监控 控制器
+ * @author fxf
+ */
+public class WxConfig extends WXPayConfig {
+	private String appid;
+
+	private String machId;
+
+	private String key;
+
+	private byte[] certData;
+
+	/**
+	 * 获取 App ID
+	 *
+	 * @return App ID
+	 */
+	@Override
+	public String getAppID() {
+		//银城慧家
+		return appid;
+	}
+	
+	/**
+	 * 获取 Mch ID
+	 *
+	 * @return Mch ID
+	 */
+	@Override
+	public String getMchID() {
+		return machId;
+	}
+	
+	/**
+	 * 获取 API 密钥
+	 *
+	 * @return API密钥
+	 */
+	@Override
+	public String getKey() {
+		return key;
+	}
+	
+	/**
+	 * 获取商户证书内容
+	 *
+	 * @return 商户证书内容
+	 */
+	@Override
+	public InputStream getCertStream() {
+		ByteArrayInputStream certBis = new ByteArrayInputStream(this.certData);
+		return certBis;
+
+	}
+
+	public int getHttpConnectTimeoutMs() {
+		return 8000;
+	}
+
+	public int getHttpReadTimeoutMs() {
+		return 10000;
+	}
+	
+	/**
+	 * 获取WXPayDomain, 用于多域名容灾自动切换
+	 *
+	 * @return
+	 */
+	@Override
+	IWXPayDomain getWXPayDomain() {
+		IWXPayDomain iwxPayDomain = new IWXPayDomain() {
+			@Override
+			public void report(String domain, long elapsedTimeMillis, Exception ex) {
+			
+			}
+			@Override
+			public DomainInfo getDomain(WXPayConfig config) {
+				return new IWXPayDomain.DomainInfo(WXPayConstants.DOMAIN_API, true);
+			}
+		};
+		return iwxPayDomain;
+	}
+
+	public void setAppid(String appid) {
+		this.appid = appid;
+	}
+
+	public void setMachId(String machId) {
+		this.machId = machId;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public void setCertData(byte[] certData) {
+		this.certData = certData;
+	}
+}
+

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

@@ -1,17 +1,21 @@
 package com.huiju.estateagents.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.AliOSSUtils;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.SMSUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITdMiniappTemplateTypeService;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -20,13 +24,16 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("/api")
-public class CommonController {
+public class CommonController extends BaseController {
     @Autowired
     SMSUtils smsUtils;
 
     @Autowired
     ITdMiniappTemplateTypeService iTdMiniappTemplateTypeService;
 
+    @Autowired
+    IMiniAppService iMiniAppService;
+
     /**
      * 图片
      * @param multipartFile
@@ -42,6 +49,43 @@ public class CommonController {
         }
     }
 
+    @PostMapping("/admin/qrcode")
+    public ResponseBean createQrCode(@RequestBody String jsonStr, HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+
+        if (StringUtils.isEmpty(jsonStr)) {
+            return ResponseBean.error("参数不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        JSONObject params = JSONObject.parseObject(jsonStr);
+        if (params == null) {
+            return ResponseBean.error("参数是非法的 JSON 对象", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String paramStr = params.getString("params");
+        if (StringUtils.isEmpty(paramStr)) {
+            ResponseBean.error("参数 params 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        JSONObject qrObj = JSONObject.parseObject(paramStr);
+        if (qrObj == null) {
+            return ResponseBean.error("小程序码参数是非法", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String scene = qrObj.getString("scene");
+        String page = qrObj.getString("page");
+
+        if (StringUtils.isEmpty(scene) || StringUtils.isEmpty(page)) {
+            return ResponseBean.error("小程序码参数: scene 或者 page 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (scene.indexOf("id=") == -1) {
+            return ResponseBean.error("小程序码参数: 必须存在 id 参数", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return iMiniAppService.getOrgQrCode(paramStr, orgId);
+    }
+
     /**
      * 为适应 ANTD 特制的图片上传
      * plat 中心端传 center 管理端传 admin
@@ -78,6 +122,16 @@ public class CommonController {
         }
     }
 
+    @PostMapping("{plat}/check/captcha")
+    public ResponseBean sendCaptcha(@RequestParam String tel,@RequestParam String captcha) {
+        boolean success = smsUtils.checkCaptcha(tel,captcha);
+        if (success) {
+            return ResponseBean.success("验证码校验成功");
+        } else {
+            return ResponseBean.error("验证码校验失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     @GetMapping("/center/dict/templateType")
     public ResponseBean getAllTplTypes() {
         return ResponseBean.success(iTdMiniappTemplateTypeService.getAllTypes());

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

@@ -27,6 +27,8 @@ import net.bytebuddy.asm.Advice;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.*;
@@ -38,10 +40,15 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 @RestController
 @RequestMapping("/api/wx")
 public class MiniAppController extends BaseController {
+
+    private Logger logger = LoggerFactory.getLogger(MiniAppController.class);
+
     @Autowired
     private ITaPersonService taPersonService;
 
@@ -70,7 +77,7 @@ public class MiniAppController extends BaseController {
     private ITaBuildingDynamicService buildingDynamicService;
 
     @Autowired
-    private  ITaNewsService newsService;
+    private ITaNewsService newsService;
 
     @Autowired
     private ITaUserService userService;
@@ -101,15 +108,16 @@ public class MiniAppController extends BaseController {
      */
     @GetMapping(value = "/", produces = "text/plain;charset=utf-8")
     public String access(@RequestParam(name = "signature", required = false) String signature,
-                          @RequestParam(name = "timestamp", required = false) String timestamp,
-                          @RequestParam(name = "nonce", required = false) String nonce,
-                          @RequestParam(name = "echostr", required = false) String echostr) {
+                         @RequestParam(name = "timestamp", required = false) String timestamp,
+                         @RequestParam(name = "nonce", required = false) String nonce,
+                         @RequestParam(name = "echostr", required = false) String echostr) {
         return echostr;
     }
 
 
     /**
      * 小程序数据预拉取 https://developers.weixin.qq.com/miniprogram/dev/framework/ability/pre-fetch.html
+     *
      * @param appid
      * @param timestamp
      * @param token
@@ -153,7 +161,7 @@ public class MiniAppController extends BaseController {
         queryExt.eq("status", CommConstant.STATUS_NORMAL);
         List<TaCustomImg> taCustomImg = iTaCustomImgService.list(queryExt);
 
-        return ResponseBean.success(new HashMap<String, Object>(){{
+        return ResponseBean.success(new HashMap<String, Object>() {{
             put("miniapp", taMiniapp);
             put("org", taOrg);
             put("cityList", taOrgCityList);
@@ -175,7 +183,7 @@ public class MiniAppController extends BaseController {
             HttpServletRequest request) {
         String appid = request.getHeader("appid");
 
-         if (StringUtils.isBlank(code)) {
+        if (StringUtils.isBlank(code)) {
             return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
         if (StringUtils.isBlank(appid)) {
@@ -191,18 +199,18 @@ public class MiniAppController extends BaseController {
         try {
             TaMiniapp miniapp = taMiniappService.getById(appid);
             WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code, appid);
-            Integer orgId =miniapp.getOrgId();
+            Integer orgId = miniapp.getOrgId();
             Map<String, Object> miniResp = new HashMap<>();
             miniResp.put("openid", session.getOpenid());
             miniResp.put("sessionKey", session.getSessionKey());
             miniResp.put("unionid", session.getUnionid());
-            miniResp.put("name",miniapp.getName());
+            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);
+            personQueryWrapper.eq("mini_openid", session.getOpenid());
+            personQueryWrapper.eq("org_id", orgId);
             int count = taPersonService.count(personQueryWrapper);
 
             TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);
@@ -210,36 +218,36 @@ public class MiniAppController extends BaseController {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
 
-            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) {
                 // 校验是否点击过此人的分享
-                boolean checkPoint = checkSharePersonFrom(from,taPerson.getPersonId(),targetId,orgId);
-                if (checkPoint){
+                boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
+                if (checkPoint) {
                     // 添加积分
                     applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
                 }
             }
 
 
-            Map<Object,Object> map = new HashMap<>();
-            map.put("openId",session.getOpenid());
-            map.put("orgId",orgId);
-            map.put("personId",taPerson.getPersonId());
+            Map<Object, Object> map = new HashMap<>();
+            map.put("openId", session.getOpenid());
+            map.put("orgId", orgId);
+            map.put("personId", taPerson.getPersonId());
             miniResp.put("token", JWTUtils.newTokenByMap(map));
-            if(StringUtils.isEmpty(taPerson.getFromCode())){
+            if (StringUtils.isEmpty(taPerson.getFromCode())) {
                 taPerson.setFromCode(from);
             }
-            if(StringUtils.isEmpty(taPerson.getRecommendPerson())){
+            if (StringUtils.isEmpty(taPerson.getRecommendPerson())) {
                 taPerson.setRecommendPerson(recommender);
                 TaPerson type = taPersonService.getById(recommender);
-                if(null != type){
-                    if(!StringUtils.isEmpty(type.getPersonType())){
+                if (null != type) {
+                    if (!StringUtils.isEmpty(type.getPersonType())) {
                         taPerson.setRecommendPersonType(type.getPersonType());
                     }
                 }
             }
             taPerson.setMiniappId(appid);
             taPersonService.updateById(taPerson);
-            if(StringUtils.isNotBlank(from) &&StringUtils.isNotBlank(recommender) &&StringUtils.isNotBlank(targetId)){
+            if (StringUtils.isNotBlank(from) && StringUtils.isNotBlank(recommender) && StringUtils.isNotBlank(targetId)) {
                 TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
                 TaPerson recommenderPerson = taPersonService.getById(recommender);
                 taSharePersonFrom.setCreateDate(LocalDateTime.now());
@@ -248,43 +256,43 @@ public class MiniAppController extends BaseController {
                 taSharePersonFrom.setSharePersonType(recommenderPerson.getPersonType());
                 taSharePersonFrom.setTargetId(targetId);
                 taSharePersonFrom.setTargetType(from);
-                if(CommConstant.PERSON_REALTY_CONSULTANT.equals(recommenderPerson.getPersonType())){
+                if (CommConstant.PERSON_REALTY_CONSULTANT.equals(recommenderPerson.getPersonType())) {
                     taSharePersonFrom.setSharePerson(recommenderPerson.getUserId().toString());
-                }else {
+                } else {
                     taSharePersonFrom.setSharePerson(recommenderPerson.getPersonId());
                 }
                 QueryWrapper<TaSharePersonFrom> sharePersonFromQueryWrapper = new QueryWrapper<>();
-                sharePersonFromQueryWrapper.eq("person_id",taPerson.getPersonId());
-                if(from.equals("dynamic_share")){ // activity_share
+                sharePersonFromQueryWrapper.eq("person_id", taPerson.getPersonId());
+                if (from.equals("dynamic_share")) { // activity_share
                     //产品不认了
                     taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
                     TaBuildingDynamic buildingDynamic = buildingDynamicService.getById(targetId);
                     taSharePersonFrom.setBuildingId(buildingDynamic.getBuildingId());
-                    sharePersonFromQueryWrapper.eq("building_id",buildingDynamic.getBuildingId());
-                }else {
+                    sharePersonFromQueryWrapper.eq("building_id", buildingDynamic.getBuildingId());
+                } else {
                     taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
                 }
-                if (from.contains("card")){
+                if (from.contains("card")) {
                     // 因为targetId 是 personId ，需要查询出 userId
                     TaPerson person = taPersonService.getById(targetId);
 
                     QueryWrapper<TaPersonBuilding> personBuildingQueryWrapper = new QueryWrapper<>();
-                    personBuildingQueryWrapper.eq("user_id",person.getUserId());
+                    personBuildingQueryWrapper.eq("user_id", person.getUserId());
                     TaPersonBuilding personBuilding = personBuildingService.getOne(personBuildingQueryWrapper);
                     taSharePersonFrom.setBuildingId(personBuilding.getBuildingId());
-                    sharePersonFromQueryWrapper.eq("building_id",personBuilding.getBuildingId());
-                }else if (from.contains("news")){
+                    sharePersonFromQueryWrapper.eq("building_id", personBuilding.getBuildingId());
+                } else if (from.contains("news")) {
                     TaNews news = newsService.getById(targetId);
                     taSharePersonFrom.setBuildingId(news.getBuildingId());
-                    sharePersonFromQueryWrapper.eq("building_id",news.getBuildingId());
-                }else if (from.contains("building")){
+                    sharePersonFromQueryWrapper.eq("building_id", news.getBuildingId());
+                } else if (from.contains("building")) {
                     taSharePersonFrom.setBuildingId(targetId);
-                    sharePersonFromQueryWrapper.eq("building_id",targetId);
+                    sharePersonFromQueryWrapper.eq("building_id", targetId);
                 }
                 Integer isFirstTime = taSharePersonFromService.count(sharePersonFromQueryWrapper);
-                if(isFirstTime>0){
+                if (isFirstTime > 0) {
                     taSharePersonFrom.setIsFirstTime(false);
-                }else {
+                } else {
                     taSharePersonFrom.setIsFirstTime(true);
                 }
                 taSharePersonFromService.save(taSharePersonFrom);
@@ -296,10 +304,10 @@ public class MiniAppController extends BaseController {
             Map<String, Object> extraInfo = taPersonService.getExtraInfo(taPerson.getPersonId());
             // 所有人员都返回 org yansen 2019-11-13 19:56:18
 //            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
-                QueryWrapper<TaOrg>orgQueryWrapper = new QueryWrapper<>();
-                orgQueryWrapper.eq("org_id", orgId);
-                TaOrg org = taOrgService.getOne(orgQueryWrapper);
-                taPerson.setOrg(org);
+            QueryWrapper<TaOrg> orgQueryWrapper = new QueryWrapper<>();
+            orgQueryWrapper.eq("org_id", orgId);
+            TaOrg org = taOrgService.getOne(orgQueryWrapper);
+            taPerson.setOrg(org);
 //            }
             Map<String, Object> result = new HashMap<>();
             result.put("miniApp", miniResp);
@@ -311,8 +319,8 @@ public class MiniAppController extends BaseController {
             QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id", orgId);
             queryWrapper.eq("img_type", "auth");
-            List<TaCustomImg>  taCustomImgs = iTaCustomImgService.list(queryWrapper);
-            result.put("avatarAuth", CollectionUtils.isEmpty(taCustomImgs) ? false : "1".equals(taCustomImgs.get(0).getImgUrl()) ? true: false);
+            List<TaCustomImg> taCustomImgs = iTaCustomImgService.list(queryWrapper);
+            result.put("avatarAuth", CollectionUtils.isEmpty(taCustomImgs) ? false : "1".equals(taCustomImgs.get(0).getImgUrl()) ? true : false);
 
             String token = (String) miniResp.get("token");
             sysTokenService.saveToken(token);
@@ -321,11 +329,11 @@ public class MiniAppController extends BaseController {
             QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
             tdPointsRulesQueryWrapper.eq("org_id", orgId);
             List<TdPointsRules> rulesPointList = iTdPointsRulesService.list(tdPointsRulesQueryWrapper);
-            result.put("rulesPointList",rulesPointList);
+            result.put("rulesPointList", rulesPointList);
 
             // 定位城市
             String location = null == lon ? null : lon + "," + lat;
-            TdCity tdCity = iTdCityService.getLocationCity(location, orgId);
+            TdCity tdCity = iTdCityService.getLocationCity(location, orgId, taPerson.getPersonId());
             result.put("city", tdCity);
 
             return ResponseBean.success(result);
@@ -354,13 +362,13 @@ public class MiniAppController extends BaseController {
     }
 
     private boolean checkSharePersonFrom(String from, String personId, String targetId, Integer orgId) {
-        QueryWrapper<TaSharePersonFrom> queryWrapper =  new QueryWrapper<>();
-        queryWrapper.eq("target_type",from);
-        queryWrapper.eq("person_id",personId);
-        queryWrapper.eq("target_id",targetId);
-        queryWrapper.eq("org_id",orgId);
+        QueryWrapper<TaSharePersonFrom> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_type", from);
+        queryWrapper.eq("person_id", personId);
+        queryWrapper.eq("target_id", targetId);
+        queryWrapper.eq("org_id", orgId);
         List<TaSharePersonFrom> list = taSharePersonFromService.list(queryWrapper);
-        if (list.size() > 0){
+        if (list.size() > 0) {
             return false;
         }
         return true;
@@ -432,7 +440,7 @@ public class MiniAppController extends BaseController {
         Map<String, Object> result = new HashMap<>();
         result.put("person", person);
         result.put("extraInfo", extraInfo);
-        result.put("miniApp",miniapp);
+        result.put("miniApp", miniapp);
 
         return ResponseBean.success(result);
     }
@@ -458,18 +466,18 @@ public class MiniAppController extends BaseController {
         // 更新用户绑定手机
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
-        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(),orgId);
+        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(), orgId);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        QueryWrapper<TaRecommendCustomer> cus= new QueryWrapper<>();
-        cus.eq("phone",phoneNoInfo.getPhoneNumber());
+        QueryWrapper<TaRecommendCustomer> cus = new QueryWrapper<>();
+        cus.eq("phone", phoneNoInfo.getPhoneNumber());
         cus.orderByDesc("create_date");
         List<TaRecommendCustomer> customer = taRecommendCustomerService.list(cus);
-        if (customer.size()>0){
-            for(int i =0;i<customer.size();i++){
+        if (customer.size() > 0) {
+            for (int i = 0; i < customer.size(); i++) {
                 customer.get(i).setPersonId(person.getPersonId());
                 customer.get(i).setPicture(person.getAvatarurl());
                 customer.get(i).setCountry(person.getCountry());
@@ -478,7 +486,7 @@ public class MiniAppController extends BaseController {
             }
 //            TaRecommendCustomer customers = customer.get(0);
 
-            if(!taRecommendCustomerService.updateBatchById(customer)){
+            if (!taRecommendCustomerService.updateBatchById(customer)) {
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
 //            if(null != customers.getRecommendPerson()&&!StringUtils.isEmpty(customers.getRecommendPerson())&& StringUtils.isEmpty(person.getRecommendPerson())){
@@ -516,6 +524,7 @@ public class MiniAppController extends BaseController {
 
     /**
      * 生成二维码
+     *
      * @return
      */
     @PostMapping("/qrcode")
@@ -526,6 +535,7 @@ public class MiniAppController extends BaseController {
 
     /**
      * 获取二维码参数
+     *
      * @param serialNo
      * @return
      */
@@ -545,10 +555,10 @@ public class MiniAppController extends BaseController {
         }
     }
 
-    public Integer getOrgId(HttpServletRequest request){
+    public Integer getOrgId(HttpServletRequest request) {
 
         Map map = JWTUtils.getUserIdAndOrgId(request);
-        if (null != map && null != map.get("orgId")){
+        if (null != map && null != map.get("orgId")) {
             return Integer.valueOf(map.get("orgId").toString());
         }
 

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

@@ -160,7 +160,8 @@ public class StatisticalController extends BaseController {
                                             @RequestParam(value = "pageSize", defaultValue = "2") Integer pageSize,
                                             @RequestParam(value = "buildingId", required = false) String buildingId,
                                             HttpServletRequest request) {
-        return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId);
+        Integer userId = getUserId(request);
+        return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId, userId);
     }
 
     /**

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

@@ -0,0 +1,231 @@
+package com.huiju.estateagents.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.SysAdvancedConfig;
+import com.huiju.estateagents.entity.TaAdvancedController;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaWxPayConfig;
+import com.huiju.estateagents.service.ISysAdvancedConfigService;
+import com.huiju.estateagents.service.ITaAdvancedControllerService;
+import com.huiju.estateagents.service.ITaMiniappService;
+import com.huiju.estateagents.service.ITaWxPayConfigService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+    * 高级配置基础表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@RestController
+@RequestMapping("/api")
+public class SysAdvancedConfigController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysAdvancedConfigController.class);
+
+    @Autowired
+    public ISysAdvancedConfigService iSysAdvancedConfigService;
+
+    @Autowired
+    public ITaWxPayConfigService taWxPayConfigService;
+
+    @Autowired
+    public ITaAdvancedControllerService taAdvancedControllerService;
+
+    @Autowired
+    public ITaMiniappService taMiniappService;
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysAdvancedConfig",method= RequestMethod.GET)
+    public ResponseBean sysAdvancedConfigList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysAdvancedConfig> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysAdvancedConfig> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysAdvancedConfig> result = iSysAdvancedConfigService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysAdvancedConfigList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysAdvancedConfig 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysAdvancedConfig",method= RequestMethod.POST)
+    public ResponseBean sysAdvancedConfigAdd(@RequestBody SysAdvancedConfig sysAdvancedConfig){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysAdvancedConfigService.save(sysAdvancedConfig)){
+                responseBean.addSuccess(sysAdvancedConfig);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysAdvancedConfigAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/sysAdvancedConfig/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysAdvancedConfigDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysAdvancedConfigService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysAdvancedConfigDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysAdvancedConfig 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysAdvancedConfig/{id}",method= RequestMethod.PUT)
+    public ResponseBean sysAdvancedConfigUpdate(@PathVariable Integer id,
+                                        @RequestBody SysAdvancedConfig sysAdvancedConfig){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysAdvancedConfigService.updateById(sysAdvancedConfig)){
+                responseBean.addSuccess(sysAdvancedConfig);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysAdvancedConfigUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysAdvancedConfig/{id}",method= RequestMethod.GET)
+    public ResponseBean sysAdvancedConfigGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysAdvancedConfigService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysAdvancedConfigDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param orgId  小程序的orgId
+     */
+    @RequestMapping(value="/center/sysAdvancedConfig/list",method= RequestMethod.GET)
+    public ResponseBean sysAdvancedConfigList(@RequestParam Integer orgId){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Map<String,Object> map = new HashMap<>();
+            List<SysAdvancedConfig> sysAdvancedConfigList = iSysAdvancedConfigService.getSysAdvancedConfigList(orgId);
+            TaWxPayConfig taWxPayConfig = taWxPayConfigService.getOne(new QueryWrapper<TaWxPayConfig>().eq("org_id", orgId));
+            map.put("list",sysAdvancedConfigList);
+            map.put("taWxPayConfig",taWxPayConfig);
+            responseBean.addSuccess(map);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysAdvancedConfigDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 修改高级配置
+     * @param data
+     * @return
+     */
+    @PostMapping(value = "/center/sysAdvancedConfig/save")
+    public ResponseBean saveAdvancedConfig(@RequestBody Map<String, Object> data) {
+        Integer orgId = (Integer) data.get("orgId");
+        List<Integer> advancedConfigIds = (List<Integer>) data.get("menus");
+        Map<String,Object> wxPayData = (Map<String, Object>) data.get("wxPayData");
+
+        try {
+            if (advancedConfigIds.size() > 0){
+                //插入高级控制表先删除后添加
+                taAdvancedControllerService.remove(new QueryWrapper<TaAdvancedController>().eq("org_id",orgId));
+                advancedConfigIds.forEach(e -> {
+                    TaAdvancedController taAdvancedController = new TaAdvancedController();
+                    taAdvancedController.setAdvancedConfigId(e);
+                    taAdvancedController.setCreateDate(LocalDateTime.now());
+                    taAdvancedController.setOrgId(orgId);
+                    taAdvancedControllerService.save(taAdvancedController);
+                });
+            }
+            if (wxPayData.size() > 0){
+                TaMiniapp taMiniapp = taMiniappService.getOne(new QueryWrapper<TaMiniapp>().eq("org_id", orgId));
+                if (!taMiniapp.getMiniappId().equals(wxPayData.get("appid"))){
+                    return ResponseBean.error("appid不一致", ResponseBean.ERROR_UNAVAILABLE);
+                }
+                //维护支付信息先删除后添加
+                taWxPayConfigService.remove(new QueryWrapper<TaWxPayConfig>().eq("org_id",orgId));
+                TaWxPayConfig taWxPayConfig = new TaWxPayConfig();
+                taWxPayConfig.setApiPath((String) wxPayData.get("apiPath"));
+                taWxPayConfig.setAppid((String) wxPayData.get("appid"));
+                taWxPayConfig.setMchId((String) wxPayData.get("mchId"));
+                taWxPayConfig.setMchKey((String) wxPayData.get("mchKey"));
+                taWxPayConfig.setOrgId(orgId);
+                taWxPayConfig.setCreateDate(LocalDateTime.now());
+                taWxPayConfigService.save(taWxPayConfig);
+            }
+        } catch (Exception e) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return ResponseBean.success("ok");
+    }
+}

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

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.SysAdvancedConfigRelation;
+import com.huiju.estateagents.service.ISysAdvancedConfigRelationService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 高级配置对应关系表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@RestController
+@RequestMapping("/")
+public class SysAdvancedConfigRelationController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysAdvancedConfigRelationController.class);
+
+    @Autowired
+    public ISysAdvancedConfigRelationService iSysAdvancedConfigRelationService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysAdvancedConfigRelation",method= RequestMethod.GET)
+    public ResponseBean sysAdvancedConfigRelationList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysAdvancedConfigRelation> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysAdvancedConfigRelation> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysAdvancedConfigRelation> result = iSysAdvancedConfigRelationService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysAdvancedConfigRelationList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysAdvancedConfigRelation 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysAdvancedConfigRelation",method= RequestMethod.POST)
+    public ResponseBean sysAdvancedConfigRelationAdd(@RequestBody SysAdvancedConfigRelation sysAdvancedConfigRelation){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysAdvancedConfigRelationService.save(sysAdvancedConfigRelation)){
+                responseBean.addSuccess(sysAdvancedConfigRelation);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysAdvancedConfigRelationAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/sysAdvancedConfigRelation/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysAdvancedConfigRelationDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysAdvancedConfigRelationService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysAdvancedConfigRelationDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysAdvancedConfigRelation 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysAdvancedConfigRelation/{id}",method= RequestMethod.PUT)
+    public ResponseBean sysAdvancedConfigRelationUpdate(@PathVariable Integer id,
+                                        @RequestBody SysAdvancedConfigRelation sysAdvancedConfigRelation){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysAdvancedConfigRelationService.updateById(sysAdvancedConfigRelation)){
+                responseBean.addSuccess(sysAdvancedConfigRelation);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysAdvancedConfigRelationUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysAdvancedConfigRelation/{id}",method= RequestMethod.GET)
+    public ResponseBean sysAdvancedConfigRelationGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysAdvancedConfigRelationService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysAdvancedConfigRelationDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaAdvancedController;
+import com.huiju.estateagents.service.ITaAdvancedControllerService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 高级配置控制表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@RestController
+@RequestMapping("/api")
+public class TaAdvancedControllerController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaAdvancedControllerController.class);
+
+    @Autowired
+    public ITaAdvancedControllerService iTaAdvancedControllerService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taAdvancedController",method= RequestMethod.GET)
+    public ResponseBean taAdvancedControllerList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaAdvancedController> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaAdvancedController> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaAdvancedController> result = iTaAdvancedControllerService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taAdvancedControllerList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taAdvancedController 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taAdvancedController",method= RequestMethod.POST)
+    public ResponseBean taAdvancedControllerAdd(@RequestBody TaAdvancedController taAdvancedController){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaAdvancedControllerService.save(taAdvancedController)){
+                responseBean.addSuccess(taAdvancedController);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taAdvancedControllerAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taAdvancedController/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taAdvancedControllerDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaAdvancedControllerService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taAdvancedControllerDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taAdvancedController 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taAdvancedController/{id}",method= RequestMethod.PUT)
+    public ResponseBean taAdvancedControllerUpdate(@PathVariable Integer id,
+                                        @RequestBody TaAdvancedController taAdvancedController){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaAdvancedControllerService.updateById(taAdvancedController)){
+                responseBean.addSuccess(taAdvancedController);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taAdvancedControllerUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taAdvancedController/{id}",method= RequestMethod.GET)
+    public ResponseBean taAdvancedControllerGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaAdvancedControllerService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taAdvancedControllerDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -1,17 +1,14 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.entity.TaBuildingRoom;
-import com.huiju.estateagents.entity.TaHousingResources;
-import com.huiju.estateagents.entity.TaPreselectionRecord;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
-import com.huiju.estateagents.service.ITaBuildingRoomService;
-import com.huiju.estateagents.service.ITaHousingResourcesService;
-import com.huiju.estateagents.service.ITaPreselectionRecordService;
-import io.swagger.annotations.ApiOperation;
+import com.huiju.estateagents.service.*;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +16,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -44,6 +43,21 @@ public class TaHousingResourcesController extends BaseController {
     @Autowired
     private ITaPreselectionRecordService taPreselectionRecordService;
 
+    @Autowired
+    private ITaRaiseRecordService taRaiseRecordService;
+
+    @Autowired
+    private ITaRaiseHouseService taRaiseHouseService;
+
+    @Autowired
+    public ITaBuildingApartmentService taBuildingApartmentService;
+
+    @Autowired
+    public ITaBuildingImgService taBuildingImgService;
+
+    @Autowired
+    public ITaSalesBatchService taSalesBatchService;
+
     /**
      * 分页查询列表
      *
@@ -65,12 +79,14 @@ public class TaHousingResourcesController extends BaseController {
                                                @RequestParam(value = "apartmentId", required = false) String apartmentId,
                                                @RequestParam(value = "status", required = false) Integer status,
                                                @RequestParam(value = "houseId", required = false) String houseId,
+                                               @RequestParam(value = "lockingStatus", required = false) String lockingStatus,
                                                @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaHousingResourcesService.selectPageList(salesBatchId, buildingId, pageNumber, pageSize, getOrgId(request), termName, blockName, unitName, floorName, roomName, apartmentId, status, houseId);
+            responseBean = iTaHousingResourcesService.selectPageList(salesBatchId, buildingId, pageNumber, pageSize, getOrgId(request), termName, blockName,
+                    unitName, floorName, roomName, apartmentId, status, houseId, lockingStatus);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taHousingResourcesList -=- {}", e.toString());
@@ -210,22 +226,81 @@ public class TaHousingResourcesController extends BaseController {
      * @param startPrice   房源起始价格
      * @param endPrice     房源结束价格
      * @param apartmentId  户型ID
+     * @param source       来源，raiseChoose 为认筹添加房源来源
      * @param request
      * @return
      * @author gushaoyong
      */
     @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.GET)
     public ResponseBean listHousingResources(@RequestParam(value = "salesBatchId") String salesBatchId,
-                                             String startPrice, String endPrice, String apartmentId,
+                                             String startPrice, String endPrice, String apartmentId,@RequestParam(value = "source", required = false) String source,
                                              HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
+        String personId = getPersonId(request);
 
-        logger.info("TaHouseingResourcesController.listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{}",
-                orgId, salesBatchId, startPrice, endPrice, apartmentId);
+        logger.info("TaHouseingResourcesController.listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{},source:{}",
+                orgId, salesBatchId, startPrice, endPrice, apartmentId, source);
 
         try {
-            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, 1));
+            //获取所有楼房的预选热度和认筹热度
+            List<TaHousingResourcesPO> taHousingResourcesPOList = iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, personId, source);
+            //此处处理我的预选，我的认筹，和我的锁定
+            //我的预选记录
+            QueryWrapper<TaPreselectionRecord> taPreselectionRecordQueryWrapper = new QueryWrapper<>();
+            taPreselectionRecordQueryWrapper.eq("org_id", orgId);
+            taPreselectionRecordQueryWrapper.eq("sales_batch_id", salesBatchId);
+            taPreselectionRecordQueryWrapper.eq("person_id", getPersonId(request));
+            taPreselectionRecordQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            List<TaPreselectionRecord> taPreselectionRecordList = taPreselectionRecordService.list(taPreselectionRecordQueryWrapper);
+            //我的认筹记录
+            QueryWrapper<TaRaiseRecord> taRaiseRecordQueryWrapper = new QueryWrapper<>();
+            taRaiseRecordQueryWrapper.eq("org_id", orgId);
+            taRaiseRecordQueryWrapper.eq("sales_batch_id", salesBatchId);
+            taRaiseRecordQueryWrapper.eq("person_id", getPersonId(request));
+            taRaiseRecordQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            List<TaRaiseRecord> taRaiseRecordList = taRaiseRecordService.list(taRaiseRecordQueryWrapper);
+
+            //认筹记录对应的有效房源,我的锁定的房源也在里面
+            QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
+            taRaiseHouseQueryWrapper.in(taRaiseRecordList.size() > 0, "raise_record_id", taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
+            List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
+            TaSalesBatch taSalesBatch = taSalesBatchService.getById(salesBatchId);
+            taHousingResourcesPOList.forEach(e -> {
+                taPreselectionRecordList.forEach(p -> {
+                    //我的预选
+                    if (e.getHouseId().equals(p.getHouseId())) {
+                        e.setMinePreselection("mine");
+                    }
+                });
+                //我的认筹和锁定
+                taRaiseHouseList.forEach(r -> {
+                    //我的认筹
+                    if (e.getHouseId().equals(r.getHouseId())) {
+                        e.setMineRaise("mine");
+                        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus())) {
+                            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);
+                }
+
+                e.setDisplayHousePrice(taSalesBatch.getDisplayHousePrice());
+            });
+
+            responseBean.addSuccess(taHousingResourcesPOList);
         } catch (Exception e) {
             logger.error("listHousingResources -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -245,9 +320,8 @@ public class TaHousingResourcesController extends BaseController {
                                                     HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
-
         try {
-            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, "", "", "", 0));
+            responseBean.addSuccess(iTaHousingResourcesService.listHousingResourcesForCms(orgId, salesBatchId, "", "", "", 0));
         } catch (Exception e) {
             logger.error("listHousingResourcesFormCms -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -282,12 +356,12 @@ public class TaHousingResourcesController extends BaseController {
      * @author gushaoyong
      */
     @RequestMapping(value = "/wx/getHousingDetailById", method = RequestMethod.GET)
-    public ResponseBean getHousingDetailById(@RequestParam(value = "houseId") String houseId,
+    public ResponseBean getHousingDetailById(@RequestParam(value = "houseId") Integer houseId,
                                              @RequestParam(value = "personId") String personId) {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaHousingResourcesPO taHousingResourcesPO = iTaHousingResourcesService.getHousingDetailById(personId, houseId);
-            if (taHousingResourcesPO.getStatus() != null && taHousingResourcesPO.getStatus() == CommConstant.STATUS_NORMAL){
+            if (taHousingResourcesPO.getStatus() != null && taHousingResourcesPO.getStatus() == CommConstant.STATUS_NORMAL) {
                 responseBean.addSuccess(taHousingResourcesPO);
                 return responseBean;
             }
@@ -351,4 +425,123 @@ public class TaHousingResourcesController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 批量更新房源认筹基础热度
+     *
+     * @param housingResources
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/house/batchUpdateRaiseHeat", method = RequestMethod.PUT)
+    public ResponseBean batchUpdateRaiseHeat(@RequestBody TaHousingResources housingResources, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 校验认筹热度
+            if (housingResources.getRaiseHeat() == null || housingResources.getRaiseHeat() < 0) {
+                responseBean.addError("基础热度需大于等于0");
+                return responseBean;
+            }
+
+            responseBean = iTaHousingResourcesService.batchUpdateRaiseHeat(housingResources.getHouseIdList(), housingResources.getRaiseHeat(),
+                    housingResources.getSalesBatchId(), getOrgId(request), getUserId(request));
+        } catch (Exception e) {
+            logger.error("batchUpdateRaiseHeat -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量更新房源预选基础热度
+     *
+     * @param housingResources
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/house/batchUpdateHeat", method = RequestMethod.PUT)
+    public ResponseBean batchUpdateHeat(@RequestBody TaHousingResources housingResources, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 校验认筹热度
+            if (housingResources.getHeat() == null || housingResources.getHeat() < 0) {
+                responseBean.addError("基础热度需大于等于0");
+                return responseBean;
+            }
+
+            responseBean = iTaHousingResourcesService.batchUpdateHeat(housingResources.getHouseIdList(), housingResources.getHeat(),
+                    housingResources.getSalesBatchId(), getOrgId(request), getUserId(request));
+        } catch (Exception e) {
+            logger.error("batchUpdateRaiseHeat -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据认筹记录查询房源列表
+     *
+     * @param pageNumber
+     * @param pageSize
+     * @param raiseRecordId
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/house/listHouseByRaiseRecordId", method = RequestMethod.GET)
+    public ResponseBean listHouseByRaiseRecordId(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                 @RequestParam(value = "raiseRecordId") Integer raiseRecordId,
+                                                 HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaHousingResourcesService.listHouseByRaiseRecordId(raiseRecordId, getOrgId(request), pageNumber, pageSize);
+            logger.info("listHouseByRaiseRecordId 返回结果：", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("listHouseByRaiseRecordId 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 更新房源锁定状态
+     *
+     * @param houseId
+     * @param type         修改类型：lock为锁定房源，unlock为解锁房源
+     * @param raiseHouseId 认筹房源关系表ID, 接口‘/admin/house/listHouseByRaiseRecordId’ 有返回
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/house/updateLockingStatus", method = RequestMethod.PUT)
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId, String personId, Integer raiseRecordId,
+                                            HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request), raiseHouseId, personId, raiseRecordId);
+            logger.info("updateLockingStatus 返回结果：", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("updateLockingStatus 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 校验房源认筹状态
+     *
+     * @return
+     */
+    @RequestMapping(value = "/wx/check/raise", method = RequestMethod.GET)
+    public ResponseBean checkRaise(@RequestParam(value = "houseIds") String houseIds,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            boolean state = iTaHousingResourcesService.checkRaiseState(houseIds,getPersonId(request),getOrgId(request));
+            responseBean.addSuccess(state);
+        } catch (Exception e) {
+            logger.error("校验房源状态 -=- {}", e.getMessage());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        return responseBean;
+    }
 }

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

@@ -0,0 +1,100 @@
+package com.huiju.estateagents.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaMiniappOrgIcon;
+import com.huiju.estateagents.entity.TaMiniappTheme;
+import com.huiju.estateagents.service.ITaMiniappThemeService;
+import io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+@RestController
+@RequestMapping("/api")
+public class TaMiniappThemeController extends BaseController {
+
+    @Autowired
+    ITaMiniappThemeService iTaMiniappThemeService;
+
+    @GetMapping("/admin/miniapp-theme")
+    public ResponseBean getThemeListForAdmin(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+
+        Boolean includeNotUsed = true;
+        IPage<TaMiniappTheme> themeList = iTaMiniappThemeService.getThemeList(orgId, includeNotUsed, pageNum, pageSize);
+
+        return ResponseBean.success(themeList);
+    }
+
+    @GetMapping("/admin/miniapp-theme/{id}")
+    public ResponseBean getThemeById(@PathVariable Integer id) {
+        if (id == null || id == 0) {
+            ResponseBean.error("未找到主题设置", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaMiniappTheme taMiniappTheme = iTaMiniappThemeService.getProfileById(id);
+        if (taMiniappTheme == null) {
+            ResponseBean.error("未找到主题设置", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return ResponseBean.success(taMiniappTheme);
+    }
+
+    @PostMapping("/admin/miniapp-theme")
+    public ResponseBean saveTheme(@RequestBody TaMiniappTheme taMiniappTheme, HttpServletRequest request) {
+        return this.editTheme(taMiniappTheme, request);
+    }
+
+    @PutMapping("/admin/miniapp-theme")
+    public ResponseBean updateTheme(@RequestBody TaMiniappTheme taMiniappTheme, HttpServletRequest request) {
+        return this.editTheme(taMiniappTheme, request);
+    }
+
+    private ResponseBean editTheme(TaMiniappTheme taMiniappTheme, HttpServletRequest request) {
+        if (taMiniappTheme == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        Integer userId = getUserId(request);
+        taMiniappTheme.setOrgId(orgId);
+        taMiniappTheme.setModifyUser(userId);
+        taMiniappTheme.setModifyDate(LocalDateTime.now());
+
+        return iTaMiniappThemeService.editTheme(taMiniappTheme);
+    }
+
+    @DeleteMapping("/admin/miniapp-theme/{themeId}")
+    public ResponseBean deleteTheme(@PathVariable Integer themeId, HttpServletRequest request) {
+        if (themeId == null || themeId <= 0) {
+            return ResponseBean.error("未找到删除内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        QueryWrapper<TaMiniappTheme> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("theme_id", themeId);
+        TaMiniappTheme taMiniappTheme = iTaMiniappThemeService.getById(themeId);
+        if (taMiniappTheme == null || taMiniappTheme.getStatus().equals(CommConstant.STATUS_DELETE)) {
+            return ResponseBean.success("");
+        }
+
+        if (!orgId.equals(taMiniappTheme.getOrgId())) {
+            return ResponseBean.error("无权删除该主题", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer userId = getUserId(request);
+        taMiniappTheme.setModifyUser(userId);
+
+        return iTaMiniappThemeService.deleteTheme(taMiniappTheme);
+    }
+
+}

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

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaOrder;
+import com.huiju.estateagents.service.ITaOrderService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 订单表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@RestController
+@RequestMapping("/")
+public class TaOrderController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaOrderController.class);
+
+    @Autowired
+    public ITaOrderService iTaOrderService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taOrder",method= RequestMethod.GET)
+    public ResponseBean taOrderList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaOrder> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaOrder> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaOrder> result = iTaOrderService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrderList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taOrder 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taOrder",method= RequestMethod.POST)
+    public ResponseBean taOrderAdd(@RequestBody TaOrder taOrder){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrderService.save(taOrder)){
+                responseBean.addSuccess(taOrder);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrderAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taOrder/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taOrderDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaOrderService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrderDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taOrder 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taOrder/{id}",method= RequestMethod.PUT)
+    public ResponseBean taOrderUpdate(@PathVariable Integer id,
+                                        @RequestBody TaOrder taOrder){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrderService.updateById(taOrder)){
+                responseBean.addSuccess(taOrder);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrderUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taOrder/{id}",method= RequestMethod.GET)
+    public ResponseBean taOrderGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaOrderService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrderDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -92,74 +92,19 @@ public class TaPersonVisitRecordController extends BaseController {
      */
     @RequestMapping(value = "/wx/taPersonVisitRecord", method = RequestMethod.POST)
     public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
         String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        taPersonVisitRecord.setActivity(taPersonVisitRecord.getPropertyName());
-        taPersonVisitRecord.setOrgId(String.valueOf(getOrgId(request)));
-        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(), taPersonVisitRecord.getEventType(), taPersonVisitRecord.getActivity(), getOrgId(request));
-        if (eventProperties <= 0) {
-            TaEventProperties taEventProperty = new TaEventProperties();
-            taEventProperty.setBuildingId(taPersonVisitRecord.getTargetId());
-            taEventProperty.setCreateDate(LocalDateTime.now());
-            taEventProperty.setPropertyCode(taPersonVisitRecord.getPropertyName());
-            taEventProperty.setPropertyName(taPersonVisitRecord.getPropertyName());
-            taEventProperty.setStatus(CommConstant.STATUS_NORMAL);
-            taEventProperty.setBuildingId(taPersonVisitRecord.getBuildingId());
-            taEventProperty.setEventType(taPersonVisitRecord.getEventType());
-            taEventProperty.setOrgId(getOrgId(request));
-            if (!taEventPropertiesService.save(taEventProperty)) {
-                return ResponseBean.error("新增失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
-
-        }
 
+        taPersonVisitRecord.setActivity(taPersonVisitRecord.getPropertyName());
+        taPersonVisitRecord.setOrgId(String.valueOf(orgId));
         taPersonVisitRecord.setPersonId(person.getPersonId());
-        taPersonVisitRecord.setVisitTime(LocalDateTime.now());
-        if (!StringUtils.isEmpty(taPersonVisitRecord.getBuildingId())) {
-            QueryWrapper<TaBuildingIntention> intentionQueryWrapper = new QueryWrapper<>();
-            intentionQueryWrapper.eq("building_id", taPersonVisitRecord.getBuildingId());
-            intentionQueryWrapper.eq("org_id", getOrgId(request));
-            intentionQueryWrapper.eq("event_code", taPersonVisitRecord.getEvent());
-            List<TaBuildingIntention> list = buildingIntentionService.list(intentionQueryWrapper);
-            if (list.size() > 0) {
-                TaBuildingIntention buildingIntention = list.get(0);
-                TaPersonIntentionRecord intentionRecord = new TaPersonIntentionRecord();
-                TaBuilding building = buildingService.getById(buildingIntention.getBuildingId());
-                intentionRecord.setBuildingId(buildingIntention.getBuildingId());
-                intentionRecord.setBuildingName(building.getBuildingName());
-                intentionRecord.setCreateDate(LocalDateTime.now());
-                intentionRecord.setEventCode(buildingIntention.getEventCode());
-                intentionRecord.setEventId(buildingIntention.getEventId());
-                intentionRecord.setEventName(buildingIntention.getEventName());
-                intentionRecord.setIntention(buildingIntention.getIntention());
-                intentionRecord.setOrgId(getOrgId(request));
-                intentionRecord.setPersonId(person.getPersonId());
-                intentionRecord.setPersonName(person.getNickname());
-                intentionRecord.setStatus(CommConstant.STATUS_NORMAL);
-                if (!personIntentionRecordService.save(intentionRecord)) {
-                    return ResponseBean.error("新增失败", ResponseBean.ERROR_UNAVAILABLE);
-                }
-            }
-        }
-        try {
-            if (iTaPersonVisitRecordService.save(taPersonVisitRecord)) {
-                //清洗埋點數據到新增用戶表--只有进入小程序的时候 start才记录
-                if (taPersonVisitRecord.getEvent().equals(CommConstant.BIZ_EVENT_START)) {
-                    iTaPersonFromRecordService.addNewPersonRecordRecord(taPersonVisitRecord);
-                }
 
-                return ResponseBean.success(taPersonVisitRecord);
-            } else {
-                return ResponseBean.error("保存失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
-        } catch (Exception e) {
-            logger.error("taPersonVisitRecordAdd -=- {}", e.toString());
-            return ResponseBean.error("系统异常" + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
-        }
+        return iTaPersonVisitRecordService.newRecord(taPersonVisitRecord, person);
     }
 
     /**

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

@@ -0,0 +1,288 @@
+package com.huiju.estateagents.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaPreselection;
+import com.huiju.estateagents.entity.TaSalesBatch;
+import com.huiju.estateagents.service.ITaPreselectionService;
+import com.huiju.estateagents.service.impl.TaSalesBatchServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 预选表  前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@RestController
+@RequestMapping("/api")
+public class TaPreselectionController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaPreselectionController.class);
+
+    @Autowired
+    public ITaPreselectionService iTaPreselectionService;
+
+    @Autowired
+    private TaSalesBatchServiceImpl taSalesBatchService;
+
+    /**
+     * 条件查询预选列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param salesBatchName
+     * @param status
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/listPresecretByCondition", method = RequestMethod.GET)
+    public ResponseBean listPresecretByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                 String buildingId, String salesBatchName, Integer status,
+                                                 HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+
+        try {
+            Integer orgId = getOrgId(request);
+            List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
+
+            responseBean = iTaPreselectionService.listPresecretByCondition(pageSize, pageNum, salesBatchName, buildingId, orgId, status, personBuildingList);
+            logger.info("listSalesBatchForPreselect 返回结果：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("listSalesBatchForPreselect -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/taPreselection", method = RequestMethod.GET)
+    public ResponseBean taPreselectionList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaPreselection> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPreselection> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaPreselection> result = iTaPreselectionService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taPreselectionList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taPreselection 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/taPreselection", method = RequestMethod.POST)
+    public ResponseBean taPreselectionAdd(@RequestBody TaPreselection taPreselection, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taPreselection.getSalesBatchId() == null) {
+                responseBean.addError("销售批次为空");
+                return responseBean;
+            }
+
+            Integer orgId = getOrgId(request);
+            // 校验是否预选过
+            QueryWrapper<TaPreselection> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", orgId);
+            queryWrapper.eq("sales_batch_id", taPreselection.getSalesBatchId());
+            queryWrapper.eq("status", 1);
+            TaPreselection record = iTaPreselectionService.getOne(queryWrapper);
+            if (record != null) {
+                responseBean.addError("销售批次已新增过预选");
+                return responseBean;
+            }
+
+            // 更新批次表信息
+            TaSalesBatch taSalesBatch = new TaSalesBatch();
+            taSalesBatch.setSalesBatchId(taPreselection.getSalesBatchId());
+            taSalesBatch.setPreselectionStartTime(taPreselection.getPreselectionStartTime());
+            taSalesBatch.setPreselectionEndTime(taPreselection.getPreselectionEndTime());
+            Boolean updateResult = taSalesBatchService.updateById(taSalesBatch);
+            if (!updateResult) {
+                responseBean.addError("fail");
+                return responseBean;
+            }
+
+            // 新增数据
+            taPreselection.setOrgId(getOrgId(request));
+            taPreselection.setStatus(CommConstant.IS_PUBLISH);
+            taPreselection.setCreateDate(LocalDateTime.now());
+            if (iTaPreselectionService.save(taPreselection)) {
+                responseBean.addSuccess(taPreselection);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taPreselectionAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param taPreselectionList
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/admin/preselection/batchDelete", method = RequestMethod.PUT)
+    public ResponseBean batchDelete(@RequestBody List<TaPreselection> taPreselectionList, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer orgId = getOrgId(request);
+            responseBean = iTaPreselectionService.batchDelete(taPreselectionList, orgId);
+            logger.info("TaPreselectionController.batchDelete 返回：{}", JSONObject.toJSONString(responseBean));
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taPreselectionDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 删除
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/admin/taPreselection/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taPreselectionDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPreselectionService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taPreselectionDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id             实体ID
+     * @param taPreselection 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/taPreselection/{id}", method = RequestMethod.PUT)
+    public ResponseBean taPreselectionUpdate(@PathVariable Integer id,
+                                             @RequestBody TaPreselection taPreselection) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+
+            if (taPreselection.getSalesBatchId() == null) {
+                responseBean.addError("销售批次为空");
+                return responseBean;
+            }
+
+            if (taPreselection.getPreselectionStartTime() != null && taPreselection.getPreselectionEndTime() != null) {
+                // 更新批次表信息
+                TaSalesBatch taSalesBatch = new TaSalesBatch();
+                taSalesBatch.setSalesBatchId(taPreselection.getSalesBatchId());
+                taSalesBatch.setPreselectionStartTime(taPreselection.getPreselectionStartTime());
+                taSalesBatch.setPreselectionEndTime(taPreselection.getPreselectionEndTime());
+                Boolean updateResult = taSalesBatchService.updateById(taSalesBatch);
+                if (!updateResult) {
+                    responseBean.addError("fail");
+                    return responseBean;
+                }
+            }
+
+            taPreselection.setPreselectionId(id);
+            if (iTaPreselectionService.updateById(taPreselection)) {
+                responseBean.addSuccess(taPreselection);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taPreselectionUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/admin/taPreselection/{id}", method = RequestMethod.GET)
+    public ResponseBean taPreselectionGet(@PathVariable Integer id, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaPreselectionService.getPresecretById(id, getOrgId(request));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taPreselectionDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 校验批次下是否有预选
+     *
+     * @param salesBatchId
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/checkHavingRecord/{salesBatchId}", method = RequestMethod.GET)
+    public ResponseBean checkHavingRecordForSalesBatch(@PathVariable("salesBatchId") Integer salesBatchId, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaPreselectionService.checkHavingRecordForSalesBatch(salesBatchId, getOrgId(request));
+            logger.info("checkHavingRecordForSalesBatch 返回结果：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("checkHavingRecordForSalesBatch -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.PresecretRecordRequestBO;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.service.ITaPreselectionRecordService;
 import org.apache.commons.lang3.StringUtils;
@@ -16,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * <p>
@@ -80,7 +82,7 @@ public class TaPreselectionRecordController extends BaseController {
         try {
 
             // 校验参数
-            if (StringUtils.isBlank(taPreselectionRecord.getHouseId()) || StringUtils.isBlank(taPreselectionRecord.getPersonId()) ||
+            if (null == taPreselectionRecord.getHouseId() || StringUtils.isBlank(taPreselectionRecord.getPersonId()) ||
                 taPreselectionRecord.getOrgId() == null) {
                 logger.info("taPreselectionRecordAdd 参数错误");
                 responseBean.addError("参数错误");
@@ -170,7 +172,7 @@ public class TaPreselectionRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/taPreselectionRecordCancel", method = RequestMethod.DELETE)
-    public ResponseBean taPreselectionRecordCancel(@RequestParam("houseId") String houseId,
+    public ResponseBean taPreselectionRecordCancel(@RequestParam("houseId") Integer houseId,
                                                    @RequestParam("personId") String personId) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -185,21 +187,34 @@ public class TaPreselectionRecordController extends BaseController {
     /**
      * 获取当前用户预选记录
      *
-     * @param pageNum  页码
-     * @param pageSize 分页大小
-     * @param personId 用户ID
+     * @param buildingId
+     * @param salesBatchId
+     * @param apartmentId
+     * @param houseLockingStatus
+     * @param customerLocked
+     * @param pageNumber
+     * @param pageSize
+     * @param personId
+     * @param source             来源，raiseChoose 为认筹添加房源来源
+     * @param request
      * @return
-     * @author gushaoyong
      */
     @RequestMapping(value = "/wx/listPreselectionRecord", method = RequestMethod.GET)
-    public ResponseBean listPreselectionRecord(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+    public ResponseBean listPreselectionRecord(@RequestParam(value = "buildingId", required = false) String buildingId,
+                                               @RequestParam(value = "salesBatchId", required = false) Integer salesBatchId,
+                                               @RequestParam(value = "apartmentId", required = false) String apartmentId,
+                                               @RequestParam(value = "houseLockingStatus", required = false) String houseLockingStatus,
+                                               @RequestParam(value = "customerLocked", required = false) String customerLocked,
+                                               @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                                @RequestParam("personId") String personId,
+                                               @RequestParam(value = "source", required = false) String source,
                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         try {
-            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNum, pageSize, orgId, personId));
+            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNumber, pageSize, orgId, personId, buildingId,
+                    salesBatchId, apartmentId, houseLockingStatus, customerLocked, source));
         } catch (Exception e) {
             logger.error("listPreselectionRecord -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -207,18 +222,27 @@ public class TaPreselectionRecordController extends BaseController {
         return responseBean;
     }
 
-    @RequestMapping(value = "/admin/taPreselectRecord", method = RequestMethod.GET)
-    public ResponseBean selectPreSelectRecordList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+    /**
+     * 查询预选记录列表
+     *
+     * @param recordRequestBO
+     * @param salesBatchId
+     * @param pageNum
+     * @param pageSize
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/taPreselectRecord/{salesBatchId}", method = RequestMethod.GET)
+    public ResponseBean selectPreSelectRecordList(PresecretRecordRequestBO recordRequestBO,
+                                                  @PathVariable("salesBatchId") Integer salesBatchId,
+                                                  @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                  @RequestParam(value = "salesBatchId") String salesBatchId,
-                                                  @RequestParam(value = "house", required = false) Integer house,
-                                                  @RequestParam(value = "phone", required = false) String phone,
-                                                  @RequestParam(value = "apartmentId", required = false) String apartmentId,
-                                                  @RequestParam(value = "status", required = false) Integer status,
                                                   HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaPreselectionRecordService.selectPreSelectRecordList(pageNum, pageSize, salesBatchId, house, getOrgId(request), phone, apartmentId, status);
+            recordRequestBO.setSalesBatchId(salesBatchId);
+            recordRequestBO.setOrgId(getOrgId(request));
+            responseBean = iTaPreselectionRecordService.selectPreSelectRecordList(recordRequestBO, pageNum, pageSize);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taHousingResourcesList -=- {}", e.toString());
@@ -226,4 +250,25 @@ public class TaPreselectionRecordController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 批量删除预选记录
+     *
+     * @param preselectionRecordList
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/preselectRecord/batchDelete", method = RequestMethod.PUT)
+    public ResponseBean batchDeletePreselectRecord(@RequestBody List<TaPreselectionRecord> preselectionRecordList,
+                                                   HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaPreselectionRecordService.batchDeletePreselectRecord(preselectionRecordList, getOrgId(request), getUserId(request));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("batchDeletePreselectRecord -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -0,0 +1,256 @@
+package com.huiju.estateagents.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaRaise;
+import com.huiju.estateagents.service.ITaRaiseService;
+import com.huiju.estateagents.service.ITdCityService;
+import io.swagger.models.auth.In;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 认筹表  前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@RestController
+@RequestMapping("/api")
+public class TaRaiseController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRaiseController.class);
+
+    @Autowired
+    public ITaRaiseService iTaRaiseService;
+
+    @Autowired
+    public ITdCityService iTdCityService;
+
+    /**
+     * 获取认筹列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param salesBatchName
+     * @param status
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/listRaiseByCondition", method = RequestMethod.GET)
+    public ResponseBean listRaiseByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                             String buildingId, String salesBatchName, Integer status,
+                                             HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+
+        try {
+            Integer orgId = getOrgId(request);
+            List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
+
+            responseBean = iTaRaiseService.listRaiseByCondition(pageSize, pageNum, salesBatchName, buildingId, orgId, status, personBuildingList);
+            logger.info("listRaiseByCondition 返回结果：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("listRaiseByCondition -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/admin/taRaise", method = RequestMethod.GET)
+    public ResponseBean taRaiseList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaRaise> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRaise> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRaise> result = iTaRaiseService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taRaise 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/taRaise", method = RequestMethod.POST)
+    public ResponseBean taRaiseAdd(@RequestBody TaRaise taRaise, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 参数校验
+            Integer raisePrice = taRaise.getRaisePrice();
+            if (raisePrice != null && (raisePrice > CommConstant.MAX_RAISE_PRICE || raisePrice < 0)) {
+                responseBean.addError("认筹金额范围为0到50000元");
+                return responseBean;
+            }
+
+            Integer orgId = getOrgId(request);
+
+            // 校验批次是否已经认筹过
+            QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
+            taRaiseQueryWrapper.eq("org_Id", orgId);
+            taRaiseQueryWrapper.eq("sales_batch_id", taRaise.getSalesBatchId());
+            taRaiseQueryWrapper.eq("status", 1);
+            TaRaise tr = iTaRaiseService.getOne(taRaiseQueryWrapper);
+            if (tr != null) {
+                responseBean.addError("该销售批次已添加过认筹");
+                return responseBean;
+            }
+
+            taRaise.setOrgId(orgId);
+            taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null );
+            taRaise.setStatus(CommConstant.IS_PUBLISH);
+            taRaise.setCreateDate(LocalDateTime.now());
+            if (iTaRaiseService.save(taRaise)) {
+                responseBean.addSuccess(taRaise);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param taRaiseList
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/admin/raise/batchDelete", method = RequestMethod.DELETE)
+    public ResponseBean batchDelete(@RequestBody List<TaRaise> taRaiseList, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer orgId = getOrgId(request);
+            responseBean = iTaRaiseService.batchDelete(taRaiseList, orgId);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/taRaise/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taRaiseDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRaiseService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id      实体ID
+     * @param taRaise 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/taRaise/{id}", method = RequestMethod.PUT)
+    public ResponseBean taRaiseUpdate(@PathVariable Integer id,
+                                      @RequestBody TaRaise taRaise) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer raisePrice = taRaise.getRaisePrice();
+            if (raisePrice != null && (raisePrice > CommConstant.MAX_RAISE_PRICE || raisePrice < 0)) {
+                responseBean.addError("认筹金额范围为0到50000元");
+                return responseBean;
+            }
+
+            taRaise.setRaiseId(id);
+            taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null);
+            if (iTaRaiseService.updateById(taRaise)) {
+                responseBean.addSuccess(taRaise);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/admin/taRaise/{id}", method = RequestMethod.GET)
+    public ResponseBean taRaiseGet(@PathVariable Integer id, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaRaiseService.getRaiseById(id, getOrgId(request));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @GetMapping("/wx/taRaise")
+    public ResponseBean getRaiseProfile(@RequestParam(required = false) Integer salesBatchId,
+                                        @RequestParam(required = false) Integer raiseId,
+                                        @RequestParam(required = false) Integer raiseRecordId,
+                                        HttpServletRequest request) {
+        TaRaise taRaise = iTaRaiseService.getRaiseProfile(raiseId, raiseRecordId, salesBatchId);
+        return ResponseBean.success(taRaise);
+    }
+
+}

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

@@ -0,0 +1,170 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaRaiseHouse;
+import com.huiju.estateagents.service.ITaRaiseHouseService;
+import com.huiju.estateagents.service.ITaRaiseRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 认筹单与房源关系表  前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@RestController
+@RequestMapping("/api")
+public class TaRaiseHouseController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRaiseHouseController.class);
+
+    @Autowired
+    public ITaRaiseHouseService iTaRaiseHouseService;
+
+    @Autowired
+    private ITaRaiseRecordService iTaRaiseRecordService;
+
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/taRaiseHouse", method = RequestMethod.GET)
+    public ResponseBean taRaiseHouseList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaRaiseHouse> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRaiseHouse> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRaiseHouse> result = iTaRaiseHouseService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseHouseList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taRaiseHouse 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/taRaiseHouse", method = RequestMethod.POST)
+    public ResponseBean taRaiseHouseAdd(TaRaiseHouse taRaiseHouse, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+
+            // 校验参数
+            if (taRaiseHouse.getRaiseRecordId() == null) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+
+            Integer orgId = getOrgId(request);
+            Integer userId = getUserId(request);
+
+            // 认筹表房源数+1
+            iTaRaiseRecordService.addHouseNum(taRaiseHouse.getRaiseRecordId(), orgId, userId);
+
+            taRaiseHouse.setOrgId(orgId);
+            taRaiseHouse.setCreateDate(LocalDateTime.now());
+            if (iTaRaiseHouseService.save(taRaiseHouse)) {
+                responseBean.addSuccess(taRaiseHouse);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseHouseAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/taRaiseHouse/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taRaiseHouseDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRaiseHouseService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseHouseDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id           实体ID
+     * @param taRaiseHouse 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/taRaiseHouse/{id}", method = RequestMethod.PUT)
+    public ResponseBean taRaiseHouseUpdate(@PathVariable Integer id,
+                                           @RequestBody TaRaiseHouse taRaiseHouse) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRaiseHouseService.updateById(taRaiseHouse)) {
+                responseBean.addSuccess(taRaiseHouse);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseHouseUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/taRaiseHouse/{id}", method = RequestMethod.GET)
+    public ResponseBean taRaiseHouseGet(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRaiseHouseService.getById(id));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseHouseDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,673 @@
+package com.huiju.estateagents.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
+import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
+import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.po.BuildingImgPO;
+import com.huiju.estateagents.service.*;
+import jodd.util.StringUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 认筹单(认筹记录表)  前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@RestController
+@RequestMapping("/api")
+public class TaRaiseRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRaiseRecordController.class);
+
+    @Autowired
+    public ITaRaiseRecordService iTaRaiseRecordService;
+
+    @Autowired
+    public ITaRaiseHouseService taRaiseHouseService;
+
+    @Autowired
+    public ITaHousingResourcesService taHousingResourcesService;
+
+    @Autowired
+    public ITaOrderService taOrderService;
+
+    @Autowired
+    public ITaBuildingImgService taBuildingImgService;
+
+    @Autowired
+    public ITaRaiseService taRaiseService;
+
+    @Autowired
+    public ITaBuildingApartmentService taBuildingApartmentService;
+
+    @Autowired
+    public ITaUserService taUserService;
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
+    /**
+     * 条件查询房源认筹记录
+     *
+     * @param requestBO
+     * @param pageNumber
+     * @param pageSize
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/listHousingRaiseByCondition", method = RequestMethod.GET)
+    public ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO,
+                                                    @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest request) {
+        logger.info("TaRaiseRecordController.listHousingRaiseByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(requestBO), pageNumber, pageSize);
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            requestBO.setOrgId(getOrgId(request));
+            responseBean = iTaRaiseRecordService.listHousingRaiseByCondition(requestBO, pageNumber, pageSize);
+            logger.info("TaRaiseRecordController.listHousingRaiseByCondition 返回：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("TaRaiseRecordController.listHousingRaiseByCondition -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 条件查询认筹单
+     *
+     * @param recordRequestBO
+     * @param pageNumber
+     * @param pageSize
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/listRaiseRecordByCondition", method = RequestMethod.GET)
+    public ResponseBean listRaiseRecordByCondition(RaiseRecordRequestBO recordRequestBO,
+                                                   @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                   HttpServletRequest request) {
+        logger.info("TaRaiseRecordController.listRaiseRecordByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(recordRequestBO), pageNumber, pageSize);
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            recordRequestBO.setOrgId(getOrgId(request));
+            responseBean = iTaRaiseRecordService.listRaiseRecordByCondition(recordRequestBO, pageNumber, pageSize);
+            logger.info("TaRaiseRecordController.listRaiseRecordByCondition 返回：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("TaRaiseRecordController.taRaiseRecordList -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 条件查询缴费单/退费单
+     * 备注：
+     * 缴费单：payStatus传 paid
+     * 退费单：payStatus传 refunded
+     *
+     * @param orderRequestBO
+     * @param pageNumber
+     * @param pageSize
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/listRaiseOrderByCondition", method = RequestMethod.GET)
+    public ResponseBean listRaiseOrderByCondition(RaiseOrderRequestBO orderRequestBO,
+                                                  @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                  HttpServletRequest request) {
+        logger.info("TaRaiseRecordController.listOrderByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(orderRequestBO), pageNumber, pageSize);
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            orderRequestBO.setOrgId(getOrgId(request));
+            responseBean = iTaRaiseRecordService.listRaiseOrderByCondition(orderRequestBO, pageNumber, pageSize);
+            logger.info("TaRaiseRecordController.listOrderByCondition 返回：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("TaRaiseRecordController.listOrderByCondition -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量作废
+     *
+     * @param raiseRecord
+     * @return
+     */
+    @RequestMapping(value = "/admin/batchInvalidRaiseRecord", method = RequestMethod.PUT)
+    public ResponseBean batchInvalidRaiseRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
+
+        logger.info("TaRaiseRecordController.batchInvalidRaiseRecord 接收参数：TaRaiseRecord:{}", JSONObject.toJSONString(raiseRecord));
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 校验参数
+            if (CollectionUtils.isEmpty(raiseRecord.getTaRaiseRecords()) || StringUtils.isBlank(raiseRecord.getInvalidReason())) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+
+            // 获取用户信息
+            TaUser taUser = taUserService.getUserInfoById(getUserId(request), getOrgId(request));
+
+            raiseRecord.getTaRaiseRecords().stream().forEach(record -> {
+                if (taUser != null) {
+                    record.setUpdateUserName(taUser.getUserName());
+                }
+                record.setInvalidReason(raiseRecord.getInvalidReason());
+                record.setUpdateDate(LocalDateTime.now());
+                record.setStatus(0);
+
+                // 更新房源认筹热度
+                iTaRaiseRecordService.updateForSubtractRaiseHeat(record.getRaiseRecordId());
+
+                //发送订阅消息
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
+            });
+
+            if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            logger.error("TaRaiseRecordController.taRaiseRecordList -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param raiseRecord
+     * @return
+     */
+    @RequestMapping(value = "/admin/batchDeleteRaiseRecord", method = RequestMethod.PUT)
+    public ResponseBean batchDeleteRaiseRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
+        logger.info("TaRaiseRecordController.batchDeleteRaiseRecord 接收参数：{}", JSONObject.toJSONString(raiseRecord));
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 参数校验
+            if (CollectionUtils.isEmpty(raiseRecord.getTaRaiseRecords())) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+
+            // 获取用户信息
+            TaUser taUser = taUserService.getUserInfoById(getUserId(request), getOrgId(request));
+
+            raiseRecord.getTaRaiseRecords().stream().forEach(record -> {
+                if (taUser != null) {
+                    record.setUpdateUserName(taUser.getUserName());
+                }
+                record.setStatus(CommConstant.STATUS_DELETE);
+                record.setUpdateDate(LocalDateTime.now());
+
+                // 更新房源认筹热度
+                iTaRaiseRecordService.updateForSubtractRaiseHeat(record.getRaiseRecordId());
+
+                //发送订阅消息
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
+            });
+
+            if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            logger.error("TaRaiseRecordController.taRaiseRecordList -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量线下缴费
+     *
+     * @param raiseRecord
+     * @return
+     */
+    @RequestMapping(value = "/admin/batchPayOfflineRaiseRecord", method = RequestMethod.PUT)
+    public ResponseBean batchPayOfflineRaiseRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
+        logger.info("TaRaiseRecordController.batchPayOfflineRaiseRecord 接收参数：{}", JSONObject.toJSONString(raiseRecord));
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 参数校验
+            if (CollectionUtils.isEmpty(raiseRecord.getTaRaiseRecords())) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+
+            Integer orgId = getOrgId(request);
+            TaRaiseRecord tr;
+            QueryWrapper<TaRaiseRecord> queryWrapper;
+            for (TaRaiseRecord record : raiseRecord.getTaRaiseRecords()) {
+                queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("org_id", orgId);
+                queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
+                tr = iTaRaiseRecordService.getOne(queryWrapper);
+                if (tr == null) {
+                    responseBean.addError(String.format("未找到认筹单编号为%s的记录", record.getRaiseRecordId()));
+                    return responseBean;
+                }
+                if (-1 == tr.getStatus()) {
+                    responseBean.addError(String.format("认筹单编号为%s的记录已作废，请重新选择", record.getRaiseRecordId()));
+                    return responseBean;
+                }
+                if (!CommConstant.PAY_STATUS_UNPAID.equals(tr.getPayStatus())) {
+                    responseBean.addError(String.format("认筹单编号为%s的记录为未缴费状态 ，请重新选择", record.getRaiseRecordId()));
+                    return responseBean;
+                }
+            }
+
+            // 获取用户信息
+            TaUser taUser = taUserService.getUserInfoById(getUserId(request), orgId);
+
+            // 设置缴费状态为已缴费
+            raiseRecord.getTaRaiseRecords().stream().forEach(record -> {
+                if (taUser != null) {
+                    record.setUpdateUserName(taUser.getUserName());
+                }
+                record.setPayStatus(CommConstant.PAY_STATUS_PAID);
+                record.setUpdateDate(LocalDateTime.now());
+                //发送订阅消息
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹已缴费","点击详情查看认筹单","您的认筹已成功缴费",false);
+            });
+
+            if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            logger.error("TaRaiseRecordController.batchPayOfflineRaiseRecord -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量线下退费
+     *
+     * @param raiseRecord
+     * @param refundReason 退款原因
+     * @return
+     */
+    @RequestMapping(value = "/admin/batchRefundOfflineRaiseRecord", method = RequestMethod.PUT)
+    public ResponseBean batchRefundOfflineRaiseRecord(@RequestBody TaRaiseRecord raiseRecord, String refundReason,
+                                                      HttpServletRequest request) {
+        logger.info("TaRaiseRecordController.batchRefundOfflineRaiseRecord 接收参数：{},refundReason:{}", JSONObject.toJSONString(raiseRecord), refundReason);
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 参数校验
+            if (CollectionUtils.isEmpty(raiseRecord.getTaRaiseRecords())) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+
+            Integer orgId = getOrgId(request);
+            TaRaiseRecord tr;
+            QueryWrapper<TaRaiseRecord> queryWrapper;
+            for (TaRaiseRecord record : raiseRecord.getTaRaiseRecords()) {
+                queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("org_id", orgId);
+                queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
+                tr = iTaRaiseRecordService.getOne(queryWrapper);
+                if (tr == null) {
+                    responseBean.addError(String.format("未找到认筹单编号为%s的记录", record.getRaiseRecordId()));
+                    return responseBean;
+                }
+                if (-1 == tr.getStatus()) {
+                    responseBean.addError(String.format("认筹单编号为%s的记录已作废，请重新选择", record.getRaiseRecordId()));
+                    return responseBean;
+                }
+                if (CommConstant.PAY_STATUS_UNPAID.equals(tr.getPayStatus())) {
+                    responseBean.addError(String.format("认筹单编号为%s的未缴费，请重新选择", record.getRaiseRecordId()));
+                    return responseBean;
+                }
+                if (CommConstant.PAY_STATUS_REFUNDED.equals(tr.getPayStatus())) {
+                    responseBean.addError(String.format("认筹单编号为%s的记录已退费，请重新选择", record.getRaiseRecordId()));
+                    return responseBean;
+                }
+            }
+
+            // 获取用户信息
+            TaUser taUser = taUserService.getUserInfoById(getUserId(request), orgId);
+
+            raiseRecord.getTaRaiseRecords().stream().forEach(record -> {
+                if (taUser != null) {
+                    record.setUpdateUserName(taUser.getUserName());
+                }
+                record.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
+                record.setRefundReason(raiseRecord.getRefundReason());
+                record.setUpdateDate(LocalDateTime.now());
+                //发送订阅消息
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹已退费","点击详情查看认筹单","您的认筹已成功退费",false);
+            });
+
+            if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            logger.error("TaRaiseRecordController.batchRefundOfflineRaiseRecord -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taRaiseRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/taRaiseRecord", method = RequestMethod.POST)
+    public ResponseBean taRaiseRecordAdd(@RequestBody TaRaiseRecord taRaiseRecord) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRaiseRecordService.save(taRaiseRecord)) {
+                responseBean.addSuccess(taRaiseRecord);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseRecordAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/taRaiseRecord/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taRaiseRecordDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRaiseRecordService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseRecordDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id            实体ID
+     * @param taRaiseRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/taRaiseRecord/{id}", method = RequestMethod.PUT)
+    public ResponseBean taRaiseRecordUpdate(@PathVariable Integer id,
+                                            @RequestBody TaRaiseRecord taRaiseRecord) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRaiseRecordService.updateById(taRaiseRecord)) {
+                responseBean.addSuccess(taRaiseRecord);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseRecordUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/taRaiseRecord/{id}", method = RequestMethod.GET)
+    public ResponseBean taRaiseRecordGet(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRaiseRecordService.getById(id));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseRecordDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 条件查询认筹单
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/getUserInfo", method = RequestMethod.GET)
+    public ResponseBean getUserInfo(@RequestParam("raiseRecordId") Integer raiseRecordId,
+                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                    HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRaiseRecordService.getUserInfo(raiseRecordId, getOrgId(request)));
+        } catch (Exception e) {
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 微信端下认筹单
+     *
+     * @param taRaiseRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/wx/taRaiseRecord", method = RequestMethod.POST)
+    public ResponseBean wxRaiseRecordAdd(@RequestBody TaRaiseRecord taRaiseRecord, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRaiseRecordService.saveRaiseInfo(taRaiseRecord, getOrgId(request), getPersonId(request)));
+        } catch (Exception e) {
+            logger.error("微信端下认筹单 -=- {}", e.toString());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 微信端获取认筹单详细信息
+     *
+     * @param raiseRecordId 认筹旦id
+     * @return
+     */
+    @RequestMapping(value = "/wx/taRaiseRecord/{raiseRecordId}", method = RequestMethod.GET)
+    public ResponseBean wxGetRaiseRecordById(@PathVariable Integer raiseRecordId, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //获取认筹单信息
+            TaRaiseRecord taRaiseRecord = iTaRaiseRecordService.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())) {
+                        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);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("微信端获取认筹单详细信息 -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 微信端获取认筹单列表信息
+     *
+     * @return
+     */
+    @RequestMapping(value = "/wx/taRaiseRecord/list", method = RequestMethod.GET)
+    public ResponseBean wxGetRaiseRecordList(@RequestParam(value = "buildingId", required = false) String buildingId,
+                                             @RequestParam(value = "salesBtchId", required = false) Integer salesBtchId,
+                                             @RequestParam(value = "houseLockingStatus", required = false) String houseLockingStatus,
+                                             @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            IPage<TaRaiseRecord> pg = new Page<>(pageNumber, pageSize);
+            //获取认筹单列表信息
+            QueryWrapper<TaRaiseRecord> taRaiseRecordQueryWrapper = new QueryWrapper<>();
+            taRaiseRecordQueryWrapper.eq("org_id", getOrgId(request));
+            taRaiseRecordQueryWrapper.eq("person_id", getPersonId(request));
+            taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(buildingId), "building_id", buildingId);
+            taRaiseRecordQueryWrapper.eq(null != salesBtchId, "sales_batch_id", salesBtchId);
+            taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(houseLockingStatus), "house_locking_status", houseLockingStatus);
+            IPage<TaRaiseRecord> page = iTaRaiseRecordService.page(pg, taRaiseRecordQueryWrapper);
+            List<TaRaiseRecord> list = page.getRecords();
+            list.forEach(e -> {
+                //房源与认筹单关系图
+                List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", e.getRaiseRecordId()));
+                //房源信息
+                List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
+                //户型图列表
+                List<TaBuildingImg> apartMentList = taBuildingImgService.getAparemnetList(houseList.stream().map(TaHousingResources::getApartmentId).collect(Collectors.toList()));
+                e.setTaHousingResourcesList(houseList);
+                e.setTaHousingResourcesSize(houseList.size());
+                e.setBuildingImgList(apartMentList);
+            });
+
+            responseBean.addSuccess(page);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("微信端获取认筹单列表信息 -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 微信端客户选择线下缴费就需要把此人的认筹单的缴费状态改为线下缴费
+     *
+     */
+    @RequestMapping(value = "/wx/taRaiseRecord/{raiseRecordId}", method = RequestMethod.PUT)
+    public ResponseBean taRaiseRecordUpdate(@PathVariable Integer raiseRecordId,
+                                            HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
+            taRaiseRecord.setRaiseRecordId(raiseRecordId);
+            taRaiseRecord.setPayType(CommConstant.PAY_TYPE_OFFLINE);
+            if (iTaRaiseRecordService.updateById(taRaiseRecord)) {
+                responseBean.addSuccess(taRaiseRecord);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseRecordUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -6,14 +6,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.*;
-import io.swagger.models.auth.In;
+import com.huiju.estateagents.service.impl.TaPreselectionServiceImpl;
+import com.huiju.estateagents.service.impl.TaRaiseServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Request;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
@@ -49,6 +50,12 @@ public class TaSalesBatchController extends BaseController {
     @Autowired
     public IExtendContentService iExtendContentService;
 
+    @Autowired
+    public TaRaiseServiceImpl taRaiseService;
+
+    @Autowired
+    private TaPreselectionServiceImpl taPreselectionService;
+
     /**
      * 分页查询列表
      *
@@ -67,7 +74,7 @@ public class TaSalesBatchController extends BaseController {
             //使用分页插件
             IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
 
-            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request),getTaPersonBuildingListByUserId(request));
+            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request), getTaPersonBuildingListByUserId(request));
             responseBean.addSuccess(result);
         } catch (Exception e) {
             e.printStackTrace();
@@ -95,7 +102,7 @@ public class TaSalesBatchController extends BaseController {
             iTaSalesBatchService.save(taSalesBatch);
 
             QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
-            taMiniappQuery.eq("org_id", getOrgId(request));
+            taMiniappQuery.eq("org_id", orgId);
             TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
             // 生成二维码
             ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.HOUSE_QRCODE.replace("#0", taSalesBatch.getSalesBatchId().toString()).replace("#1", "house"), taMiniapp.getMiniappId());
@@ -125,26 +132,55 @@ public class TaSalesBatchController extends BaseController {
     /**
      * 删除批次
      *
-     * @param taSalesBatch 实体对象
+     * @param salesBatchs
+     * @param request
      * @return
      */
     @RequestMapping(value = "/admin/taSalesBatch", method = RequestMethod.PUT)
     public ResponseBean taSalesBatchDel(@RequestBody List<TaSalesBatch> salesBatchs, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+
+            Integer orgId = getOrgId(request);
+
+            for (TaSalesBatch ts : salesBatchs) {
+
+                // 校验批次下是否有预选记录
+                QueryWrapper<TaPreselection> preselectionQueryWrapper = new QueryWrapper<>();
+                preselectionQueryWrapper.eq("org_id", orgId);
+                preselectionQueryWrapper.eq("sales_batch_id", ts.getSalesBatchId());
+                preselectionQueryWrapper.eq("status", 1);
+                TaPreselection preselection = taPreselectionService.getOne(preselectionQueryWrapper);
+                if (preselection != null) {
+                    responseBean.addError(String.format("销售批次%s关联有预选,请先删除关联的预选模块", ts.getSalesBatchName()));
+                    return responseBean;
+                }
+
+                // 校验批次下是否有认筹
+                QueryWrapper<TaRaise> raiseQueryWrapper = new QueryWrapper<>();
+                raiseQueryWrapper.eq("org_id", orgId);
+                raiseQueryWrapper.eq("sales_batch_id", ts.getSalesBatchId());
+                raiseQueryWrapper.eq("status", 1);
+                TaRaise raise = taRaiseService.getOne(raiseQueryWrapper);
+                if (raise != null) {
+                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的预选模块", ts.getSalesBatchName()));
+                    return responseBean;
+                }
+            }
+
             List<Integer> liveActivityIds = new ArrayList<>();
-            for(TaSalesBatch taSalesBatch : salesBatchs){
+            for (TaSalesBatch taSalesBatch : salesBatchs) {
                 liveActivityIds.add(taSalesBatch.getSalesBatchId());
             }
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.eq("content_type",CommConstant.SALES_BATCH);
-            queryWrapper.in("target_id",liveActivityIds);
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("content_type", CommConstant.SALES_BATCH);
+            queryWrapper.in("target_id", liveActivityIds);
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
             list.forEach(e -> {
                 e.setStatus(CommConstant.NOT_PUBLISH);
             });
-            if (list.size() > 0){
+            if (list.size() > 0) {
                 iExtendContentService.updateBatchById(list);
             }
 
@@ -194,17 +230,41 @@ public class TaSalesBatchController extends BaseController {
         try {
             taSalesBatch.setSalesBatchId(id);
 
+            if (taSalesBatch.getStatus() != null && taSalesBatch.getStatus() != 1) {
+                // 校验批次下是否有预选记录
+                QueryWrapper<TaPreselection> preselectionQueryWrapper = new QueryWrapper<>();
+                preselectionQueryWrapper.eq("org_id", getOrgId(request));
+                preselectionQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
+                preselectionQueryWrapper.eq("status", 1);
+                TaPreselection preselection = taPreselectionService.getOne(preselectionQueryWrapper);
+                if (preselection != null) {
+                    responseBean.addError(String.format("销售批次%s关联有预选,请先删除关联的预选模块", taSalesBatch.getSalesBatchName()));
+                    return responseBean;
+                }
+
+                // 校验批次下是否有认筹
+                QueryWrapper<TaRaise> raiseQueryWrapper = new QueryWrapper<>();
+                raiseQueryWrapper.eq("org_id", getOrgId(request));
+                raiseQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
+                raiseQueryWrapper.eq("status", 1);
+                TaRaise raise = taRaiseService.getOne(raiseQueryWrapper);
+                if (raise != null) {
+                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的认筹模块", taSalesBatch.getSalesBatchName()));
+                    return responseBean;
+                }
+            }
+
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.eq("content_type",CommConstant.SALES_BATCH);
-            queryWrapper.eq("target_id",taSalesBatch.getSalesBatchId());
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("content_type", CommConstant.SALES_BATCH);
+            queryWrapper.eq("target_id", taSalesBatch.getSalesBatchId());
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
-            if (CommConstant.NOT_PUBLISH.equals(taSalesBatch.getStatus())){
+            if (CommConstant.NOT_PUBLISH.equals(taSalesBatch.getStatus())) {
                 list.forEach(e -> {
                     e.setStatus(CommConstant.NOT_PUBLISH);
                 });
             }
-            if (list.size() > 0){
+            if (list.size() > 0) {
                 iExtendContentService.updateBatchById(list);
             }
 
@@ -274,4 +334,66 @@ public class TaSalesBatchController extends BaseController {
         }
         return responseBean;
     }
+
+    @RequestMapping(value = "/admin/salesBatchList", method = RequestMethod.GET)
+    public ResponseBean salesBatchList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "salesBatchName", required = false) String salesBatchName,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       @RequestParam(value = "status", required = false) Integer status, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
+
+            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request), getTaPersonBuildingListByUserId(request));
+            List<TaSalesBatch> taSalesBatches = result.getRecords();
+            responseBean.addSuccess(taSalesBatches);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taSalesBatchList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 查询销售批次列表--小程序
+     */
+    @RequestMapping(value = "/wx/taSalesBatch/choice", method = RequestMethod.GET)
+    public ResponseBean taSalesBatchGetForMiniApp(@RequestParam(value = "buildingId", required = false) String buildingId, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<TaSalesBatch> taSalesBatchQueryWrapper = new QueryWrapper<>();
+            taSalesBatchQueryWrapper.eq("org_id", getOrgId(request));
+            taSalesBatchQueryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
+            taSalesBatchQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            List<TaSalesBatch> list = iTaSalesBatchService.list(taSalesBatchQueryWrapper);
+            responseBean.addSuccess(list);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taSalesBatchGetForMiniApp -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据销售批次查询项目信息
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/taSalesBatch/getBuildingById/{id}", method = RequestMethod.GET)
+    public ResponseBean getBuildingById(@PathVariable("id") String id, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaSalesBatchService.getBuildingById(id, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("taSalesBatchGetForMiniApp -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
 }

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

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaWxPayConfig;
+import com.huiju.estateagents.service.ITaWxPayConfigService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 微信支付设置  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@RestController
+@RequestMapping("/")
+public class TaWxPayConfigController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaWxPayConfigController.class);
+
+    @Autowired
+    public ITaWxPayConfigService iTaWxPayConfigService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taWxPayConfig",method= RequestMethod.GET)
+    public ResponseBean taWxPayConfigList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaWxPayConfig> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaWxPayConfig> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaWxPayConfig> result = iTaWxPayConfigService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taWxPayConfigList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taWxPayConfig 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taWxPayConfig",method= RequestMethod.POST)
+    public ResponseBean taWxPayConfigAdd(@RequestBody TaWxPayConfig taWxPayConfig){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaWxPayConfigService.save(taWxPayConfig)){
+                responseBean.addSuccess(taWxPayConfig);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taWxPayConfigAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taWxPayConfig/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taWxPayConfigDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaWxPayConfigService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taWxPayConfigDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taWxPayConfig 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taWxPayConfig/{id}",method= RequestMethod.PUT)
+    public ResponseBean taWxPayConfigUpdate(@PathVariable Integer id,
+                                        @RequestBody TaWxPayConfig taWxPayConfig){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaWxPayConfigService.updateById(taWxPayConfig)){
+                responseBean.addSuccess(taWxPayConfig);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taWxPayConfigUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taWxPayConfig/{id}",method= RequestMethod.GET)
+    public ResponseBean taWxPayConfigGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaWxPayConfigService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taWxPayConfigDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -28,8 +28,8 @@ import java.util.List;
 
 /**
  * <p>
-    *  前端控制器
-    * </p>
+ * 前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2019-08-07
@@ -51,16 +51,17 @@ public class TdCityController extends BaseController {
 
     /**
      * 中心端城市
+     *
      * @return
      */
-    @RequestMapping(value="/center/tdCity",method= RequestMethod.GET)
-    public ResponseBean tdCityList(@RequestParam(value = "leveltype", required = false) String leveltype){
+    @RequestMapping(value = "/center/tdCity", method = RequestMethod.GET)
+    public ResponseBean tdCityList(@RequestParam(value = "leveltype", required = false) String leveltype) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            List<TdCity> result = iTdCityService.selectCity(leveltype,"");
+            List<TdCity> result = iTdCityService.selectCity(leveltype, "");
             responseBean.addSuccess(result);
-        }catch (Exception e){
-            logger.error("tdCityList -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("tdCityList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -69,8 +70,8 @@ public class TdCityController extends BaseController {
     /**
      * 业务端城市
      */
-    @RequestMapping(value="/admin/tdCityList/tdCity",method= RequestMethod.GET)
-    public ResponseBean adminTdCityList(HttpServletRequest request){
+    @RequestMapping(value = "/admin/tdCityList/tdCity", method = RequestMethod.GET)
+    public ResponseBean adminTdCityList(HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean<>();
         List<TaOrgCity> taOrgCityList = taOrgCityMapper.selectAdminTdCityList(getOrgId(request));
         responseBean.addSuccess(taOrgCityList);
@@ -80,10 +81,11 @@ public class TdCityController extends BaseController {
 
     /**
      * 查询列表
+     *
      * @return
      */
-    @RequestMapping(value="/wx/tdCity",method= RequestMethod.GET)
-    public ResponseBean tdCityListWx(@RequestParam(value = "leveltype", required = false) String leveltype,HttpServletRequest request){
+    @RequestMapping(value = "/wx/tdCity", method = RequestMethod.GET)
+    public ResponseBean tdCityListWx(@RequestParam(value = "leveltype", required = false) String leveltype, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         String appId = request.getHeader("appId");
         try {
@@ -94,8 +96,8 @@ public class TdCityController extends BaseController {
             /**leveltype,暂时保留*/
             List<TdCity> result = iTdCityService.selectWxCity(leveltype, taMiniapp.getOrgId());
             responseBean.addSuccess(result);
-        }catch (Exception e){
-            logger.error("tdCityList -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("tdCityList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -103,20 +105,21 @@ public class TdCityController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param tdCity 实体对象
      * @return
      */
-    @RequestMapping(value="/tdCity",method= RequestMethod.POST)
-    public ResponseBean tdCityAdd(@RequestBody TdCity tdCity){
+    @RequestMapping(value = "/tdCity", method = RequestMethod.POST)
+    public ResponseBean tdCityAdd(@RequestBody TdCity tdCity) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTdCityService.save(tdCity)){
+            if (iTdCityService.save(tdCity)) {
                 responseBean.addSuccess(tdCity);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
-            logger.error("tdCityAdd -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("tdCityAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -124,20 +127,21 @@ public class TdCityController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/tdCity/{id}", method= RequestMethod.DELETE)
-    public ResponseBean tdCityDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/tdCity/{id}", method = RequestMethod.DELETE)
+    public ResponseBean tdCityDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTdCityService.removeById(id)){
+            if (iTdCityService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
-            logger.error("tdCityDelete -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("tdCityDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -145,21 +149,22 @@ public class TdCityController extends BaseController {
 
     /**
      * 修改对象
+     *
      * @param tdCity 实体对象
      * @return
      */
-    @RequestMapping(value="/edit/tdCity/",method= RequestMethod.PUT)
+    @RequestMapping(value = "/edit/tdCity/", method = RequestMethod.PUT)
     public ResponseBean tdCityUpdate(@PathVariable List<TdCity> cities,
-                                        @RequestBody TdCity tdCity){
+                                     @RequestBody TdCity tdCity) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTdCityService.updateBatchById(cities)){
+            if (iTdCityService.updateBatchById(cities)) {
                 responseBean.addSuccess(tdCity);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
-            logger.error("tdCityUpdate -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("tdCityUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -167,34 +172,36 @@ public class TdCityController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/tdCity/{id}",method= RequestMethod.GET)
-    public ResponseBean tdCityGet(@PathVariable Integer id){
+    @RequestMapping(value = "/tdCity/{id}", method = RequestMethod.GET)
+    public ResponseBean tdCityGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTdCityService.getById(id));
-        }catch (Exception e){
-            logger.error("tdCityDelete -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("tdCityDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
-    
+
     /**
      * 根据经纬度查询城市ID
      * 经度在前，纬度在后，经纬度间以“,”分割，经纬度小数点后不要超过 6 位
+     *
      * @return
      */
-    @RequestMapping(value="/wx/location/city",method= RequestMethod.GET)
-    public ResponseBean wxLocationCityDetail(@RequestParam(value = "location") String location,HttpServletRequest request){
+    @RequestMapping(value = "/wx/location/city", method = RequestMethod.GET)
+    public ResponseBean wxLocationCityDetail(@RequestParam(value = "location") String location, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         try {
-            TdCity tdCity = iTdCityService.getLocationCity(location, orgId);
+            TdCity tdCity = iTdCityService.getLocationCity(location, orgId, null);
             responseBean.addSuccess(tdCity);
-        }catch (Exception e){
-            logger.error("tdCityList -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("tdCityList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -0,0 +1,210 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.common.wxpay.WXPayConstants;
+import com.huiju.estateagents.common.wxpay.WXPayUtil;
+import com.huiju.estateagents.entity.TaOrder;
+import com.huiju.estateagents.entity.TaWxPayConfig;
+import com.huiju.estateagents.service.ITaWxPayConfigService;
+import com.huiju.estateagents.service.IWxPayService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import sun.misc.BASE64Decoder;
+import sun.security.provider.MD5;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+import javax.servlet.http.HttpServletRequest;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.security.Security;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static sun.security.x509.CertificateAlgorithmId.ALGORITHM;
+
+@Slf4j
+@RestController
+@RequestMapping("/api")
+public class WxPayController extends BaseController {
+
+    @Autowired
+    private IWxPayService wxPayService;
+
+    @Autowired
+    private ITaWxPayConfigService taWxPayConfigService;
+
+    /**
+     * 微信统一下单接口
+     * @param taOrder
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/wx/unifiedOrder",method = RequestMethod.POST)
+    public ResponseBean wxUnifiedOrder(@RequestBody TaOrder taOrder,
+                                       HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taOrder.setOrgId(getOrgId(request));
+            taOrder.setPersonId(getPersonId(request));
+            responseBean = wxPayService.payUnifiedOrder(taOrder,request.getRemoteAddr());
+        } catch (Exception e) {
+            log.error("微信统一下单失败： {}" , e.getMessage());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        return responseBean;
+    }
+
+    /**
+     * 微信支付成功回调接口
+     * @param type
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/notify/{type}",method = RequestMethod.POST)
+    public String wxNotify(@PathVariable String type, HttpServletRequest request){
+        log.info("支付成功回调开始，支付类型是{}",type);
+        String failResult = "<xml>" + "<return_code><![CDATA[FAIL]]></return_code>" + "<return_msg><![CDATA[失败]]></return_msg>" + "</xml> ";
+        String successResult = "<xml>" + "<return_code><![CDATA[SUCCESS]]></return_code>" + "<return_msg><![CDATA[OK]]></return_msg>" + "</xml> ";
+        Map<String, String> resultMap = new HashMap<>();
+        try {
+            InputStream inStream = request.getInputStream();
+            ByteArrayOutputStream outSteam = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            int len = 0;
+            while ((len = inStream.read(buffer)) != -1) {
+                outSteam.write(buffer, 0, len);
+            }
+
+            // 获取微信调用我们notify_url的返回信息
+            String result = new String(outSteam.toByteArray(), "utf-8");
+            log.info("wxnotify:微信支付----result----=" + result);
+
+            // 关闭流
+            outSteam.close();
+            inStream.close();
+            // xml转换为map
+            resultMap = WXPayUtil.xmlToMap(result);
+            //处理业务需求
+            if (WXPayConstants.SUCCESS.equalsIgnoreCase(resultMap.get("result_code"))) {
+                wxPayService.wxNotify(resultMap, type);
+            }else {
+                log.error("支付回调出错{}",resultMap.get("return_msg"));
+                return failResult;
+            }
+
+        } catch (Exception e) {
+            log.error("支付回调出错{}",e.getMessage());
+            return failResult;
+        }
+
+        return successResult;
+    }
+
+    /**
+     * 微信退款成功回调接口
+     * @param type
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/refund/{type}",method = RequestMethod.POST)
+    public String wxRefund(@PathVariable String type, HttpServletRequest request){
+        log.info("微信退款成功回调开始，退款类型是{}",type);
+        String failResult = "<xml>" + "<return_code><![CDATA[FAIL]]></return_code>" + "<return_msg><![CDATA[失败]]></return_msg>" + "</xml> ";
+        String successResult = "<xml>" + "<return_code><![CDATA[SUCCESS]]></return_code>" + "<return_msg><![CDATA[OK]]></return_msg>" + "</xml> ";
+        Map<String, String> resultMap = new HashMap<>();
+        try {
+            InputStream inStream = request.getInputStream();
+            ByteArrayOutputStream outSteam = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            int len = 0;
+            while ((len = inStream.read(buffer)) != -1) {
+                outSteam.write(buffer, 0, len);
+            }
+
+            // 获取微信调用我们notify_url的返回信息
+            String result = new String(outSteam.toByteArray(), "utf-8");
+            log.info("wxnotify:微信退款----result----=" + result);
+
+            // 关闭流
+            outSteam.close();
+            inStream.close();
+            // xml转换为map
+            resultMap = WXPayUtil.xmlToMap(result);
+            //处理业务需求
+            if (WXPayConstants.SUCCESS.equalsIgnoreCase(resultMap.get("return_code"))) {
+                String mchId = resultMap.get("mch_id");
+                QueryWrapper<TaWxPayConfig> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("mch_id",mchId);
+                String mchKey = taWxPayConfigService.list(queryWrapper).get(0).getMchKey();
+                log.info("key等于{}",mchKey);
+                SecretKeySpec key = new SecretKeySpec(DigestUtils.md5Hex(mchKey).toLowerCase().getBytes(), "AES");
+                Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+                cipher.init(Cipher.DECRYPT_MODE, key);
+                String req_info = new String(cipher.doFinal(new BASE64Decoder().decodeBuffer(resultMap.get("req_info"))), "UTF-8");
+                log.info("req_info等于{}",req_info);
+                Map<String, String> orderInfo = WXPayUtil.xmlToMap(req_info);
+                wxPayService.houseRefund(orderInfo);
+            }else {
+                log.error("支付回调出错{}",resultMap.get("return_msg"));
+                return failResult;
+            }
+
+        } catch (Exception e) {
+            log.error("支付回调出错{}",e.getMessage());
+            return failResult;
+        }
+
+        return successResult;
+    }
+
+    /**
+     * 微信申请退款接口
+     * @param taOrder
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/refund",method = RequestMethod.POST)
+    public ResponseBean wxRefund(@RequestBody TaOrder taOrder,
+                                       HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            wxPayService.payRefund(taOrder,getOrgId(request),getOrgId(request));
+        } catch (Exception e) {
+            log.error("微信批量退款失败： {}" , e.getMessage());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        responseBean.addSuccess(taOrder);
+        return responseBean;
+    }
+
+    /**
+     * 取消微信支付
+     * @param taOrder
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/wx/cancel",method = RequestMethod.POST)
+    public ResponseBean wxCancel(@RequestBody TaOrder taOrder,
+                                 HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taOrder.setOrgId(getOrgId(request));
+            taOrder.setPersonId(getPersonId(request));
+            wxPayService.payCancel(taOrder);
+        } catch (Exception e) {
+            log.error("微信取消付款异常： {}" , e.getMessage());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        responseBean.addSuccess(taOrder);
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
@@ -32,7 +33,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.DateFormat;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.UUID;
 
@@ -82,6 +85,7 @@ public class TaDrainageController extends BaseController {
                                        @RequestParam(value ="name",required = false) String name,
                                        @RequestParam(value ="isMiniapp",required = false) Integer isMiniapp,
                                        @RequestParam(value ="status",required = false) Integer status,
+                                       @RequestParam(value ="buildingId",required = false) String buildingId,
                                        HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -94,6 +98,7 @@ public class TaDrainageController extends BaseController {
                 queryWrapper.gt("status",-1);
             }
             queryWrapper.eq(null != status,"status",status);
+            queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
             queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
             queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
             queryWrapper.orderByDesc("create_date");
@@ -133,7 +138,7 @@ public class TaDrainageController extends BaseController {
             taDrainage.setOrgId(getOrgId(request));
             taDrainage.setCreateDate(LocalDateTime.now());
             taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);
-            if (taDrainage.getEndDate().isAfter(LocalDateTime.now())){
+            if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isAfter(LocalDateTime.now())){
                 taDrainage.setStatus(CommConstant.STATUS_NORMAL);
             }
             if (iTaDrainageService.save(taDrainage)){
@@ -299,7 +304,7 @@ public class TaDrainageController extends BaseController {
                     e.setStatus(CommConstant.STATUS_UNACCALIMED);
                 });
             }else{
-                if (taDrainage.getEndDate().isBefore(LocalDateTime.now())){
+                if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isBefore(LocalDateTime.now())){
                     responseBean.addError("已过下架时间，无法上架");
                     return responseBean;
                 }

src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java

@@ -54,7 +54,7 @@ public class TaDrainage implements Serializable {
     /**
      * 截止时间
      */
-    private LocalDateTime endDate;
+    private String endDate;
 
     /**
      * 参与数

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

@@ -0,0 +1,54 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 高级配置基础表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysAdvancedConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 高级配置id
+     */
+    @TableId(value = "advanced_config_id", type = IdType.AUTO)
+    private Integer advancedConfigId;
+
+    /**
+     * 高级配置名称
+     */
+    private String advancedConfigName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 是否有权限
+     */
+    @TableField(exist = false)
+    private Boolean hasRights;
+}

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

@@ -0,0 +1,46 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 高级配置对应关系表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysAdvancedConfigRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 对应关系id
+     */
+    @TableId(value = "relation_id", type = IdType.AUTO)
+    private Integer relationId;
+
+    /**
+     * 对应类型 menu菜单btn按钮
+     */
+    private String targetType;
+
+    /**
+     * 对应类型的id menuId或btnId
+     */
+    private String targetId;
+
+    /**
+     * 高级配置id
+     */
+    private Integer advancedConfigId;
+}

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

@@ -0,0 +1,49 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 高级配置控制表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaAdvancedController implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 高级配置控制id
+     */
+    @TableId(value = "advanced_controller_id", type = IdType.AUTO)
+    private Integer advancedControllerId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 高级配置id
+     */
+    private Integer advancedConfigId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

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

@@ -11,6 +11,7 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -125,6 +126,12 @@ public class TaHousingResources implements Serializable {
     @TableField(exist = false)
     private String apartmentName;
 
+    @TableField(exist = false)
+    private Double insideArea;
+
+    @TableField(exist = false)
+    private Double buildingArea;
+
     /**
      * 状态
      */
@@ -145,6 +152,26 @@ public class TaHousingResources implements Serializable {
      */
     private LocalDateTime updateDate;
 
+    /**
+     * 房源锁定状态
+     */
+    private String houseLockingStatus;
+
+    /**
+     * 认筹基础热度
+     */
+    private Integer raiseHeat;
+
+    /**
+     * 锁定人personId
+     */
+    private String houseLockingPerson;
+
+    /**
+     * 认筹实际热度
+     */
+    private Integer raiseRealHeat;
+
     private Integer updateUser;
 
     @TableField(exist = false)
@@ -152,4 +179,16 @@ public class TaHousingResources implements Serializable {
 
     @TableField(exist = false)
     private List<TaHousingResources> houseIdList;
+
+    /**
+     * 我的锁定
+     */
+    @TableField(exist = false)
+    private String mineLocked;
+
+    /**
+     * 户型图列表列表
+     */
+    @TableField(exist = false)
+    private List<TaBuildingImg> apartmentImgList = new ArrayList<>();
 }

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

@@ -70,5 +70,5 @@ public class TaMiniappOrgIcon implements Serializable {
      */
     private LocalDateTime updateDate;
 
-
+    private Integer themeId;
 }

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

@@ -0,0 +1,100 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 小程序主题设置
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-02-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaMiniappTheme implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主题ID
+     */
+    @TableId(value = "theme_id", type = IdType.AUTO)
+    private Integer themeId;
+
+    /**
+     * 主题名称
+     */
+    private String themeTitle;
+
+    /**
+     * 启用时间 格式MM-DDTHH24:MI
+     */
+    private String startTime;
+
+    /**
+     * 停用时间 格式MM-DDTHH24:MI
+     */
+    private String endTime;
+
+    /**
+     * 导航前景颜色
+     */
+    private String naviFrontColor;
+
+    /**
+     * 导航背景颜色
+     */
+    private String naviBackColor;
+
+    /**
+     * TabBar前景颜色
+     */
+    private String tabbarFrontColor;
+
+    /**
+     * TabBar背景颜色
+     */
+    private String tabbarBackColor;
+
+    /**
+     * TabBar选择色
+     */
+    private String tabbarSelectColor;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 修改人
+     */
+    private Integer modifyUser;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime modifyDate;
+
+    /**
+     * 导航图标列表
+     */
+    @TableField(exist = false)
+    private List<TaMiniappOrgIcon> iconList;
+}

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

@@ -0,0 +1,99 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 订单表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订单id
+     */
+    @TableId(value = "order_id", type = IdType.AUTO)
+    private Integer orderId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 支付时间
+     */
+    private LocalDateTime payTime;
+
+    /**
+     * targetId
+     */
+    private String targetId;
+
+    /**
+     * targetType
+     */
+    private String targetType;
+
+    /**
+     * 小程序用户id
+     */
+    private String personId;
+
+    /**
+     * 微信订单号
+     */
+    private String tradeNo;
+
+    /**
+     * 实付金额 单位分
+     */
+    private Integer totalFee;
+
+    /**
+     * 缴费状态 unpaid未缴费paid已缴费refunded已退费
+     */
+    private String payStatus;
+
+    /**
+     * 如果是退费需要知道是那个订单退费
+     */
+    private Integer parentOrderId;
+
+    /**
+     * 微信订单号
+     */
+    private String transactionId;
+
+    /**
+     * 退款单号
+     */
+    private String refundNo;
+
+    /**
+     * 退款原因
+     */
+    @TableField(exist = false)
+    private String refundReason;
+}

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

@@ -184,6 +184,11 @@ public class TaPerson implements Serializable {
      */
     private Integer points;
 
+    /**
+     * 身份证号
+     */
+    private String idcard;
+
     /**
      * 访问记录
      */

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

@@ -0,0 +1,86 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 人员表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaPersonPositon implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.UUID)
+    private Integer id;
+
+    /**
+     * 人员ID
+     */
+    private String personId;
+
+    /**
+     * 精度
+     */
+    private String lon;
+
+    /**
+     * 纬度
+     */
+    private String lat;
+
+    /**
+     * 城市编码
+     */
+    private String citycode;
+
+    /**
+     * 国家
+     */
+    private String country;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 区县
+     */
+    private String district;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+}

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

@@ -0,0 +1,119 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 预选表
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaPreselection implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 预选id
+     */
+    @TableId(value = "preselection_id", type = IdType.AUTO)
+    private Integer preselectionId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 销售批次id
+     */
+    private Integer salesBatchId;
+
+    /**
+     * 预选开始时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime preselectionStartTime;
+
+    /**
+     * 预选结束时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime preselectionEndTime;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 项目id
+     */
+    private String buildingId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 出售房源数
+     */
+    @TableField(exist = false)
+    private Integer salesNumber;
+
+    /**
+     * 楼盘名
+     */
+    @TableField(exist = false)
+    private String buildingName;
+
+    /**
+     * 销售批次名
+     */
+    @TableField(exist = false)
+    private String salesBatchName;
+
+    /**
+     * 备注
+     */
+    @TableField(exist = false)
+    private String remark;
+
+    /**
+     * 二维码
+     */
+    @TableField(exist = false)
+    private String qrCode;
+
+    /**
+     * 预选实际热度
+     */
+    @TableField(exist = false)
+    private Integer realHeat;
+
+    /**
+     * 预选实际热度
+     */
+    @TableField(exist = false)
+    private Integer preNum;
+
+    /**
+     * 销售批次状态
+     */
+    @TableField(exist = false)
+    private Integer salesBatchStatus;
+}

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

@@ -48,7 +48,7 @@ public class TaPreselectionRecord implements Serializable {
     /**
      * 房源id
      */
-    private String houseId;
+    private Integer houseId;
 
     /**
      * 小程序用户id
@@ -74,4 +74,9 @@ public class TaPreselectionRecord implements Serializable {
      * 楼盘id
      */
     private String buildingId;
+
+    /**
+     * 预选idtaSalesBatch
+     */
+    private String preselectionId;
 }

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

@@ -0,0 +1,169 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 认筹表
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaRaise implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 认筹id
+     */
+    @TableId(value = "raise_id", type = IdType.AUTO)
+    private Integer raiseId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 销售批次id
+     */
+    private Integer salesBatchId;
+
+    /**
+     * 项目id
+     */
+    private String buildingId;
+
+    /**
+     * 认筹开始时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime raiseStartTime;
+
+    /**
+     * 认筹结束时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime raiseEndTime;
+
+    /**
+     * 锁房方式 auto自动锁房，manual手动锁房
+     */
+    private String houseLockingType;
+
+    /**
+     * 认筹金额 单位是分！
+     */
+    private Integer raisePrice;
+
+    /**
+     * 认筹是否预选
+     */
+    private Boolean needPreselection;
+
+    /**
+     * 是否展示房源价格
+     */
+    private Boolean displayHousePrice;
+
+    /**
+     * 缴费方式 onLine线上offLine线下
+     */
+    private String payType;
+
+    /**
+     * 线上缴费说明
+     */
+    private String payDescriptionOnline;
+
+    /**
+     * 线下缴费说明
+     */
+    private String payDescriptionOffline;
+
+    /**
+     * 认筹单注意事项
+     */
+    private String raisePrecautions;
+
+    /**
+     * 线上选房协议
+     */
+    private String payProtocol;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 楼盘名
+     */
+    @TableField(exist = false)
+    private String buildingName;
+
+    /**
+     * 销售批次名
+     */
+    @TableField(exist = false)
+    private String salesBatchName;
+
+    /**
+     * 二维码
+     */
+    @TableField(exist = false)
+    private String qrCode;
+
+    /**
+     * 认筹实际热度
+     */
+    @TableField(exist = false)
+    private Integer raiseRealHeat;
+
+    /**
+     * 销售批次备注
+     */
+    @TableField(exist = false)
+    private String remark;
+
+    @TableField(exist = false)
+    private List<String> checkValue;
+
+    /**
+     * 出售房源数
+     */
+    @TableField(exist = false)
+    private Integer salesNumber;
+
+    /**
+     * 个人认筹单
+     */
+    @TableField(exist = false)
+    private TaRaiseRecord record;
+
+    /**
+     * 销售批次状态
+     */
+    @TableField(exist = false)
+    private Integer salesBatchStatus;
+}

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

@@ -0,0 +1,52 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 认筹单与房源关系表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaRaiseHouse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 认筹单下的房源id
+     */
+    @TableId(value = "raise_house_id", type = IdType.AUTO)
+    private Integer raiseHouseId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 认筹单id
+     */
+    private Integer raiseRecordId;
+
+    /**
+     * 房源id
+     */
+    private Integer houseId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+}

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

@@ -0,0 +1,249 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 认筹单(认筹记录表)
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaRaiseRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 认筹记录表
+     */
+    @TableId(value = "raise_record_id", type = IdType.AUTO)
+    private Integer raiseRecordId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 认筹id
+     */
+    private String raiseId;
+
+    /**
+     * 销售批次id
+     */
+    private String salesBatchId;
+
+    /**
+     * 认筹人
+     */
+    private String personId;
+
+    /**
+     * 认筹人姓名
+     */
+    private String personName;
+
+    /**
+     * 房源数
+     */
+    private Integer houseNum;
+
+    /**
+     * 认筹的房源锁定状态 locked已锁定unlocked未锁定
+     */
+    private String houseLockingStatus;
+
+    /**
+     * 账户手机号
+     */
+    private String tel;
+
+    /**
+     * 置业顾问id
+     */
+    private Integer userId;
+
+    /**
+     * 置业顾问姓名
+     */
+    private String userName;
+
+    /**
+     * 是否作废
+     */
+    private Integer status;
+
+    /**
+     * 作废原因
+     */
+    private String invalidReason;
+
+    /**
+     * 缴费状态 unpaid未缴费paid已缴费refunded已退费
+     */
+    private String payStatus;
+
+    /**
+     * 缴费方式 onLine线上offLine线下
+     */
+    private String payType;
+
+    /**
+     * 退费原因
+     */
+    private String refundReason;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 更新人
+     */
+    private String updateUserName;
+
+    /**
+     * 身份证号
+     */
+    private String idcard;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 订单id
+     */
+    private Integer orderId;
+
+    /**
+     * 用户手机号
+     */
+    @TableField(exist = false)
+    private String personTel;
+
+    /**
+     * 用户昵称
+     */
+    @TableField(exist = false)
+    private String nickname;
+
+    /**
+     * 用户头像
+     */
+    @TableField(exist = false)
+    private String avatarurl;
+
+    /**
+     * 支付时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime payTime;
+
+    /**
+     * 微信订单号
+     */
+    @TableField(exist = false)
+    private String tradeNo;
+
+    /**
+     * 微信订单号
+     */
+    @TableField(exist = false)
+    private String transactionId;
+
+    /**
+     * 微信退款单号
+     */
+    @TableField(exist = false)
+    private String refundNo;
+
+    /**
+     * 实付金额
+     */
+    @TableField(exist = false)
+    private String totalFee;
+
+    /**
+     * 小程序端提交的房源的id的集合
+     */
+    @TableField(exist = false)
+    private List<Integer> houseList = new ArrayList<>();
+
+    /**
+     * 房源信息列表
+     */
+    @TableField(exist = false)
+    private List<TaHousingResources> taHousingResourcesList = new ArrayList<>();
+
+    /**
+     * 认筹单列表
+     */
+    @TableField(exist = false)
+    private List<TaRaiseRecord> taRaiseRecords;
+
+    /**
+     * 房源信息数
+     */
+    @TableField(exist = false)
+    private Integer taHousingResourcesSize;
+
+    /**
+     * 户型名称
+     */
+    @TableField(exist = false)
+    private String apartmentName;
+
+    /**
+     * 户型图列表列表
+     */
+    @TableField(exist = false)
+    private List<TaBuildingImg> buildingImgList = new ArrayList<>();
+
+    /**
+     * 置业顾问信息
+     */
+    @TableField(exist = false)
+    private TaUser consultantInfo;
+
+    /**
+     * 验证码
+     *
+     */
+    @TableField(exist = false)
+    private String captcha;
+
+    /**
+     * 订单id
+     */
+    @TableField(exist = false)
+    private Integer refundedOrderId;
+}

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import net.sf.cglib.core.Local;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -13,7 +14,7 @@ import java.util.List;
 
 /**
  * <p>
- * 销售批次表 
+ * 销售批次表
  * </p>
  *
  * @author jobob
@@ -60,12 +61,12 @@ public class TaSalesBatch implements Serializable {
     /**
      * 预选开始时间
      */
-    private String preselectionStartTime;
+    private LocalDateTime preselectionStartTime;
 
     /**
      * 预选结束时间
      */
-    private String preselectionEndTime;
+    private LocalDateTime preselectionEndTime;
 
     /**
      * 发布状态
@@ -104,4 +105,66 @@ public class TaSalesBatch implements Serializable {
     @TableField(exist = false)
     private List<TaShareContent> shareContents;
 
+    /**
+     * 是否展示房源价格
+     */
+    private Boolean displayHousePrice;
+
+    /**
+     * V3.5.12 新增
+     */
+
+    /**
+     * 认筹id
+     */
+    @TableField(exist = false)
+    private Integer raiseId;
+
+    /**
+     * 认筹状态
+     */
+    @TableField(exist = false)
+    private Integer raiseStaus;
+
+    /**
+     * 锁房方式 auto自动锁房，manual手动锁房
+     */
+    @TableField(exist = false)
+    private String houseLockingType;
+
+    /**
+     * 认筹开始时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime raiseStartTime;
+
+    /**
+     * 认筹结束时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime raiseEndTime;
+
+    /**
+     * 认筹金额 单位是分！
+     */
+    @TableField(exist = false)
+    private Integer raisePrice;
+
+    /**
+     * 缴费方式 onLine线上offLine线下
+     */
+    @TableField(exist = false)
+    private String payType;
+
+    /**
+     * 认筹数量
+     */
+    @TableField(exist = false)
+    private Integer raiseCount;
+
+    /**
+     * 预选数量
+     */
+    @TableField(exist = false)
+    private Integer preselectCount;
 }

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

@@ -0,0 +1,72 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 微信支付设置 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaWxPayConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 微信配置id
+     */
+    @TableId(value = "wx_pay_config_id", type = IdType.AUTO)
+    private Integer wxPayConfigId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 微信支付商户号
+     */
+    private String mchId;
+
+    /**
+     * API密钥
+     */
+    private String appid;
+
+    /**
+     * Appsecret
+     */
+    private String secret;
+
+    /**
+     * 商户key
+     */
+    private String mchKey;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * api证书路径
+     */
+    private String apiPath;
+}

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -69,7 +69,9 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/webjars/springfox-swagger-ui/css/typography.css",
             "/clean/menurole",
             "/clean/buttonrole",
-            "/api/admin/taPersonFromRecord"
+            "/api/admin/taPersonFromRecord",
+            "/api/notify",//微信支付所有回调放过
+            "/api/refund/",//微信退款所有回调放过
     };
 
     /*

src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java

@@ -54,7 +54,7 @@ public class JudglActivityTimeJob extends BaseController {
     /**
      * 开启定时任务，每天12：30执行
      */
-    @Scheduled(cron = "* 0/5 * * * ?")
+//    @Scheduled(cron = "* 0/5 * * * ?")
     private void configureTasks() {
         String time = DateUtils.cutSecond(LocalDateTime.now());
 

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

@@ -0,0 +1,26 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.SysAdvancedConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 高级配置基础表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Mapper
+public interface SysAdvancedConfigMapper extends BaseMapper<SysAdvancedConfig> {
+
+    /**
+     * 获取高级配置
+     * @param orgId
+     * @return
+     */
+    List<SysAdvancedConfig> getSysAdvancedConfigList(Integer orgId);
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.SysAdvancedConfigRelation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 高级配置对应关系表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Mapper
+public interface SysAdvancedConfigRelationMapper extends BaseMapper<SysAdvancedConfigRelation> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaAdvancedController;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 高级配置控制表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Mapper
+public interface TaAdvancedControllerMapper extends BaseMapper<TaAdvancedController> {
+
+}

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

@@ -31,7 +31,6 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      * @param startPrice
      * @param endPrice
      * @param apartmentId
-     * @param type         为1只展示已发布的房源
      * @return
      */
     List<TaHousingResourcesPO> listHousingResources(@Param("orgId") Integer orgId,
@@ -39,7 +38,25 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
                                                     @Param("startPrice") String startPrice,
                                                     @Param("endPrice") String endPrice,
                                                     @Param("apartmentId") String apartmentId,
-                                                    @Param("type") Integer type);
+                                                    @Param("personId") String personId,
+                                                    @Param("source") String source);
+
+    /**
+     * 分页获取房源列表
+     *
+     * @param salesBatchId
+     * @param startPrice
+     * @param endPrice
+     * @param apartmentId
+     * @param type         为1只展示已发布的房源
+     * @return
+     */
+    List<TaHousingResourcesPO> listHousingResourcesForCms(@Param("orgId") Integer orgId,
+                                                          @Param("salesBatchId") String salesBatchId,
+                                                          @Param("startPrice") String startPrice,
+                                                          @Param("endPrice") String endPrice,
+                                                          @Param("apartmentId") String apartmentId,
+                                                          @Param("type") Integer type);
 
     /**
      * 获取某销售批次下所有房源户型
@@ -55,7 +72,7 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      * @param houseId
      * @return
      */
-    Boolean updateForAddHeat(@Param("houseId") String houseId);
+    Boolean updateForAddHeat(@Param("houseId") Integer houseId);
 
     /**
      * 减少热度值
@@ -63,7 +80,14 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      * @param houseId
      * @return
      */
-    Boolean updateForSubtractHeat(@Param("houseId") String houseId);
+    Boolean updateForSubtractHeat(@Param("houseId") Integer houseId);
+
+    /**
+     * 减少认筹热度值
+     * @param raiseRecordId
+     * @return
+     */
+    Boolean updateForSubtractRaiseHeat(@Param("raiseRecordId") Integer raiseRecordId);
 
     /**
      * 根据房源ID获取房源详情
@@ -72,7 +96,7 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      * @param type    是否只查询已发布数据，1是 0否
      * @return
      */
-    TaHousingResourcesPO getHousingDetailById(@Param("houseId") String houseId,
+    TaHousingResourcesPO getHousingDetailById(@Param("houseId") Integer houseId,
                                               @Param("type") String type);
 
     /**
@@ -86,16 +110,69 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      * @param blockName
      * @param unitName
      * @param floorName
-     * @param roomName
+     * @param roomNamesa
      * @param apartmentId
      * @param status
      * @param houseId
      * @return
      */
-    IPage<TaHousingResources> getHouseResourceList(IPage<TaHousingResources> pg,@Param("salesBatchId") Integer salesBatchId,@Param("buildingId") String buildingId,
-                                                   @Param("orgId") Integer orgId,@Param("termName") String termName,@Param("blockName") String blockName,
-                                                   @Param("unitName") String unitName,@Param("floorName") String floorName,@Param("roomName") String roomName,
-                                                   @Param("apartmentId") String apartmentId,@Param("status") Integer status,@Param("houseId") String houseId);
+    IPage<TaHousingResources> getHouseResourceList(IPage<TaHousingResources> pg, @Param("salesBatchId") Integer salesBatchId, @Param("buildingId") String buildingId,
+                                                   @Param("orgId") Integer orgId, @Param("termName") String termName, @Param("blockName") String blockName,
+                                                   @Param("unitName") String unitName, @Param("floorName") String floorName, @Param("roomName") String roomName,
+                                                   @Param("apartmentId") String apartmentId, @Param("status") Integer status, @Param("houseId") String houseId,
+                                                   @Param("lockingStatus") String lockingStatus);
+
+    List<TaHousingResources> selectHousingList(@Param("orgId") Integer orgId, @Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
 
-    List<TaHousingResources> selectHousingList(@Param("orgId") Integer orgId,@Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
+    /**
+     * 批量更新房源认筹基础认读
+     *
+     * @param housingResourcesList
+     * @param raiseHeat
+     * @param salesBatchId
+     * @param orgId
+     * @return
+     */
+    Integer batchUpdateRaiseHeat(@Param("housingResourcesList") List<TaHousingResources> housingResourcesList,
+                                 @Param("raiseHeat") Integer raiseHeat,
+                                 @Param("updateUser") Integer updateUser,
+                                 @Param("salesBatchId") Integer salesBatchId,
+                                 @Param("orgId") Integer orgId);
+
+    /**
+     * 批量更新房源认筹基础热度
+     *
+     * @param housingResourcesList
+     * @param heat
+     * @param salesBatchId
+     * @param orgId
+     * @return
+     */
+    Integer batchUpdateHeat(@Param("housingResourcesList") List<TaHousingResources> housingResourcesList,
+                            @Param("heat") Integer heat,
+                            @Param("updateUser") Integer updateUser,
+                            @Param("salesBatchId") Integer salesBatchId,
+                            @Param("orgId") Integer orgId);
+
+    /**
+     * 根据认筹单ID查询房源列表
+     *
+     * @param pg
+     * @param raiseRecordId
+     * @param orgId
+     * @return
+     */
+    IPage<TaHousingResourcesPO> listHouseByRaiseRecordId(IPage<TaHousingResourcesPO> pg,
+                                                         @Param("raiseRecordId") Integer raiseRecordId,
+                                                         @Param("orgId") Integer orgId);
+
+    /**
+     * 根据认筹房源关联表ID查询房源信息
+     *
+     * @param orgId
+     * @param raiseHouseId
+     * @return
+     */
+    TaHousingResourcesPO getHouseByRaiseHouseId(@Param("orgId") Integer orgId,
+                                                @Param("raiseHouseId") Integer raiseHouseId);
 }

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

@@ -2,7 +2,11 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaMiniappIcon;
+import com.huiju.estateagents.entity.TaMiniappOrgIcon;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +19,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaMiniappIconMapper extends BaseMapper<TaMiniappIcon> {
 
+    List<TaMiniappOrgIcon> getListByTheme(@Param("themeId") Integer themeId);
 }

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

@@ -0,0 +1,9 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaMiniappTheme;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaMiniappThemeMapper extends BaseMapper<TaMiniappTheme> {
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaOrder;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 订单表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Mapper
+public interface TaOrderMapper extends BaseMapper<TaOrder> {
+
+}

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

@@ -29,5 +29,8 @@ public interface TaPersonIntentionRecordMapper extends BaseMapper<TaPersonIntent
      * @param buildingId
      * @return
      */
-    IPage<Map<String, Object>> selectIntentionUser(IPage<Map<String, Object>> page, @Param("orgId") Integer orgId, @Param("buildingId") String buildingId);
+    IPage<Map<String, Object>> selectIntentionUser(IPage<Map<String, Object>> page,
+                                                   @Param("orgId") Integer orgId,
+                                                   @Param("buildingId") String buildingId,
+                                                   @Param("userId") Integer userId);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TaPerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaPersonPositon;
 import com.huiju.estateagents.po.PersonPO;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.*;
@@ -24,7 +25,7 @@ import java.util.Map;
  */
 @Mapper
 public interface TaPersonMapper extends BaseMapper<TaPerson> {
-    List<Map<String,Object>> selectCardList(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status,@Param("buildingId")String buildingId,@Param("orgId")Integer orgId);
+    List<Map<String, Object>> selectCardList(IPage<Map<String, Object>> page, @Param("personType") String personType, @Param("status") int status, @Param("buildingId") String buildingId, @Param("orgId") Integer orgId);
 
     int setFieldIncrement(@Param("personId") String personId, @Param("field") String field, @Param("increment") int increment);
 
@@ -39,20 +40,21 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     TaPerson getById(@Param("personId") String personId);
 
 
-    List<String>getUserProjects(@Param("personId") Integer personId);
+    List<String> getUserProjects(@Param("personId") Integer personId);
 
     TaPerson selectByIdPerson(@Param("openid") String openid);
 
-    List<String> getConsultantByName(@Param("name")String name);
+    List<String> getConsultantByName(@Param("name") String name);
 
-    String getConsultantByTel(@Param("tel")String tel);
+    String getConsultantByTel(@Param("tel") String tel);
 
-    List<Map<String,Object>> selectCardListofMine(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status,@Param("personIds")List<String> personIds);
+    List<Map<String, Object>> selectCardListofMine(IPage<Map<String, Object>> page, @Param("personType") String personType, @Param("status") int status, @Param("personIds") List<String> personIds);
 
     //---------- 用户总数 start ------------
 
     /**
      * 总用户数
+     *
      * @return
      */
     @ResultType(Integer.class)
@@ -61,6 +63,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 总注册数
+     *
      * @return
      */
     @ResultType(Integer.class)
@@ -69,6 +72,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 渠道代理后台总用户数
+     *
      * @return
      */
     @ResultType(Integer.class)
@@ -77,6 +81,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 渠道代理后台总注册数
+     *
      * @return
      */
     @ResultType(Integer.class)
@@ -85,15 +90,17 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 根据时间段查询
+     *
      * @param personType
      * @return
      */
-    Integer selectRecentlyCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    Integer selectRecentlyCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
     //---------- 用户总数 end ------------
 
     /**
      * 用户行为
+     *
      * @param personType
      * @param startDate
      * @param endDate
@@ -101,8 +108,8 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      */
     List<PersonPO> selectUserBehavior(@Param("org") Integer orgId,
                                       @Param("personType") String personType,
-                                      @Param("startDate")LocalDate startDate,
-                                      @Param("endDate")LocalDate endDate,
+                                      @Param("startDate") LocalDate startDate,
+                                      @Param("endDate") LocalDate endDate,
                                       @Param("buildingId") String buildingId,
                                       @Param("eventType") String eventType,
                                       @Param("event") String event,
@@ -110,25 +117,27 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 活跃用户数 / 最近新增的用户数
+     *
      * @param personType
      * @param dateType
      * @return
      */
-    List<Map<String, Object>> selectActiveUserCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("dateType") String dateType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String, Object>> selectActiveUserCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("dateType") String dateType, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
     /**
      * 新增用户数
+     *
      * @param personType
      * @param startDate
      * @param endDate
      * @return
      */
-    List<Map<String, Object>> selectNewsUserCount(@Param("orgId") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String, Object>> selectNewsUserCount(@Param("orgId") Integer orgId, @Param("personType") String personType, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
     /**
      * 性别比例
-     *
-     *  据说 1 男  2 女
+     * <p>
+     * 据说 1 男  2 女
      *
      * @return
      */
@@ -138,6 +147,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 城市比例
+     *
      * @param personType
      * @return
      */
@@ -164,6 +174,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 用户来源 的饼图
+     *
      * @param recommendPersonType
      * @return
      */
@@ -171,33 +182,36 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 用户来源 柱状
+     *
      * @return
      */
-    List<Map<String, Object>> selectUserSourceColumnar(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate") LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String, Object>> selectUserSourceColumnar(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
     /**
      * 用户来源 数据列表
      */
-    List<Map<String,Object>> selectUserSourceData(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String, Object>> selectUserSourceData(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
     // ------------- 用户来源 end ------------
 
     @Update("UPDATE ta_person  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE person_id = #{newsId}")
     void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
 
-    IPage<TaPerson> getPersonList(IPage<TaPerson> page, @Param("personType")String personType, @Param("name") String name, @Param("phone") String phone,@Param("status") Integer status,@Param("buildingId") String buildingId,@Param("personTags") String personTags);
+    IPage<TaPerson> getPersonList(IPage<TaPerson> page, @Param("personType") String personType, @Param("name") String name, @Param("phone") String phone, @Param("status") Integer status, @Param("buildingId") String buildingId, @Param("personTags") String personTags);
 
     /**
      * 渠道下的经纪人
+     *
      * @param pg
      * @param name
      * @param phone
      * @return
      */
-    IPage<TaPerson> channelBrokerList(IPage<TaChannel> pg, @Param("name") String name, @Param("phone") String phone,@Param("orgid") Integer orgid,@Param("channelId") Integer channelId);
+    IPage<TaPerson> channelBrokerList(IPage<TaChannel> pg, @Param("name") String name, @Param("phone") String phone, @Param("orgid") Integer orgid, @Param("channelId") Integer channelId);
 
     /**
      * 渠道邀请经纪人
+     *
      * @param pg
      * @param id
      * @return
@@ -206,21 +220,31 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 获取用户总积分
+     *
      * @param orgId
      * @return
      */
     Integer sumPointsByOrgId(@Param("orgId") Integer orgId);
 
     //更新city拼音为cityId
-    void upDatePersonCityToId (@Param("personId")String personId);
+    void upDatePersonCityToId(@Param("personId") String personId);
 
     /**
      * 判断置业顾问绑定状态
+     *
      * @return
      */
     Integer judgeBindStatusByCondition(@Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("phone") String phone);
 
-    IPage<TaPerson> selectDriftCustomerPageList(IPage<TaPerson> page,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId,@Param("personEstateDrift") String personEstateDrift,@Param("sceneType") String sceneType);
+    IPage<TaPerson> selectDriftCustomerPageList(IPage<TaPerson> page, @Param("buildingId") String buildingId, @Param("orgId") Integer orgId, @Param("personEstateDrift") String personEstateDrift, @Param("sceneType") String sceneType);
 
-    int selectFromNum(@Param("orgId") Integer orgId,@Param("personType") String personType);
+    int selectFromNum(@Param("orgId") Integer orgId, @Param("personType") String personType);
+
+    /**
+     * 保存用户位置信息
+     *
+     * @param record
+     * @return
+     */
+    Integer savePersonPosition(TaPersonPositon record);
 }

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

@@ -0,0 +1,49 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaPreselection;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预选表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Mapper
+@Component
+public interface TaPreselectionMapper extends BaseMapper<TaPreselection> {
+
+    /**
+     * 条件查询预选
+     *
+     * @param page
+     * @param salesBatchName
+     * @param buildingId
+     * @param orgId
+     * @param status
+     * @param personBuildingList
+     * @return
+     */
+    IPage<TaPreselection> listPresecretByCondition(IPage<TaPreselection> page,
+                                                   @Param("salesBatchName") String salesBatchName,
+                                                   @Param("buildingId") String buildingId,
+                                                   @Param("orgId") Integer orgId,
+                                                   @Param("status") Integer status,
+                                                   @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * @param id
+     * @param orgId
+     * @return
+     */
+    TaPreselection getPresecretById(@Param("id") Integer id, @Param("orgId") Integer orgId);
+}

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.bo.request.PresecretRecordRequestBO;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
 import org.apache.ibatis.annotations.Mapper;
@@ -32,7 +33,9 @@ public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRec
      */
     IPage<TaPreselectionRecordPO> listPreselectionRecord(IPage<TaPreselectionRecordPO> iPage,
                                                          @Param("orgId") Integer orgId,
-                                                         @Param("personId") String personId);
+                                                         @Param("personId") String personId, @Param("buildingId") String buildingId, @Param("salesBatchId") Integer salesBatchId,
+                                                         @Param("apartmentId") String apartmentId, @Param("houseLockingStatus") String houseLockingStatus,
+                                                         @Param("customerLocked") String customerLocked, @Param("source") String source);
 
     /**
      * 根据房源ID和用户ID获取预选记录
@@ -42,24 +45,24 @@ public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRec
      * @return
      */
     TaPreselectionRecord getRecordByPersonIdAndHouseId(@Param("personId") String personId,
-                                                       @Param("houseId") String houseId);
+                                                       @Param("houseId") Integer houseId);
 
     /**
      * 查询预选记录表
+     *
      * @param page
-     * @param salesBatchId
-     * @param houseId
-     * @param orgId
-     * @param phone
-     * @param apartmentId
-     * @param status
+     * @param bo
      * @return
      */
-    List<TaPreselectionRecord> selectPreSelectRecordList(Page page,
-                                                         @Param("salesBatchId") String salesBatchId,
-                                                         @Param("houseId") Integer houseId,
-                                                         @Param("orgId") Integer orgId,
-                                                         @Param("phone") String phone,
-                                                         @Param("apartmentId") String apartmentId,
-                                                         @Param("status") Integer status);
+    List<TaPreselectionRecordPO> selectPreSelectRecordList(Page page, @Param("bo") PresecretRecordRequestBO bo);
+
+    /**
+     * 批量删除预选记录
+     *
+     * @param preselectionRecordList
+     * @param orgId
+     */
+    void batchDeletePreselectRecord(@Param("preselectionRecordList") List<TaPreselectionRecord> preselectionRecordList,
+                                    @Param("orgId") Integer orgId,
+                                    @Param("userId") Integer userId);
 }

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaRaiseHouse;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 认筹单与房源关系表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Mapper
+public interface TaRaiseHouseMapper extends BaseMapper<TaRaiseHouse> {
+
+}

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

@@ -0,0 +1,33 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaRaise;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 认筹表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Mapper
+@Component
+public interface TaRaiseMapper extends BaseMapper<TaRaise> {
+
+    IPage<TaRaise> listRaiseByCondition(IPage<TaRaise> page,
+                                        @Param("salesBatchName") String salesBatchName,
+                                        @Param("buildingId") String buildingId,
+                                        @Param("orgId") Integer orgId,
+                                        @Param("status") Integer status,
+                                        @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    TaRaise getRaiseById(@Param("id") Integer id, @Param("orgId") Integer orgId);
+}

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

@@ -0,0 +1,83 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
+import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
+import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
+import com.huiju.estateagents.entity.TaRaiseRecord;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 认筹单(认筹记录表)  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Mapper
+@Component
+public interface TaRaiseRecordMapper extends BaseMapper<TaRaiseRecord> {
+
+    /**
+     * 条件查询认筹单
+     *
+     * @param page
+     * @param bo
+     * @return
+     */
+    IPage<TaRaiseRecord> listHousingRaiseByCondition(IPage<TaRaiseRecord> page,
+                                                     @Param("bo") HousingRaiseRequestBO bo);
+
+    /**
+     * 条件查询认筹单
+     *
+     * @param page
+     * @param bo
+     * @return
+     */
+    IPage<TaRaiseRecord> listRaiseRecordByCondition(IPage<TaRaiseRecord> page,
+                                                    @Param("bo") RaiseRecordRequestBO bo);
+
+    /**
+     * 条件查询缴费单
+     *
+     * @param page
+     * @param bo
+     * @return
+     */
+    IPage<TaRaiseRecord> listRaiseOrderByCondition(IPage<TaRaiseRecord> page,
+                                                   @Param("bo") RaiseOrderRequestBO bo);
+
+    /**
+     * 批量更新
+     *
+     * @param recordList
+     * @param orgId
+     * @param payType
+     * @return
+     */
+    Boolean batchUpdateById(@Param("recordList") List<TaRaiseRecord> recordList,
+                            @Param("orgId") Integer orgId,
+                            @Param("payType") String payType);
+
+    TaRaiseRecord getUserInfo(@Param("raiseRecordId") Integer raiseRecordId, @Param("orgId") Integer orgId);
+
+    /**
+     * 认筹单房源数+1
+     *
+     * @param raiseRecordId
+     * @param orgId
+     * @param updateUserName
+     * @return
+     */
+    Boolean addHouseNum(@Param("raiseRecordId") Integer raiseRecordId,
+                        @Param("orgId") Integer orgId,
+                        @Param("updateUserName") String updateUserName);
+}

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

@@ -10,7 +10,6 @@ import com.huiju.estateagents.excel.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -46,9 +45,10 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param entryType
      * @param verifyStatus
      * @param sex
+     * @param personBuildingList
      * @return
      */
-    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel,@Param("sceneType") String sceneType);
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel") String consultTel, @Param("sceneType") String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("buildingId") String buildingId);
 
     /**
      * 导出数据 获取推荐用户数据

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

@@ -2,6 +2,8 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaHousingResources;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaSalesBatch;
 import org.apache.ibatis.annotations.Mapper;
@@ -20,7 +22,7 @@ import java.util.Map;
  */
 @Mapper
 public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
-    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, @Param("salesBatchName") String salesBatchName, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList")  List<TaPersonBuilding> personBuildingList);
+    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, @Param("salesBatchName") String salesBatchName, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 根据批次号统计预选数据
@@ -39,5 +41,25 @@ public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
      * @param salesBatchId
      * @return
      */
-    Map<String,Object> getTotalHousesAndHeat(@Param("salesBatchId") Integer salesBatchId);
+    Map<String, Object> getTotalHousesAndHeat(@Param("salesBatchId") Integer salesBatchId);
+
+    /**
+     * 根据销售批次获取项目信息
+     *
+     * @param salesBatchId
+     * @param orgId
+     * @return
+     */
+    List<TaBuilding> getBuildingById(@Param("salesBatchId") String salesBatchId,
+                                     @Param("orgId") Integer orgId);
+
+    /**
+     * 出售房源自增
+     *
+     * @param salesBatchId
+     * @param orgId
+     * @return
+     */
+    Boolean addSalesNumberById(@Param("salesBatchId") Integer salesBatchId,
+                               @Param("orgId") Integer orgId);
 }

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

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +22,6 @@ public interface TaShareMapper extends BaseMapper<TaShare> {
     List<TaShare> selectHouseShareList(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("shareType")String shareType, @Param("phone")String phone, @Param("saleBatchId")Integer saleBatchId);
 
     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);
 }

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaWxPayConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 微信支付设置  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+@Mapper
+public interface TaWxPayConfigMapper extends BaseMapper<TaWxPayConfig> {
+
+}

src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.huiju.estateagents.entity.TaBuildingImg;
 import com.huiju.estateagents.entity.TaBuildingPanorama;
 import com.huiju.estateagents.entity.TaHousingResources;
+import com.huiju.estateagents.entity.TaRaise;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -20,10 +21,6 @@ import java.util.List;
 @Accessors(chain = true)
 public class TaHousingResourcesPO extends TaHousingResources {
 
-    private Double insideArea;
-
-    private Double buildingArea;
-
     /**
      * 是否已经预选该房源，true 是 false 否
      */
@@ -54,5 +51,66 @@ public class TaHousingResourcesPO extends TaHousingResources {
     /**
      * 楼盘名称
      */
+    @TableField(exist = false)
     private String buildingName;
+
+    /**
+     * 我的预选
+     */
+    @TableField(exist = false)
+    private String minePreselection;
+
+    /**
+     * 我的认筹
+     */
+    @TableField(exist = false)
+    private String mineRaise;
+
+    /**
+     * 锁定人ID
+     */
+    @TableField(exist = false)
+    private String lockingPersonId;
+
+    /**
+     * 锁定人姓名
+     */
+    @TableField(exist = false)
+    private String lockingPersonName;
+
+    /**
+     * 认筹房源关系表Id
+     */
+    @TableField(exist = false)
+    private String raiseHouseId;
+
+    /**
+     * 是否展示预选按钮
+     */
+    @TableField(exist = false)
+    private Boolean preselectionBtn;
+
+    /**
+     * 是否展示认筹按钮
+     */
+    @TableField(exist = false)
+    private Boolean raiseBtn;
+
+    /**
+     * 认筹信息
+     */
+    @TableField(exist = false)
+    private TaRaise taRaise;
+
+    /**
+     * 锁定认筹单编号
+     */
+    @TableField(exist = false)
+    private Integer raiseRecordId;
+
+    /**
+     * 是否展示房源价格
+     */
+    @TableField(exist = false)
+    private Boolean displayHousePrice;
 }

src/main/java/com/huiju/estateagents/po/TaPreselectionRecordPO.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.huiju.estateagents.entity.TaBuildingImg;
+import com.huiju.estateagents.entity.TaHousingResources;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -103,4 +104,16 @@ public class TaPreselectionRecordPO extends TaPreselectionRecord {
      * 销售批次装填
      */
     private String saleBatchStatus;
+
+    /**
+     * 房源信息
+     */
+    @TableField(exist = false)
+    private TaHousingResources housingInfo;
+
+    /**
+     * 是否展示房源价格
+     */
+    @TableField(exist = false)
+    private Boolean displayHousePrice;
 }

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

@@ -43,4 +43,6 @@ public interface IMiniAppService {
     TaMiniappTemplate getTplByType(String type, String appid);
 
     List<TaMiniappTemplate> getTpls(String appid);
+
+    ResponseBean getOrgQrCode(String paramsStr, Integer orgId);
 }

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

@@ -105,7 +105,7 @@ public interface IStatisticalService {
      * @param buildingId
      * @return
      */
-    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId);
+    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, Integer userId);
 
     /**
      * 用户来源数据 首页

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.SysAdvancedConfigRelation;
+
+/**
+ * <p>
+ * 高级配置对应关系表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+public interface ISysAdvancedConfigRelationService extends IService<SysAdvancedConfigRelation> {
+
+}

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

@@ -0,0 +1,25 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.SysAdvancedConfig;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 高级配置基础表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+public interface ISysAdvancedConfigService extends IService<SysAdvancedConfig> {
+
+    /**
+     *
+     * 获取高级配置
+     * @param orgId
+     * @return
+     */
+    List<SysAdvancedConfig> getSysAdvancedConfigList(Integer orgId);
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaAdvancedController;
+
+/**
+ * <p>
+ * 高级配置控制表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+public interface ITaAdvancedControllerService extends IService<TaAdvancedController> {
+
+}

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

@@ -15,4 +15,11 @@ import java.util.List;
  */
 public interface ITaBuildingImgService extends IService<TaBuildingImg> {
     int insertBatch(List<TaBuildingImg> imgs, String buildingId);
+
+    /**
+     * 获取户型图的图片集合
+     * @param apartMentIds
+     * @return
+     */
+    List<TaBuildingImg> getAparemnetList(List<String> apartMentIds);
 }

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

@@ -29,7 +29,19 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @param type  为1只展示已发布的房源
      * @return
      */
-    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId, Integer type);
+    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId,String personId,String source );
+
+
+    /* 分页获取房源列表-后台管理端
+     *
+     * @param salesBatchId 销售批次ID
+     * @param startPrice
+     * @param endPrice
+     * @param apartmentId
+     * @param type  为1只展示已发布的房源
+     * @return
+     */
+    List<TaHousingResourcesPO> listHousingResourcesForCms(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId, Integer type);
 
     /**
      * 获取某销售批次下所有房源户型
@@ -46,7 +58,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @param houseId  房源ID
      * @return
      */
-    TaHousingResourcesPO getHousingDetailById(String personId, String houseId);
+    TaHousingResourcesPO getHousingDetailById(String personId, Integer houseId);
 
     /**
      * 校验楼栋信息存不存在
@@ -82,7 +94,8 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @param houseId
      * @return
      */
-    ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId, String termName, String blockName, String unitName, String floorName, String roomName, String apartmentId, Integer status, String houseId);
+    ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId, String termName,
+                                String blockName, String unitName, String floorName, String roomName, String apartmentId, Integer status, String houseId, String lockingStatus);
 
     /**
      * 更新房源信息
@@ -113,4 +126,58 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @return
      */
     ResponseBean saveExcelValue(MultipartFile file, Integer salesBatchId, String buildingId, Integer orgId);
+
+    /**
+     * 批量更新认筹基础数据
+     *
+     * @param housingResourcesList
+     * @param raiseHeat
+     * @param salesBatchId
+     * @param orgId
+     * @return
+     */
+    ResponseBean batchUpdateRaiseHeat(List<TaHousingResources> housingResourcesList, Integer raiseHeat, Integer salesBatchId, Integer orgId, Integer updateUser);
+
+    /**
+     * 批量更新预选基础数据
+     *
+     * @param housingResourcesList
+     * @param heat
+     * @param salesBatchId
+     * @param orgId
+     * @param updateUser
+     * @return
+     */
+    ResponseBean batchUpdateHeat(List<TaHousingResources> housingResourcesList, Integer heat, Integer salesBatchId, Integer orgId, Integer updateUser);
+
+    /**
+     * 根据认筹记录查询房源信息
+     *
+     * @param raiseRecordId
+     * @param orgId
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    ResponseBean listHouseByRaiseRecordId(Integer raiseRecordId, Integer orgId, Integer pageNumber, Integer pageSize);
+
+    /**
+     * 更新房源锁定状态
+     *
+     * @param houseId
+     * @param type
+     * @param orgId
+     * @param personId
+     * @return
+     */
+    ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId);
+
+    /**
+     * 校验房源的认筹状态
+     * @param houseIds
+     * @param personId
+     * @param orgId
+     * @return
+     */
+    boolean checkRaiseState(String houseIds, String personId, Integer orgId) throws Exception;
 }

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaMiniappTheme;
+
+public interface ITaMiniappThemeService extends IService<TaMiniappTheme> {
+
+    IPage<TaMiniappTheme> getThemeList(Integer orgId, Boolean includeNotUsed, Integer pageNum, Integer pageSize);
+
+    ResponseBean editTheme(TaMiniappTheme taMiniappTheme);
+
+    ResponseBean deleteTheme(TaMiniappTheme taMiniappTheme);
+
+    TaMiniappTheme getProfileById(Integer id);
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaOrder;
+
+/**
+ * <p>
+ * 订单表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+public interface ITaOrderService extends IService<TaOrder> {
+
+}

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

@@ -8,6 +8,7 @@ import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaPersonPositon;
 
 import java.util.List;
 import java.util.Map;
@@ -23,15 +24,15 @@ import java.util.Map;
 public interface ITaPersonService extends IService<TaPerson> {
     TaPerson mergePersonWxInfo(WxMaUserInfo userInfo);
 
-    TaPerson updatePersonPhone(String miniOpenid, String phone,Integer orgId);
+    TaPerson updatePersonPhone(String miniOpenid, String phone, Integer orgId);
 
-    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId,Integer orgId);
+    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize, String buildingId, Integer orgId);
 
     ResponseBean checkPhoneAndPass(String phone, String pass);
 
     ResponseBean resetPassword(String phone, String pass, String plat);
 
-    ResponseBean getCardDetail(String openid, String id,String personId);
+    ResponseBean getCardDetail(String openid, String id, String personId);
 
     ResponseBean resgiteAgent(String name, String phone, Integer sex, String explain, String openid);
 
@@ -41,11 +42,11 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     TaPerson getPersonByTel(String userPhone);
 
-    IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone,Integer status,String buildingId,String personTags);
+    IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone, Integer status, String buildingId, String personTags);
 
-    IPage<TaUser> getBuildingConsultantList(int pageNumber, int pageSize,String buildingId);
+    IPage<TaUser> getBuildingConsultantList(int pageNumber, int pageSize, String buildingId);
 
-    TaPerson newPersonByOpenid(String openid,Integer orgId);
+    TaPerson newPersonByOpenid(String openid, Integer orgId);
 
     ResponseBean bindCard(String phone, String pass, String openid);
 
@@ -53,33 +54,35 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     ResponseBean editConsultant(String id, String paramStr);
 
-    Map<String,Object> getExtraInfo(String personId);
+    Map<String, Object> getExtraInfo(String personId);
 
     List<TaPerson> getPersonsByOpenId(String openid);
 
-    IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId, String sceneType);
+    IPage<TaPerson> getDriftCustomerList(int pageNumber, int pageSize, String building, Integer orgId, String sceneType);
 
     String getPersonIdByCustomerId(String customerId);
 
-    IPage<Map<String,Object>> getSavedConsaultants(int pageNumber, int pageSize,String personId);
+    IPage<Map<String, Object>> getSavedConsaultants(int pageNumber, int pageSize, String personId);
 
 
     List<TaPersonBuilding> getPersonBuildings(String personId);
 
-    String agentCodeGenerator ();
+    String agentCodeGenerator();
 
     Integer sumPointsByOrgId(Integer orgId);
 
     /**
      * 渠道管理下的经纪人
+     *
      * @param name
      * @param phone
      * @return
      */
-    ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize,Integer orgid,Integer channelId);
+    ResponseBean channelBrokerList(String name, String phone, Integer pageNum, Integer pageSize, Integer orgid, Integer channelId);
 
     /**
      * 渠道下邀请经纪人
+     *
      * @param id
      * @param phone
      * @param pageNum
@@ -89,14 +92,23 @@ public interface ITaPersonService extends IService<TaPerson> {
     ResponseBean InviteClientsList(String id, String phone, Integer pageNum, Integer pageSize);
 
     //更新city拼音为cityId
-    void upDatePersonCityToId (String personId);
+    void upDatePersonCityToId(String personId);
 
     Integer judgeBindStatusByCondition(Integer userId, Integer orgId, String phone);
 
     /**
      * 第三方获取人员信息接口
+     *
      * @param personId
      * @return
      */
     ResponseBean ThirdUserInfo(String personId);
+
+    /**
+     * 保存用户位置信息
+     *
+     * @param record
+     * @return
+     */
+    Integer savePersonPosition(TaPersonPositon record);
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaConsultantInfo;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
@@ -63,4 +64,6 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, String personId);
 
 	Integer countShareNumByEventType(Integer orgId, String targetId, Integer userId, String personId, String eventType);
+
+    ResponseBean newRecord(TaPersonVisitRecord taPersonVisitRecord, TaPerson person);
 }

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

@@ -3,9 +3,12 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.PresecretRecordRequestBO;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
 
+import java.util.List;
+
 /**
  * <p>
  * 预选记录表  服务类
@@ -25,7 +28,9 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
      * @param personId
      * @return
      */
-    IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId);
+    IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId, String buildingId,
+                                                         Integer salesBatchId, String apartmentId, String houseLockingStatus, String customerLocked,
+                                                         String source);
 
     /**
      * 添加预选记录预选
@@ -42,8 +47,18 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
      * @param houseId  房源ID
      * @return
      */
-    ResponseBean taPreselectionRecordCancel(String personId, String houseId);
+    ResponseBean taPreselectionRecordCancel(String personId, Integer houseId);
+
+    ResponseBean selectPreSelectRecordList(PresecretRecordRequestBO recordRequestBO, Integer pageNum, Integer pageSize);
 
-    ResponseBean selectPreSelectRecordList(Integer pageNum, Integer pageSize, String salesBatchId, Integer houseId, Integer orgId, String phone, String apartmentId, Integer status);
+    /**
+     * 批量删除预选记录
+     *
+     * @param preselectionRecordList
+     * @param orgId
+     * @param userId
+     * @return
+     */
+    ResponseBean batchDeletePreselectRecord(List<TaPreselectionRecord> preselectionRecordList, Integer orgId, Integer userId);
 
 }

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

@@ -0,0 +1,60 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaPreselection;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预选表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+public interface ITaPreselectionService extends IService<TaPreselection> {
+
+    /**
+     * 获取预选列表
+     *
+     * @param pageSize
+     * @param pageNum
+     * @param salesBatchName
+     * @param buildingId
+     * @param orgId
+     * @param status
+     * @return
+     */
+    ResponseBean listPresecretByCondition(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId,
+                                          Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 批量删除
+     *
+     * @param taPreselectionList
+     * @param orgId
+     * @return
+     */
+    ResponseBean batchDelete(List<TaPreselection> taPreselectionList, Integer orgId);
+
+
+    /**
+     * @param id
+     * @param orgId
+     * @return
+     */
+    ResponseBean getPresecretById(Integer id, Integer orgId);
+
+    /**
+     * 校验批次下是否添加预选
+     *
+     * @param salesBatchId
+     * @param orgId
+     * @return
+     */
+    ResponseBean checkHavingRecordForSalesBatch(Integer salesBatchId, Integer orgId);
+
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaRaiseHouse;
+
+/**
+ * <p>
+ * 认筹单与房源关系表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+public interface ITaRaiseHouseService extends IService<TaRaiseHouse> {
+
+}

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

@@ -0,0 +1,90 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
+import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
+import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
+import com.huiju.estateagents.entity.TaRaiseRecord;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 认筹单(认筹记录表)  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
+
+
+    /**
+     * 条件查询房源认筹记录
+     *
+     * @param requestBO
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO, Integer pageNumber, Integer pageSize);
+
+    /**
+     * 条件查询认筹单
+     *
+     * @param recordRequestBO
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    ResponseBean listRaiseRecordByCondition(RaiseRecordRequestBO recordRequestBO, Integer pageNumber, Integer pageSize);
+
+    /**
+     * 条件查询缴费单
+     *
+     * @param orderRequestBO
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    ResponseBean listRaiseOrderByCondition(RaiseOrderRequestBO orderRequestBO, Integer pageNumber, Integer pageSize);
+
+    /**
+     * 小程序端保存认筹单信息
+     *
+     * @param taRaiseRecord
+     * @param orgId
+     * @param personId
+     * @return
+     */
+    TaRaiseRecord saveRaiseInfo(TaRaiseRecord taRaiseRecord, Integer orgId, String personId) throws Exception;
+
+    /**
+     * 获取用户信息
+     *
+     * @param orgId
+     * @param raiseRecordId
+     * @return
+     */
+    TaRaiseRecord getUserInfo(Integer orgId, Integer raiseRecordId);
+
+    /**
+     * 认筹单房源数+1
+     *
+     * @param raiseRecordId
+     * @param orgId
+     * @return
+     */
+    Boolean addHouseNum(Integer raiseRecordId, Integer orgId, Integer userId);
+
+    /**
+     * 发送认筹消息
+     */
+    void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String reason,String remark, Boolean isSuccess);
+
+    Boolean updateForSubtractRaiseHeat(Integer raiseRecordId);
+}

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

@@ -0,0 +1,59 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaRaise;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ * 认筹表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-26
+ */
+public interface ITaRaiseService extends IService<TaRaise> {
+
+    /**
+     * 获取销售批次列表 - 认筹
+     *
+     * @param pageSize
+     * @param pageNum
+     * @param salesBatchName
+     * @param buildingId
+     * @param orgId
+     * @param status
+     * @return
+     */
+    ResponseBean listRaiseByCondition(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId,
+                                      Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 批量删除
+     *
+     * @param taRaiseList
+     * @param orgId
+     * @return
+     */
+    ResponseBean batchDelete(List<TaRaise> taRaiseList, Integer orgId);
+
+    /**
+     * @param id
+     * @param orgId
+     * @return
+     */
+    ResponseBean getRaiseById(Integer id, Integer orgId);
+
+    /**
+     *
+     * @param raiseId
+     * @param raiseRecordId
+     * @param salesBatchId
+     * @return
+     */
+    TaRaise getRaiseProfile(Integer raiseId, Integer raiseRecordId, Integer salesBatchId);
+}

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

@@ -36,4 +36,12 @@ public interface ITaSalesBatchService extends IService<TaSalesBatch> {
      * @return
      */
     ResponseBean getSalesBatchById(Integer salesBatchId);
+
+    /**
+     *
+     * @param salesBatchId
+     * @param orgId
+     * @return
+     */
+    ResponseBean getBuildingById(String salesBatchId,Integer orgId);
 }