Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.0.0</version>
+	<version>v3.4.1</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

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

@@ -272,11 +272,11 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "helpRecordInitiateId", paramType = "query", value = "发起助力ID"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "verifyCode", paramType = "query", value = "核销码"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "verifyCode", paramType = "query", value = "核销码"),
     })
     @RequestMapping(value = "admin/helpInitiateRecordVerify", method = RequestMethod.POST)
     public ResponseBean helpInitiateRecordVerify(@RequestParam(value = "helpRecordInitiateId", required = false) Integer helpRecordInitiateId,
-                                                 @RequestParam(value = "verifyCode", required = false) Integer verifyCode) {
+                                                 @RequestParam(value = "verifyCode", required = false) String verifyCode) {
         ResponseBean helpRecord = taHelpActivityService.helpInitiateRecordVerify(helpRecordInitiateId, verifyCode);
         return helpRecord;
     }
@@ -477,5 +477,14 @@ public class HelpActivityController extends BaseController {
         }
         return responseBean;
     }
+    @ApiOperation(value = "微信端查询拼团和助力推首页的活动的", notes = "微信端查询拼团和助力推首页的活动的")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "path", value = "活动状态")
+    })
+    @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
+    public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request) {
+            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request));
+                return lsit;
+        }
 
 }

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/entity/HelpActivity.java

@@ -134,4 +134,17 @@ public class HelpActivity implements Serializable {
     @TableField(exist = false)
     private Integer successNum;
 
+    /**
+     * 助力拼团2表和1活动ID
+     * activityId
+     */
+    @TableField(exist = false)
+    private Integer activityId;
+
+    /**
+     * 助力拼团2表和1
+     * type(1助力，2拼团)
+     */
+    @TableField(exist = false)
+    private Integer type;
 }

src/main/java/com/huiju/estateagents/entity/TaShareRecord.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -90,5 +91,24 @@ public class TaShareRecord implements Serializable {
      */
     private String verificationCode;
 
-
+    @TableField(exist = false)
+    private String activityName;
+    
+    @TableField(exist = false)
+    private String mainImg;
+    
+    @TableField(exist = false)
+    private Integer activityStatus;
+    
+    @TableField(exist = false)
+    private LocalDateTime endDate;
+    
+    @TableField(exist = false)
+    private Integer id;
+    
+    /**
+     * 是否发起者
+     */
+    @TableField(exist = false)
+    private boolean groupStatus;
 }

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

@@ -36,4 +36,11 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
     void updateUnStartHelpActivity(@Param("list") List<Integer> startHelpActivityId);
 
     void updateEndHelpActivity(@Param("list")List<Integer> endHelpActivityId);
+
+    /**
+     * 微信端查询拼团和助力推首页的活动的
+     * @param orgId
+     * @return
+     */
+    List<HelpActivity> selectWxhelpActivityAndGroup(Integer orgId);
 }

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/IHelpActivityService.java

@@ -69,7 +69,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param verifyCode
      * @return
      */
-    ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, Integer verifyCode);
+    ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, String verifyCode);
 
     /**
      * 查询当前导出数据的总数
@@ -125,4 +125,11 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param endGroupActivityIds
      */
     void updateEndActivity(List<Integer> endGroupActivityIds);
+
+    /**
+     * 微信端查询拼团和助力推首页的活动的
+     * @param orgId
+     * @return
+     */
+    ResponseBean wxhelpActivityAndGroup(Integer orgId);
 }

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/HelpActivityServiceImpl.java

@@ -130,7 +130,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, Integer verifyCode) {
+    public ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, String verifyCode) {
         ResponseBean responseBean = new ResponseBean<>();
         HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecordInitiateId);
         if (null ==verifyCode || "".equals(verifyCode)){
@@ -144,7 +144,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
             return responseBean;
         }
 
-        if (verifyCode.equals(Integer.valueOf(helpInitiateRecord.getVerification()))){
+        if (verifyCode.equals(String.valueOf(helpInitiateRecord.getVerification()))){
             helpInitiateRecord.setVerificationStatus(1);
             helpInitiateRecordMapper.updateById(helpInitiateRecord);
 
@@ -204,4 +204,12 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
             taHelpActivityMapper.updateEndHelpActivity(endHelpActivityIds);
         }
     }
+
+    @Override
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId) {
+        ResponseBean responseBean = new ResponseBean<>();
+        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId);
+        responseBean.addSuccess(HelpActivity);
+        return responseBean;
+    }
 }

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/HelpActivityMapper.xml

@@ -52,5 +52,27 @@
             #{item}
         </foreach>
     </update>
-
+    <select id="selectWxhelpActivityAndGroup" resultType="com.huiju.estateagents.entity.HelpActivity">
+		(
+			SELECT
+				a.help_activity_id as activityId,
+				a.img as img,
+				1 AS type
+			FROM
+				ta_help_activity a
+				WHERE a.is_main = 1
+				and org_id =#{orgId}
+		)
+		UNION ALL
+			(
+				SELECT
+					s.group_activity_id as activityId,
+					s.main_img as img,
+					2 AS type
+				FROM
+					ta_share_activity s
+					WHERE s.sort = 1
+					and org_id =#{orgId}
+			)
+    </select>
 </mapper>

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
@@ -114,16 +113,49 @@
     </select>
     <select id="getShareRecordList" resultType="com.huiju.estateagents.entity.TaShareRecord">
         SELECT
-            t.*,
+            t.record_id AS id,
+            t.group_activity_id,
+            t.nickname,
+            t.phone,
+            t.avatarurl,
+            t.create_time,
+            t.end_time,
+            t.STATUS,
+            t.verification_status,
+            t.verification_code,
             a.activity_name,
             a.main_img,
             a.activity_status,
-            a.end_time AS end_date
+            a.end_time AS end_date,
+            1 as groupStatus
         FROM
             ta_share_record t
             LEFT JOIN ta_share_activity a ON t.group_activity_id = a.group_activity_id
         WHERE
             t.org_id = #{orgId}
             AND t.person_id = #{personId}
+	UNION ALL
+        SELECT
+            t.child_record_id AS id,
+            t.group_activity_id,
+            t.nickname,
+            t.phone,
+            t.avatarurl,
+            t.create_time,
+            t.end_time,
+            t.STATUS,
+            t.verification_status,
+            t.verification_code,
+            a.activity_name,
+            a.main_img,
+            a.activity_status,
+            a.end_time AS end_date,
+            0 as groupStatus
+        FROM
+            ta_share_child_record t
+            LEFT JOIN ta_share_activity a ON t.group_activity_id = a.group_activity_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
     </select>
 </mapper>