* bug修复

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

@@ -112,8 +112,8 @@ public class TaRaiseController extends BaseController {
         try {
             // 参数校验
             Integer raisePrice = taRaise.getRaisePrice();
-            if (raisePrice != null && raisePrice > CommConstant.MAX_RAISE_PRICE) {
-                responseBean.addError("认筹金额最高50000");
+            if (raisePrice != null && (raisePrice > CommConstant.MAX_RAISE_PRICE || raisePrice < 0)) {
+                responseBean.addError("认筹金额范围为0到50000元");
                 return responseBean;
             }
 
@@ -131,6 +131,7 @@ public class TaRaiseController extends BaseController {
             }
 
             taRaise.setOrgId(orgId);
+            taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? null : taRaise.getRaisePrice() * 100);
             taRaise.setStatus(CommConstant.IS_PUBLISH);
             taRaise.setCreateDate(LocalDateTime.now());
             if (iTaRaiseService.save(taRaise)) {
@@ -204,7 +205,14 @@ public class TaRaiseController extends BaseController {
                                       @RequestBody TaRaise taRaise) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            Integer raisePrice = taRaise.getRaisePrice();
+            if (raisePrice != null && (raisePrice > CommConstant.MAX_RAISE_PRICE || raisePrice < 0)) {
+                responseBean.addError("认筹金额范围为0到50000元");
+                return responseBean;
+            }
+
             taRaise.setRaiseId(id);
+            taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? null : taRaise.getRaisePrice() * 100);
             if (iTaRaiseService.updateById(taRaise)) {
                 responseBean.addSuccess(taRaise);
             } else {

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

@@ -103,7 +103,14 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
     @Override
     public ResponseBean getRaiseById(Integer id, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean.addSuccess(taRaiseMapper.getRaiseById(id, orgId));
+        TaRaise taRaise = taRaiseMapper.getRaiseById(id, orgId);
+        if (taRaise == null) {
+            responseBean.addSuccess(null);
+            return responseBean;
+        }
+
+        taRaise.setRaisePrice(taRaise.getRaisePrice() == null ? null : taRaise.getRaisePrice() / 100);
+        responseBean.addSuccess(taRaise);
         return responseBean;
     }
 

src/main/resources/mapper/TaRaiseMapper.xml

@@ -4,7 +4,21 @@
 
     <select id="listRaiseByCondition" resultType="com.huiju.estateagents.entity.TaRaise">
         SELECT
-            t.*,
+            t.raise_id,
+            ( CASE WHEN t.raise_price IS NOT NULL THEN t.raise_price / 100 ELSE NULL END ) raise_price,
+            t.org_id,
+            t.sales_batch_id,
+            t.building_id,
+            t.raise_start_time,
+            t.raise_end_time,
+            t.house_locking_type,
+            t.need_preselection,
+            t.pay_type,
+            t.pay_description_online,
+            t.pay_description_offline,
+            t.pay_protocol,
+            t.`status`,
+            t.create_date,
             t2.sales_batch_name,
             t2.sales_number,
             t2.remark,

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -17,7 +17,6 @@
         WHERE
             t.org_id = #{bo.orgId}
             AND t.`status` != - 1
-            AND t2.raise_house_id is not null
         <if test="bo.salesBatchId != null and bo.salesBatchId != ''">
             AND t.sales_batch_id = #{bo.salesBatchId}
         </if>