Browse Source

新需求

weichaochao 5 years ago
parent
commit
e5a0bfc4e6

+ 19
- 19
src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java View File

65
      * @param request
65
      * @param request
66
      * @return
66
      * @return
67
      */
67
      */
68
-    @RequestMapping(value = "listHousingRaiseByCondition", method = RequestMethod.GET)
68
+    @RequestMapping(value = "/admin/listHousingRaiseByCondition", method = RequestMethod.GET)
69
     public ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO,
69
     public ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO,
70
                                                     @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
70
                                                     @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
71
                                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
71
                                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
157
      * @return
157
      * @return
158
      */
158
      */
159
     @RequestMapping(value = "/admin/batchInvalidRaiseRecord", method = RequestMethod.PUT)
159
     @RequestMapping(value = "/admin/batchInvalidRaiseRecord", method = RequestMethod.PUT)
160
-    public ResponseBean batchInvalidRaiseRecord(@RequestBody List<TaRaiseRecord> raiseRecordList, String invalidReason) {
160
+    public ResponseBean batchInvalidRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, String invalidReason) {
161
 
161
 
162
         logger.info("TaRaiseRecordController.batchInvalidRaiseRecord 接收参数:list:{},invalidReason:{}", JSONObject.toJSONString(raiseRecordList), invalidReason);
162
         logger.info("TaRaiseRecordController.batchInvalidRaiseRecord 接收参数:list:{},invalidReason:{}", JSONObject.toJSONString(raiseRecordList), invalidReason);
163
 
163
 
164
         ResponseBean responseBean = new ResponseBean();
164
         ResponseBean responseBean = new ResponseBean();
165
         try {
165
         try {
166
             // 校验参数
166
             // 校验参数
167
-            if (CollectionUtils.isEmpty(raiseRecordList) || StringUtils.isBlank(invalidReason)) {
167
+            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords()) || StringUtils.isBlank(raiseRecordList.getInvalidReason())) {
168
                 responseBean.addError("参数错误");
168
                 responseBean.addError("参数错误");
169
                 return responseBean;
169
                 return responseBean;
170
             }
170
             }
171
 
171
 
172
-            raiseRecordList.stream().forEach(record -> {
172
+            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
173
                 record.setInvalidReason(invalidReason);
173
                 record.setInvalidReason(invalidReason);
174
                 record.setUpdateDate(LocalDateTime.now());
174
                 record.setUpdateDate(LocalDateTime.now());
175
                 record.setStatus(0);
175
                 record.setStatus(0);
176
             });
176
             });
177
 
177
 
178
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList)) {
178
+            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
179
                 responseBean.addSuccess("success");
179
                 responseBean.addSuccess("success");
180
             } else {
180
             } else {
181
                 responseBean.addError("fail");
181
                 responseBean.addError("fail");
194
      * @return
194
      * @return
195
      */
195
      */
196
     @RequestMapping(value = "/admin/batchDeleteRaiseRecord", method = RequestMethod.PUT)
196
     @RequestMapping(value = "/admin/batchDeleteRaiseRecord", method = RequestMethod.PUT)
197
-    public ResponseBean batchDeleteRaiseRecord(@RequestBody List<TaRaiseRecord> raiseRecordList) {
197
+    public ResponseBean batchDeleteRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList) {
198
         logger.info("TaRaiseRecordController.batchDeleteRaiseRecord 接收参数:{}", JSONObject.toJSONString(raiseRecordList));
198
         logger.info("TaRaiseRecordController.batchDeleteRaiseRecord 接收参数:{}", JSONObject.toJSONString(raiseRecordList));
199
 
199
 
200
         ResponseBean responseBean = new ResponseBean();
200
         ResponseBean responseBean = new ResponseBean();
201
         try {
201
         try {
202
             // 参数校验
202
             // 参数校验
203
-            if (CollectionUtils.isEmpty(raiseRecordList)) {
203
+            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords())) {
204
                 responseBean.addError("参数错误");
204
                 responseBean.addError("参数错误");
205
                 return responseBean;
205
                 return responseBean;
206
             }
206
             }
207
 
207
 
208
-            raiseRecordList.stream().forEach(record -> {
208
+            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
209
                 record.setStatus(CommConstant.STATUS_DELETE);
209
                 record.setStatus(CommConstant.STATUS_DELETE);
210
                 record.setUpdateDate(LocalDateTime.now());
210
                 record.setUpdateDate(LocalDateTime.now());
211
             });
211
             });
212
 
212
 
213
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList)) {
213
+            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
214
                 responseBean.addSuccess("success");
214
                 responseBean.addSuccess("success");
215
             } else {
215
             } else {
216
                 responseBean.addError("fail");
216
                 responseBean.addError("fail");
229
      * @return
229
      * @return
230
      */
230
      */
231
     @RequestMapping(value = "/admin/batchPayOfflineRaiseRecord", method = RequestMethod.PUT)
231
     @RequestMapping(value = "/admin/batchPayOfflineRaiseRecord", method = RequestMethod.PUT)
232
-    public ResponseBean batchPayOfflineRaiseRecord(@RequestBody List<TaRaiseRecord> raiseRecordList, HttpServletRequest request) {
232
+    public ResponseBean batchPayOfflineRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, HttpServletRequest request) {
233
         logger.info("TaRaiseRecordController.batchPayOfflineRaiseRecord 接收参数:{}", JSONObject.toJSONString(raiseRecordList));
233
         logger.info("TaRaiseRecordController.batchPayOfflineRaiseRecord 接收参数:{}", JSONObject.toJSONString(raiseRecordList));
234
 
234
 
235
         ResponseBean responseBean = new ResponseBean();
235
         ResponseBean responseBean = new ResponseBean();
236
         try {
236
         try {
237
             // 参数校验
237
             // 参数校验
238
-            if (CollectionUtils.isEmpty(raiseRecordList)) {
238
+            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords())) {
239
                 responseBean.addError("参数错误");
239
                 responseBean.addError("参数错误");
240
                 return responseBean;
240
                 return responseBean;
241
             }
241
             }
243
             Integer orgId = getOrgId(request);
243
             Integer orgId = getOrgId(request);
244
             TaRaiseRecord tr;
244
             TaRaiseRecord tr;
245
             QueryWrapper<TaRaiseRecord> queryWrapper;
245
             QueryWrapper<TaRaiseRecord> queryWrapper;
246
-            for (TaRaiseRecord record : raiseRecordList) {
246
+            for (TaRaiseRecord record : raiseRecordList.getTaRaiseRecords()) {
247
                 queryWrapper = new QueryWrapper<>();
247
                 queryWrapper = new QueryWrapper<>();
248
                 queryWrapper.eq("org_id", orgId);
248
                 queryWrapper.eq("org_id", orgId);
249
                 queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
249
                 queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
263
             }
263
             }
264
 
264
 
265
             // 设置缴费状态为已缴费
265
             // 设置缴费状态为已缴费
266
-            raiseRecordList.stream().forEach(record -> {
266
+            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
267
                 record.setPayStatus(CommConstant.PAY_STATUS_PAID);
267
                 record.setPayStatus(CommConstant.PAY_STATUS_PAID);
268
                 record.setUpdateDate(LocalDateTime.now());
268
                 record.setUpdateDate(LocalDateTime.now());
269
             });
269
             });
270
 
270
 
271
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList)) {
271
+            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
272
                 responseBean.addSuccess("success");
272
                 responseBean.addSuccess("success");
273
             } else {
273
             } else {
274
                 responseBean.addError("fail");
274
                 responseBean.addError("fail");
288
      * @return
288
      * @return
289
      */
289
      */
290
     @RequestMapping(value = "/admin/batchRefundOfflineRaiseRecord", method = RequestMethod.PUT)
290
     @RequestMapping(value = "/admin/batchRefundOfflineRaiseRecord", method = RequestMethod.PUT)
291
-    public ResponseBean batchRefundOfflineRaiseRecord(@RequestBody List<TaRaiseRecord> raiseRecordList, String refundReason,
291
+    public ResponseBean batchRefundOfflineRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, String refundReason,
292
                                                       HttpServletRequest request) {
292
                                                       HttpServletRequest request) {
293
         logger.info("TaRaiseRecordController.batchRefundOfflineRaiseRecord 接收参数:{},refundReason:{}", JSONObject.toJSONString(raiseRecordList), refundReason);
293
         logger.info("TaRaiseRecordController.batchRefundOfflineRaiseRecord 接收参数:{},refundReason:{}", JSONObject.toJSONString(raiseRecordList), refundReason);
294
 
294
 
295
         ResponseBean responseBean = new ResponseBean();
295
         ResponseBean responseBean = new ResponseBean();
296
         try {
296
         try {
297
             // 参数校验
297
             // 参数校验
298
-            if (CollectionUtils.isEmpty(raiseRecordList) || StringUtils.isBlank(refundReason)) {
298
+            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords())) {
299
                 responseBean.addError("参数错误");
299
                 responseBean.addError("参数错误");
300
                 return responseBean;
300
                 return responseBean;
301
             }
301
             }
303
             Integer orgId = getOrgId(request);
303
             Integer orgId = getOrgId(request);
304
             TaRaiseRecord tr;
304
             TaRaiseRecord tr;
305
             QueryWrapper<TaRaiseRecord> queryWrapper;
305
             QueryWrapper<TaRaiseRecord> queryWrapper;
306
-            for (TaRaiseRecord record : raiseRecordList) {
306
+            for (TaRaiseRecord record : raiseRecordList.getTaRaiseRecords()) {
307
                 queryWrapper = new QueryWrapper<>();
307
                 queryWrapper = new QueryWrapper<>();
308
                 queryWrapper.eq("org_id", orgId);
308
                 queryWrapper.eq("org_id", orgId);
309
                 queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
309
                 queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
326
                 }
326
                 }
327
             }
327
             }
328
 
328
 
329
-            raiseRecordList.stream().forEach(record -> {
329
+            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
330
                 record.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
330
                 record.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
331
                 record.setRefundReason(refundReason);
331
                 record.setRefundReason(refundReason);
332
                 record.setUpdateDate(LocalDateTime.now());
332
                 record.setUpdateDate(LocalDateTime.now());
333
             });
333
             });
334
 
334
 
335
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList)) {
335
+            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
336
                 responseBean.addSuccess("success");
336
                 responseBean.addSuccess("success");
337
             } else {
337
             } else {
338
                 responseBean.addError("fail");
338
                 responseBean.addError("fail");

+ 7
- 0
src/main/java/com/huiju/estateagents/entity/TaRaiseRecord.java View File

186
     @TableField(exist = false)
186
     @TableField(exist = false)
187
     private List<TaHousingResources> taHousingResourcesList= new ArrayList<>();
187
     private List<TaHousingResources> taHousingResourcesList= new ArrayList<>();
188
 
188
 
189
+    /**
190
+     *  认筹单列表
191
+     */
192
+    @TableField(exist = false)
193
+    private List<TaRaiseRecord> taRaiseRecords;
194
+
189
     /**
195
     /**
190
      * 房源信息数
196
      * 房源信息数
191
      */
197
      */
198
+    @TableField(exist = false)
192
     private Integer taHousingResourcesSize;
199
     private Integer taHousingResourcesSize;
193
 }
200
 }