Pārlūkot izejas kodu

* 预选接口优化

顾绍勇 5 gadus atpakaļ
vecāks
revīzija
7dbbbc69c5

+ 18
- 2
src/main/java/com/huiju/estateagents/controller/TaPreselectionRecordController.java Parādīt failu

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
17 17
 import org.springframework.web.bind.annotation.*;
18 18
 
19 19
 import javax.servlet.http.HttpServletRequest;
20
+import java.util.List;
20 21
 
21 22
 /**
22 23
  * <p>
@@ -237,9 +238,24 @@ public class TaPreselectionRecordController extends BaseController {
237 238
         return responseBean;
238 239
     }
239 240
 
240
-    @RequestMapping(value = "", method = RequestMethod.PUT)
241
-    public ResponseBean btachDeletPresecretRecord() {
241
+    /**
242
+     * 批量删除预选记录
243
+     *
244
+     * @param preselectionRecordList
245
+     * @param request
246
+     * @return
247
+     */
248
+    @RequestMapping(value = "/admin/preselect/batchDelete", method = RequestMethod.PUT)
249
+    public ResponseBean batchDeletePreselectRecord(@RequestBody List<TaPreselectionRecord> preselectionRecordList,
250
+                                                   HttpServletRequest request) {
242 251
         ResponseBean responseBean = new ResponseBean();
252
+        try {
253
+            responseBean = iTaPreselectionRecordService.batchDeletePreselectRecord(preselectionRecordList, getOrgId(request));
254
+        } catch (Exception e) {
255
+            e.printStackTrace();
256
+            logger.error("batchDeletePreselectRecord -=- {}", e.toString());
257
+            responseBean.addError(e.getMessage());
258
+        }
243 259
         return responseBean;
244 260
     }
245 261
 }

+ 4
- 0
src/main/java/com/huiju/estateagents/controller/TaRaiseController.java Parādīt failu

@@ -10,6 +10,7 @@ import com.huiju.estateagents.common.CommConstant;
10 10
 import com.huiju.estateagents.entity.TaPersonBuilding;
11 11
 import com.huiju.estateagents.entity.TaRaise;
12 12
 import com.huiju.estateagents.service.ITaRaiseService;
13
+import com.huiju.estateagents.service.ITdCityService;
13 14
 import org.slf4j.Logger;
14 15
 import org.slf4j.LoggerFactory;
15 16
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,9 @@ public class TaRaiseController extends BaseController {
35 36
     @Autowired
36 37
     public ITaRaiseService iTaRaiseService;
37 38
 
39
+    @Autowired
40
+    public ITdCityService iTdCityService;
41
+
38 42
     /**
39 43
      * 获取认筹列表
40 44
      *

+ 12
- 9
src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java Parādīt failu

@@ -119,7 +119,10 @@ public class TaRaiseRecordController extends BaseController {
119 119
     }
120 120
 
121 121
     /**
122
-     * 条件查询缴费单
122
+     * 条件查询缴费单/退费单
123
+     * 备注:
124
+     * 缴费单:payStatus传 paid
125
+     * 退费单:payStatus传 refunded
123 126
      *
124 127
      * @param orderRequestBO
125 128
      * @param pageNumber
@@ -437,10 +440,10 @@ public class TaRaiseRecordController extends BaseController {
437 440
      * @return
438 441
      */
439 442
     @RequestMapping(value = "/wx/taRaiseRecord", method = RequestMethod.POST)
440
-    public ResponseBean wxRaiseRecordAdd(@RequestBody TaRaiseRecord taRaiseRecord,HttpServletRequest request) {
443
+    public ResponseBean wxRaiseRecordAdd(@RequestBody TaRaiseRecord taRaiseRecord, HttpServletRequest request) {
441 444
         ResponseBean responseBean = new ResponseBean();
442 445
         try {
443
-            responseBean.addSuccess(iTaRaiseRecordService.saveRaiseInfo(taRaiseRecord,getOrgId(request),getPersonId(request)));
446
+            responseBean.addSuccess(iTaRaiseRecordService.saveRaiseInfo(taRaiseRecord, getOrgId(request), getPersonId(request)));
444 447
         } catch (Exception e) {
445 448
             logger.error("微信端下认筹单 -=- {}", e.toString());
446 449
             responseBean.addError(e.getMessage());
@@ -456,7 +459,7 @@ public class TaRaiseRecordController extends BaseController {
456 459
      * @return
457 460
      */
458 461
     @RequestMapping(value = "/wx/taRaiseRecord/{raiseRecordId}", method = RequestMethod.POST)
459
-    public ResponseBean wxGetRaiseRecordById(@PathVariable Integer raiseRecordId,HttpServletRequest request) {
462
+    public ResponseBean wxGetRaiseRecordById(@PathVariable Integer raiseRecordId, HttpServletRequest request) {
460 463
         ResponseBean responseBean = new ResponseBean();
461 464
         try {
462 465
             //获取认筹单信息
@@ -468,11 +471,11 @@ public class TaRaiseRecordController extends BaseController {
468 471
             //订单信息
469 472
             TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
470 473
 
471
-            Map<String,Object> map = new HashMap<>();
472
-            map.put("taRaiseRecord",taRaiseRecord);
473
-            map.put("taRaiseHouseList",taRaiseHouseList);
474
-            map.put("houseList",houseList);
475
-            map.put("taOrder",taOrder);
474
+            Map<String, Object> map = new HashMap<>();
475
+            map.put("taRaiseRecord", taRaiseRecord);
476
+            map.put("taRaiseHouseList", taRaiseHouseList);
477
+            map.put("houseList", houseList);
478
+            map.put("taOrder", taOrder);
476 479
             responseBean.addSuccess(map);
477 480
         } catch (Exception e) {
478 481
             e.printStackTrace();

+ 9
- 0
src/main/java/com/huiju/estateagents/mapper/TaPreselectionRecordMapper.java Parādīt failu

@@ -53,4 +53,13 @@ public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRec
53 53
      * @return
54 54
      */
55 55
     List<TaPreselectionRecordPO> selectPreSelectRecordList(Page page, @Param("bo") PresecretRecordRequestBO bo);
56
+
57
+    /**
58
+     * 批量删除预选记录
59
+     *
60
+     * @param preselectionRecordList
61
+     * @param orgId
62
+     */
63
+    void batchDeletePreselectRecord(@Param("preselectionRecordList") List<TaPreselectionRecord> preselectionRecordList,
64
+                                    @Param("orgId") Integer orgId);
56 65
 }

+ 11
- 0
src/main/java/com/huiju/estateagents/service/ITaPreselectionRecordService.java Parādīt failu

@@ -7,6 +7,8 @@ import com.huiju.estateagents.bo.request.PresecretRecordRequestBO;
7 7
 import com.huiju.estateagents.entity.TaPreselectionRecord;
8 8
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
9 9
 
10
+import java.util.List;
11
+
10 12
 /**
11 13
  * <p>
12 14
  * 预选记录表  服务类
@@ -47,4 +49,13 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
47 49
 
48 50
     ResponseBean selectPreSelectRecordList(PresecretRecordRequestBO recordRequestBO, Integer pageNum, Integer pageSize);
49 51
 
52
+    /**
53
+     * 批量删除预选记录
54
+     *
55
+     * @param preselectionRecordList
56
+     * @param orgId
57
+     * @return
58
+     */
59
+    ResponseBean batchDeletePreselectRecord(List<TaPreselectionRecord> preselectionRecordList, Integer orgId);
60
+
50 61
 }

+ 8
- 0
src/main/java/com/huiju/estateagents/service/impl/TaPreselectionRecordServiceImpl.java Parādīt failu

@@ -224,6 +224,14 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
224 224
         return ResponseBean.success(page);
225 225
     }
226 226
 
227
+    @Override
228
+    public ResponseBean batchDeletePreselectRecord(List<TaPreselectionRecord> preselectionRecordList, Integer orgId) {
229
+        ResponseBean responseBean = new ResponseBean();
230
+
231
+
232
+        return responseBean;
233
+    }
234
+
227 235
     /**
228 236
      * 发送订阅消息
229 237
      *

+ 11
- 0
src/main/resources/mapper/TaPreselectionRecordMapper.xml Parādīt failu

@@ -125,4 +125,15 @@
125 125
 
126 126
     </select>
127 127
 
128
+    <update id="batchDeletePreselectRecord">
129
+        UPDATE ta_preselection_record t
130
+          SET t.`status` = - 1,t.update_date = now()
131
+        WHERE
132
+            t.org_id = #{orgId}
133
+            AND t.preselection_id IN
134
+        <foreach collection="preselectionRecordList" item="record" open="(" close=")" separator=",">
135
+            #{record.preselectionRecordId}
136
+        </foreach>
137
+    </update>
138
+
128 139
 </mapper>