顾绍勇 преди 5 години
родител
ревизия
ff2a2b78fe
променени са 1 файла, в които са добавени 27 реда и са изтрити 27 реда
  1. 27
    27
      src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java

+ 27
- 27
src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java Целия файл

161
     /**
161
     /**
162
      * 批量作废
162
      * 批量作废
163
      *
163
      *
164
-     * @param raiseRecordList
164
+     * @param raiseRecord
165
      * @return
165
      * @return
166
      */
166
      */
167
     @RequestMapping(value = "/admin/batchInvalidRaiseRecord", method = RequestMethod.PUT)
167
     @RequestMapping(value = "/admin/batchInvalidRaiseRecord", method = RequestMethod.PUT)
168
-    public ResponseBean batchInvalidRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, HttpServletRequest request) {
168
+    public ResponseBean batchInvalidRaiseRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
169
 
169
 
170
-        logger.info("TaRaiseRecordController.batchInvalidRaiseRecord 接收参数:TaRaiseRecord:{}", JSONObject.toJSONString(raiseRecordList));
170
+        logger.info("TaRaiseRecordController.batchInvalidRaiseRecord 接收参数:TaRaiseRecord:{}", JSONObject.toJSONString(raiseRecord));
171
 
171
 
172
         ResponseBean responseBean = new ResponseBean();
172
         ResponseBean responseBean = new ResponseBean();
173
         try {
173
         try {
174
             // 校验参数
174
             // 校验参数
175
-            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords()) || StringUtils.isBlank(raiseRecordList.getInvalidReason())) {
175
+            if (CollectionUtils.isEmpty(raiseRecord.getTaRaiseRecords()) || StringUtils.isBlank(raiseRecord.getInvalidReason())) {
176
                 responseBean.addError("参数错误");
176
                 responseBean.addError("参数错误");
177
                 return responseBean;
177
                 return responseBean;
178
             }
178
             }
180
             // 获取用户信息
180
             // 获取用户信息
181
             TaUser taUser = taUserService.getUserInfoById(getUserId(request), getOrgId(request));
181
             TaUser taUser = taUserService.getUserInfoById(getUserId(request), getOrgId(request));
182
 
182
 
183
-            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
183
+            raiseRecord.getTaRaiseRecords().stream().forEach(record -> {
184
                 if (taUser != null) {
184
                 if (taUser != null) {
185
                     record.setUpdateUserName(taUser.getUserName());
185
                     record.setUpdateUserName(taUser.getUserName());
186
                 }
186
                 }
187
-                record.setInvalidReason(raiseRecordList.getInvalidReason());
187
+                record.setInvalidReason(raiseRecord.getInvalidReason());
188
                 record.setUpdateDate(LocalDateTime.now());
188
                 record.setUpdateDate(LocalDateTime.now());
189
                 record.setStatus(0);
189
                 record.setStatus(0);
190
             });
190
             });
191
 
191
 
192
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
192
+            if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
193
                 responseBean.addSuccess("success");
193
                 responseBean.addSuccess("success");
194
             } else {
194
             } else {
195
                 responseBean.addError("fail");
195
                 responseBean.addError("fail");
204
     /**
204
     /**
205
      * 批量删除
205
      * 批量删除
206
      *
206
      *
207
-     * @param raiseRecordList
207
+     * @param raiseRecord
208
      * @return
208
      * @return
209
      */
209
      */
210
     @RequestMapping(value = "/admin/batchDeleteRaiseRecord", method = RequestMethod.PUT)
210
     @RequestMapping(value = "/admin/batchDeleteRaiseRecord", method = RequestMethod.PUT)
211
-    public ResponseBean batchDeleteRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, HttpServletRequest request) {
212
-        logger.info("TaRaiseRecordController.batchDeleteRaiseRecord 接收参数:{}", JSONObject.toJSONString(raiseRecordList));
211
+    public ResponseBean batchDeleteRaiseRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
212
+        logger.info("TaRaiseRecordController.batchDeleteRaiseRecord 接收参数:{}", JSONObject.toJSONString(raiseRecord));
213
 
213
 
214
         ResponseBean responseBean = new ResponseBean();
214
         ResponseBean responseBean = new ResponseBean();
215
         try {
215
         try {
216
             // 参数校验
216
             // 参数校验
217
-            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords())) {
217
+            if (CollectionUtils.isEmpty(raiseRecord.getTaRaiseRecords())) {
218
                 responseBean.addError("参数错误");
218
                 responseBean.addError("参数错误");
219
                 return responseBean;
219
                 return responseBean;
220
             }
220
             }
222
             // 获取用户信息
222
             // 获取用户信息
223
             TaUser taUser = taUserService.getUserInfoById(getUserId(request), getOrgId(request));
223
             TaUser taUser = taUserService.getUserInfoById(getUserId(request), getOrgId(request));
224
 
224
 
225
-            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
225
+            raiseRecord.getTaRaiseRecords().stream().forEach(record -> {
226
                 if (taUser != null) {
226
                 if (taUser != null) {
227
                     record.setUpdateUserName(taUser.getUserName());
227
                     record.setUpdateUserName(taUser.getUserName());
228
                 }
228
                 }
230
                 record.setUpdateDate(LocalDateTime.now());
230
                 record.setUpdateDate(LocalDateTime.now());
231
             });
231
             });
232
 
232
 
233
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
233
+            if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
234
                 responseBean.addSuccess("success");
234
                 responseBean.addSuccess("success");
235
             } else {
235
             } else {
236
                 responseBean.addError("fail");
236
                 responseBean.addError("fail");
245
     /**
245
     /**
246
      * 批量线下缴费
246
      * 批量线下缴费
247
      *
247
      *
248
-     * @param raiseRecordList
248
+     * @param raiseRecord
249
      * @return
249
      * @return
250
      */
250
      */
251
     @RequestMapping(value = "/admin/batchPayOfflineRaiseRecord", method = RequestMethod.PUT)
251
     @RequestMapping(value = "/admin/batchPayOfflineRaiseRecord", method = RequestMethod.PUT)
252
-    public ResponseBean batchPayOfflineRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, HttpServletRequest request) {
253
-        logger.info("TaRaiseRecordController.batchPayOfflineRaiseRecord 接收参数:{}", JSONObject.toJSONString(raiseRecordList));
252
+    public ResponseBean batchPayOfflineRaiseRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
253
+        logger.info("TaRaiseRecordController.batchPayOfflineRaiseRecord 接收参数:{}", JSONObject.toJSONString(raiseRecord));
254
 
254
 
255
         ResponseBean responseBean = new ResponseBean();
255
         ResponseBean responseBean = new ResponseBean();
256
         try {
256
         try {
257
             // 参数校验
257
             // 参数校验
258
-            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords())) {
258
+            if (CollectionUtils.isEmpty(raiseRecord.getTaRaiseRecords())) {
259
                 responseBean.addError("参数错误");
259
                 responseBean.addError("参数错误");
260
                 return responseBean;
260
                 return responseBean;
261
             }
261
             }
263
             Integer orgId = getOrgId(request);
263
             Integer orgId = getOrgId(request);
264
             TaRaiseRecord tr;
264
             TaRaiseRecord tr;
265
             QueryWrapper<TaRaiseRecord> queryWrapper;
265
             QueryWrapper<TaRaiseRecord> queryWrapper;
266
-            for (TaRaiseRecord record : raiseRecordList.getTaRaiseRecords()) {
266
+            for (TaRaiseRecord record : raiseRecord.getTaRaiseRecords()) {
267
                 queryWrapper = new QueryWrapper<>();
267
                 queryWrapper = new QueryWrapper<>();
268
                 queryWrapper.eq("org_id", orgId);
268
                 queryWrapper.eq("org_id", orgId);
269
                 queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
269
                 queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
286
             TaUser taUser = taUserService.getUserInfoById(getUserId(request), orgId);
286
             TaUser taUser = taUserService.getUserInfoById(getUserId(request), orgId);
287
 
287
 
288
             // 设置缴费状态为已缴费
288
             // 设置缴费状态为已缴费
289
-            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
289
+            raiseRecord.getTaRaiseRecords().stream().forEach(record -> {
290
                 if (taUser != null) {
290
                 if (taUser != null) {
291
                     record.setUpdateUserName(taUser.getUserName());
291
                     record.setUpdateUserName(taUser.getUserName());
292
                 }
292
                 }
294
                 record.setUpdateDate(LocalDateTime.now());
294
                 record.setUpdateDate(LocalDateTime.now());
295
             });
295
             });
296
 
296
 
297
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
297
+            if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
298
                 responseBean.addSuccess("success");
298
                 responseBean.addSuccess("success");
299
             } else {
299
             } else {
300
                 responseBean.addError("fail");
300
                 responseBean.addError("fail");
309
     /**
309
     /**
310
      * 批量线下退费
310
      * 批量线下退费
311
      *
311
      *
312
-     * @param raiseRecordList
312
+     * @param raiseRecord
313
      * @param refundReason    退款原因
313
      * @param refundReason    退款原因
314
      * @return
314
      * @return
315
      */
315
      */
316
     @RequestMapping(value = "/admin/batchRefundOfflineRaiseRecord", method = RequestMethod.PUT)
316
     @RequestMapping(value = "/admin/batchRefundOfflineRaiseRecord", method = RequestMethod.PUT)
317
-    public ResponseBean batchRefundOfflineRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, String refundReason,
317
+    public ResponseBean batchRefundOfflineRaiseRecord(@RequestBody TaRaiseRecord raiseRecord, String refundReason,
318
                                                       HttpServletRequest request) {
318
                                                       HttpServletRequest request) {
319
-        logger.info("TaRaiseRecordController.batchRefundOfflineRaiseRecord 接收参数:{},refundReason:{}", JSONObject.toJSONString(raiseRecordList), refundReason);
319
+        logger.info("TaRaiseRecordController.batchRefundOfflineRaiseRecord 接收参数:{},refundReason:{}", JSONObject.toJSONString(raiseRecord), refundReason);
320
 
320
 
321
         ResponseBean responseBean = new ResponseBean();
321
         ResponseBean responseBean = new ResponseBean();
322
         try {
322
         try {
323
             // 参数校验
323
             // 参数校验
324
-            if (CollectionUtils.isEmpty(raiseRecordList.getTaRaiseRecords())) {
324
+            if (CollectionUtils.isEmpty(raiseRecord.getTaRaiseRecords())) {
325
                 responseBean.addError("参数错误");
325
                 responseBean.addError("参数错误");
326
                 return responseBean;
326
                 return responseBean;
327
             }
327
             }
329
             Integer orgId = getOrgId(request);
329
             Integer orgId = getOrgId(request);
330
             TaRaiseRecord tr;
330
             TaRaiseRecord tr;
331
             QueryWrapper<TaRaiseRecord> queryWrapper;
331
             QueryWrapper<TaRaiseRecord> queryWrapper;
332
-            for (TaRaiseRecord record : raiseRecordList.getTaRaiseRecords()) {
332
+            for (TaRaiseRecord record : raiseRecord.getTaRaiseRecords()) {
333
                 queryWrapper = new QueryWrapper<>();
333
                 queryWrapper = new QueryWrapper<>();
334
                 queryWrapper.eq("org_id", orgId);
334
                 queryWrapper.eq("org_id", orgId);
335
                 queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
335
                 queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
355
             // 获取用户信息
355
             // 获取用户信息
356
             TaUser taUser = taUserService.getUserInfoById(getUserId(request), orgId);
356
             TaUser taUser = taUserService.getUserInfoById(getUserId(request), orgId);
357
 
357
 
358
-            raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
358
+            raiseRecord.getTaRaiseRecords().stream().forEach(record -> {
359
                 if (taUser != null) {
359
                 if (taUser != null) {
360
                     record.setUpdateUserName(taUser.getUserName());
360
                     record.setUpdateUserName(taUser.getUserName());
361
                 }
361
                 }
364
                 record.setUpdateDate(LocalDateTime.now());
364
                 record.setUpdateDate(LocalDateTime.now());
365
             });
365
             });
366
 
366
 
367
-            if (iTaRaiseRecordService.updateBatchById(raiseRecordList.getTaRaiseRecords())) {
367
+            if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
368
                 responseBean.addSuccess("success");
368
                 responseBean.addSuccess("success");
369
             } else {
369
             } else {
370
                 responseBean.addError("fail");
370
                 responseBean.addError("fail");