线下收益

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java

@@ -94,7 +94,6 @@ public class RevenueRewardUserQueryController {
                                                                                                  UserListMatchmakerRevenueRewardRecordQueryParams queryParams,
                                                                                                  @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) {
         queryParams.setQueryOrgId(orgId);
-        //return  PageUtil.convert(revenueRewardQueryService.pageMatchmakerRevenueRewardRecord(pageUtil, queryParams), UserPageMatchmakerRevenueRewardRecordVo.class);
-        return null;
+        return PageUtil.convert(revenueRewardQueryService.pageMatchmakerRevenueRewardRecord(pageUtil, queryParams), UserPageMatchmakerRevenueRewardRecordVo.class);
     }
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UserListMatchmakerRevenueRewardRecordQueryParams.java

@@ -12,8 +12,8 @@ public class UserListMatchmakerRevenueRewardRecordQueryParams {
     @ApiModelProperty("查询组织标识")
     private Long queryOrgId;
 
-    @ApiModelProperty("红娘标识")
-    private Long matchmakerId;
+    @ApiModelProperty("红娘名称")
+    private String matchmakerName;
 
     @ApiModelProperty("所属门店")
     private Long storeId;

dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/RevenueRewardQueryService.java

@@ -2,10 +2,7 @@ package com.qniao.dam.query.revenuereward;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qniao.dam.api.command.revenuereward.user.response.UserGetRevenueRewardRecordByOperatorVo;
-import com.qniao.dam.api.query.revenuereward.user.request.UseGetRevenueRewardAbstractQueryParams;
-import com.qniao.dam.api.query.revenuereward.user.request.UserListMatchmakerRevenueRewardStatisticsQueryParams;
-import com.qniao.dam.api.query.revenuereward.user.request.UserPageRevenueRewardRecordByOperatorQueryParams;
-import com.qniao.dam.api.query.revenuereward.user.request.UsePageRevenueRewardRecordQueryParams;
+import com.qniao.dam.api.query.revenuereward.user.request.*;
 import com.qniao.dam.api.query.revenuereward.user.response.*;
 import com.qniao.dam.domain.aggregate.revenuereward.entity.RevenueReward;
 import com.qniao.dam.domian.aggregate.walletaccount.constant.IdentityTypeEnum;
@@ -33,4 +30,6 @@ public interface RevenueRewardQueryService {
     UserGetRevenueRewardRecordByOperatorVo getRevenueRewardRecordByOperator(Long revenueRewardRecordId);
 
     List<UserListMatchmakerRevenueRewardStatisticsVo> listMatchmakerRevenueRewardStatistics(UserListMatchmakerRevenueRewardStatisticsQueryParams queryParams);
+
+    IPage<UserPageMatchmakerRevenueRewardRecordVo> pageMatchmakerRevenueRewardRecord(PageUtil pageUtil, UserListMatchmakerRevenueRewardRecordQueryParams queryParams);
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/impl/RevenueRewardQueryServiceImpl.java

@@ -4,10 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qniao.dam.api.command.revenuereward.user.response.UserGetRevenueRewardRecordByOperatorVo;
-import com.qniao.dam.api.query.revenuereward.user.request.UseGetRevenueRewardAbstractQueryParams;
-import com.qniao.dam.api.query.revenuereward.user.request.UserListMatchmakerRevenueRewardStatisticsQueryParams;
-import com.qniao.dam.api.query.revenuereward.user.request.UserPageRevenueRewardRecordByOperatorQueryParams;
-import com.qniao.dam.api.query.revenuereward.user.request.UsePageRevenueRewardRecordQueryParams;
+import com.qniao.dam.api.query.revenuereward.user.request.*;
 import com.qniao.dam.api.query.revenuereward.user.response.*;
 import com.qniao.dam.domain.aggregate.revenuereward.entity.RevenueReward;
 import com.qniao.dam.domain.aggregate.revenuereward.valueobj.RevenueRewardRecord;
@@ -167,6 +164,29 @@ public class RevenueRewardQueryServiceImpl implements RevenueRewardQueryService
         return list;
     }
 
+    @Override
+    public IPage<UserPageMatchmakerRevenueRewardRecordVo> pageMatchmakerRevenueRewardRecord(PageUtil pageUtil,
+                                                                                            UserListMatchmakerRevenueRewardRecordQueryParams queryParams) {
+        Organization organization = organizationDao.selectById(queryParams.getQueryOrgId());
+        if (Objects.nonNull(organization)) {
+            List<Long> storeIdList = new ArrayList<>();
+            if (OrganizationTypeEnum.OPERATION_CENTER.equals(organization.getType())) {
+                storeIdList = storeQueryService.listByOperationCenterOrgId(queryParams.getQueryOrgId())
+                        .stream().map(Store::getId).collect(Collectors.toList());
+            } else if (OrganizationTypeEnum.STORE.equals(organization.getType())) {
+                Store store = storeQueryService.queryByOrg(queryParams.getQueryOrgId());
+                if (Objects.nonNull(store)) {
+                    storeIdList = Collections.singletonList(store.getId());
+                }
+            }
+            if (CollUtil.isNotEmpty(storeIdList)) {
+                //查询
+
+            }
+        }
+        return null;
+    }
+
     private List<RevenueRewardRecordExportVo> transformExport(List<UserPageRevenueRewardRecordByOperatorVo> recordList) {
         List<RevenueRewardRecordExportVo> list = new ArrayList<>();
         for (UserPageRevenueRewardRecordByOperatorVo record : recordList) {

dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml

@@ -173,15 +173,17 @@
         INNER JOIN da_revenue_reward_associate_order_record as darrasor on darrasor.revenue_reward_record_id=darrr.id
         INNER JOIN da_order as dao on dao.is_delete=0 and dao.id=darrasor.associate_order_id
         INNER JOIN da_matchmaker as dam on dam.is_delete=0 and dam.user_id=darr.user_id
-        where 1=1
+        where darrr.trade_scene=1
         <if test="queryParams.revenueTimeFrom != null and queryParams.revenueTimeTo != null">
             and darrr.create_time BETWEEN #{queryParams.revenueTimeFrom} and #{queryParams.revenueTimeTo}
         </if>
         <if test="storeIdList.size > 0">
+            and dam.store_id in
             <foreach collection="storeIdList" item="storeId" open="(" close=")" separator=",">
                 #{storeId}
             </foreach>
         </if>
-        GROUP BY dam.id;
+        GROUP BY dam.id
+        order by inviteMatchmakerNum desc
     </select>
 </mapper>