微信端查询拼团和助力推首页的活动的

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

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

@@ -131,4 +131,18 @@ 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/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/service/IHelpActivityService.java

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

@@ -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/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>