新需求

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

@@ -65,7 +65,7 @@ public class TaRaiseRecordController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "listHousingRaiseByCondition", method = RequestMethod.GET)
+    @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,
@@ -157,25 +157,25 @@ public class TaRaiseRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/batchInvalidRaiseRecord", method = RequestMethod.PUT)
-    public ResponseBean batchInvalidRaiseRecord(@RequestBody List<TaRaiseRecord> raiseRecordList, String invalidReason) {
+    public ResponseBean batchInvalidRaiseRecord(@RequestBody 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)) {
+            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords()) || StringUtils.isBlank(raiseRecordList.getInvalidReason())) {
                 responseBean.addError("参数错误");
                 return responseBean;
             }
 
-            raiseRecordList.stream().forEach(record -> {
+            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
                 record.setInvalidReason(invalidReason);
                 record.setUpdateDate(LocalDateTime.now());
                 record.setStatus(0);
             });
 
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList)) {
+            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
                 responseBean.addSuccess("success");
             } else {
                 responseBean.addError("fail");
@@ -194,23 +194,23 @@ public class TaRaiseRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/batchDeleteRaiseRecord", method = RequestMethod.PUT)
-    public ResponseBean batchDeleteRaiseRecord(@RequestBody List<TaRaiseRecord> raiseRecordList) {
+    public ResponseBean batchDeleteRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList) {
         logger.info("TaRaiseRecordController.batchDeleteRaiseRecord 接收参数：{}", JSONObject.toJSONString(raiseRecordList));
 
         ResponseBean responseBean = new ResponseBean();
         try {
             // 参数校验
-            if (CollectionUtils.isEmpty(raiseRecordList)) {
+            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords())) {
                 responseBean.addError("参数错误");
                 return responseBean;
             }
 
-            raiseRecordList.stream().forEach(record -> {
+            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
                 record.setStatus(CommConstant.STATUS_DELETE);
                 record.setUpdateDate(LocalDateTime.now());
             });
 
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList)) {
+            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
                 responseBean.addSuccess("success");
             } else {
                 responseBean.addError("fail");
@@ -229,13 +229,13 @@ public class TaRaiseRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/batchPayOfflineRaiseRecord", method = RequestMethod.PUT)
-    public ResponseBean batchPayOfflineRaiseRecord(@RequestBody List<TaRaiseRecord> raiseRecordList, HttpServletRequest request) {
+    public ResponseBean batchPayOfflineRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, HttpServletRequest request) {
         logger.info("TaRaiseRecordController.batchPayOfflineRaiseRecord 接收参数：{}", JSONObject.toJSONString(raiseRecordList));
 
         ResponseBean responseBean = new ResponseBean();
         try {
             // 参数校验
-            if (CollectionUtils.isEmpty(raiseRecordList)) {
+            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords())) {
                 responseBean.addError("参数错误");
                 return responseBean;
             }
@@ -243,7 +243,7 @@ public class TaRaiseRecordController extends BaseController {
             Integer orgId = getOrgId(request);
             TaRaiseRecord tr;
             QueryWrapper<TaRaiseRecord> queryWrapper;
-            for (TaRaiseRecord record : raiseRecordList) {
+            for (TaRaiseRecord record : raiseRecordList.getTaRaiseRecords()) {
                 queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("org_id", orgId);
                 queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
@@ -263,12 +263,12 @@ public class TaRaiseRecordController extends BaseController {
             }
 
             // 设置缴费状态为已缴费
-            raiseRecordList.stream().forEach(record -> {
+            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
                 record.setPayStatus(CommConstant.PAY_STATUS_PAID);
                 record.setUpdateDate(LocalDateTime.now());
             });
 
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList)) {
+            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
                 responseBean.addSuccess("success");
             } else {
                 responseBean.addError("fail");
@@ -288,14 +288,14 @@ public class TaRaiseRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/batchRefundOfflineRaiseRecord", method = RequestMethod.PUT)
-    public ResponseBean batchRefundOfflineRaiseRecord(@RequestBody List<TaRaiseRecord> raiseRecordList, String refundReason,
+    public ResponseBean batchRefundOfflineRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, String refundReason,
                                                       HttpServletRequest request) {
         logger.info("TaRaiseRecordController.batchRefundOfflineRaiseRecord 接收参数：{},refundReason:{}", JSONObject.toJSONString(raiseRecordList), refundReason);
 
         ResponseBean responseBean = new ResponseBean();
         try {
             // 参数校验
-            if (CollectionUtils.isEmpty(raiseRecordList) || StringUtils.isBlank(refundReason)) {
+            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords())) {
                 responseBean.addError("参数错误");
                 return responseBean;
             }
@@ -303,7 +303,7 @@ public class TaRaiseRecordController extends BaseController {
             Integer orgId = getOrgId(request);
             TaRaiseRecord tr;
             QueryWrapper<TaRaiseRecord> queryWrapper;
-            for (TaRaiseRecord record : raiseRecordList) {
+            for (TaRaiseRecord record : raiseRecordList.getTaRaiseRecords()) {
                 queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("org_id", orgId);
                 queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
@@ -326,13 +326,13 @@ public class TaRaiseRecordController extends BaseController {
                 }
             }
 
-            raiseRecordList.stream().forEach(record -> {
+            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
                 record.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
                 record.setRefundReason(refundReason);
                 record.setUpdateDate(LocalDateTime.now());
             });
 
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList)) {
+            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
                 responseBean.addSuccess("success");
             } else {
                 responseBean.addError("fail");

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

@@ -186,8 +186,15 @@ public class TaRaiseRecord implements Serializable {
     @TableField(exist = false)
     private List<TaHousingResources> taHousingResourcesList= new ArrayList<>();
 
+    /**
+     *  认筹单列表
+     */
+    @TableField(exist = false)
+    private List<TaRaiseRecord> taRaiseRecords;
+
     /**
      * 房源信息数
      */
+    @TableField(exist = false)
     private Integer taHousingResourcesSize;
 }