合并

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.IHelpInitiateRecordService;
@@ -216,7 +217,7 @@ public class HelpInitiateRecordController extends BaseController {
             }
  
             helpInitiateRecord.setPersonId(person.getPersonId());
- 
+            helpInitiateRecord.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
             helpInitiateRecord.setCreateDate(LocalDateTime.now());
             helpInitiateRecord.setOrgId(orgId);
             helpInitiateRecord.setStatus(1);

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

@@ -238,9 +238,7 @@ public class TaGoodsController extends BaseController {
     @ApiOperation(value = "微信 查询有商品的项目", notes = "微信 查询有商品的项目")
     @GetMapping(value = "/wx/goodsToBuilding")
     public ResponseBean wxGoodsToBuilding(HttpServletRequest request) {
-        ResponseBean responseBean = new ResponseBean();
-
-        return responseBean;
+        return iTaBuildingService.getBuildingListById(getOrgId(request));
     }
 
     /**

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

@@ -43,6 +43,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
 
     List<TaBuilding> buildingAll(@Param("orgId") Integer orgId);
 
+    List<TaBuilding> getBuildingListById(@Param("orgId") Integer orgId);
     /**
      * 查询当前楼盘
      * @param buildingId

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -158,4 +158,6 @@ public interface ITaBuildingService extends IService<TaBuilding> {
     ResponseBean buildingAll(Integer orgId);
 
     Integer getCityById(String buildingId);
+
+    ResponseBean getBuildingListById(Integer orgId);
 }

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

@@ -618,6 +618,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         return taBuilding.getCityId();
     }
 
+    @Override
+    public ResponseBean getBuildingListById(Integer orgId) {
+        List<TaBuilding> buildings = taBuildingMapper.getBuildingListById(orgId);
+        return ResponseBean.success(buildings);
+    }
+
 
     int insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
         int rows = 0;

src/main/resources/mapper/TaBuildingMapper.xml

@@ -194,4 +194,10 @@
 
     </select>
 
+    <select id="getBuildingListById" resultType="com.huiju.estateagents.entity.TaBuilding">
+      select * from ta_building t where t.building_id in (
+	    select t.building_id from ta_goods t where t.org_id = #{orgId} group by t.building_id
+      )
+    </select>
+
 </mapper>

src/main/resources/mapper/TaShareRecordMapper.xml

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