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

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

@@ -50,12 +50,12 @@ public class TaRaise implements Serializable {
     /**
      * 认筹开始时间
      */
-    private LocalDateTime raiseStartTime;
+    private String raiseStartTime;
 
     /**
      * 认筹结束时间
      */
-    private LocalDateTime raiseEndTime;
+    private String raiseEndTime;
 
     /**
      * 锁房方式 auto自动锁房，manual手动锁房

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
@@ -24,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+import sun.util.locale.LocaleUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -311,8 +313,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             }
         }
         //判断是否在时间之内
-        LocalDateTime raiseStartTime = taRaise.getRaiseStartTime();
-        LocalDateTime raiseEndTime = taRaise.getRaiseEndTime();
+
+        LocalDateTime raiseStartTime = DateUtils.dayToLocalDateime(taRaise.getRaiseStartTime());
+        LocalDateTime raiseEndTime = DateUtils.dayToLocalDateime(taRaise.getRaiseEndTime());
         LocalDateTime now = LocalDateTime.now();
         if (now.isBefore(raiseStartTime) || now.isAfter(raiseEndTime)){
             return false;

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -41,7 +41,7 @@
                 AND t2.house_locking_status = 'locked'
             </if>
             <if test="houseLockingStatus == 'unlocked'">
-                AND t2.house_locking_status != 'locked'
+                AND ( t2.house_locking_status != 'locked' OR t2.house_locking_status IS NULL )
             </if>
             ) t3
             LEFT JOIN ta_building t4 ON t3.buildingId = t4.building_id

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -168,9 +168,12 @@
             <if test = "bo.refundNo != null and bo.refundNo != ''">
                 AND t2.refund_no = #{bo.refundNo}
             </if>
-            <if test = "bo.payStatus != null and bo.payStatus != ''">
+            <if test = "bo.payStatus == 'paid'">
                 AND t.pay_status = #{bo.payStatus}
             </if>
+            <if test = "bo.payStatus == 'refunded'">
+                AND t.pay_status IN ('refunded','change')
+            </if>
             <if test = "bo.payStartTime != null and bo.payStartTime != ''">
                 AND t2.pay_time &gt;= STR_TO_DATE(#{bo.payStartTime}, '%Y-%m-%d %H:%i:%s')
             </if>