拼团优化

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

@@ -61,15 +61,7 @@ public class TaShareRecordController extends BaseController {
                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            //使用分页插件
-            IPage<TaShareRecord> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq(phone != null,"phone", phone);
-            queryWrapper.eq(groupStatus != null, "status", groupStatus);
-            queryWrapper.eq(groupActivityId != null, "group_activity_id", groupActivityId);
-            queryWrapper.eq(getOrgId(request) != null, "org_id", getOrgId(request));
-
-            IPage<TaShareRecord> result = iTaShareRecordService.page(pg, queryWrapper);
+            IPage<TaShareRecord> result = iTaShareRecordService.getSuccessList(pageNum, pageSize, phone, groupStatus, groupActivityId, getOrgId(request));
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -23,11 +23,10 @@ import java.util.List;
  */
 @Mapper
 public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
-    IPage<TaShareRecord> recordSuccessList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
+    IPage<TaShareRecord> recordSuccessList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("groupActivityId") Integer groupActivityId, @Param("orgId") Integer orgId);
     IPage<TaShareRecordPO> recordFailAndProcessingList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("groupActivityId") Integer groupActivityId, @Param("orgId") Integer orgId);
     List<ShareRecordSuccessExport> getShareRecordSuccessExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
     List<ShareRecordFailExport> getShareRecordFailExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
-    List<TaShareRecord> recordSuccessList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
     List<TaShareRecordPO> recordFailAndProcessingList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
 	List<TaShareRecord> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
     void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityIds);

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

@@ -22,7 +22,7 @@ import java.util.List;
  * @since 2019-10-18
  */
 public interface ITaShareRecordService extends IService<TaShareRecord> {
-    IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId);
+    IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId);
     IPage<TaShareRecordPO> getFailAndProcessingList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId);
     ResponseBean validateRule(TaShareRecord taShareRecord);
     ResponseBean verifyCode(Integer activityId, String verifyCode);

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

@@ -46,9 +46,9 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
     private TaShareChildRecordMapper taShareChildRecordMapper;
 
     @Override
-    public IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId) {
+    public IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId) {
         IPage<TaShareRecord> page = new Page<>(pageNum,pageSize);
-        return taShareRecordMapper.recordSuccessList(page, phone, status, orgId);
+        return taShareRecordMapper.recordSuccessList(page, phone, status, groupActivityId, orgId);
     }
 
     @Override
@@ -95,12 +95,12 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         ResponseBean responseBean = new ResponseBean();
         QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("verification_code", verifyCode);
-        queryWrapper.eq("group_activity_id", activityId);
+        queryWrapper.eq(activityId!=null, "group_activity_id", activityId);
         TaShareRecord taShareRecord = taShareRecordMapper.selectOne(queryWrapper);
 
         QueryWrapper<TaShareChildRecord> wrapper = new QueryWrapper<>();
         wrapper.eq("verification_code", verifyCode);
-        wrapper.eq("group_activity_id", activityId);
+        wrapper.eq(activityId!=null, "group_activity_id", activityId);
         TaShareChildRecord taShareChildRecord = taShareChildRecordMapper.selectOne(wrapper);
 
         if (taShareRecord == null && taShareChildRecord == null){

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -12,6 +12,7 @@
 
     <select id="recordSuccessList" resultType="com.huiju.estateagents.entity.TaShareRecord">
         (select
+        t.group_activity_id as groupActivityId,
         t.nickname,
         t.phone,
         t.create_time,
@@ -22,6 +23,9 @@
         <if test="status !=null and status != ''">
             and t.status = #{status}
         </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and t.group_activity_id = #{groupActivityId}
+        </if>
         <if test="orgId != null and orgId != ''">
             and t.org_id = #{orgId}
         </if>
@@ -30,6 +34,7 @@
         </if> order by t.end_time desc limit 100000000)
         union all
         (select
+        a.group_activity_id as groupActivityId,
         a.nickname as joinNickName,
         a.phone as joinPhone,
         a.create_time as joinCreateTime,
@@ -40,6 +45,9 @@
         <if test="status !=null and status != ''">
             and a.status = #{status}
         </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and a.group_activity_id = #{groupActivityId}
+        </if>
         <if test="orgId != null and orgId != ''">
             and a.org_id = #{orgId}
         </if>