顾绍勇 5 лет назад
Родитель
Сommit
22c888ba76

+ 10
- 2
src/main/java/com/huiju/estateagents/controller/TaRaiseController.java Просмотреть файл

112
         try {
112
         try {
113
             // 参数校验
113
             // 参数校验
114
             Integer raisePrice = taRaise.getRaisePrice();
114
             Integer raisePrice = taRaise.getRaisePrice();
115
-            if (raisePrice != null && raisePrice > CommConstant.MAX_RAISE_PRICE) {
116
-                responseBean.addError("认筹金额最高50000");
115
+            if (raisePrice != null && (raisePrice > CommConstant.MAX_RAISE_PRICE || raisePrice < 0)) {
116
+                responseBean.addError("认筹金额范围为0到50000元");
117
                 return responseBean;
117
                 return responseBean;
118
             }
118
             }
119
 
119
 
131
             }
131
             }
132
 
132
 
133
             taRaise.setOrgId(orgId);
133
             taRaise.setOrgId(orgId);
134
+            taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? null : taRaise.getRaisePrice() * 100);
134
             taRaise.setStatus(CommConstant.IS_PUBLISH);
135
             taRaise.setStatus(CommConstant.IS_PUBLISH);
135
             taRaise.setCreateDate(LocalDateTime.now());
136
             taRaise.setCreateDate(LocalDateTime.now());
136
             if (iTaRaiseService.save(taRaise)) {
137
             if (iTaRaiseService.save(taRaise)) {
204
                                       @RequestBody TaRaise taRaise) {
205
                                       @RequestBody TaRaise taRaise) {
205
         ResponseBean responseBean = new ResponseBean();
206
         ResponseBean responseBean = new ResponseBean();
206
         try {
207
         try {
208
+            Integer raisePrice = taRaise.getRaisePrice();
209
+            if (raisePrice != null && (raisePrice > CommConstant.MAX_RAISE_PRICE || raisePrice < 0)) {
210
+                responseBean.addError("认筹金额范围为0到50000元");
211
+                return responseBean;
212
+            }
213
+
207
             taRaise.setRaiseId(id);
214
             taRaise.setRaiseId(id);
215
+            taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? null : taRaise.getRaisePrice() * 100);
208
             if (iTaRaiseService.updateById(taRaise)) {
216
             if (iTaRaiseService.updateById(taRaise)) {
209
                 responseBean.addSuccess(taRaise);
217
                 responseBean.addSuccess(taRaise);
210
             } else {
218
             } else {

+ 8
- 1
src/main/java/com/huiju/estateagents/service/impl/TaRaiseServiceImpl.java Просмотреть файл

103
     @Override
103
     @Override
104
     public ResponseBean getRaiseById(Integer id, Integer orgId) {
104
     public ResponseBean getRaiseById(Integer id, Integer orgId) {
105
         ResponseBean responseBean = new ResponseBean();
105
         ResponseBean responseBean = new ResponseBean();
106
-        responseBean.addSuccess(taRaiseMapper.getRaiseById(id, orgId));
106
+        TaRaise taRaise = taRaiseMapper.getRaiseById(id, orgId);
107
+        if (taRaise == null) {
108
+            responseBean.addSuccess(null);
109
+            return responseBean;
110
+        }
111
+
112
+        taRaise.setRaisePrice(taRaise.getRaisePrice() == null ? null : taRaise.getRaisePrice() / 100);
113
+        responseBean.addSuccess(taRaise);
107
         return responseBean;
114
         return responseBean;
108
     }
115
     }
109
 
116
 

+ 15
- 1
src/main/resources/mapper/TaRaiseMapper.xml Просмотреть файл

4
 
4
 
5
     <select id="listRaiseByCondition" resultType="com.huiju.estateagents.entity.TaRaise">
5
     <select id="listRaiseByCondition" resultType="com.huiju.estateagents.entity.TaRaise">
6
         SELECT
6
         SELECT
7
-            t.*,
7
+            t.raise_id,
8
+            ( CASE WHEN t.raise_price IS NOT NULL THEN t.raise_price / 100 ELSE NULL END ) raise_price,
9
+            t.org_id,
10
+            t.sales_batch_id,
11
+            t.building_id,
12
+            t.raise_start_time,
13
+            t.raise_end_time,
14
+            t.house_locking_type,
15
+            t.need_preselection,
16
+            t.pay_type,
17
+            t.pay_description_online,
18
+            t.pay_description_offline,
19
+            t.pay_protocol,
20
+            t.`status`,
21
+            t.create_date,
8
             t2.sales_batch_name,
22
             t2.sales_batch_name,
9
             t2.sales_number,
23
             t2.sales_number,
10
             t2.remark,
24
             t2.remark,

+ 0
- 1
src/main/resources/mapper/TaRaiseRecordMapper.xml Просмотреть файл

17
         WHERE
17
         WHERE
18
             t.org_id = #{bo.orgId}
18
             t.org_id = #{bo.orgId}
19
             AND t.`status` != - 1
19
             AND t.`status` != - 1
20
-            AND t2.raise_house_id is not null
21
         <if test="bo.salesBatchId != null and bo.salesBatchId != ''">
20
         <if test="bo.salesBatchId != null and bo.salesBatchId != ''">
22
             AND t.sales_batch_id = #{bo.salesBatchId}
21
             AND t.sales_batch_id = #{bo.salesBatchId}
23
         </if>
22
         </if>