* 新需求

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

@@ -8,12 +8,11 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.*;
-import io.swagger.models.auth.In;
+import com.huiju.estateagents.service.impl.TaRaiseServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Request;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
@@ -49,6 +48,9 @@ public class TaSalesBatchController extends BaseController {
     @Autowired
     public IExtendContentService iExtendContentService;
 
+    @Autowired
+    public TaRaiseServiceImpl taRaiseService;
+
     /**
      * 分页查询列表
      *
@@ -67,7 +69,7 @@ public class TaSalesBatchController extends BaseController {
             //使用分页插件
             IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
 
-            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request),getTaPersonBuildingListByUserId(request));
+            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request), getTaPersonBuildingListByUserId(request));
             responseBean.addSuccess(result);
         } catch (Exception e) {
             e.printStackTrace();
@@ -95,7 +97,7 @@ public class TaSalesBatchController extends BaseController {
             iTaSalesBatchService.save(taSalesBatch);
 
             QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
-            taMiniappQuery.eq("org_id", getOrgId(request));
+            taMiniappQuery.eq("org_id", orgId);
             TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
             // 生成二维码
             ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.HOUSE_QRCODE.replace("#0", taSalesBatch.getSalesBatchId().toString()).replace("#1", "house"), taMiniapp.getMiniappId());
@@ -113,6 +115,24 @@ public class TaSalesBatchController extends BaseController {
             shareContent.setCreateDate(LocalDateTime.now());
             taShareContentService.save(shareContent);
 
+            // 保存认筹信息
+            TaRaise taRaise = new TaRaise();
+            taRaise.setOrgId(orgId);
+            taRaise.setSalesBatchId(taSalesBatch.getSalesBatchId());
+            taRaise.setRaiseStartTime(taSalesBatch.getRaiseStartTime());
+            taRaise.setRaiseEndTime(taSalesBatch.getRaiseEndTime());
+            taRaise.setHouseLockingType(taSalesBatch.getHouseLockingType());
+            taRaise.setRaisePrice(taSalesBatch.getRaisePrice());
+            taRaise.setNeedPreselection(taSalesBatch.getNeedPreselection());
+            taRaise.setDisplayHousePrice(taSalesBatch.getDisplayHousePrice());
+            taRaise.setPayType(taSalesBatch.getPayType());
+            taRaise.setPayDescription(taSalesBatch.getPayDescription());
+            taRaise.setPayProtocol(taSalesBatch.getPayProtocol());
+            taRaise.setStatus(taSalesBatch.getStatus());
+            taRaise.setCreateDate(LocalDateTime.now());
+            taRaiseService.save(taRaise);
+
+            taSalesBatch.setRaiseId(taRaise.getRaiseId());
             responseBean.addSuccess(taSalesBatch);
         } catch (Exception e) {
             e.printStackTrace();
@@ -125,7 +145,8 @@ public class TaSalesBatchController extends BaseController {
     /**
      * 删除批次
      *
-     * @param taSalesBatch 实体对象
+     * @param salesBatchs
+     * @param request
      * @return
      */
     @RequestMapping(value = "/admin/taSalesBatch", method = RequestMethod.PUT)
@@ -133,18 +154,18 @@ public class TaSalesBatchController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             List<Integer> liveActivityIds = new ArrayList<>();
-            for(TaSalesBatch taSalesBatch : salesBatchs){
+            for (TaSalesBatch taSalesBatch : salesBatchs) {
                 liveActivityIds.add(taSalesBatch.getSalesBatchId());
             }
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.eq("content_type",CommConstant.SALES_BATCH);
-            queryWrapper.in("target_id",liveActivityIds);
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("content_type", CommConstant.SALES_BATCH);
+            queryWrapper.in("target_id", liveActivityIds);
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
             list.forEach(e -> {
                 e.setStatus(CommConstant.NOT_PUBLISH);
             });
-            if (list.size() > 0){
+            if (list.size() > 0) {
                 iExtendContentService.updateBatchById(list);
             }
 
@@ -195,16 +216,16 @@ public class TaSalesBatchController extends BaseController {
             taSalesBatch.setSalesBatchId(id);
 
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.eq("content_type",CommConstant.SALES_BATCH);
-            queryWrapper.eq("target_id",taSalesBatch.getSalesBatchId());
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("content_type", CommConstant.SALES_BATCH);
+            queryWrapper.eq("target_id", taSalesBatch.getSalesBatchId());
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
-            if (CommConstant.NOT_PUBLISH.equals(taSalesBatch.getStatus())){
+            if (CommConstant.NOT_PUBLISH.equals(taSalesBatch.getStatus())) {
                 list.forEach(e -> {
                     e.setStatus(CommConstant.NOT_PUBLISH);
                 });
             }
-            if (list.size() > 0){
+            if (list.size() > 0) {
                 iExtendContentService.updateBatchById(list);
             }
 

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

@@ -13,7 +13,7 @@ import java.util.List;
 
 /**
  * <p>
- * 销售批次表 
+ * 销售批次表
  * </p>
  *
  * @author jobob
@@ -104,4 +104,68 @@ public class TaSalesBatch implements Serializable {
     @TableField(exist = false)
     private List<TaShareContent> shareContents;
 
+    /**
+     * V3.5.12增加
+     */
+
+    /**
+     * 缴费方式 onLine线上offLine线下
+     */
+    @TableField(exist = false)
+    private String payType;
+
+    /**
+     * 认筹是否预选
+     */
+    @TableField(exist = false)
+    private Boolean needPreselection;
+
+    /**
+     * 认筹金额 单位是分！
+     */
+    @TableField(exist = false)
+    private Integer raisePrice;
+
+    /**
+     * 认筹开始时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime raiseStartTime;
+
+    /**
+     * 认筹结束时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime raiseEndTime;
+
+    /**
+     * 是否展示房源价格
+     */
+    @TableField(exist = false)
+    private Boolean displayHousePrice;
+
+    /**
+     * 线上选房协议
+     */
+    @TableField(exist = false)
+    private String payProtocol;
+
+    /**
+     * 缴费说明
+     */
+    @TableField(exist = false)
+    private String payDescription;
+
+    /**
+     * 锁房方式 auto自动锁房，manual手动锁房
+     */
+    @TableField(exist = false)
+    private String houseLockingType;
+
+    /**
+     * 认筹Id
+     */
+    @TableField(exist = false)
+    private Integer raiseId;
+
 }

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

@@ -36,4 +36,12 @@ public interface ITaSalesBatchService extends IService<TaSalesBatch> {
      * @return
      */
     ResponseBean getSalesBatchById(Integer salesBatchId);
+
+    /**
+     * 获取销售批次详情 cms端
+     *
+     * @param salesBatchId
+     * @return
+     */
+    ResponseBean getSalesBatchDetailForCms(Integer salesBatchId);
 }

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

@@ -194,4 +194,9 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
         responseBean.addSuccess(result);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getSalesBatchDetailForCms(Integer salesBatchId) {
+        return null;
+    }
 }