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

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

@@ -195,7 +195,7 @@ public class TaPreselectionRecordController extends BaseController {
      */
     @RequestMapping(value = "/wx/listPreselectionRecord", method = RequestMethod.GET)
     public ResponseBean listPreselectionRecord(@RequestParam(value = "buildingId", required = false) String buildingId,
-                                               @RequestParam(value = "salesBtchId", required = false) Integer salesBtchId,
+                                               @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,
@@ -206,7 +206,7 @@ public class TaPreselectionRecordController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         try {
-            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNumber, pageSize, orgId, personId, buildingId, salesBtchId, apartmentId, houseLockingStatus, customerLocked));
+            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNumber, pageSize, orgId, personId, buildingId, salesBatchId, apartmentId, houseLockingStatus, customerLocked));
         } catch (Exception e) {
             logger.error("listPreselectionRecord -=- {}", e);
             responseBean.addError(e.getMessage());

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

@@ -161,18 +161,18 @@ public class TaRaiseRecordController extends BaseController {
     /**
      * 批量作废
      *
-     * @param raiseRecordList
+     * @param raiseRecord
      * @return
      */
     @RequestMapping(value = "/admin/batchInvalidRaiseRecord", method = RequestMethod.PUT)
-    public ResponseBean batchInvalidRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, HttpServletRequest request) {
+    public ResponseBean batchInvalidRaiseRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
 
-        logger.info("TaRaiseRecordController.batchInvalidRaiseRecord 接收参数：TaRaiseRecord:{}", JSONObject.toJSONString(raiseRecordList));
+        logger.info("TaRaiseRecordController.batchInvalidRaiseRecord 接收参数：TaRaiseRecord:{}", JSONObject.toJSONString(raiseRecord));
 
         ResponseBean responseBean = new ResponseBean();
         try {
             // 校验参数
-            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords()) || StringUtils.isBlank(raiseRecordList.getInvalidReason())) {
+            if (CollectionUtils.isEmpty(raiseRecord.getTaRaiseRecords()) || StringUtils.isBlank(raiseRecord.getInvalidReason())) {
                 responseBean.addError("参数错误");
                 return responseBean;
             }
@@ -180,16 +180,16 @@ public class TaRaiseRecordController extends BaseController {
             // 获取用户信息
             TaUser taUser = taUserService.getUserInfoById(getUserId(request), getOrgId(request));
 
-            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
+            raiseRecord.getTaRaiseRecords().stream().forEach(record -> {
                 if (taUser != null) {
                     record.setUpdateUserName(taUser.getUserName());
                 }
-                record.setInvalidReason(raiseRecordList.getInvalidReason());
+                record.setInvalidReason(raiseRecord.getInvalidReason());
                 record.setUpdateDate(LocalDateTime.now());
                 record.setStatus(0);
             });
 
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
+            if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
                 responseBean.addSuccess("success");
             } else {
                 responseBean.addError("fail");
@@ -204,17 +204,17 @@ public class TaRaiseRecordController extends BaseController {
     /**
      * 批量删除
      *
-     * @param raiseRecordList
+     * @param raiseRecord
      * @return
      */
     @RequestMapping(value = "/admin/batchDeleteRaiseRecord", method = RequestMethod.PUT)
-    public ResponseBean batchDeleteRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, HttpServletRequest request) {
-        logger.info("TaRaiseRecordController.batchDeleteRaiseRecord 接收参数：{}", JSONObject.toJSONString(raiseRecordList));
+    public ResponseBean batchDeleteRaiseRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
+        logger.info("TaRaiseRecordController.batchDeleteRaiseRecord 接收参数：{}", JSONObject.toJSONString(raiseRecord));
 
         ResponseBean responseBean = new ResponseBean();
         try {
             // 参数校验
-            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords())) {
+            if (CollectionUtils.isEmpty(raiseRecord.getTaRaiseRecords())) {
                 responseBean.addError("参数错误");
                 return responseBean;
             }
@@ -222,7 +222,7 @@ public class TaRaiseRecordController extends BaseController {
             // 获取用户信息
             TaUser taUser = taUserService.getUserInfoById(getUserId(request), getOrgId(request));
 
-            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
+            raiseRecord.getTaRaiseRecords().stream().forEach(record -> {
                 if (taUser != null) {
                     record.setUpdateUserName(taUser.getUserName());
                 }
@@ -230,7 +230,7 @@ public class TaRaiseRecordController extends BaseController {
                 record.setUpdateDate(LocalDateTime.now());
             });
 
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
+            if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
                 responseBean.addSuccess("success");
             } else {
                 responseBean.addError("fail");
@@ -245,17 +245,17 @@ public class TaRaiseRecordController extends BaseController {
     /**
      * 批量线下缴费
      *
-     * @param raiseRecordList
+     * @param raiseRecord
      * @return
      */
     @RequestMapping(value = "/admin/batchPayOfflineRaiseRecord", method = RequestMethod.PUT)
-    public ResponseBean batchPayOfflineRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, HttpServletRequest request) {
-        logger.info("TaRaiseRecordController.batchPayOfflineRaiseRecord 接收参数：{}", JSONObject.toJSONString(raiseRecordList));
+    public ResponseBean batchPayOfflineRaiseRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
+        logger.info("TaRaiseRecordController.batchPayOfflineRaiseRecord 接收参数：{}", JSONObject.toJSONString(raiseRecord));
 
         ResponseBean responseBean = new ResponseBean();
         try {
             // 参数校验
-            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords())) {
+            if (CollectionUtils.isEmpty(raiseRecord.getTaRaiseRecords())) {
                 responseBean.addError("参数错误");
                 return responseBean;
             }
@@ -263,7 +263,7 @@ public class TaRaiseRecordController extends BaseController {
             Integer orgId = getOrgId(request);
             TaRaiseRecord tr;
             QueryWrapper<TaRaiseRecord> queryWrapper;
-            for (TaRaiseRecord record : raiseRecordList.getTaRaiseRecords()) {
+            for (TaRaiseRecord record : raiseRecord.getTaRaiseRecords()) {
                 queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("org_id", orgId);
                 queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
@@ -286,7 +286,7 @@ public class TaRaiseRecordController extends BaseController {
             TaUser taUser = taUserService.getUserInfoById(getUserId(request), orgId);
 
             // 设置缴费状态为已缴费
-            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
+            raiseRecord.getTaRaiseRecords().stream().forEach(record -> {
                 if (taUser != null) {
                     record.setUpdateUserName(taUser.getUserName());
                 }
@@ -294,7 +294,7 @@ public class TaRaiseRecordController extends BaseController {
                 record.setUpdateDate(LocalDateTime.now());
             });
 
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
+            if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
                 responseBean.addSuccess("success");
             } else {
                 responseBean.addError("fail");
@@ -309,19 +309,19 @@ public class TaRaiseRecordController extends BaseController {
     /**
      * 批量线下退费
      *
-     * @param raiseRecordList
+     * @param raiseRecord
      * @param refundReason    退款原因
      * @return
      */
     @RequestMapping(value = "/admin/batchRefundOfflineRaiseRecord", method = RequestMethod.PUT)
-    public ResponseBean batchRefundOfflineRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, String refundReason,
+    public ResponseBean batchRefundOfflineRaiseRecord(@RequestBody TaRaiseRecord raiseRecord, String refundReason,
                                                       HttpServletRequest request) {
-        logger.info("TaRaiseRecordController.batchRefundOfflineRaiseRecord 接收参数：{},refundReason:{}", JSONObject.toJSONString(raiseRecordList), refundReason);
+        logger.info("TaRaiseRecordController.batchRefundOfflineRaiseRecord 接收参数：{},refundReason:{}", JSONObject.toJSONString(raiseRecord), refundReason);
 
         ResponseBean responseBean = new ResponseBean();
         try {
             // 参数校验
-            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords())) {
+            if (CollectionUtils.isEmpty(raiseRecord.getTaRaiseRecords())) {
                 responseBean.addError("参数错误");
                 return responseBean;
             }
@@ -329,7 +329,7 @@ public class TaRaiseRecordController extends BaseController {
             Integer orgId = getOrgId(request);
             TaRaiseRecord tr;
             QueryWrapper<TaRaiseRecord> queryWrapper;
-            for (TaRaiseRecord record : raiseRecordList.getTaRaiseRecords()) {
+            for (TaRaiseRecord record : raiseRecord.getTaRaiseRecords()) {
                 queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("org_id", orgId);
                 queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
@@ -355,7 +355,7 @@ public class TaRaiseRecordController extends BaseController {
             // 获取用户信息
             TaUser taUser = taUserService.getUserInfoById(getUserId(request), orgId);
 
-            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
+            raiseRecord.getTaRaiseRecords().stream().forEach(record -> {
                 if (taUser != null) {
                     record.setUpdateUserName(taUser.getUserName());
                 }
@@ -364,7 +364,7 @@ public class TaRaiseRecordController extends BaseController {
                 record.setUpdateDate(LocalDateTime.now());
             });
 
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
+            if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
                 responseBean.addSuccess("success");
             } else {
                 responseBean.addError("fail");
@@ -541,7 +541,7 @@ public class TaRaiseRecordController extends BaseController {
             houseList.forEach(e -> {
                 taRaiseHouseList.forEach(r -> {
                     //我的认筹
-                    if (e.getHouseId().equals(r.getHouseId()) && r.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)) {
+                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(r.getHouseLockingStatus())) {
                         e.setMineLocked("mine");
                     }
                 });

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

@@ -152,7 +152,7 @@ public class TaSalesBatchController extends BaseController {
                 preselectionQueryWrapper.eq("status", 1);
                 TaPreselection preselection = taPreselectionService.getOne(preselectionQueryWrapper);
                 if (preselection != null) {
-                    responseBean.addError(String.format("销售批次%s关联有预选,请先删除关联的预选模块", ts.getSalesBatchId()));
+                    responseBean.addError(String.format("销售批次%s关联有预选,请先删除关联的预选模块", ts.getSalesBatchName()));
                     return responseBean;
                 }
 
@@ -163,7 +163,7 @@ public class TaSalesBatchController extends BaseController {
                 raiseQueryWrapper.eq("status", 1);
                 TaRaise raise = taRaiseService.getOne(raiseQueryWrapper);
                 if (raise != null) {
-                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的预选模块", ts.getSalesBatchId()));
+                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的预选模块", ts.getSalesBatchName()));
                     return responseBean;
                 }
             }

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

@@ -13,7 +13,7 @@ import java.util.List;
 
 /**
  * <p>
- * 认筹表 
+ * 认筹表
  * </p>
  *
  * @author jobob

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

@@ -33,7 +33,7 @@ public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRec
      */
     IPage<TaPreselectionRecordPO> listPreselectionRecord(IPage<TaPreselectionRecordPO> iPage,
                                                          @Param("orgId") Integer orgId,
-                                                         @Param("personId") String personId, @Param("buildingId") String buildingId, @Param("salesBtchId") Integer salesBtchId,
+                                                         @Param("personId") String personId, @Param("buildingId") String buildingId, @Param("salesBatchId") Integer salesBatchId,
                                                          @Param("apartmentId") String apartmentId, @Param("houseLockingStatus") String houseLockingStatus, @Param("customerLocked") String customerLocked);
 
     /**

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

@@ -28,7 +28,7 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
      * @param personId
      * @return
      */
-    IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId, String buildingId, Integer salesBtchId, String apartmentId, String houseLockingStatus, String customerLocked);
+    IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId, String buildingId, Integer salesBatchId, String apartmentId, String houseLockingStatus, String customerLocked);
 
     /**
      * 添加预选记录预选

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

@@ -68,11 +68,11 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
 
 
     @Override
-    public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId, String buildingId, Integer salesBtchId, String apartmentId, String houseLockingStatus, String customerLocked) {
+    public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId, String buildingId, Integer salesBatchId, String apartmentId, String houseLockingStatus, String customerLocked) {
         logger.info("listPreselectionRecord 接收参数：pageNum：{}，pageSize：{}，orgId：{}，personId：{}", pageNum, pageSize, orgId, personId);
 
         IPage<TaPreselectionRecordPO> iPage = new Page<>(pageNum, pageSize);
-        iPage = taPreselectionRecordMapper.listPreselectionRecord(iPage, orgId, personId, buildingId, salesBtchId, apartmentId, houseLockingStatus, customerLocked);
+        iPage = taPreselectionRecordMapper.listPreselectionRecord(iPage, orgId, personId, buildingId, salesBatchId, apartmentId, houseLockingStatus, customerLocked);
 
         List<TaPreselectionRecordPO> poList = iPage.getRecords();
         if (CollectionUtils.isEmpty(poList)) {

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

@@ -83,7 +83,7 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
             taRaiseRecordQueryWrapper.eq("status", 1);
             List<TaRaiseRecord> list = taRaiseRecordMapper.selectList(taRaiseRecordQueryWrapper);
             if (CollectionUtils.isNotEmpty(list)) {
-                responseBean.addError(String.format("销售批次%s下已有认筹记录，不可删除", tr.getSalesBatchId()));
+                responseBean.addError(String.format("销售批次%s下已有认筹记录，不可删除", tr.getSalesBatchName()));
                 return responseBean;
             }
         }
@@ -112,13 +112,13 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
         if (raiseId == null && salesBatchId == null && raiseRecordId == null) return null;
 
         TaRaise taRaise = null;
-        TaRaiseRecord  taRaiseRecord = null;
+        TaRaiseRecord taRaiseRecord = null;
 
         // 通过认筹记录ID 或者 批次ID 查询
         if (raiseId != null || salesBatchId != null) {
             QueryWrapper<TaRaise> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq(raiseId != null,"raise_id", raiseId);
-            queryWrapper.eq(salesBatchId != null,"sales_batch_id", salesBatchId);
+            queryWrapper.eq(raiseId != null, "raise_id", raiseId);
+            queryWrapper.eq(salesBatchId != null, "sales_batch_id", salesBatchId);
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.last(" limit 1");
             taRaise = this.getOne(queryWrapper);
@@ -128,9 +128,9 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
         boolean mayPerson = taRaise != null && !StringUtils.isEmpty(personId);
         if (raiseRecordId != null || mayPerson) {
             QueryWrapper<TaRaiseRecord> wrapper = new QueryWrapper<>();
-            wrapper.eq(raiseRecordId != null,"raise_record_id", raiseRecordId);
-            if (mayPerson){
-                wrapper.eq( "raise_id", taRaise.getRaiseId());
+            wrapper.eq(raiseRecordId != null, "raise_record_id", raiseRecordId);
+            if (mayPerson) {
+                wrapper.eq("raise_id", taRaise.getRaiseId());
                 wrapper.eq("person_id", personId);
             }
             wrapper.eq("status", CommConstant.STATUS_NORMAL);
@@ -138,10 +138,10 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
             taRaiseRecord = taRaiseRecordMapper.selectOne(wrapper);
 
             //加入房源信息
-            if (null != taRaiseRecord){
+            if (null != taRaiseRecord) {
                 //房源与认筹单关系图
                 List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseMapper.selectList(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
-                if (taRaiseHouseList.size() > 0){
+                if (taRaiseHouseList.size() > 0) {
                     //房源信息
                     List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
                     taRaiseRecord.setTaHousingResourcesList(houseList);

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -31,8 +31,8 @@
             <if test="buildingId != null and buildingId != ''">
                 AND t.building_id = #{buildingId}
             </if>
-            <if test="salesBtchId != null and salesBtchId != ''">
-                AND t2.sales_batch_id = #{salesBtchId}
+            <if test="salesBatchId != null and salesBatchId != ''">
+                AND t2.sales_batch_id = #{salesBatchId}
             </if>
             <if test="apartmentId != null and apartmentId != ''">
                 AND t2.apartment_id = #{apartmentId}

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -17,7 +17,6 @@
         WHERE
             t.org_id = #{bo.orgId}
             AND t.`status` != - 1
-            AND t4.`status` != - 1
         <if test="bo.salesBatchId != null and bo.salesBatchId != ''">
             AND t.sales_batch_id = #{bo.salesBatchId}
         </if>