Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/bo/request/RaiseOrderRequestBO.java

      */
     private Integer orderId;
 
+    /**
+     * 订单表ID
+     */
+    private Integer refundedOrderId;
+
     /**
      * 认筹单表ID
      */

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

     @Autowired
     public ITaBuildingImgService taBuildingImgService;
 
+    @Autowired
+    public ITaSalesBatchService taSalesBatchService;
+
     /**
      * 分页查询列表
      *
             QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
             taRaiseHouseQueryWrapper.in(taRaiseRecordList.size() > 0, "raise_record_id", taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
             List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
-
+            TaSalesBatch taSalesBatch = taSalesBatchService.getById(salesBatchId);
             taHousingResourcesPOList.forEach(e -> {
                 taPreselectionRecordList.forEach(p -> {
                     //我的预选
                     List<TaBuildingImg> apartMentList = taBuildingImgService.getAparemnetList(apartMentIds);
                     e.setApartmentImgList(apartMentList);
                 }
+
+                e.setDisplayHousePrice(taSalesBatch.getDisplayHousePrice());
             });
 
             responseBean.addSuccess(taHousingResourcesPOList);

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

      */
     @TableField(exist = false)
     private String captcha;
+
+    /**
+     * 订单id
+     */
+    @TableField(exist = false)
+    private Integer refundedOrderId;
 }

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

 import com.huiju.estateagents.mapper.TaPreselectionRecordMapper;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
+import com.huiju.estateagents.service.ITaBuildingApartmentService;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
 import com.huiju.estateagents.service.ITaPreselectionRecordService;
 import org.apache.commons.collections.CollectionUtils;
     @Autowired
     private ITaHousingResourcesService taHousingResourcesService;
 
+    @Autowired
+    public ITaBuildingApartmentService taBuildingApartmentService;
+
 
     @Override
     public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId, String buildingId,
             housingQueryWrapper.eq("org_id", record.getOrgId());
             housingQueryWrapper.eq("house_id", record.getHouseId());
             housingQueryWrapper.ne("status", -1);
-            record.setHousingInfo(taHousingResourcesService.getOne(housingQueryWrapper));
+            TaHousingResources housingResources = taHousingResourcesService.getOne(housingQueryWrapper);
+            //户型图name
+            TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(housingResources.getApartmentId());
+            housingResources.setApartmentName(buildingApartment.getApartmentName());
+            housingResources.setBuildingArea(buildingApartment.getBuildingArea());
+            housingResources.setInsideArea(buildingApartment.getInsideArea());
+            record.setHousingInfo(housingResources);
         });
 
         iPage.setRecords(resultList);

src/main/resources/mapper/TaHousingResourcesMapper.xml

             AND t4.`status` = 1
         <if test = "source == 'raiseChoose'">
             AND ( t6.`status` != 0 OR t6.`status` IS NULL )
-            --AND (t.house_locking_status  != 'locked' OR t.house_locking_status IS NULL)
             AND t7.raise_start_time &lt;= now() AND t7.raise_end_time &gt;= now()
             <if test="personId != null and personId != ''">
                 AND (t6.person_id != #{personId} OR t6.person_id IS NULL)

src/main/resources/mapper/TaRaiseRecordMapper.xml

             t2.trade_no,
             t2.transaction_id,
             t4.refund_no,
+            t4.order_id as refunded_order_id,
             t2.total_fee
         FROM
             ta_raise_record t
             <if test = "bo.orderId != null and bo.orderId != ''">
                 AND t2.order_id = #{bo.orderId}
             </if>
+            <if test = "bo.refundedOrderId != null and bo.refundedOrderId != ''">
+                AND t4.order_id = #{bo.refundedOrderId}
+            </if>
             <if test = "bo.raiseRecordId != null and bo.raiseRecordId != ''">
                 AND t.raise_record_id = #{bo.raiseRecordId}
             </if>
                 AND t2.refund_no = #{bo.refundNo}
             </if>
             <if test = "bo.payStatus == 'paid'">
-                AND t.pay_status = #{bo.payStatus}
+                AND t.pay_status IN ('refunded','paid')
             </if>
             <if test = "bo.payStatus == 'refunded'">
                 AND t.pay_status IN ('refunded','change')