充值记录+ 返利记录

snowy-admin-web/src/views/biz/rebaterecord/index.vue

@@ -1,20 +1,20 @@
 <template>
-	<a-card :bordered="false">
+	<a-card :bordered="false" class="xn-mb10">
 		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
 			<a-row :gutter="24">
 				<a-col :span="6">
-					<a-form-item label="推荐人" name="recommendUserId">
-						<a-input v-model:value="searchFormState.recommendUserId" placeholder="请输入推荐人" />
+					<a-form-item label="推荐人" name="recommendSearchKey">
+						<a-input v-model:value="searchFormState.recommendSearchKey" placeholder="请输入推荐人姓名或手机号" />
 					</a-form-item>
 				</a-col>
 				<a-col :span="6">
-					<a-form-item label="充值人" name="rechargeUserId">
-						<a-input v-model:value="searchFormState.rechargeUserId" placeholder="请输入充值人" />
+					<a-form-item label="充值人" name="rechargeSearchKey">
+						<a-input v-model:value="searchFormState.rechargeSearchKey" placeholder="请输入充值人姓名或手机号" />
 					</a-form-item>
 				</a-col>
 				<a-col :span="6">
-					<a-form-item label="代金券状态： 1. 待生效 2.已生效" name="rebateStatus">
-						<a-input v-model:value="searchFormState.rebateStatus" placeholder="请输入代金券状态： 1. 待生效 2.已生效" />
+					<a-form-item label="状态" name="rebateStatus">
+						<a-input v-model:value="searchFormState.rebateStatus" placeholder="请输入代金券状态" />
 					</a-form-item>
 				</a-col>
 				<a-col :span="6">
@@ -23,41 +23,18 @@
 				</a-col>
 			</a-row>
 		</a-form>
-		<s-table
-			ref="tableRef"
-			:columns="columns"
-			:data="loadData"
-			:alert="options.alert.show"
-			bordered
-			:row-key="(record) => record.id"
-			:tool-config="toolConfig"
-			:row-selection="options.rowSelection"
-		>
-			<template #operator class="table-operator">
-				<a-space>
-					<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizRebateRecordAdd')">
-						<template #icon><plus-outlined /></template>
-						新增
-					</a-button>
-					<xn-batch-button
-						v-if="hasPerm('bizRebateRecordBatchDelete')"
-						buttonName="批量删除"
-                        icon="DeleteOutlined"
-						:selectedRowKeys="selectedRowKeys"
-						@batchCallBack="deleteBatchBizRebateRecord"
-					/>
-				</a-space>
-			</template>
-			<template #bodyCell="{ column, record }">
-				<template v-if="column.dataIndex === 'action'">
-					<a-space>
-						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizRebateRecordEdit')">编辑</a>
-						<a-divider type="vertical" v-if="hasPerm(['bizRebateRecordEdit', 'bizRebateRecordDelete'], 'and')" />
-						<a-popconfirm title="确定要删除吗？" @confirm="deleteBizRebateRecord(record)">
-							<a-button type="link" danger size="small" v-if="hasPerm('bizRebateRecordDelete')">删除</a-button>
-						</a-popconfirm>
-					</a-space>
+	</a-card>
+	<a-card :bordered="false">
+		<s-table ref="tableRef" :columns="columns" :data="loadData" bordered :row-key="(record) => record.id">
+			<template #bodyCell="{ column, record, index }">
+				<template v-if="column.dataIndex === 'serial'">
+					{{ index + 1 }}
 				</template>
+				<!--				<template v-if="column.dataIndex === 'action'">-->
+				<!--					<a-space>-->
+				<!--						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizRebateRecordEdit')">编辑</a>-->
+				<!--					</a-space>-->
+				<!--				</template>-->
 			</template>
 		</s-table>
 	</a-card>
@@ -72,8 +49,12 @@
 	const searchFormRef = ref()
 	const tableRef = ref()
 	const formRef = ref()
-	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
 	const columns = [
+		{
+			title: '序号',
+			dataIndex: 'serial',
+			width: 80
+		},
 		{
 			title: '代金券金额',
 			dataIndex: 'rebateAmout'
@@ -87,35 +68,17 @@
 			dataIndex: 'rechargeUserId'
 		},
 		{
-			title: '代金券状态： 1. 待生效 2.已生效',
+			title: '状态',
 			dataIndex: 'rebateStatus'
-		},
-	]
-	// 操作栏通过权限判断是否显示
-	if (hasPerm(['bizRebateRecordEdit', 'bizRebateRecordDelete'])) {
-		columns.push({
-			title: '操作',
-			dataIndex: 'action',
-			align: 'center',
-			width: 150
-		})
-	}
-	const selectedRowKeys = ref([])
-	// 列表选择配置
-	const options = {
-		// columns数字类型字段加入 needTotal: true 可以勾选自动算账
-		alert: {
-			show: true,
-			clear: () => {
-				selectedRowKeys.value = ref([])
-			}
-		},
-		rowSelection: {
-			onChange: (selectedRowKey, selectedRows) => {
-				selectedRowKeys.value = selectedRowKey
-			}
 		}
-	}
+	]
+	// // 操作栏通过权限判断是否显示
+	// columns.push({
+	// 	title: '操作',
+	// 	dataIndex: 'action',
+	// 	align: 'center',
+	// 	width: 150
+	// })
 	const loadData = (parameter) => {
 		const searchFormParam = cloneDeep(searchFormState.value)
 		return bizRebateRecordApi.bizRebateRecordPage(Object.assign(parameter, searchFormParam)).then((data) => {
@@ -127,21 +90,4 @@
 		searchFormRef.value.resetFields()
 		tableRef.value.refresh(true)
 	}
-	// 删除
-	const deleteBizRebateRecord = (record) => {
-		let params = [
-			{
-				id: record.id
-			}
-		]
-		bizRebateRecordApi.bizRebateRecordDelete(params).then(() => {
-			tableRef.value.refresh(true)
-		})
-	}
-	// 批量删除
-	const deleteBatchBizRebateRecord = (params) => {
-		bizRebateRecordApi.bizRebateRecordDelete(params).then(() => {
-			tableRef.value.clearRefreshSelected()
-		})
-	}
 </script>

snowy-admin-web/src/views/biz/rechargerecord/form.vue

@@ -1,60 +1,25 @@
 <template>
-	<xn-form-container
-		:title="formData.id ? '编辑充值记录表' : '增加充值记录表'"
-		:width="700"
-		v-model:open="open"
-		:destroy-on-close="true"
-		@close="onClose"
-	>
-		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
-			<a-form-item label="用户id：" name="userId">
-				<a-input v-model:value="formData.userId" placeholder="请输入用户id" allow-clear />
-			</a-form-item>
-			<a-form-item label="充值方案id：" name="rechargePlanId">
-				<a-input v-model:value="formData.rechargePlanId" placeholder="请输入充值方案id" allow-clear />
-			</a-form-item>
-			<a-form-item label="充值金额：" name="rechargeAmount">
-				<a-input v-model:value="formData.rechargeAmount" placeholder="请输入充值金额" allow-clear />
-			</a-form-item>
-			<a-form-item label="充值时间：" name="rechargeTime">
-				<a-date-picker v-model:value="formData.rechargeTime" value-format="YYYY-MM-DD HH:mm:ss" show-time placeholder="请选择充值时间" style="width: 100%" />
-			</a-form-item>
-			<a-form-item label="原账户余额：" name="oldAccountBalance">
-				<a-input v-model:value="formData.oldAccountBalance" placeholder="请输入原账户余额" allow-clear />
-			</a-form-item>
-			<a-form-item label="原代金券金额：" name="oldVoucherBalance">
-				<a-input v-model:value="formData.oldVoucherBalance" placeholder="请输入原代金券金额" allow-clear />
-			</a-form-item>
-			<a-form-item label="新账户余额：" name="newAccountBalance">
-				<a-input v-model:value="formData.newAccountBalance" placeholder="请输入新账户余额" allow-clear />
-			</a-form-item>
-			<a-form-item label="新代金券金额：" name="newVoucherBalance">
-				<a-input v-model:value="formData.newVoucherBalance" placeholder="请输入新代金券金额" allow-clear />
-			</a-form-item>
-			<a-form-item label="推荐人的返点比例：" name="rebateRatio">
-				<a-input v-model:value="formData.rebateRatio" placeholder="请输入推荐人的返点比例" allow-clear />
-			</a-form-item>
-			<a-form-item label="推荐人具体返点金额：" name="rebateAmount">
-				<a-input v-model:value="formData.rebateAmount" placeholder="请输入推荐人具体返点金额" allow-clear />
-			</a-form-item>
-			<a-form-item label="优惠券（蛋糕券）数量：" name="couponNum">
-				<a-input v-model:value="formData.couponNum" placeholder="请输入优惠券（蛋糕券）数量" allow-clear />
-			</a-form-item>
-			<a-form-item label="优惠券金额：" name="couponAmount">
-				<a-input v-model:value="formData.couponAmount" placeholder="请输入优惠券金额" allow-clear />
-			</a-form-item>
-			<a-form-item label="系统订单号：" name="orderNo">
-				<a-input v-model:value="formData.orderNo" placeholder="请输入系统订单号" allow-clear />
-			</a-form-item>
-			<a-form-item label="微信订单编号：" name="wxOrderNo">
-				<a-input v-model:value="formData.wxOrderNo" placeholder="请输入微信订单编号" allow-clear />
-			</a-form-item>
-			<a-form-item label="是否支付 0.未支付 1.已支付：" name="isPay">
-				<a-input v-model:value="formData.isPay" placeholder="请输入是否支付 0.未支付 1.已支付" allow-clear />
-			</a-form-item>
-			<a-form-item label="支付时间：" name="payTime">
-				<a-date-picker v-model:value="formData.payTime" value-format="YYYY-MM-DD HH:mm:ss" show-time placeholder="请选择支付时间" style="width: 100%" />
-			</a-form-item>
+	<xn-form-container :title="'充值记录详情'" :width="800" v-model:open="open" :destroy-on-close="true" @close="onClose">
+		<a-form ref="formRef" :model="formData">
+			<a-descriptions :column="2" bordered>
+				<a-descriptions-item label="姓名">{{ formData.name }}</a-descriptions-item>
+				<a-descriptions-item label="充值金额">{{ formData.rechargeAmount }}</a-descriptions-item>
+				<a-descriptions-item label="充值金额">{{ formData.rechargeAmount }}</a-descriptions-item>
+				<a-descriptions-item label="充值时间">{{ formData.rechargeTime }}</a-descriptions-item>
+				<a-descriptions-item label="原账户余额">{{ formData.oldAccountBalance + '元' }}</a-descriptions-item>
+				<a-descriptions-item label="新账户余额">{{ formData.newAccountBalance + '元' }}</a-descriptions-item>
+				<a-descriptions-item label="返利金额" v-if="formData.rebateAmount != null">{{
+					formData.rebateAmount
+				}}</a-descriptions-item>
+				<a-descriptions-item label="蛋糕券数量" v-if="formData.couponNum != null">{{
+					formData.couponNum
+				}}</a-descriptions-item>
+				<a-descriptions-item label="订单号">{{ formData.orderNo }}</a-descriptions-item>
+				<a-descriptions-item label="是否支付">{{ formData.isPay }}</a-descriptions-item>
+				<a-descriptions-item label="充值方案说明：" v-if="formData.rechargePlanId != null">{{
+					formData.rechargePlanDescribe
+				}}</a-descriptions-item>
+			</a-descriptions>
 		</a-form>
 		<template #footer>
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
@@ -90,8 +55,7 @@
 		open.value = false
 	}
 	// 默认要校验的
-	const formRules = {
-	}
+	const formRules = {}
 	// 验证并提交数据
 	const onSubmit = () => {
 		formRef.value

snowy-admin-web/src/views/biz/rechargerecord/index.vue

@@ -1,10 +1,10 @@
 <template>
-	<a-card :bordered="false">
+	<a-card :bordered="false" class="xn-mb10">
 		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
 			<a-row :gutter="24">
 				<a-col :span="6">
-					<a-form-item label="用户id" name="userId">
-						<a-input v-model:value="searchFormState.userId" placeholder="请输入用户id" />
+					<a-form-item label="关键字搜素" name="searchKey">
+						<a-input v-model:value="searchFormState.userId" placeholder="请输入姓名或者手机号" />
 					</a-form-item>
 				</a-col>
 				<a-col :span="6">
@@ -18,39 +18,20 @@
 				</a-col>
 			</a-row>
 		</a-form>
-		<s-table
-			ref="tableRef"
-			:columns="columns"
-			:data="loadData"
-			:alert="options.alert.show"
-			bordered
-			:row-key="(record) => record.id"
-			:tool-config="toolConfig"
-			:row-selection="options.rowSelection"
-		>
-			<template #operator class="table-operator">
-				<a-space>
-					<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizRechargeRecordAdd')">
-						<template #icon><plus-outlined /></template>
-						新增
-					</a-button>
-					<xn-batch-button
-						v-if="hasPerm('bizRechargeRecordBatchDelete')"
-						buttonName="批量删除"
-                        icon="DeleteOutlined"
-						:selectedRowKeys="selectedRowKeys"
-						@batchCallBack="deleteBatchBizRechargeRecord"
-					/>
-				</a-space>
-			</template>
-			<template #bodyCell="{ column, record }">
+	</a-card>
+	<a-card>
+		<s-table ref="tableRef" :columns="columns" :data="loadData" bordered :row-key="(record) => record.id">
+			<template #bodyCell="{ column, record, index }">
+				<template v-if="column.dataIndex === 'serial'">
+					{{ index + 1 }}
+				</template>
+				<template v-if="column.dataIndex === 'isPay'">
+					<a-tag v-if="record.isPay === true" color="blue">已支付</a-tag>
+					<a-tag v-else color="pink">待支付</a-tag>
+				</template>
 				<template v-if="column.dataIndex === 'action'">
 					<a-space>
-						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizRechargeRecordEdit')">编辑</a>
-						<a-divider type="vertical" v-if="hasPerm(['bizRechargeRecordEdit', 'bizRechargeRecordDelete'], 'and')" />
-						<a-popconfirm title="确定要删除吗？" @confirm="deleteBizRechargeRecord(record)">
-							<a-button type="link" danger size="small" v-if="hasPerm('bizRechargeRecordDelete')">删除</a-button>
-						</a-popconfirm>
+						<a @click="formRef.onOpen(record)">详情</a>
 					</a-space>
 				</template>
 			</template>
@@ -67,18 +48,22 @@
 	const searchFormRef = ref()
 	const tableRef = ref()
 	const formRef = ref()
-	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
 	const columns = [
 		{
-			title: '用户id',
-			dataIndex: 'userId'
+			title: '序号',
+			dataIndex: 'serial',
+			width: 80
+		},
+		{
+			title: '姓名',
+			dataIndex: 'name'
 		},
 		{
-			title: '充值方案id',
-			dataIndex: 'rechargePlanId'
+			title: '手机号',
+			dataIndex: 'phone'
 		},
 		{
-			title: '充值金额',
+			title: '充值金额（元）',
 			dataIndex: 'rechargeAmount'
 		},
 		{
@@ -86,55 +71,25 @@
 			dataIndex: 'rechargeTime'
 		},
 		{
-			title: '原账户余额',
+			title: '原账户余额（元）',
 			dataIndex: 'oldAccountBalance'
 		},
 		{
-			title: '原代金券金额',
-			dataIndex: 'oldVoucherBalance'
+			title: '新账户余额（元）',
+			dataIndex: 'newAccountBalance'
 		},
 		{
-			title: '系统订单号',
-			dataIndex: 'orderNo'
-		},
-		{
-			title: '微信订单编号',
-			dataIndex: 'wxOrderNo'
-		},
-		{
-			title: '是否支付 0.未支付 1.已支付',
+			title: '是否支付',
 			dataIndex: 'isPay'
-		},
-		{
-			title: '支付时间',
-			dataIndex: 'payTime'
-		},
+		}
 	]
 	// 操作栏通过权限判断是否显示
-	if (hasPerm(['bizRechargeRecordEdit', 'bizRechargeRecordDelete'])) {
-		columns.push({
-			title: '操作',
-			dataIndex: 'action',
-			align: 'center',
-			width: 150
-		})
-	}
-	const selectedRowKeys = ref([])
-	// 列表选择配置
-	const options = {
-		// columns数字类型字段加入 needTotal: true 可以勾选自动算账
-		alert: {
-			show: true,
-			clear: () => {
-				selectedRowKeys.value = ref([])
-			}
-		},
-		rowSelection: {
-			onChange: (selectedRowKey, selectedRows) => {
-				selectedRowKeys.value = selectedRowKey
-			}
-		}
-	}
+	columns.push({
+		title: '操作',
+		dataIndex: 'action',
+		align: 'center',
+		width: 150
+	})
 	const loadData = (parameter) => {
 		const searchFormParam = cloneDeep(searchFormState.value)
 		// rechargeTime范围查询条件重载
@@ -152,21 +107,4 @@
 		searchFormRef.value.resetFields()
 		tableRef.value.refresh(true)
 	}
-	// 删除
-	const deleteBizRechargeRecord = (record) => {
-		let params = [
-			{
-				id: record.id
-			}
-		]
-		bizRechargeRecordApi.bizRechargeRecordDelete(params).then(() => {
-			tableRef.value.refresh(true)
-		})
-	}
-	// 批量删除
-	const deleteBatchBizRechargeRecord = (params) => {
-		bizRechargeRecordApi.bizRechargeRecordDelete(params).then(() => {
-			tableRef.value.clearRefreshSelected()
-		})
-	}
 </script>

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rebaterecord/controller/BizRebateRecordController.java

@@ -62,52 +62,6 @@ public class BizRebateRecordController {
         return CommonResult.data(bizRebateRecordService.page(bizRebateRecordPageParam));
     }
 
-    /**
-     * 添加返利记录
-     *
-     * @author wulei
-     * @date  2025/02/06 17:39
-     */
-    @Operation(summary = "添加返利记录")
-    @CommonLog("添加返利记录")
-    @SaCheckPermission("/biz/rebaterecord/add")
-    @PostMapping("/biz/rebaterecord/add")
-    public CommonResult<String> add(@RequestBody @Valid BizRebateRecordAddParam bizRebateRecordAddParam) {
-        bizRebateRecordService.add(bizRebateRecordAddParam);
-        return CommonResult.ok();
-    }
-
-    /**
-     * 编辑返利记录
-     *
-     * @author wulei
-     * @date  2025/02/06 17:39
-     */
-    @Operation(summary = "编辑返利记录")
-    @CommonLog("编辑返利记录")
-    @SaCheckPermission("/biz/rebaterecord/edit")
-    @PostMapping("/biz/rebaterecord/edit")
-    public CommonResult<String> edit(@RequestBody @Valid BizRebateRecordEditParam bizRebateRecordEditParam) {
-        bizRebateRecordService.edit(bizRebateRecordEditParam);
-        return CommonResult.ok();
-    }
-
-    /**
-     * 删除返利记录
-     *
-     * @author wulei
-     * @date  2025/02/06 17:39
-     */
-    @Operation(summary = "删除返利记录")
-    @CommonLog("删除返利记录")
-    @SaCheckPermission("/biz/rebaterecord/delete")
-    @PostMapping("/biz/rebaterecord/delete")
-    public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
-                                                   List<BizRebateRecordIdParam> bizRebateRecordIdParamList) {
-        bizRebateRecordService.delete(bizRebateRecordIdParamList);
-        return CommonResult.ok();
-    }
-
     /**
      * 获取返利记录详情
      *
@@ -115,7 +69,6 @@ public class BizRebateRecordController {
      * @date  2025/02/06 17:39
      */
     @Operation(summary = "获取返利记录详情")
-    @SaCheckPermission("/biz/rebaterecord/detail")
     @GetMapping("/biz/rebaterecord/detail")
     public CommonResult<BizRebateRecord> detail(@Valid BizRebateRecordIdParam bizRebateRecordIdParam) {
         return CommonResult.data(bizRebateRecordService.detail(bizRebateRecordIdParam));

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rebaterecord/entity/BizRebateRecord.java

@@ -45,6 +45,11 @@ public class BizRebateRecord extends CommonEntity {
     @Schema(description = "推荐人")
     private String recommendUserId;
 
+    /** 推荐人 */
+    @Schema(description = "推荐人")
+    @TableField(exist = false)
+    private String recommendUserName;
+
     /** 充值记录id */
     @Schema(description = "充值记录id")
     private String rechargeRecordId;
@@ -53,6 +58,11 @@ public class BizRebateRecord extends CommonEntity {
     @Schema(description = "充值人")
     private String rechargeUserId;
 
+    /** 充值人 */
+    @Schema(description = "充值人")
+    @TableField(exist = false)
+    private String rechargeUserName;
+
     /** 代金券状态： 1. 待生效 2.已生效 */
     @Schema(description = "代金券状态： 1. 待生效 2.已生效")
     private String rebateStatus;

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rebaterecord/mapper/BizRebateRecordMapper.java

@@ -12,14 +12,19 @@
  */
 package vip.xiaonuo.biz.modular.rebaterecord.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import vip.xiaonuo.biz.modular.rebaterecord.entity.BizRebateRecord;
 
 /**
  * 返利记录Mapper接口
  *
  * @author wulei
- * @date  2025/02/06 17:39
+ * @date 2025/02/06 17:39
  **/
 public interface BizRebateRecordMapper extends BaseMapper<BizRebateRecord> {
+
+    Page<BizRebateRecord> page(@Param("page") Page<BizRebateRecord> page, @Param("ew") QueryWrapper<BizRebateRecord> queryWrapper);
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rebaterecord/mapper/mapping/BizRebateRecordMapper.xml

@@ -2,4 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="vip.xiaonuo.biz.modular.rebaterecord.mapper.BizRebateRecordMapper">
 
+    <select id="page" resultType="vip.xiaonuo.biz.modular.rebaterecord.entity.BizRebateRecord">
+        SELECT
+            t.id,
+            t.rebate_amout,
+            t.recharge_record_id,
+            t.recommend_user_id,
+            t.recharge_user_id,
+            t.create_time,
+            t.rebate_status,
+            u1.`NAME` rechargeUserName,
+            u2.`NAME` recommendUserName
+        FROM
+            biz_rebate_record t
+        LEFT JOIN SYS_USER u1 ON u1.ID = t.recharge_user_id
+        LEFT JOIN SYS_USER u2 ON u2.ID = t.recommend_user_id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rebaterecord/param/BizRebateRecordPageParam.java

@@ -15,8 +15,6 @@ package vip.xiaonuo.biz.modular.rebaterecord.param;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 返利记录查询参数
@@ -50,11 +48,11 @@ public class BizRebateRecordPageParam {
 
     /** 推荐人 */
     @Schema(description = "推荐人")
-    private String recommendUserId;
+    private String recommendSearchKey;
 
     /** 充值人 */
     @Schema(description = "充值人")
-    private String rechargeUserId;
+    private String rechargeSearchKey;
 
     /** 代金券状态： 1. 待生效 2.已生效 */
     @Schema(description = "代金券状态： 1. 待生效 2.已生效")

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rebaterecord/service/BizRebateRecordService.java

@@ -38,30 +38,6 @@ public interface BizRebateRecordService extends IService<BizRebateRecord> {
      */
     Page<BizRebateRecord> page(BizRebateRecordPageParam bizRebateRecordPageParam);
 
-    /**
-     * 添加返利记录
-     *
-     * @author wulei
-     * @date  2025/02/06 17:39
-     */
-    void add(BizRebateRecordAddParam bizRebateRecordAddParam);
-
-    /**
-     * 编辑返利记录
-     *
-     * @author wulei
-     * @date  2025/02/06 17:39
-     */
-    void edit(BizRebateRecordEditParam bizRebateRecordEditParam);
-
-    /**
-     * 删除返利记录
-     *
-     * @author wulei
-     * @date  2025/02/06 17:39
-     */
-    void delete(List<BizRebateRecordIdParam> bizRebateRecordIdParamList);
-
     /**
      * 获取返利记录详情
      *

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rebaterecord/service/impl/BizRebateRecordServiceImpl.java

@@ -38,7 +38,7 @@ import java.util.List;
  * 返利记录Service接口实现类
  *
  * @author wulei
- * @date  2025/02/06 17:39
+ * @date 2025/02/06 17:39
  **/
 @Service
 public class BizRebateRecordServiceImpl extends ServiceImpl<BizRebateRecordMapper, BizRebateRecord> implements BizRebateRecordService {
@@ -46,45 +46,19 @@ public class BizRebateRecordServiceImpl extends ServiceImpl<BizRebateRecordMappe
     @Override
     public Page<BizRebateRecord> page(BizRebateRecordPageParam bizRebateRecordPageParam) {
         QueryWrapper<BizRebateRecord> queryWrapper = new QueryWrapper<BizRebateRecord>().checkSqlInjection();
-        if(ObjectUtil.isNotEmpty(bizRebateRecordPageParam.getRecommendUserId())) {
-            queryWrapper.lambda().eq(BizRebateRecord::getRecommendUserId, bizRebateRecordPageParam.getRecommendUserId());
+        if (ObjectUtil.isNotEmpty(bizRebateRecordPageParam.getRecommendSearchKey())) {
+            queryWrapper.and(s -> s.like("u2.NAME", bizRebateRecordPageParam.getRecommendSearchKey())
+                    .or().like("u2.ACCOUNT", bizRebateRecordPageParam.getRecommendSearchKey()));
+            if (ObjectUtil.isNotEmpty(bizRebateRecordPageParam.getRechargeSearchKey())) {
+                queryWrapper.and(s -> s.like("u1.NAME", bizRebateRecordPageParam.getRechargeSearchKey())
+                        .or().like("u1.ACCOUNT", bizRebateRecordPageParam.getRechargeSearchKey()));
+            }
+            if (ObjectUtil.isNotEmpty(bizRebateRecordPageParam.getRebateStatus())) {
+                queryWrapper.eq("t.rebate_status", bizRebateRecordPageParam.getRebateStatus());
+            }
         }
-        if(ObjectUtil.isNotEmpty(bizRebateRecordPageParam.getRechargeUserId())) {
-            queryWrapper.lambda().eq(BizRebateRecord::getRechargeUserId, bizRebateRecordPageParam.getRechargeUserId());
-        }
-        if(ObjectUtil.isNotEmpty(bizRebateRecordPageParam.getRebateStatus())) {
-            queryWrapper.lambda().eq(BizRebateRecord::getRebateStatus, bizRebateRecordPageParam.getRebateStatus());
-        }
-        if(ObjectUtil.isAllNotEmpty(bizRebateRecordPageParam.getSortField(), bizRebateRecordPageParam.getSortOrder())) {
-            CommonSortOrderEnum.validate(bizRebateRecordPageParam.getSortOrder());
-            queryWrapper.orderBy(true, bizRebateRecordPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
-                    StrUtil.toUnderlineCase(bizRebateRecordPageParam.getSortField()));
-        } else {
-            queryWrapper.lambda().orderByAsc(BizRebateRecord::getId);
-        }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void add(BizRebateRecordAddParam bizRebateRecordAddParam) {
-        BizRebateRecord bizRebateRecord = BeanUtil.toBean(bizRebateRecordAddParam, BizRebateRecord.class);
-        this.save(bizRebateRecord);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void edit(BizRebateRecordEditParam bizRebateRecordEditParam) {
-        BizRebateRecord bizRebateRecord = this.queryEntity(bizRebateRecordEditParam.getId());
-        BeanUtil.copyProperties(bizRebateRecordEditParam, bizRebateRecord);
-        this.updateById(bizRebateRecord);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void delete(List<BizRebateRecordIdParam> bizRebateRecordIdParamList) {
-        // 执行删除
-        this.removeByIds(CollStreamUtil.toList(bizRebateRecordIdParamList, BizRebateRecordIdParam::getId));
+        queryWrapper.orderByDesc("t.create_time");
+        return baseMapper.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
 
     @Override
@@ -95,7 +69,7 @@ public class BizRebateRecordServiceImpl extends ServiceImpl<BizRebateRecordMappe
     @Override
     public BizRebateRecord queryEntity(String id) {
         BizRebateRecord bizRebateRecord = this.getById(id);
-        if(ObjectUtil.isEmpty(bizRebateRecord)) {
+        if (ObjectUtil.isEmpty(bizRebateRecord)) {
             throw new CommonException("返利记录不存在，id值为：{}", id);
         }
         return bizRebateRecord;

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rechargerecord/entity/BizRechargeRecord.java

@@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
+import vip.xiaonuo.common.handler.CommonSm4CbcTypeHandler;
 import vip.xiaonuo.common.pojo.CommonEntity;
 
 import java.math.BigDecimal;
@@ -25,11 +26,11 @@ import java.util.Date;
  * 充值记录表实体
  *
  * @author wulei
- * @date  2025/02/06 17:41
+ * @date 2025/02/06 17:41
  **/
 @Getter
 @Setter
-@TableName("biz_recharge_record")
+@TableName(value = "biz_recharge_record")
 public class BizRechargeRecord extends CommonEntity {
 
     /** 充值记录表id */
@@ -49,6 +50,10 @@ public class BizRechargeRecord extends CommonEntity {
     @Schema(description = "充值方案中账户需要增加的金额")
     private BigDecimal planAccountBalance;
 
+    /** 充值方案内容 */
+    @Schema(description = "充值方案内容")
+    private String rechargePlanDescribe;
+
     /** 充值金额 */
     @Schema(description = "充值金额")
     private BigDecimal rechargeAmount;
@@ -109,5 +114,13 @@ public class BizRechargeRecord extends CommonEntity {
     @Schema(description = "支付时间")
     private Date payTime;
 
+    /** 用户姓名 */
+    @Schema(description = "用户姓名")
+    @TableField(exist = false)
+    private String name;
 
+    /** 手机号 */
+    @Schema(description = "手机号")
+    @TableField(exist = false)
+    private String phone;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rechargerecord/mapper/BizRechargeRecordMapper.java

@@ -12,14 +12,27 @@
  */
 package vip.xiaonuo.biz.modular.rechargerecord.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import vip.xiaonuo.biz.modular.rechargerecord.entity.BizRechargeRecord;
+import vip.xiaonuo.biz.modular.rechargerecord.param.BizRechargeRecordPageParam;
 
 /**
  * 充值记录表Mapper接口
  *
  * @author wulei
- * @date  2025/02/06 17:41
+ * @date 2025/02/06 17:41
  **/
 public interface BizRechargeRecordMapper extends BaseMapper<BizRechargeRecord> {
+    /**
+     * 查询分页
+     * @param page
+     * @param queryWrapper
+     * @return
+     */
+    Page<BizRechargeRecord> pageList(@Param("page") Page page, @Param("ew") QueryWrapper<BizRechargeRecord> queryWrapper);
+
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rechargerecord/mapper/mapping/BizRechargeRecordMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="vip.xiaonuo.biz.modular.rechargerecord.mapper.BizRechargeRecordMapper">
 
+    <select id="pageList" resultType="vip.xiaonuo.biz.modular.rechargerecord.entity.BizRechargeRecord">
+        SELECT
+            t.id,
+            t.user_id,
+            su.NAME,
+            su.PHONE,
+            t.recharge_plan_id,
+            t.plan_account_balance,
+            t.recharge_amount,
+            t.recharge_time,
+            t.old_account_balance,
+            t.old_voucher_balance,
+            t.new_account_balance,
+            t.new_voucher_balance,
+            t.recharge_plan_describe,
+            t.order_no,
+            t.wx_pay_amount,
+            t.is_pay,
+            t.pay_time
+        FROM biz_recharge_record t
+        LEFT JOIN SYS_USER su ON t.user_id = su.id
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rechargerecord/service/impl/BizRechargeRecordServiceImpl.java

@@ -41,6 +41,7 @@ import vip.xiaonuo.biz.modular.rechargeplanconfig.entity.BizRechargePlanConfig;
 import vip.xiaonuo.biz.modular.rechargeplanconfig.mapper.BizRechargePlanConfigMapper;
 import vip.xiaonuo.biz.modular.user.entity.BizUser;
 import vip.xiaonuo.biz.modular.user.mapper.BizUserMapper;
+import vip.xiaonuo.common.enums.CommonDeleteFlagEnum;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
@@ -51,6 +52,8 @@ import vip.xiaonuo.biz.modular.rechargerecord.param.BizRechargeRecordEditParam;
 import vip.xiaonuo.biz.modular.rechargerecord.param.BizRechargeRecordIdParam;
 import vip.xiaonuo.biz.modular.rechargerecord.param.BizRechargeRecordPageParam;
 import vip.xiaonuo.biz.modular.rechargerecord.service.BizRechargeRecordService;
+import vip.xiaonuo.common.pojo.CommonEntity;
+import vip.xiaonuo.common.util.CommonCryptogramUtil;
 import vip.xiaonuo.common.util.CommonWxUtil;
 import vip.xiaonuo.common.wx.WxPayConfig;
 
@@ -85,20 +88,22 @@ public class BizRechargeRecordServiceImpl extends ServiceImpl<BizRechargeRecordM
     @Override
     public Page<BizRechargeRecord> page(BizRechargeRecordPageParam bizRechargeRecordPageParam) {
         QueryWrapper<BizRechargeRecord> queryWrapper = new QueryWrapper<BizRechargeRecord>().checkSqlInjection();
-        if (ObjectUtil.isNotEmpty(bizRechargeRecordPageParam.getUserId())) {
-            queryWrapper.lambda().like(BizRechargeRecord::getUserId, bizRechargeRecordPageParam.getUserId());
+        if (ObjectUtil.isNotEmpty(bizRechargeRecordPageParam.getSearchKey())) {
+            queryWrapper.and(s -> s.like("u.PHONE", bizRechargeRecordPageParam.getSearchKey())
+                    .or().like("u.NAME", bizRechargeRecordPageParam.getSearchKey()));
         }
         if (ObjectUtil.isNotEmpty(bizRechargeRecordPageParam.getStartRechargeTime()) && ObjectUtil.isNotEmpty(bizRechargeRecordPageParam.getEndRechargeTime())) {
-            queryWrapper.lambda().between(BizRechargeRecord::getRechargeTime, bizRechargeRecordPageParam.getStartRechargeTime(), bizRechargeRecordPageParam.getEndRechargeTime());
+            queryWrapper.between("t.recharge_time", bizRechargeRecordPageParam.getStartRechargeTime(), bizRechargeRecordPageParam.getEndRechargeTime());
         }
-        if (ObjectUtil.isAllNotEmpty(bizRechargeRecordPageParam.getSortField(), bizRechargeRecordPageParam.getSortOrder())) {
-            CommonSortOrderEnum.validate(bizRechargeRecordPageParam.getSortOrder());
-            queryWrapper.orderBy(true, bizRechargeRecordPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
-                    StrUtil.toUnderlineCase(bizRechargeRecordPageParam.getSortField()));
-        } else {
-            queryWrapper.lambda().orderByAsc(BizRechargeRecord::getId);
-        }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        queryWrapper.orderByDesc("t.recharge_time");
+        queryWrapper.eq("t.delete_flag", CommonDeleteFlagEnum.NOT_DELETE);
+        Page<BizRechargeRecord> pageList = baseMapper.pageList(CommonPageRequest.defaultPage(), queryWrapper);
+        pageList.getRecords().forEach(bizRechargeRecord -> {
+            if (ObjectUtil.isNotEmpty(bizRechargeRecord.getPhone())) {
+                bizRechargeRecord.setPhone(CommonCryptogramUtil.doSm4CbcDecrypt(bizRechargeRecord.getPhone()));
+            }
+        });
+        return pageList;
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -124,6 +129,18 @@ public class BizRechargeRecordServiceImpl extends ServiceImpl<BizRechargeRecordM
             if (bizRechargeRecordAddParam.getRechargeAmount().compareTo(bizRechargePlanConfig.getRechargeAmount()) < 0) {
                 throw new CommonException("当前充值金额不符合该优惠方案");
             }
+            //拼接方案内容
+            StringBuffer content = new StringBuffer();
+            content.append("充值方案：").append(bizRechargePlanConfig.getRechargeAmount()).append("元及以上，");
+            if (bizRechargePlanConfig.getCouponAmount().compareTo(BigDecimal.ZERO) != 0) {
+                content.append("赠送蛋糕券 ").append(bizRechargePlanConfig.getCouponAmount())
+                        .append(" x ").append(bizRechargePlanConfig.getCouponNum())
+                        .append("（线下核销领蛋糕）");
+            }
+            content.append("，账户余额到账").append(bizRechargePlanConfig.getAccountBalance())
+                    .append("元，返利").append(bizRechargePlanConfig.getRebateRatio())
+                    .append("%到推荐人代金券");
+            bizRechargeRecord.setRechargePlanDescribe(content.toString());
             bizRechargeRecord.setRechargePlanId(bizRechargeRecordAddParam.getRechargePlanId());
             bizRechargeRecord.setPlanAccountBalance(bizRechargePlanConfig.getAccountBalance());
             bizRechargeRecord.setCouponAmount(bizRechargePlanConfig.getCouponAmount());

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/recommendrecord/controller/BizRecommendRecordController.java

@@ -62,51 +62,6 @@ public class BizRecommendRecordController {
         return CommonResult.data(bizRecommendRecordService.page(bizRecommendRecordPageParam));
     }
 
-    /**
-     * 添加推荐记录表
-     *
-     * @author wulei
-     * @date  2025/02/06 17:42
-     */
-    @Operation(summary = "添加推荐记录表")
-    @CommonLog("添加推荐记录表")
-    @SaCheckPermission("/biz/recommendrecord/add")
-    @PostMapping("/biz/recommendrecord/add")
-    public CommonResult<String> add(@RequestBody @Valid BizRecommendRecordAddParam bizRecommendRecordAddParam) {
-        bizRecommendRecordService.add(bizRecommendRecordAddParam);
-        return CommonResult.ok();
-    }
-
-    /**
-     * 编辑推荐记录表
-     *
-     * @author wulei
-     * @date  2025/02/06 17:42
-     */
-    @Operation(summary = "编辑推荐记录表")
-    @CommonLog("编辑推荐记录表")
-    @SaCheckPermission("/biz/recommendrecord/edit")
-    @PostMapping("/biz/recommendrecord/edit")
-    public CommonResult<String> edit(@RequestBody @Valid BizRecommendRecordEditParam bizRecommendRecordEditParam) {
-        bizRecommendRecordService.edit(bizRecommendRecordEditParam);
-        return CommonResult.ok();
-    }
-
-    /**
-     * 删除推荐记录表
-     *
-     * @author wulei
-     * @date  2025/02/06 17:42
-     */
-    @Operation(summary = "删除推荐记录表")
-    @CommonLog("删除推荐记录表")
-    @SaCheckPermission("/biz/recommendrecord/delete")
-    @PostMapping("/biz/recommendrecord/delete")
-    public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
-                                                   List<BizRecommendRecordIdParam> bizRecommendRecordIdParamList) {
-        bizRecommendRecordService.delete(bizRecommendRecordIdParamList);
-        return CommonResult.ok();
-    }
 
     /**
      * 获取推荐记录表详情
@@ -115,7 +70,6 @@ public class BizRecommendRecordController {
      * @date  2025/02/06 17:42
      */
     @Operation(summary = "获取推荐记录表详情")
-    @SaCheckPermission("/biz/recommendrecord/detail")
     @GetMapping("/biz/recommendrecord/detail")
     public CommonResult<BizRecommendRecord> detail(@Valid BizRecommendRecordIdParam bizRecommendRecordIdParam) {
         return CommonResult.data(bizRecommendRecordService.detail(bizRecommendRecordIdParam));

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/recommendrecord/service/BizRecommendRecordService.java

@@ -38,30 +38,6 @@ public interface BizRecommendRecordService extends IService<BizRecommendRecord>
      */
     Page<BizRecommendRecord> page(BizRecommendRecordPageParam bizRecommendRecordPageParam);
 
-    /**
-     * 添加推荐记录表
-     *
-     * @author wulei
-     * @date  2025/02/06 17:42
-     */
-    void add(BizRecommendRecordAddParam bizRecommendRecordAddParam);
-
-    /**
-     * 编辑推荐记录表
-     *
-     * @author wulei
-     * @date  2025/02/06 17:42
-     */
-    void edit(BizRecommendRecordEditParam bizRecommendRecordEditParam);
-
-    /**
-     * 删除推荐记录表
-     *
-     * @author wulei
-     * @date  2025/02/06 17:42
-     */
-    void delete(List<BizRecommendRecordIdParam> bizRecommendRecordIdParamList);
-
     /**
      * 获取推荐记录表详情
      *

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/recommendrecord/service/impl/BizRecommendRecordServiceImpl.java

@@ -56,28 +56,6 @@ public class BizRecommendRecordServiceImpl extends ServiceImpl<BizRecommendRecor
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
 
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void add(BizRecommendRecordAddParam bizRecommendRecordAddParam) {
-        BizRecommendRecord bizRecommendRecord = BeanUtil.toBean(bizRecommendRecordAddParam, BizRecommendRecord.class);
-        this.save(bizRecommendRecord);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void edit(BizRecommendRecordEditParam bizRecommendRecordEditParam) {
-        BizRecommendRecord bizRecommendRecord = this.queryEntity(bizRecommendRecordEditParam.getId());
-        BeanUtil.copyProperties(bizRecommendRecordEditParam, bizRecommendRecord);
-        this.updateById(bizRecommendRecord);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void delete(List<BizRecommendRecordIdParam> bizRecommendRecordIdParamList) {
-        // 执行删除
-        this.removeByIds(CollStreamUtil.toList(bizRecommendRecordIdParamList, BizRecommendRecordIdParam::getId));
-    }
-
     @Override
     public BizRecommendRecord detail(BizRecommendRecordIdParam bizRecommendRecordIdParam) {
         return this.queryEntity(bizRecommendRecordIdParam.getId());