feat(integral-external): order/user list, integral log, wa selfBonus
- Fix ExternalIntegral order list (no double restPage); default 普通订单; UI columns for useIntegral and buyer uid/nickname/phone; enrich StoreOrderDetailResponse and admin query select. - External user list: UserResponse.selfBonus and fillWaSelfBonus from wa_users.id=uid. - Integral log: AdminIntegralSearchRequest nickName/phone; findAdminList filters and ordering; integralExternal API sends page/limit as query params. - Integral detail page: linkType Chinese mapping including selfbonus; update docs/newpage.md. - Dashboard grid menu entries for integral-external routes. Made-with: Cursor
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.zbkj.admin.controller;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.zbkj.common.page.CommonPage;
|
||||
import com.zbkj.common.request.*;
|
||||
import com.zbkj.common.response.StoreOrderDetailResponse;
|
||||
@@ -69,7 +70,7 @@ public class ExternalIntegralController {
|
||||
@Validated StoreOrderSearchRequest request,
|
||||
@Validated PageParamRequest pageParamRequest) {
|
||||
CommonPage<StoreOrderDetailResponse> restPage =
|
||||
CommonPage.restPage(storeOrderService.getAdminList(request, pageParamRequest));
|
||||
storeOrderService.getAdminList(request, pageParamRequest);
|
||||
return CommonResult.success(restPage);
|
||||
}
|
||||
|
||||
@@ -87,6 +88,9 @@ public class ExternalIntegralController {
|
||||
@Validated PageParamRequest pageParamRequest) {
|
||||
CommonPage<UserResponse> restPage =
|
||||
CommonPage.restPage(userService.getList(request, pageParamRequest));
|
||||
if (CollUtil.isNotEmpty(restPage.getList())) {
|
||||
userService.fillWaSelfBonus(restPage.getList());
|
||||
}
|
||||
return CommonResult.success(restPage);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user