bug fix

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

@@ -61,5 +61,5 @@ public class HousingRaiseRequestBO {
     /**
      * 房源锁定状态
      */
-    private Integer lockingStatus;
+    private String lockingStatus;
 }

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

@@ -61,7 +61,7 @@ public class RaiseRecordRequestBO {
     /**
      * 房源锁定状态
      */
-    private Integer lockingStatus;
+    private String lockingStatus;
 
     /**
      * 认筹手机号

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

@@ -9,7 +9,10 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
+import com.huiju.estateagents.entity.TaSalesBatch;
 import com.huiju.estateagents.service.ITaRaiseService;
+import com.huiju.estateagents.service.ITaSalesBatchService;
+import com.huiju.estateagents.service.ITaSaveService;
 import com.huiju.estateagents.service.ITdCityService;
 import io.swagger.models.auth.In;
 import org.slf4j.Logger;
@@ -41,6 +44,9 @@ public class TaRaiseController extends BaseController {
     @Autowired
     public ITdCityService iTdCityService;
 
+    @Autowired
+    public ITaSalesBatchService iTaSalesBatchService;
+
     /**
      * 获取认筹列表
      *
@@ -130,9 +136,18 @@ public class TaRaiseController extends BaseController {
                 return responseBean;
             }
 
+            //获取销售批次状态
+            TaSalesBatch taSalesBatch = new TaSalesBatch();
+            if (taRaise.getSalesBatchId() != null){
+                QueryWrapper<TaSalesBatch> taSalesBatchQueryWrapper = new QueryWrapper<>();
+                taSalesBatchQueryWrapper.eq("sales_batch_id", taRaise.getSalesBatchId());
+                taSalesBatch = iTaSalesBatchService.getOne(taSalesBatchQueryWrapper);
+
+            }
+
             taRaise.setOrgId(orgId);
             taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null );
-            taRaise.setStatus(CommConstant.IS_PUBLISH);
+            taRaise.setStatus(taSalesBatch.getStatus());
             taRaise.setCreateDate(LocalDateTime.now());
             if (iTaRaiseService.save(taRaise)) {
                 responseBean.addSuccess(taRaise);

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

@@ -163,7 +163,7 @@ public class TaSalesBatchController extends BaseController {
                 raiseQueryWrapper.eq("status", 1);
                 TaRaise raise = taRaiseService.getOne(raiseQueryWrapper);
                 if (raise != null) {
-                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的预选模块", ts.getSalesBatchName()));
+                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的认筹模块", ts.getSalesBatchName()));
                     return responseBean;
                 }
             }

src/main/resources/mapper/TaRaiseMapper.xml

@@ -17,7 +17,7 @@
             t.pay_description_online,
             t.pay_description_offline,
             t.pay_protocol,
-            t.`status`,
+            t2.`status`,
             t.create_date,
             t2.sales_batch_name,
             t2.sales_number,

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -38,9 +38,12 @@
         <if test="bo.status != null">
             AND t.`status` = #{bo.status}
         </if>
-        <if test="bo.lockingStatus != null">
+        <if test="bo.lockingStatus == 'locked'">
             AND t.house_locking_status = #{bo.lockingStatus}
         </if>
+        <if test="bo.lockingStatus == 'unlocked'">
+            AND (t.house_locking_status = #{bo.lockingStatus} || t.house_locking_status is null)
+        </if>
         <if test="bo.apartmentId != null and bo.apartmentId != ''">
             AND t.apartment_id = #{bo.apartmentId}
         </if>