瀏覽代碼

* 新需求

顾绍勇 5 年之前
父節點
當前提交
d4f821d2df

+ 36
- 15
src/main/java/com/huiju/estateagents/controller/TaSalesBatchController.java 查看文件

8
 import com.huiju.estateagents.common.CommConstant;
8
 import com.huiju.estateagents.common.CommConstant;
9
 import com.huiju.estateagents.entity.*;
9
 import com.huiju.estateagents.entity.*;
10
 import com.huiju.estateagents.service.*;
10
 import com.huiju.estateagents.service.*;
11
-import io.swagger.models.auth.In;
11
+import com.huiju.estateagents.service.impl.TaRaiseServiceImpl;
12
 import org.slf4j.Logger;
12
 import org.slf4j.Logger;
13
 import org.slf4j.LoggerFactory;
13
 import org.slf4j.LoggerFactory;
14
 import org.springframework.beans.factory.annotation.Autowired;
14
 import org.springframework.beans.factory.annotation.Autowired;
15
 import org.springframework.web.bind.annotation.*;
15
 import org.springframework.web.bind.annotation.*;
16
-import sun.misc.Request;
17
 
16
 
18
 import javax.servlet.http.HttpServletRequest;
17
 import javax.servlet.http.HttpServletRequest;
19
 import java.time.LocalDateTime;
18
 import java.time.LocalDateTime;
49
     @Autowired
48
     @Autowired
50
     public IExtendContentService iExtendContentService;
49
     public IExtendContentService iExtendContentService;
51
 
50
 
51
+    @Autowired
52
+    public TaRaiseServiceImpl taRaiseService;
53
+
52
     /**
54
     /**
53
      * 分页查询列表
55
      * 分页查询列表
54
      *
56
      *
67
             //使用分页插件
69
             //使用分页插件
68
             IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
70
             IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
69
 
71
 
70
-            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request),getTaPersonBuildingListByUserId(request));
72
+            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request), getTaPersonBuildingListByUserId(request));
71
             responseBean.addSuccess(result);
73
             responseBean.addSuccess(result);
72
         } catch (Exception e) {
74
         } catch (Exception e) {
73
             e.printStackTrace();
75
             e.printStackTrace();
95
             iTaSalesBatchService.save(taSalesBatch);
97
             iTaSalesBatchService.save(taSalesBatch);
96
 
98
 
97
             QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
99
             QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
98
-            taMiniappQuery.eq("org_id", getOrgId(request));
100
+            taMiniappQuery.eq("org_id", orgId);
99
             TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
101
             TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
100
             // 生成二维码
102
             // 生成二维码
101
             ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.HOUSE_QRCODE.replace("#0", taSalesBatch.getSalesBatchId().toString()).replace("#1", "house"), taMiniapp.getMiniappId());
103
             ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.HOUSE_QRCODE.replace("#0", taSalesBatch.getSalesBatchId().toString()).replace("#1", "house"), taMiniapp.getMiniappId());
113
             shareContent.setCreateDate(LocalDateTime.now());
115
             shareContent.setCreateDate(LocalDateTime.now());
114
             taShareContentService.save(shareContent);
116
             taShareContentService.save(shareContent);
115
 
117
 
118
+            // 保存认筹信息
119
+            TaRaise taRaise = new TaRaise();
120
+            taRaise.setOrgId(orgId);
121
+            taRaise.setSalesBatchId(taSalesBatch.getSalesBatchId());
122
+            taRaise.setRaiseStartTime(taSalesBatch.getRaiseStartTime());
123
+            taRaise.setRaiseEndTime(taSalesBatch.getRaiseEndTime());
124
+            taRaise.setHouseLockingType(taSalesBatch.getHouseLockingType());
125
+            taRaise.setRaisePrice(taSalesBatch.getRaisePrice());
126
+            taRaise.setNeedPreselection(taSalesBatch.getNeedPreselection());
127
+            taRaise.setDisplayHousePrice(taSalesBatch.getDisplayHousePrice());
128
+            taRaise.setPayType(taSalesBatch.getPayType());
129
+            taRaise.setPayDescription(taSalesBatch.getPayDescription());
130
+            taRaise.setPayProtocol(taSalesBatch.getPayProtocol());
131
+            taRaise.setStatus(taSalesBatch.getStatus());
132
+            taRaise.setCreateDate(LocalDateTime.now());
133
+            taRaiseService.save(taRaise);
134
+
135
+            taSalesBatch.setRaiseId(taRaise.getRaiseId());
116
             responseBean.addSuccess(taSalesBatch);
136
             responseBean.addSuccess(taSalesBatch);
117
         } catch (Exception e) {
137
         } catch (Exception e) {
118
             e.printStackTrace();
138
             e.printStackTrace();
125
     /**
145
     /**
126
      * 删除批次
146
      * 删除批次
127
      *
147
      *
128
-     * @param taSalesBatch 实体对象
148
+     * @param salesBatchs
149
+     * @param request
129
      * @return
150
      * @return
130
      */
151
      */
131
     @RequestMapping(value = "/admin/taSalesBatch", method = RequestMethod.PUT)
152
     @RequestMapping(value = "/admin/taSalesBatch", method = RequestMethod.PUT)
133
         ResponseBean responseBean = new ResponseBean();
154
         ResponseBean responseBean = new ResponseBean();
134
         try {
155
         try {
135
             List<Integer> liveActivityIds = new ArrayList<>();
156
             List<Integer> liveActivityIds = new ArrayList<>();
136
-            for(TaSalesBatch taSalesBatch : salesBatchs){
157
+            for (TaSalesBatch taSalesBatch : salesBatchs) {
137
                 liveActivityIds.add(taSalesBatch.getSalesBatchId());
158
                 liveActivityIds.add(taSalesBatch.getSalesBatchId());
138
             }
159
             }
139
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
160
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
140
-            queryWrapper.eq("org_id",getOrgId(request));
141
-            queryWrapper.eq("content_type",CommConstant.SALES_BATCH);
142
-            queryWrapper.in("target_id",liveActivityIds);
161
+            queryWrapper.eq("org_id", getOrgId(request));
162
+            queryWrapper.eq("content_type", CommConstant.SALES_BATCH);
163
+            queryWrapper.in("target_id", liveActivityIds);
143
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
164
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
144
             list.forEach(e -> {
165
             list.forEach(e -> {
145
                 e.setStatus(CommConstant.NOT_PUBLISH);
166
                 e.setStatus(CommConstant.NOT_PUBLISH);
146
             });
167
             });
147
-            if (list.size() > 0){
168
+            if (list.size() > 0) {
148
                 iExtendContentService.updateBatchById(list);
169
                 iExtendContentService.updateBatchById(list);
149
             }
170
             }
150
 
171
 
195
             taSalesBatch.setSalesBatchId(id);
216
             taSalesBatch.setSalesBatchId(id);
196
 
217
 
197
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
218
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
198
-            queryWrapper.eq("org_id",getOrgId(request));
199
-            queryWrapper.eq("content_type",CommConstant.SALES_BATCH);
200
-            queryWrapper.eq("target_id",taSalesBatch.getSalesBatchId());
219
+            queryWrapper.eq("org_id", getOrgId(request));
220
+            queryWrapper.eq("content_type", CommConstant.SALES_BATCH);
221
+            queryWrapper.eq("target_id", taSalesBatch.getSalesBatchId());
201
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
222
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
202
-            if (CommConstant.NOT_PUBLISH.equals(taSalesBatch.getStatus())){
223
+            if (CommConstant.NOT_PUBLISH.equals(taSalesBatch.getStatus())) {
203
                 list.forEach(e -> {
224
                 list.forEach(e -> {
204
                     e.setStatus(CommConstant.NOT_PUBLISH);
225
                     e.setStatus(CommConstant.NOT_PUBLISH);
205
                 });
226
                 });
206
             }
227
             }
207
-            if (list.size() > 0){
228
+            if (list.size() > 0) {
208
                 iExtendContentService.updateBatchById(list);
229
                 iExtendContentService.updateBatchById(list);
209
             }
230
             }
210
 
231
 

+ 65
- 1
src/main/java/com/huiju/estateagents/entity/TaSalesBatch.java 查看文件

13
 
13
 
14
 /**
14
 /**
15
  * <p>
15
  * <p>
16
- * 销售批次表 
16
+ * 销售批次表
17
  * </p>
17
  * </p>
18
  *
18
  *
19
  * @author jobob
19
  * @author jobob
104
     @TableField(exist = false)
104
     @TableField(exist = false)
105
     private List<TaShareContent> shareContents;
105
     private List<TaShareContent> shareContents;
106
 
106
 
107
+    /**
108
+     * V3.5.12增加
109
+     */
110
+
111
+    /**
112
+     * 缴费方式 onLine线上offLine线下
113
+     */
114
+    @TableField(exist = false)
115
+    private String payType;
116
+
117
+    /**
118
+     * 认筹是否预选
119
+     */
120
+    @TableField(exist = false)
121
+    private Boolean needPreselection;
122
+
123
+    /**
124
+     * 认筹金额 单位是分!
125
+     */
126
+    @TableField(exist = false)
127
+    private Integer raisePrice;
128
+
129
+    /**
130
+     * 认筹开始时间
131
+     */
132
+    @TableField(exist = false)
133
+    private LocalDateTime raiseStartTime;
134
+
135
+    /**
136
+     * 认筹结束时间
137
+     */
138
+    @TableField(exist = false)
139
+    private LocalDateTime raiseEndTime;
140
+
141
+    /**
142
+     * 是否展示房源价格
143
+     */
144
+    @TableField(exist = false)
145
+    private Boolean displayHousePrice;
146
+
147
+    /**
148
+     * 线上选房协议
149
+     */
150
+    @TableField(exist = false)
151
+    private String payProtocol;
152
+
153
+    /**
154
+     * 缴费说明
155
+     */
156
+    @TableField(exist = false)
157
+    private String payDescription;
158
+
159
+    /**
160
+     * 锁房方式 auto自动锁房,manual手动锁房
161
+     */
162
+    @TableField(exist = false)
163
+    private String houseLockingType;
164
+
165
+    /**
166
+     * 认筹Id
167
+     */
168
+    @TableField(exist = false)
169
+    private Integer raiseId;
170
+
107
 }
171
 }

+ 8
- 0
src/main/java/com/huiju/estateagents/service/ITaSalesBatchService.java 查看文件

36
      * @return
36
      * @return
37
      */
37
      */
38
     ResponseBean getSalesBatchById(Integer salesBatchId);
38
     ResponseBean getSalesBatchById(Integer salesBatchId);
39
+
40
+    /**
41
+     * 获取销售批次详情 cms端
42
+     *
43
+     * @param salesBatchId
44
+     * @return
45
+     */
46
+    ResponseBean getSalesBatchDetailForCms(Integer salesBatchId);
39
 }
47
 }

+ 5
- 0
src/main/java/com/huiju/estateagents/service/impl/TaSalesBatchServiceImpl.java 查看文件

194
         responseBean.addSuccess(result);
194
         responseBean.addSuccess(result);
195
         return responseBean;
195
         return responseBean;
196
     }
196
     }
197
+
198
+    @Override
199
+    public ResponseBean getSalesBatchDetailForCms(Integer salesBatchId) {
200
+        return null;
201
+    }
197
 }
202
 }