合并

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

@@ -163,7 +163,7 @@ public class TaBuildingController extends BaseController {
     }
 
     /**
-     * 楼盘发布
+     * 楼盘getPersonId(request);
      * @param parameter
      * @return
      */

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

@@ -107,6 +107,10 @@ public class TaShareActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
+            if  (taShareActivity.getGroupBuyPeople() <= 1){
+                responseBean.addError("拼团人数必须大于等于2人");
+                return responseBean;
+            }
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
             taShareActivity.setCityId(cityId);
             taShareActivity.setOrgId(getOrgId(request));

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

@@ -281,7 +281,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
         }
         building.setCreateDate(LocalDateTime.now());
-        building.setStatus(0);
+        building.setStatus(2);
         building.setOrgId(orgId);
         if (taBuildingMapper.insert(building) < 1) {
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -44,7 +44,8 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         queryWrapper.eq(endTime != null, "end_time", endTime);
         queryWrapper.eq(orgId != null, "org_id", orgId);
         queryWrapper.eq(cityId != null, "city_id", cityId);
-        queryWrapper.orderByDesc("group_activity_id");
+        queryWrapper.orderByAsc("activity_status");
+        queryWrapper.orderByAsc("start_time");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
 
         responseBean.addSuccess(taNewsIPage);

src/main/resources/mapper/TaBuildingMapper.xml

@@ -59,7 +59,7 @@
                 and  ta_building.org_id = #{orgId}
             </if>
         </where>
-        ORDER BY create_date DESC
+        ORDER BY create_date DESC, status asc
     </select>
 
     <select id="buildingAll" resultType="com.huiju.estateagents.entity.TaBuilding">

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -65,6 +65,7 @@
         t.phone,
         t.create_time,
         a.group_buy_people,
+        t.join_people,
         t.status,
         t.verification_status,
         t.verification_code