* 预选接口优化

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

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * <p>
@@ -237,9 +238,24 @@ public class TaPreselectionRecordController extends BaseController {
         return responseBean;
     }
 
-    @RequestMapping(value = "", method = RequestMethod.PUT)
-    public ResponseBean btachDeletPresecretRecord() {
+    /**
+     * 批量删除预选记录
+     *
+     * @param preselectionRecordList
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/preselect/batchDelete", method = RequestMethod.PUT)
+    public ResponseBean batchDeletePreselectRecord(@RequestBody List<TaPreselectionRecord> preselectionRecordList,
+                                                   HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaPreselectionRecordService.batchDeletePreselectRecord(preselectionRecordList, getOrgId(request));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("batchDeletePreselectRecord -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
         return responseBean;
     }
 }

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

@@ -10,6 +10,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
 import com.huiju.estateagents.service.ITaRaiseService;
+import com.huiju.estateagents.service.ITdCityService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,9 @@ public class TaRaiseController extends BaseController {
     @Autowired
     public ITaRaiseService iTaRaiseService;
 
+    @Autowired
+    public ITdCityService iTdCityService;
+
     /**
      * 获取认筹列表
      *

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

@@ -119,7 +119,10 @@ public class TaRaiseRecordController extends BaseController {
     }
 
     /**
-     * 条件查询缴费单
+     * 条件查询缴费单/退费单
+     * 备注：
+     * 缴费单：payStatus传 paid
+     * 退费单：payStatus传 refunded
      *
      * @param orderRequestBO
      * @param pageNumber
@@ -437,10 +440,10 @@ public class TaRaiseRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/taRaiseRecord", method = RequestMethod.POST)
-    public ResponseBean wxRaiseRecordAdd(@RequestBody TaRaiseRecord taRaiseRecord,HttpServletRequest request) {
+    public ResponseBean wxRaiseRecordAdd(@RequestBody TaRaiseRecord taRaiseRecord, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaRaiseRecordService.saveRaiseInfo(taRaiseRecord,getOrgId(request),getPersonId(request)));
+            responseBean.addSuccess(iTaRaiseRecordService.saveRaiseInfo(taRaiseRecord, getOrgId(request), getPersonId(request)));
         } catch (Exception e) {
             logger.error("微信端下认筹单 -=- {}", e.toString());
             responseBean.addError(e.getMessage());
@@ -456,7 +459,7 @@ public class TaRaiseRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/taRaiseRecord/{raiseRecordId}", method = RequestMethod.POST)
-    public ResponseBean wxGetRaiseRecordById(@PathVariable Integer raiseRecordId,HttpServletRequest request) {
+    public ResponseBean wxGetRaiseRecordById(@PathVariable Integer raiseRecordId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //获取认筹单信息
@@ -468,11 +471,11 @@ public class TaRaiseRecordController extends BaseController {
             //订单信息
             TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
 
-            Map<String,Object> map = new HashMap<>();
-            map.put("taRaiseRecord",taRaiseRecord);
-            map.put("taRaiseHouseList",taRaiseHouseList);
-            map.put("houseList",houseList);
-            map.put("taOrder",taOrder);
+            Map<String, Object> map = new HashMap<>();
+            map.put("taRaiseRecord", taRaiseRecord);
+            map.put("taRaiseHouseList", taRaiseHouseList);
+            map.put("houseList", houseList);
+            map.put("taOrder", taOrder);
             responseBean.addSuccess(map);
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -53,4 +53,13 @@ public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRec
      * @return
      */
     List<TaPreselectionRecordPO> selectPreSelectRecordList(Page page, @Param("bo") PresecretRecordRequestBO bo);
+
+    /**
+     * 批量删除预选记录
+     *
+     * @param preselectionRecordList
+     * @param orgId
+     */
+    void batchDeletePreselectRecord(@Param("preselectionRecordList") List<TaPreselectionRecord> preselectionRecordList,
+                                    @Param("orgId") Integer orgId);
 }

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

@@ -7,6 +7,8 @@ import com.huiju.estateagents.bo.request.PresecretRecordRequestBO;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
 
+import java.util.List;
+
 /**
  * <p>
  * 预选记录表  服务类
@@ -47,4 +49,13 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
 
     ResponseBean selectPreSelectRecordList(PresecretRecordRequestBO recordRequestBO, Integer pageNum, Integer pageSize);
 
+    /**
+     * 批量删除预选记录
+     *
+     * @param preselectionRecordList
+     * @param orgId
+     * @return
+     */
+    ResponseBean batchDeletePreselectRecord(List<TaPreselectionRecord> preselectionRecordList, Integer orgId);
+
 }

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

@@ -224,6 +224,14 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         return ResponseBean.success(page);
     }
 
+    @Override
+    public ResponseBean batchDeletePreselectRecord(List<TaPreselectionRecord> preselectionRecordList, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+
+
+        return responseBean;
+    }
+
     /**
      * 发送订阅消息
      *

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -125,4 +125,15 @@
 
     </select>
 
+    <update id="batchDeletePreselectRecord">
+        UPDATE ta_preselection_record t
+          SET t.`status` = - 1,t.update_date = now()
+        WHERE
+            t.org_id = #{orgId}
+            AND t.preselection_id IN
+        <foreach collection="preselectionRecordList" item="record" open="(" close=")" separator=",">
+            #{record.preselectionRecordId}
+        </foreach>
+    </update>
+
 </mapper>