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:
@@ -37,4 +37,10 @@ public class AdminIntegralSearchRequest implements Serializable {
|
||||
|
||||
@ApiModelProperty(value = "用户id")
|
||||
private Integer uid;
|
||||
|
||||
@ApiModelProperty(value = "用户名称(昵称,模糊匹配)")
|
||||
private String nickName;
|
||||
|
||||
@ApiModelProperty(value = "用户手机号(模糊匹配)")
|
||||
private String phone;
|
||||
}
|
||||
|
||||
@@ -123,4 +123,16 @@ public class StoreOrderDetailResponse implements Serializable {
|
||||
|
||||
@ApiModelProperty(value = "物流状态/出库状态:0-未出库,1-已出库")
|
||||
private Integer deliveryStatus;
|
||||
|
||||
@ApiModelProperty(value = "用户id")
|
||||
private Integer uid;
|
||||
|
||||
@ApiModelProperty(value = "用户手机号")
|
||||
private String userPhone;
|
||||
|
||||
@ApiModelProperty(value = "用户昵称")
|
||||
private String nickname;
|
||||
|
||||
@ApiModelProperty(value = "使用积分")
|
||||
private Integer useIntegral;
|
||||
}
|
||||
|
||||
@@ -92,6 +92,9 @@ public class UserResponse {
|
||||
@ApiModelProperty(value = "用户剩余积分(支持小数点后3位)")
|
||||
private BigDecimal integral;
|
||||
|
||||
@ApiModelProperty(value = "个人奖金(寄卖 wa_users.self_bonus,与 uid 对应 wa_users.id)")
|
||||
private BigDecimal selfBonus;
|
||||
|
||||
@ApiModelProperty(value = "用户剩余经验")
|
||||
private Integer experience;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user