Selaa lähdekoodia

* 代码优化

顾绍勇 5 vuotta sitten
vanhempi
commit
c438c4bc44

+ 17
- 2
src/main/java/com/huiju/estateagents/controller/TaRaiseHouseController.java Näytä tiedosto

7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
 import com.huiju.estateagents.entity.TaRaiseHouse;
8
 import com.huiju.estateagents.entity.TaRaiseHouse;
9
 import com.huiju.estateagents.service.ITaRaiseHouseService;
9
 import com.huiju.estateagents.service.ITaRaiseHouseService;
10
+import com.huiju.estateagents.service.ITaRaiseRecordService;
10
 import org.slf4j.Logger;
11
 import org.slf4j.Logger;
11
 import org.slf4j.LoggerFactory;
12
 import org.slf4j.LoggerFactory;
12
 import org.springframework.beans.factory.annotation.Autowired;
13
 import org.springframework.beans.factory.annotation.Autowired;
32
     @Autowired
33
     @Autowired
33
     public ITaRaiseHouseService iTaRaiseHouseService;
34
     public ITaRaiseHouseService iTaRaiseHouseService;
34
 
35
 
36
+    @Autowired
37
+    private ITaRaiseRecordService iTaRaiseRecordService;
38
+
35
 
39
 
36
     /**
40
     /**
37
      * 分页查询列表
41
      * 分页查询列表
70
     public ResponseBean taRaiseHouseAdd(TaRaiseHouse taRaiseHouse, HttpServletRequest request) {
74
     public ResponseBean taRaiseHouseAdd(TaRaiseHouse taRaiseHouse, HttpServletRequest request) {
71
         ResponseBean responseBean = new ResponseBean();
75
         ResponseBean responseBean = new ResponseBean();
72
         try {
76
         try {
73
-            taRaiseHouse.setOrgId(getOrgId(request));
74
-            taRaiseHouse.setCreateDate(LocalDateTime.now());
75
 
77
 
78
+            // 校验参数
79
+            if (taRaiseHouse.getRaiseRecordId() != null) {
80
+                responseBean.addError("参数错误");
81
+                return responseBean;
82
+            }
83
+
84
+            Integer orgId = getOrgId(request);
85
+
86
+            // 认筹表房源数+1
87
+            iTaRaiseRecordService.addHouseNum(taRaiseHouse.getRaiseRecordId(), orgId);
88
+
89
+            taRaiseHouse.setOrgId(orgId);
90
+            taRaiseHouse.setCreateDate(LocalDateTime.now());
76
             if (iTaRaiseHouseService.save(taRaiseHouse)) {
91
             if (iTaRaiseHouseService.save(taRaiseHouse)) {
77
                 responseBean.addSuccess(taRaiseHouse);
92
                 responseBean.addSuccess(taRaiseHouse);
78
             } else {
93
             } else {

+ 12
- 2
src/main/java/com/huiju/estateagents/mapper/TaRaiseRecordMapper.java Näytä tiedosto

33
      * @return
33
      * @return
34
      */
34
      */
35
     IPage<TaRaiseRecord> listHousingRaiseByCondition(IPage<TaRaiseRecord> page,
35
     IPage<TaRaiseRecord> listHousingRaiseByCondition(IPage<TaRaiseRecord> page,
36
-                                                            @Param("bo") HousingRaiseRequestBO bo);
36
+                                                     @Param("bo") HousingRaiseRequestBO bo);
37
 
37
 
38
     /**
38
     /**
39
      * 条件查询认筹单
39
      * 条件查询认筹单
53
      * @return
53
      * @return
54
      */
54
      */
55
     IPage<TaRaiseRecord> listRaiseOrderByCondition(IPage<TaRaiseRecord> page,
55
     IPage<TaRaiseRecord> listRaiseOrderByCondition(IPage<TaRaiseRecord> page,
56
-                                              @Param("bo") RaiseOrderRequestBO bo);
56
+                                                   @Param("bo") RaiseOrderRequestBO bo);
57
 
57
 
58
     /**
58
     /**
59
      * 批量更新
59
      * 批量更新
68
                             @Param("payType") String payType);
68
                             @Param("payType") String payType);
69
 
69
 
70
     TaRaiseRecord getUserInfo(@Param("raiseRecordId") Integer raiseRecordId, @Param("orgId") Integer orgId);
70
     TaRaiseRecord getUserInfo(@Param("raiseRecordId") Integer raiseRecordId, @Param("orgId") Integer orgId);
71
+
72
+    /**
73
+     * 认筹单房源数+1
74
+     *
75
+     * @param raiseRecordId
76
+     * @param orgId
77
+     * @return
78
+     */
79
+    Boolean addHouseNum(@Param("raiseRecordId") Integer raiseRecordId,
80
+                        @Param("orgId") Integer orgId);
71
 }
81
 }

+ 11
- 0
src/main/java/com/huiju/estateagents/service/ITaRaiseRecordService.java Näytä tiedosto

55
 
55
 
56
     /**
56
     /**
57
      * 小程序端保存认筹单信息
57
      * 小程序端保存认筹单信息
58
+     *
58
      * @param taRaiseRecord
59
      * @param taRaiseRecord
59
      * @param orgId
60
      * @param orgId
60
      * @param personId
61
      * @param personId
64
 
65
 
65
     /**
66
     /**
66
      * 获取用户信息
67
      * 获取用户信息
68
+     *
67
      * @param orgId
69
      * @param orgId
68
      * @param raiseRecordId
70
      * @param raiseRecordId
69
      * @return
71
      * @return
70
      */
72
      */
71
     TaRaiseRecord getUserInfo(Integer orgId, Integer raiseRecordId);
73
     TaRaiseRecord getUserInfo(Integer orgId, Integer raiseRecordId);
74
+
75
+    /**
76
+     * 认筹单房源数+1
77
+     *
78
+     * @param raiseRecordId
79
+     * @param orgId
80
+     * @return
81
+     */
82
+    Boolean addHouseNum(Integer raiseRecordId, Integer orgId);
72
 }
83
 }

+ 17
- 10
src/main/java/com/huiju/estateagents/service/impl/TaRaiseRecordServiceImpl.java Näytä tiedosto

92
     @Override
92
     @Override
93
     public TaRaiseRecord saveRaiseInfo(TaRaiseRecord taRaiseRecord, Integer orgId, String personId) throws Exception {
93
     public TaRaiseRecord saveRaiseInfo(TaRaiseRecord taRaiseRecord, Integer orgId, String personId) throws Exception {
94
         List<Integer> houseList = taRaiseRecord.getHouseList();
94
         List<Integer> houseList = taRaiseRecord.getHouseList();
95
-        if (houseList.size() < 1){
95
+        if (houseList.size() < 1) {
96
             throw new Exception("请选择房源!");
96
             throw new Exception("请选择房源!");
97
         }
97
         }
98
         //获取认筹信息
98
         //获取认筹信息
99
         TaRaise taRaise = taRaiseMapper.selectById(taRaiseRecord.getRaiseId());
99
         TaRaise taRaise = taRaiseMapper.selectById(taRaiseRecord.getRaiseId());
100
         //如果是自动锁房就要判断里面的房源有没有被锁住
100
         //如果是自动锁房就要判断里面的房源有没有被锁住
101
-        if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)){
102
-            if (houseList.size() > 0){
101
+        if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)) {
102
+            if (houseList.size() > 0) {
103
                 throw new Exception("此认筹为自动锁房只能选择一个房源!");
103
                 throw new Exception("此认筹为自动锁房只能选择一个房源!");
104
             }
104
             }
105
             //获取房源详细信息
105
             //获取房源详细信息
106
             TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(houseList.get(0));
106
             TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(houseList.get(0));
107
-            if (null == taHousingResources){
107
+            if (null == taHousingResources) {
108
                 throw new Exception("此房源不存在!");
108
                 throw new Exception("此房源不存在!");
109
             }
109
             }
110
-            if (taHousingResources.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)){
110
+            if (taHousingResources.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)) {
111
                 throw new Exception("此房源已被锁定!");
111
                 throw new Exception("此房源已被锁定!");
112
             }
112
             }
113
             //检验成功的话先锁定房源
113
             //检验成功的话先锁定房源
114
             lockedHouseResources(taHousingResources);
114
             lockedHouseResources(taHousingResources);
115
         }
115
         }
116
         //插入认筹单
116
         //插入认筹单
117
-        saveRaiseRecord(taRaiseRecord,orgId,personId,taRaise);
117
+        saveRaiseRecord(taRaiseRecord, orgId, personId, taRaise);
118
 
118
 
119
         return taRaiseRecord;
119
         return taRaiseRecord;
120
     }
120
     }
124
         return taRaiseRecordMapper.getUserInfo(raiseRecordId, orgId);
124
         return taRaiseRecordMapper.getUserInfo(raiseRecordId, orgId);
125
     }
125
     }
126
 
126
 
127
+    @Override
128
+    public Boolean addHouseNum(Integer raiseRecordId, Integer orgId) {
129
+        return taRaiseRecordMapper.addHouseNum(raiseRecordId, orgId);
130
+    }
131
+
127
     /**
132
     /**
128
      * 插入认筹单
133
      * 插入认筹单
134
+     *
129
      * @param taRaiseRecord
135
      * @param taRaiseRecord
130
      */
136
      */
131
-    private void saveRaiseRecord(TaRaiseRecord taRaiseRecord, Integer orgId, String personId,TaRaise taRaise) {
137
+    private void saveRaiseRecord(TaRaiseRecord taRaiseRecord, Integer orgId, String personId, TaRaise taRaise) {
132
         List<Integer> houseList = taRaiseRecord.getHouseList();
138
         List<Integer> houseList = taRaiseRecord.getHouseList();
133
         //销售批次信息
139
         //销售批次信息
134
         TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(taRaiseRecord.getSalesBatchId());
140
         TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(taRaiseRecord.getSalesBatchId());
139
         taRaiseRecord.setPersonId(personId);
145
         taRaiseRecord.setPersonId(personId);
140
         taRaiseRecord.setHouseNum(houseList.size());
146
         taRaiseRecord.setHouseNum(houseList.size());
141
         taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
147
         taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
142
-        if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)){
148
+        if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)) {
143
             taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
149
             taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
144
         }
150
         }
145
         taRaiseRecord.setStatus(CommConstant.STATUS_NORMAL);
151
         taRaiseRecord.setStatus(CommConstant.STATUS_NORMAL);
148
         taRaiseRecord.setCreateDate(LocalDateTime.now());
154
         taRaiseRecord.setCreateDate(LocalDateTime.now());
149
         //插入认筹单信息
155
         //插入认筹单信息
150
         taRaiseRecordMapper.insert(taRaiseRecord);
156
         taRaiseRecordMapper.insert(taRaiseRecord);
151
-        
157
+
152
         //插入房源与认筹单关系表
158
         //插入房源与认筹单关系表
153
         TaPerson taPerson = taPersonMapper.selectById(personId);
159
         TaPerson taPerson = taPersonMapper.selectById(personId);
154
         houseList.forEach(e -> {
160
         houseList.forEach(e -> {
155
             TaRaiseHouse taRaiseHouse = new TaRaiseHouse();
161
             TaRaiseHouse taRaiseHouse = new TaRaiseHouse();
156
             taRaiseHouse.setHouseId(e);
162
             taRaiseHouse.setHouseId(e);
157
             taRaiseHouse.setCreateDate(LocalDateTime.now());
163
             taRaiseHouse.setCreateDate(LocalDateTime.now());
158
-            if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)){
164
+            if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)) {
159
                 taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
165
                 taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
160
             }
166
             }
161
             taRaiseHouse.setOrgId(orgId);
167
             taRaiseHouse.setOrgId(orgId);
168
 
174
 
169
     /**
175
     /**
170
      * 锁定房源
176
      * 锁定房源
177
+     *
171
      * @param taHousingResources
178
      * @param taHousingResources
172
      */
179
      */
173
     private synchronized void lockedHouseResources(TaHousingResources taHousingResources) {
180
     private synchronized void lockedHouseResources(TaHousingResources taHousingResources) {

+ 10
- 0
src/main/resources/mapper/TaRaiseRecordMapper.xml Näytä tiedosto

184
         where
184
         where
185
         t.raise_record_id = #{raiseRecordId} and t.org_id = #{orgId}
185
         t.raise_record_id = #{raiseRecordId} and t.org_id = #{orgId}
186
     </select>
186
     </select>
187
+
188
+    <update id="addHouseNum">
189
+        UPDATE ta_raise_record t
190
+         SET t.house_num = IFNULL ( t.house_num, 0 ) + 1
191
+        WHERE
192
+            t.raise_record_id = #{raiseRecordId}
193
+            AND t.org_id = #{orgId}
194
+            AND t.`status` != -1
195
+    </update>
196
+
187
 </mapper>
197
 </mapper>