* 新需求提交

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

@@ -0,0 +1,55 @@
+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 raiseRecordId;
+
+    /**
+     * 认筹手机号
+     */
+    private String tel;
+
+    /**
+     * 用户手机号
+     */
+    private String personTel;
+
+    /**
+     * 微信流水号
+     */
+    private String transactionId ;
+
+    /**
+     * 微信退款号
+     */
+    private String refundNo;
+
+    /**
+     * 支付状态
+     */
+    private String payStatus;
+}

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

@@ -0,0 +1,85 @@
+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 Integer tel;
+
+    /**
+     * 用户手机号
+     */
+    private Integer personTel;
+
+    /**
+     * 缴费状态
+     */
+    private String payStatus;
+
+    /**
+     * 缴费方式
+     */
+    private String payType;
+}

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
      */
@@ -671,4 +670,9 @@ public class CommConstant {
      * 已退费
      */
     public static final String PAY_STATUS_REFUNDED = "refunded";
+
+    /**
+     * 最大认筹金额
+     */
+    public static final Integer MAX_RAISE_PRICE = 5000;
 }

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

@@ -245,7 +245,6 @@ public class TaHousingResourcesController extends BaseController {
                                                     HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
-
         try {
             responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, "", "", "", 0));
         } catch (Exception e) {
@@ -351,4 +350,5 @@ public class TaHousingResourcesController extends BaseController {
         }
         return responseBean;
     }
+
 }

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

@@ -5,6 +5,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.common.CommConstant;
 import com.huiju.estateagents.entity.TaRaise;
 import com.huiju.estateagents.service.ITaRaiseService;
 import org.slf4j.Logger;
@@ -21,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-02-26
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaRaiseController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaRaiseController.class);
@@ -36,7 +37,7 @@ public class TaRaiseController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taRaise",method= RequestMethod.GET)
+    @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();
@@ -61,10 +62,17 @@ public class TaRaiseController extends BaseController {
      * @param taRaise 实体对象
      * @return
      */
-    @RequestMapping(value="/taRaise",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/taRaise",method= RequestMethod.POST)
     public ResponseBean taRaiseAdd(@RequestBody TaRaise taRaise){
         ResponseBean responseBean = new ResponseBean();
         try {
+            // 参数校验
+            Integer raisePrice = taRaise.getRaisePrice();
+            if(raisePrice != null && raisePrice > CommConstant.MAX_RAISE_PRICE){
+                responseBean.addError("认筹金额最高50000");
+                return responseBean;
+            }
+
             if (iTaRaiseService.save(taRaise)){
                 responseBean.addSuccess(taRaise);
             }else {

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

@@ -1,27 +1,35 @@
 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.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
+import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaRaiseRecord;
 import com.huiju.estateagents.service.ITaRaiseRecordService;
+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.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
-    * 认筹单(认筹记录表)  前端控制器
-    * </p>
+ * 认筹单(认筹记录表)  前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2020-02-26
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaRaiseRecordController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaRaiseRecordController.class);
@@ -31,26 +39,139 @@ public class TaRaiseRecordController extends BaseController {
 
 
     /**
-     * 分页查询列表
-     * @param pageNum
+     * 条件查询认筹单
+     *
+     * @param recordRequestBO
+     * @param startTime
+     * @param endTime
+     * @param pageNumber
      * @param pageSize
+     * @param request
      * @return
      */
-    @RequestMapping(value="/taRaiseRecord",method= RequestMethod.GET)
-    public ResponseBean taRaiseRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/admin/listRaiseRecordByCondition", method = RequestMethod.GET)
+    public ResponseBean listRaiseRecordByCondition(RaiseRecordRequestBO recordRequestBO,
+                                                   @RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
+                                                   @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
+                                                   @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                   HttpServletRequest request) {
+        logger.info("TaRaiseRecordController.listRaiseRecordByCondition 接收参数：bo:{},startTime:{},endTime:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(recordRequestBO),
+                startTime, endTime, pageNumber, pageSize);
+
         ResponseBean responseBean = new ResponseBean();
         try {
-            //使用分页插件
-		    IPage<TaRaiseRecord> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaRaiseRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaRaiseRecord> result = iTaRaiseRecordService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taRaiseRecordList -=- {}",e.toString());
+            // 校验参数
+            if (null == recordRequestBO.getRaiseId()) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+
+            recordRequestBO.setOrgId(getOrgId(request));
+            responseBean = iTaRaiseRecordService.listRaiseRecordByCondition(recordRequestBO, startTime, endTime, pageNumber, pageSize);
+            logger.info("TaRaiseRecordController.listRaiseRecordByCondition 返回：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("TaRaiseRecordController.taRaiseRecordList -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 条件查询缴费单
+     *
+     * @param orderRequestBO
+     * @param payStartTime
+     * @param payEndTime
+     * @param pageNumber
+     * @param pageSize
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/listRaiseOrderByCondition", method = RequestMethod.GET)
+    public ResponseBean listRaiseOrderByCondition(RaiseOrderRequestBO orderRequestBO,
+                                             @RequestParam(value = "payStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime payStartTime,
+                                             @RequestParam(value = "payEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime payEndTime,
+                                             @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                             HttpServletRequest request) {
+        logger.info("TaRaiseRecordController.listOrderByCondition 接收参数：bo:{},startTime:{},endTime:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(orderRequestBO),
+                payStartTime, payEndTime, pageNumber, pageSize);
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            orderRequestBO.setOrgId(getOrgId(request));
+            responseBean = iTaRaiseRecordService.listRaiseOrderByCondition(orderRequestBO, payStartTime, payEndTime, pageNumber, pageSize);
+            logger.info("TaRaiseRecordController.listOrderByCondition 返回：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("TaRaiseRecordController.listOrderByCondition -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+
+    }
+
+    /**
+     * 批量作废
+     *
+     * @param raiseRecordList
+     * @param invalidReason
+     * @return
+     */
+    @RequestMapping(value = "/admin/batchInvalidRaiseRecord", method = RequestMethod.PUT)
+    public ResponseBean batchInvalidRaiseRecord(@RequestBody List<TaRaiseRecord> raiseRecordList, String invalidReason) {
+
+        logger.info("TaRaiseRecordController.batchInvalidRaiseRecord 接收参数：list:{},invalidReason:{}", JSONObject.toJSONString(raiseRecordList), invalidReason);
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 校验参数
+            if (CollectionUtils.isEmpty(raiseRecordList) || StringUtils.isBlank(invalidReason)) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+
+            raiseRecordList.stream().forEach(record -> record.setInvalidReason(invalidReason));
+
+            if (iTaRaiseRecordService.updateBatchById(raiseRecordList)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            logger.error("TaRaiseRecordController.taRaiseRecordList -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param raiseRecordList
+     * @return
+     */
+    @RequestMapping(value = "/admin/batchDeleteRaiseRecord", method = RequestMethod.PUT)
+    public ResponseBean batchDeleteRaiseRecord(@RequestBody List<TaRaiseRecord> raiseRecordList) {
+        logger.info("TaRaiseRecordController.batchDeleteRaiseRecord 接收参数：{}", JSONObject.toJSONString(raiseRecordList));
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 参数错误
+            if (CollectionUtils.isEmpty(raiseRecordList)) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+
+            raiseRecordList.stream().forEach(record -> record.setStatus(CommConstant.STATUS_DELETE));
+
+            if (iTaRaiseRecordService.updateBatchById(raiseRecordList)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            logger.error("TaRaiseRecordController.taRaiseRecordList -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -58,21 +179,22 @@ public class TaRaiseRecordController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taRaiseRecord 实体对象
      * @return
      */
-    @RequestMapping(value="/taRaiseRecord",method= RequestMethod.POST)
-    public ResponseBean taRaiseRecordAdd(@RequestBody TaRaiseRecord taRaiseRecord){
+    @RequestMapping(value = "/taRaiseRecord", method = RequestMethod.POST)
+    public ResponseBean taRaiseRecordAdd(@RequestBody TaRaiseRecord taRaiseRecord) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaRaiseRecordService.save(taRaiseRecord)){
+            if (iTaRaiseRecordService.save(taRaiseRecord)) {
                 responseBean.addSuccess(taRaiseRecord);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRaiseRecordAdd -=- {}",e.toString());
+            logger.error("taRaiseRecordAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -80,21 +202,22 @@ public class TaRaiseRecordController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taRaiseRecord/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taRaiseRecordDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taRaiseRecord/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taRaiseRecordDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaRaiseRecordService.removeById(id)){
+            if (iTaRaiseRecordService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRaiseRecordDelete -=- {}",e.toString());
+            logger.error("taRaiseRecordDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -102,23 +225,24 @@ public class TaRaiseRecordController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id            实体ID
      * @param taRaiseRecord 实体对象
      * @return
      */
-    @RequestMapping(value="/taRaiseRecord/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/taRaiseRecord/{id}", method = RequestMethod.PUT)
     public ResponseBean taRaiseRecordUpdate(@PathVariable Integer id,
-                                        @RequestBody TaRaiseRecord taRaiseRecord){
+                                            @RequestBody TaRaiseRecord taRaiseRecord) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaRaiseRecordService.updateById(taRaiseRecord)){
+            if (iTaRaiseRecordService.updateById(taRaiseRecord)) {
                 responseBean.addSuccess(taRaiseRecord);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRaiseRecordUpdate -=- {}",e.toString());
+            logger.error("taRaiseRecordUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -126,16 +250,17 @@ public class TaRaiseRecordController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taRaiseRecord/{id}",method= RequestMethod.GET)
-    public ResponseBean taRaiseRecordGet(@PathVariable Integer 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){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRaiseRecordDelete -=- {}",e.toString());
+            logger.error("taRaiseRecordDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -1,5 +1,6 @@
 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;
@@ -115,24 +116,6 @@ public class TaSalesBatchController extends BaseController {
             shareContent.setCreateDate(LocalDateTime.now());
             taShareContentService.save(shareContent);
 
-            // 保存认筹信息
-            TaRaise taRaise = new TaRaise();
-            taRaise.setOrgId(orgId);
-            taRaise.setSalesBatchId(taSalesBatch.getSalesBatchId());
-            taRaise.setRaiseStartTime(taSalesBatch.getRaiseStartTime());
-            taRaise.setRaiseEndTime(taSalesBatch.getRaiseEndTime());
-            taRaise.setHouseLockingType(taSalesBatch.getHouseLockingType());
-            taRaise.setRaisePrice(taSalesBatch.getRaisePrice());
-            taRaise.setNeedPreselection(taSalesBatch.getNeedPreselection());
-            taRaise.setDisplayHousePrice(taSalesBatch.getDisplayHousePrice());
-            taRaise.setPayType(taSalesBatch.getPayType());
-            taRaise.setPayDescription(taSalesBatch.getPayDescription());
-            taRaise.setPayProtocol(taSalesBatch.getPayProtocol());
-            taRaise.setStatus(taSalesBatch.getStatus());
-            taRaise.setCreateDate(LocalDateTime.now());
-            taRaiseService.save(taRaise);
-
-            taSalesBatch.setRaiseId(taRaise.getRaiseId());
             responseBean.addSuccess(taSalesBatch);
         } catch (Exception e) {
             e.printStackTrace();
@@ -295,4 +278,67 @@ public class TaSalesBatchController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 获取销售批次列表-预选
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param salesBatchName
+     * @param status
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "admin/listSalesBatchForPreselect", method = RequestMethod.GET)
+    public ResponseBean listSalesBatchForPreselect(@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 = iTaSalesBatchService.listSalesBatchForPreselect(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
+     * @param buildingId
+     * @param salesBatchName
+     * @param status
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "admin/listSalesBatchForRaise", method = RequestMethod.GET)
+    public ResponseBean listSalesBatchForRaise(@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);
+            orgId = 84;
+            List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
+
+            responseBean = iTaSalesBatchService.listSalesBatchForRaise(pageSize, pageNum, salesBatchName, buildingId, orgId, status, personBuildingList);
+            logger.info("listSalesBatchForRaise 返回结果：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("listSalesBatchForRaise -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -76,9 +76,14 @@ public class TaRaise implements Serializable {
     private String payType;
 
     /**
-     * 缴费说明
+     * 线上缴费说明
      */
-    private String payDescription;
+    private String payDescriptionOnline;
+
+    /**
+     * 线下缴费说明
+     */
+    private String payDescriptionOffline;
 
     /**
      * 线上选房协议
@@ -95,5 +100,10 @@ public class TaRaise implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 基础热度
+     */
+    private Integer heat;
+
 
 }

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

@@ -1,6 +1,7 @@
 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;
@@ -135,5 +136,39 @@ public class TaRaiseRecord implements Serializable {
      */
     private Integer orderId;
 
+    /**
+     * 用户手机号
+     */
+    @TableField(exist = false)
+    private String personTel;
+
+    /**
+     * 支付时间
+     */
+    @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;
 }

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

@@ -105,26 +105,31 @@ public class TaSalesBatch implements Serializable {
     private List<TaShareContent> shareContents;
 
     /**
-     * V3.5.12增加
+     * 是否展示房源价格
      */
+    private Boolean displayHousePrice;
 
     /**
-     * 缴费方式 onLine线上offLine线下
+     * V3.5.12 新增
+     */
+
+    /**
+     * 认筹id
      */
     @TableField(exist = false)
-    private String payType;
+    private Integer raiseId;
 
     /**
-     * 认筹是否预选
+     * 认筹状态
      */
     @TableField(exist = false)
-    private Boolean needPreselection;
+    private Integer raiseStaus;
 
     /**
-     * 认筹金额 单位是分！
+     * 锁房方式 auto自动锁房，manual手动锁房
      */
     @TableField(exist = false)
-    private Integer raisePrice;
+    private String houseLockingType;
 
     /**
      * 认筹开始时间
@@ -139,33 +144,26 @@ public class TaSalesBatch implements Serializable {
     private LocalDateTime raiseEndTime;
 
     /**
-     * 是否展示房源价格
-     */
-    @TableField(exist = false)
-    private Boolean displayHousePrice;
-
-    /**
-     * 线上选房协议
+     * 认筹金额 单位是分！
      */
     @TableField(exist = false)
-    private String payProtocol;
+    private Integer raisePrice;
 
     /**
-     * 缴费说明
+     * 缴费方式 onLine线上offLine线下
      */
     @TableField(exist = false)
-    private String payDescription;
+    private String payType;
 
     /**
-     * 锁房方式 auto自动锁房，manual手动锁房
+     * 认筹数量
      */
     @TableField(exist = false)
-    private String houseLockingType;
+    private Integer raiseCount;
 
     /**
-     * 认筹Id
+     * 预选数量
      */
     @TableField(exist = false)
-    private Integer raiseId;
-
+    private Integer preselectCount;
 }

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

@@ -1,8 +1,16 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +21,47 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2020-02-26
  */
 @Mapper
+@Component
 public interface TaRaiseRecordMapper extends BaseMapper<TaRaiseRecord> {
 
+    /**
+     * 条件查询认筹单
+     *
+     * @param page
+     * @param bo
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    IPage<TaRaiseRecord> listRaiseRecordByCondition(IPage<TaRaiseRecord> page,
+                                                    @Param("bo") RaiseRecordRequestBO bo,
+                                                    @Param("startTime") LocalDateTime startTime,
+                                                    @Param("endTime") LocalDateTime endTime);
+
+    /**
+     * 条件查询缴费单
+     *
+     * @param page
+     * @param bo
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    IPage<TaRaiseRecord> listRaiseOrderByCondition(IPage<TaRaiseRecord> page,
+                                              @Param("bo") RaiseOrderRequestBO bo,
+                                              @Param("startTime") LocalDateTime startTime,
+                                              @Param("endTime") LocalDateTime endTime);
+
+    /**
+     * 批量更新
+     *
+     * @param recordList
+     * @param orgId
+     * @param payType
+     * @return
+     */
+    Boolean batchUpdateById(@Param("recordList") List<TaRaiseRecord> recordList,
+                            @Param("orgId") Integer orgId,
+                            @Param("payType") String payType);
+
 }

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

@@ -20,7 +20,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 +39,20 @@ 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);
+
+    IPage<TaSalesBatch> listSalesBatchForPreselect(IPage<TaSalesBatch> page,
+                                                   @Param("salesBatchName") String salesBatchName,
+                                                   @Param("buildingId") String buildingId,
+                                                   @Param("orgId") Integer orgId,
+                                                   @Param("status") Integer status,
+                                                   @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+
+    IPage<TaSalesBatch> listSalesBatchForRaise(IPage<TaSalesBatch> page,
+                                               @Param("salesBatchName") String salesBatchName,
+                                               @Param("buildingId") String buildingId,
+                                               @Param("orgId") Integer orgId,
+                                               @Param("status") Integer status,
+                                               @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 }

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

@@ -55,4 +55,10 @@ public class TaHousingResourcesPO extends TaHousingResources {
      * 楼盘名称
      */
     private String buildingName;
+
+    /**
+     * 认筹实际热度
+     */
+    @TableField(exist = false)
+    private Integer raiseRealHeat;
 }

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

@@ -1,7 +1,14 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+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>
@@ -13,4 +20,27 @@ import com.huiju.estateagents.entity.TaRaiseRecord;
  */
 public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
 
+    /**
+     * 条件查询认筹单
+     *
+     * @param recordRequestBO
+     * @param startTime
+     * @param endTime
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    ResponseBean listRaiseRecordByCondition(RaiseRecordRequestBO recordRequestBO, LocalDateTime startTime, LocalDateTime endTime, Integer pageNumber, Integer pageSize);
+
+    /**
+     * 条件查询缴费单
+     *
+     * @param orderRequestBO
+     * @param payStartTime
+     * @param payEndTime
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    ResponseBean listRaiseOrderByCondition(RaiseOrderRequestBO orderRequestBO, LocalDateTime payStartTime, LocalDateTime payEndTime, Integer pageNumber, Integer pageSize);
 }

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

@@ -38,10 +38,30 @@ public interface ITaSalesBatchService extends IService<TaSalesBatch> {
     ResponseBean getSalesBatchById(Integer salesBatchId);
 
     /**
-     * 获取销售批次详情 cms端
+     * 获取销售批次列表 - 预选
      *
-     * @param salesBatchId
+     * @param pageSize
+     * @param pageNum
+     * @param salesBatchName
+     * @param buildingId
+     * @param orgId
+     * @param status
+     * @return
+     */
+    ResponseBean listSalesBatchForPreselect(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId,
+                                            Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 获取销售批次列表 - 认筹
+     *
+     * @param pageSize
+     * @param pageNum
+     * @param salesBatchName
+     * @param buildingId
+     * @param orgId
+     * @param status
      * @return
      */
-    ResponseBean getSalesBatchDetailForCms(Integer salesBatchId);
+    ResponseBean listSalesBatchForRaise(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId,
+                                        Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
 }

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

@@ -1,11 +1,23 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+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.bo.request.RaiseOrderRequestBO;
+import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
 import com.huiju.estateagents.entity.TaRaiseRecord;
 import com.huiju.estateagents.mapper.TaRaiseRecordMapper;
 import com.huiju.estateagents.service.ITaRaiseRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 认筹单(认筹记录表)  服务实现类
@@ -17,4 +29,30 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, TaRaiseRecord> implements ITaRaiseRecordService {
 
+    private Logger logger = LoggerFactory.getLogger(TaRaiseRecordServiceImpl.class);
+
+    @Autowired
+    private TaRaiseRecordMapper taRaiseRecordMapper;
+
+    @Override
+    public ResponseBean listRaiseRecordByCondition(RaiseRecordRequestBO recordRequestBO, LocalDateTime startTime, LocalDateTime endTime, Integer pageNumber, Integer pageSize) {
+        logger.info("TaRaiseRecordServiceImpl.listRaiseRecordByCondition 接收参数：bo:{},startTime:{},endTime:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(recordRequestBO),
+                startTime, endTime, pageNumber, pageSize);
+
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaRaiseRecord> pg = new Page<>(pageNumber, pageSize);
+        responseBean.addSuccess(taRaiseRecordMapper.listRaiseRecordByCondition(pg, recordRequestBO, startTime, endTime));
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean listRaiseOrderByCondition(RaiseOrderRequestBO orderRequestBO, LocalDateTime payStartTime, LocalDateTime payEndTime, Integer pageNumber, Integer pageSize) {
+        logger.info("TaRaiseRecordServiceImpl.listOrderByCondition 接收参数：bo:{},startTime:{},endTime:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(orderRequestBO),
+                payStartTime, payEndTime, pageNumber, pageSize);
+
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaRaiseRecord> pg = new Page<>(pageNumber, pageSize);
+        responseBean.addSuccess(taRaiseRecordMapper.listRaiseOrderByCondition(pg, orderRequestBO, payStartTime, payEndTime));
+        return responseBean;
+    }
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service.impl;
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
@@ -67,7 +68,7 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
 
     @Override
     public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
-        return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId,taPersonBuildingListByUserId);
+        return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId, taPersonBuildingListByUserId);
     }
 
     @Override
@@ -79,7 +80,7 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
             return responseBean;
         }
         //无预选状态下删除销售批次的同时删除房源信息
-        List<TaHousingResources> housingList =taHousingResourcesMapper.selectHousingList(orgId,taSalesBatchList);
+        List<TaHousingResources> housingList = taHousingResourcesMapper.selectHousingList(orgId, taSalesBatchList);
         List<TaBuildingRoom> taBuildingRoomList = new ArrayList<>();
         housingList.forEach(e -> {
             e.setStatus(CommConstant.STATUS_DELETE);
@@ -90,11 +91,11 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
         });
 
         //房源改为无效
-        if (CollectionUtils.isNotEmpty(housingList)){
+        if (CollectionUtils.isNotEmpty(housingList)) {
             taHousingResourcesService.updateBatchById(housingList);
         }
 
-        if (CollectionUtils.isNotEmpty(taBuildingRoomList)){
+        if (CollectionUtils.isNotEmpty(taBuildingRoomList)) {
             taBuildingRoomService.updateBatchById(taBuildingRoomList);
         }
 
@@ -162,7 +163,7 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
 
         // 获取楼盘名称
         TaBuilding taBuilding = taBuildingService.getById(result.getBuildingId());
-        if(taBuilding != null){
+        if (taBuilding != null) {
             result.setBuildingName(taBuilding.getBuildingName());
         }
 
@@ -195,8 +196,41 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
         return responseBean;
     }
 
+    /**
+     * @param pageSize
+     * @param pageNum
+     * @param salesBatchName
+     * @param buildingId
+     * @param orgId
+     * @param status
+     * @return
+     */
     @Override
-    public ResponseBean getSalesBatchDetailForCms(Integer salesBatchId) {
-        return null;
+    public ResponseBean listSalesBatchForPreselect(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId,
+                                                   Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+
+        logger.info("listSalesBatchForPreselect 接收参数：pageSize:{},pageNum:{},salesBatchName:{},buildilgId:{},orgId:{},status:{},taPersonBuildingListByUserId:{}",
+                pageSize, pageNum, salesBatchName, buildingId, orgId, status,JSONObject.toJSONString(taPersonBuildingListByUserId));
+
+        ResponseBean responseBean = new ResponseBean();
+
+        IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
+        responseBean.addSuccess(taSalesBatchMapper.listSalesBatchForPreselect(pg, salesBatchName, buildingId, orgId, status, taPersonBuildingListByUserId));
+        return responseBean;
     }
+
+    @Override
+    public ResponseBean listSalesBatchForRaise(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId,
+                                               Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+
+        logger.info("listSalesBatchForRaise 接收参数：pageSize:{},pageNum:{},salesBatchName:{},buildilgId:{},orgId:{},status:{},taPersonBuildingListByUserId:{}",
+                pageSize, pageNum, salesBatchName, buildingId, orgId, status,JSONObject.toJSONString(taPersonBuildingListByUserId));
+
+        ResponseBean responseBean = new ResponseBean();
+
+        IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
+        responseBean.addSuccess(taSalesBatchMapper.listSalesBatchForRaise(pg, salesBatchName, buildingId, orgId, status, taPersonBuildingListByUserId));
+        return responseBean;
+    }
+
 }

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -47,11 +47,14 @@
             t2.building_area,
             t2.apartment_name,
             t3.term_id,
-            t.term_name
+            t.term_name,
+            t4.house_locking_status,
+            (select count(*) from ta_raise_house tr where tr.house_id = t.house_id) raiseRealHeat
         FROM
           ta_housing_resources t
         LEFT JOIN ta_building_apartment t2 ON t.apartment_id = t2.apartment_id
         LEFT JOIN ta_building_block t3 ON t.block_id = t3.block_id
+        LEFT JOIN ta_raise_house t4 ON t.house_id = t4.house_id
         WHERE
             t.sales_batch_id = #{salesBatchId}
             AND t.org_id = #{orgId}

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -2,4 +2,123 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaRaiseRecordMapper">
 
+    <select id="listRaiseRecordByCondition" resultType="com.huiju.estateagents.entity.TaRaiseRecord">
+        SELECT
+            t.*,
+            t3.house_id,
+            t3.term_name,
+            t3.block_name,
+            t3.unit_name,
+            t3.floor_name,
+            t3.room_name,
+            t3.apartment_id,
+            t4.apartment_name,
+            t5.tel personTel
+        FROM
+            ta_raise_record t
+            LEFT JOIN ta_raise_house t2 ON t.raise_record_id = t2.raise_record_id
+            LEFT JOIN ta_housing_resources t3 ON t2.house_id = t3.house_id
+            LEFT JOIN ta_building_apartment t4 ON t3.apartment_id = t4.apartment_id
+            LEFT JOIN ta_person t5 ON t.person_id = t5.person_id
+        WHERE
+            t.org_id = #{bo.orgId}
+            AND t.`status` != - 1
+            AND t3.`status` != - 1
+        <if test="bo.raiseId != null and bo.raiseId != ''">
+            AND t.raise_id =#{bo.raiseId}
+        </if>
+        <if test="bo.houseId != null and bo.houseId != ''">
+            AND t3.house_id =  =#{bo.houseId}
+        </if>
+        <if test="bo.raiseRecordId != null and bo.raiseRecordId != ''">
+            AND t.raise_record_id = #{bo.raiseRecordId}
+        </if>
+        <if test="bo.termName != null and bo.termName != ''">
+            AND t3.term_name like CONCAT('%',#{bo.termName}, '%')
+        </if>
+        <if test="bo.blockName != null and bo.blockName != ''">
+            AND t3.block_name like CONCAT('%',#{bo.blockName}, '%')
+        </if>
+        <if test="bo.unitName != null and bo.unitName != ''">
+            AND t3.unit_name like CONCAT('%',#{bo.unitName}, '%')
+        </if>
+        <if test="bo.floorName != null and bo.floorName != ''">
+            AND t3.floor_name like CONCAT('%',#{bo.floorName}, '%')
+        </if>
+        <if test="bo.roomName != null and bo.roomName != ''">
+            AND t3.room_name like CONCAT('%',#{bo.roomName}, '%')
+        </if>
+        <if test="bo.status != null">
+            AND t.status = #{bo.status}
+        </if>
+        <if test="bo.lockingStatus != null and bo.lockingStatus != ''">
+            AND t.house_locking_status = #{bo.lockingStatus}
+        </if>
+        <if test="bo.tel != null and bo.tel != ''">
+            AND t.tel = #{bo.tel}
+        </if>
+        <if test="bo.personTel != null and bo.personTel != ''">
+            AND t5.tel = #{bo.personTel}
+        </if>
+        <if test="bo.payStatus != null and bo.payStatus != ''">
+            AND t.pay_status = #{bo.payStatus}
+        </if>
+        <if test="bo.payType != null and bo.payType != ''">
+            AND t.pay_type = #{bo.payType}
+        </if>
+        <if test = 'startTime != null'>
+            AND t.create_date &gt;= #{startTime}
+        </if>
+        <if test = 'endTime != null'>
+            AND t.create_date &lt;= #{endTime}
+        </if>
+    </select>
+
+    <select id ="listRaiseOrderByCondition" resultType="com.huiju.estateagents.entity.TaRaiseRecord">
+        SELECT
+            t.*,
+            t2.order_id,
+            t2.pay_time,
+            t2.trade_no,
+            t2.transaction_id,
+            t2.refund_no,
+            t2.total_fee
+        FROM
+            ta_raise_record t
+            INNER JOIN ta_order t2 ON t.order_id = t2.order_id
+            LEFT JOIN ta_person t3 ON t2.person_id = t3.person_id
+        WHERE
+            t.org_id = #{bo.orgId}
+            AND t.`status` != - 1
+            <if test = "bo.raiseId != null and bo.raiseId != ''">
+                AND t.raise_id = #{bo.raiseId}
+            </if>
+            <if test = "bo.orderId != null and bo.orderId != ''">
+                AND t2.order_id = #{bo.orderId}
+            </if>
+            <if test = "bo.raiseRecordId != null and bo.raiseRecordId != ''">
+                AND t.raise_record_id = #{bo.raiseRecordId}
+            </if>
+            <if test = "bo.tel != null and bo.tel != ''">
+                AND t.tel = #{bo.tel}
+            </if>
+            <if test = "bo.personTel != null and bo.personTel != ''">
+                AND t3.tel = #{bo.personTel}
+            </if>
+            <if test = "bo.transactionId != null and bo.transactionId != ''">
+                AND t2.transaction_id = #{bo.transactionId}
+            </if>
+            <if test = "bo.refundNo != null and bo.refundNo != ''">
+                AND t2.refund_no = #{bo.refundNo}
+            </if>
+            <if test = "bo.payStatus != null and bo.payStatus != ''">
+                AND t.pay_status = #{bo.payStatus}
+            </if>
+            <if test = "payStartTime != null and payStartTime != ''">
+                AND t2.pay_time &gt;= #{payStartTime}
+            </if>
+            <if test = "payEndTime != null and payEndTime != ''">
+                AND t2.pay_time &lt;= #{payEndTime}
+            </if>
+    </select>
 </mapper>

src/main/resources/mapper/TaSalesBatchMapper.xml

@@ -2,12 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaSalesBatchMapper">
     <update id="updateSalesBatchStatus">
-      update ta_sales_batch t set t.status = -1
-      where t.org_id = #{orgId}
-      and t.sales_batch_id in
-      <foreach collection="taSalesBatchList" item="taSalesBatch" open="(" close=")" separator=",">
-         #{taSalesBatch.salesBatchId}
-      </foreach>
+        update ta_sales_batch t set t.status = -1
+        where t.org_id = #{orgId}
+        and t.sales_batch_id in
+        <foreach collection="taSalesBatchList" item="taSalesBatch" open="(" close=")" separator=",">
+            #{taSalesBatch.salesBatchId}
+        </foreach>
     </update>
 
     <select id="selectByCondition" resultType="com.huiju.estateagents.entity.TaSalesBatch">
@@ -32,12 +32,12 @@
     </select>
 
     <select id="countPreSelectRecord" resultType="java.lang.Integer">
-      select count(*) from ta_preselection_record t
-      where t.org_id = #{orgId}
-      and t.sales_batch_id in
-      <foreach collection="taSalesBatchList" item="taSalesBatch" open="(" close=")" separator=",">
-          #{taSalesBatch.salesBatchId}
-      </foreach>
+        select count(*) from ta_preselection_record t
+        where t.org_id = #{orgId}
+        and t.sales_batch_id in
+        <foreach collection="taSalesBatchList" item="taSalesBatch" open="(" close=")" separator=",">
+            #{taSalesBatch.salesBatchId}
+        </foreach>
     </select>
 
     <select id="getTotalHousesAndHeat" resultType="java.util.Map">
@@ -50,4 +50,73 @@
         WHERE
             t.STATUS = 1 and t.sales_batch_id = #{salesBatchId}
     </select>
+
+    <select id="listSalesBatchForPreselect" resultType="com.huiju.estateagents.entity.TaSalesBatch">
+            SELECT
+                t.*,
+                a.building_name,
+                a.real_heat preselectCount
+            FROM
+                ta_sales_batch t
+            LEFT JOIN ta_housing_resources a ON t.building_id = a.building_id
+            WHERE
+                t.org_id = #{orgId}
+                AND t.STATUS != - 1
+                AND t.preselection_start_time IS NOT NULL
+                AND t.preselection_end_time IS NOT NULL
+            <if test="buildingId != null and buildingId != ''">
+                and t.building_id = #{buildingId}
+            </if>
+            <if test="salesBatchName != null and salesBatchName != ''">
+                and t.sales_batch_name like CONCAT('%',#{salesBatchName}, '%')
+            </if>
+            <if test="status != null">
+                and t.status = #{status}
+            </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND t.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
+
+    </select>
+
+
+    <select id="listSalesBatchForRaise" resultType="com.huiju.estateagents.entity.TaSalesBatch">
+        SELECT
+            t.*,
+            a.building_name,
+            r.raise_id ,
+            r.`status` raiseStaus,
+            r.house_locking_type ,
+            r.raise_start_time ,
+            r.raise_end_time ,
+            r.raise_price ,
+            r.pay_type ,
+            (SELECT COUNT( * ) FROM ta_raise_record r2  where r2.raise_id = r.raise_id and r2.`status` != -1) raiseCount
+        FROM
+            ta_sales_batch t
+            LEFT JOIN ta_building a ON t.building_id = a.building_id
+            INNER JOIN ta_raise r ON t.sales_batch_id = r.sales_batch_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.STATUS != - 1
+            AND r.`status` != -1
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="salesBatchName != null and salesBatchName != ''">
+            and t.sales_batch_name like CONCAT('%',#{salesBatchName}, '%')
+        </if>
+        <if test="status != null">
+            and t.status = #{status}
+        </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+    </select>
 </mapper>