推荐记录

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

@@ -40,7 +40,9 @@
 					{{ index + 1 }}
 				</template>
 				<template v-if="column.dataIndex === 'gender'">
-					{{ $TOOL.dictTypeData('GENDER', record.gender) }}
+					<span v-if="record.gender !== null">
+						{{ $TOOL.dictTypeData('GENDER', record.gender) }}
+					</span>
 				</template>
 				<template v-if="column.dataIndex === 'userStatus'">
 					<a-tag :color="record.userStatus === 'ENABLE' ? 'blue' : 'pink'">{{

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

@@ -3,18 +3,18 @@
 		<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="recommendSearchKey">
-						<a-input v-model:value="searchFormState.recommendSearchKey" 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="充值人" name="rechargeSearchKey">
-						<a-input v-model:value="searchFormState.rechargeSearchKey" 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="rebateStatus">
-						<a-input v-model:value="searchFormState.rebateStatus" placeholder="请输入代金券状态" />
+						<a-select v-model:value="searchFormState.rebateStatus" :options="statusData" placeholder="请选择" />
 					</a-form-item>
 				</a-col>
 				<a-col :span="6">
@@ -30,6 +30,13 @@
 				<template v-if="column.dataIndex === 'serial'">
 					{{ index + 1 }}
 				</template>
+				<template v-if="column.dataIndex === 'rebateRatio'">
+					{{ record.rebateRatio + ' %' }}
+				</template>
+				<template v-if="column.dataIndex === 'rebateStatus'">
+					<a-tag v-if="record.rebateStatus === '2'" color="green">已生效</a-tag>
+					<a-tag v-else color="orange">待生效</a-tag>
+				</template>
 				<!--				<template v-if="column.dataIndex === 'action'">-->
 				<!--					<a-space>-->
 				<!--						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizRebateRecordEdit')">编辑</a>-->
@@ -45,6 +52,7 @@
 	import { cloneDeep } from 'lodash-es'
 	import Form from './form.vue'
 	import bizRebateRecordApi from '@/api/biz/bizRebateRecordApi'
+	import tool from '@/utils/tool'
 	const searchFormState = ref({})
 	const searchFormRef = ref()
 	const tableRef = ref()
@@ -56,16 +64,28 @@
 			width: 80
 		},
 		{
-			title: '代金券金额',
-			dataIndex: 'rebateAmout'
+			title: '充值人',
+			dataIndex: 'rechargeUserName'
+		},
+		{
+			title: '充值金额（元）',
+			dataIndex: 'rechargeAmount'
 		},
 		{
 			title: '推荐人',
-			dataIndex: 'recommendUserId'
+			dataIndex: 'recommendUserName'
 		},
 		{
-			title: '充值人',
-			dataIndex: 'rechargeUserId'
+			title: '返利金额（元）',
+			dataIndex: 'rebateAmout'
+		},
+		{
+			title: '返利比例',
+			dataIndex: 'rebateRatio'
+		},
+		{
+			title: '返利时间',
+			dataIndex: 'createTime'
 		},
 		{
 			title: '状态',
@@ -79,6 +99,7 @@
 	// 	align: 'center',
 	// 	width: 150
 	// })
+	const statusData = tool.dictList('rebate_status')
 	const loadData = (parameter) => {
 		const searchFormParam = cloneDeep(searchFormState.value)
 		return bizRebateRecordApi.bizRebateRecordPage(Object.assign(parameter, searchFormParam)).then((data) => {

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

@@ -1,90 +1,67 @@
 <template>
+	<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="searchKey">
+						<a-input v-model:value="searchFormState.searchKey" placeholder="请输入推荐人姓名或手机号" />
+					</a-form-item>
+				</a-col>
+				<a-col :span="6">
+					<a-button type="primary" @click="tableRef.refresh()">查询</a-button>
+					<a-button style="margin: 0 8px" @click="reset">重置</a-button>
+				</a-col>
+			</a-row>
+		</a-form>
+	</a-card>
 	<a-card :bordered="false">
-		<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('bizRecommendRecordAdd')">
-						<template #icon><plus-outlined /></template>
-						新增
-					</a-button>
-					<xn-batch-button
-						v-if="hasPerm('bizRecommendRecordBatchDelete')"
-						buttonName="批量删除"
-                        icon="DeleteOutlined"
-						:selectedRowKeys="selectedRowKeys"
-						@batchCallBack="deleteBatchBizRecommendRecord"
-					/>
-				</a-space>
-			</template>
-			<template #bodyCell="{ column, record }">
-				<template v-if="column.dataIndex === 'action'">
-					<a-space>
-						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizRecommendRecordEdit')">编辑</a>
-						<a-divider type="vertical" v-if="hasPerm(['bizRecommendRecordEdit', 'bizRecommendRecordDelete'], 'and')" />
-						<a-popconfirm title="确定要删除吗？" @confirm="deleteBizRecommendRecord(record)">
-							<a-button type="link" danger size="small" v-if="hasPerm('bizRecommendRecordDelete')">删除</a-button>
-						</a-popconfirm>
-					</a-space>
+		<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('bizRecommendRecordEdit')">编辑</a>-->
+				<!--						<a-divider type="vertical" v-if="hasPerm(['bizRecommendRecordEdit', 'bizRecommendRecordDelete'], 'and')" />-->
+				<!--						<a-popconfirm title="确定要删除吗？" @confirm="deleteBizRecommendRecord(record)">-->
+				<!--							<a-button type="link" danger size="small" v-if="hasPerm('bizRecommendRecordDelete')">删除</a-button>-->
+				<!--						</a-popconfirm>-->
+				<!--					</a-space>-->
+				<!--				</template>-->
 			</template>
 		</s-table>
 	</a-card>
-	<Form ref="formRef" @successful="tableRef.refresh()" />
 </template>
 
 <script setup name="recommendrecord">
-	import { cloneDeep } from 'lodash-es'
-	import Form from './form.vue'
 	import bizRecommendRecordApi from '@/api/biz/bizRecommendRecordApi'
+	import { cloneDeep } from 'lodash-es'
 	const tableRef = ref()
-	const formRef = ref()
-	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
+	const searchFormState = ref({})
+	const searchFormRef = ref()
 	const columns = [
 		{
-			title: '推荐人用户id',
-			dataIndex: 'recommendUserId'
+			title: '序号',
+			dataIndex: 'serial',
+			width: 80
 		},
 		{
-			title: '被推荐人用户id',
-			dataIndex: 'acceptUserId'
+			title: '推荐人',
+			dataIndex: 'recommendUserName'
 		},
-	]
-	// 操作栏通过权限判断是否显示
-	if (hasPerm(['bizRecommendRecordEdit', 'bizRecommendRecordDelete'])) {
-		columns.push({
-			title: '操作',
-			dataIndex: 'action',
-			align: 'center',
-			width: 150
-		})
-	}
-	const selectedRowKeys = ref([])
-	// 列表选择配置
-	const options = {
-		// columns数字类型字段加入 needTotal: true 可以勾选自动算账
-		alert: {
-			show: true,
-			clear: () => {
-				selectedRowKeys.value = ref([])
-			}
+		{
+			title: '被推荐人',
+			dataIndex: 'acceptUserName'
 		},
-		rowSelection: {
-			onChange: (selectedRowKey, selectedRows) => {
-				selectedRowKeys.value = selectedRowKey
-			}
+		{
+			title: '推荐时间',
+			dataIndex: 'createTime'
 		}
-	}
+	]
 	const loadData = (parameter) => {
-		return bizRecommendRecordApi.bizRecommendRecordPage(parameter).then((data) => {
+		const searchFormParam = cloneDeep(searchFormState.value)
+		return bizRecommendRecordApi.bizRecommendRecordPage(Object.assign(parameter, searchFormParam)).then((data) => {
 			return data
 		})
 	}
@@ -93,21 +70,4 @@
 		searchFormRef.value.resetFields()
 		tableRef.value.refresh(true)
 	}
-	// 删除
-	const deleteBizRecommendRecord = (record) => {
-		let params = [
-			{
-				id: record.id
-			}
-		]
-		bizRecommendRecordApi.bizRecommendRecordDelete(params).then(() => {
-			tableRef.value.refresh(true)
-		})
-	}
-	// 批量删除
-	const deleteBatchBizRecommendRecord = (params) => {
-		bizRecommendRecordApi.bizRecommendRecordDelete(params).then(() => {
-			tableRef.value.clearRefreshSelected()
-		})
-	}
 </script>

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

@@ -41,6 +41,16 @@ public class BizRebateRecord extends CommonEntity {
     @Schema(description = "代金券金额")
     private BigDecimal rebateAmout;
 
+    /** 充值金额 */
+    @Schema(description = "充值金额")
+    @TableField(exist = false)
+    private BigDecimal rechargeAmount;
+
+    /** 返点比例 */
+    @Schema(description = "返点比例")
+    @TableField(exist = false)
+    private BigDecimal rebateRatio;
+
     /** 推荐人 */
     @Schema(description = "推荐人")
     private String recommendUserId;

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

@@ -9,12 +9,15 @@
             t.recharge_record_id,
             t.recommend_user_id,
             t.recharge_user_id,
-            t.create_time,
+            DATE_FORMAT(t.create_time, '%Y-%m-%d') AS createTime,
             t.rebate_status,
             u1.`NAME` rechargeUserName,
-            u2.`NAME` recommendUserName
+            u2.`NAME` recommendUserName,
+            r.recharge_amount,
+            r.rebate_ratio
         FROM
             biz_rebate_record t
+        INNER JOIN biz_recharge_record r ON r.id = t.recharge_record_id
         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}

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

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.common.enums.CommonDeleteFlagEnum;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
@@ -49,14 +50,15 @@ public class BizRebateRecordServiceImpl extends ServiceImpl<BizRebateRecordMappe
         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.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());
+        }
+        queryWrapper.eq("t.delete_flag", CommonDeleteFlagEnum.NOT_DELETE);
         queryWrapper.orderByDesc("t.create_time");
         return baseMapper.page(CommonPageRequest.defaultPage(), queryWrapper);
     }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/recommendrecord/entity/BizRecommendRecord.java

@@ -41,9 +41,18 @@ public class BizRecommendRecord extends CommonEntity {
     @Schema(description = "推荐人用户id")
     private String recommendUserId;
 
+    /** 推荐人 */
+    @Schema(description = "推荐人")
+    @TableField(exist = false)
+    private String recommendUserName;
+
+
     /** 被推荐人用户id */
     @Schema(description = "被推荐人用户id")
     private String acceptUserId;
 
-
+    /** 被推荐人 */
+    @Schema(description = "被推荐人")
+    @TableField(exist = false)
+    private String acceptUserName;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/recommendrecord/mapper/BizRecommendRecordMapper.java

@@ -12,14 +12,19 @@
  */
 package vip.xiaonuo.biz.modular.recommendrecord.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.recommendrecord.entity.BizRecommendRecord;
 
 /**
  * 推荐记录表Mapper接口
  *
  * @author wulei
- * @date  2025/02/06 17:42
+ * @date 2025/02/06 17:42
  **/
 public interface BizRecommendRecordMapper extends BaseMapper<BizRecommendRecord> {
+
+    Page<BizRecommendRecord> page(@Param("page") Page<BizRecommendRecord> page, @Param("ew") QueryWrapper<BizRecommendRecord> queryWrapper);
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/recommendrecord/mapper/mapping/BizRecommendRecordMapper.xml

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="vip.xiaonuo.biz.modular.recommendrecord.mapper.BizRecommendRecordMapper">
 
+    <select id="page" resultType="vip.xiaonuo.biz.modular.recommendrecord.entity.BizRecommendRecord">
+        SELECT
+            t.id,
+            t.recommend_user_id,
+            t.accept_user_id,
+            t.create_time,
+            u1.`NAME` acceptUserName,
+            u2.`NAME` recommendUserName
+        FROM
+            biz_recommend_record t
+        LEFT JOIN SYS_USER u1 ON u1.ID = t.accept_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/recommendrecord/param/BizRecommendRecordPageParam.java

@@ -44,7 +44,7 @@ public class BizRecommendRecordPageParam {
     @Schema(description = "排序方式，升序：ASCEND；降序：DESCEND")
     private String sortOrder;
 
-    /** 关键词 */
+    /** 推荐人关键词 */
     @Schema(description = "关键词")
     private String searchKey;
 

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

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.common.enums.CommonDeleteFlagEnum;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
@@ -46,14 +47,13 @@ public class BizRecommendRecordServiceImpl extends ServiceImpl<BizRecommendRecor
     @Override
     public Page<BizRecommendRecord> page(BizRecommendRecordPageParam bizRecommendRecordPageParam) {
         QueryWrapper<BizRecommendRecord> queryWrapper = new QueryWrapper<BizRecommendRecord>().checkSqlInjection();
-        if(ObjectUtil.isAllNotEmpty(bizRecommendRecordPageParam.getSortField(), bizRecommendRecordPageParam.getSortOrder())) {
-            CommonSortOrderEnum.validate(bizRecommendRecordPageParam.getSortOrder());
-            queryWrapper.orderBy(true, bizRecommendRecordPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
-                    StrUtil.toUnderlineCase(bizRecommendRecordPageParam.getSortField()));
-        } else {
-            queryWrapper.lambda().orderByAsc(BizRecommendRecord::getId);
+        if (ObjectUtil.isNotEmpty(bizRecommendRecordPageParam.getSearchKey())) {
+            queryWrapper.and(s -> s.like("u2.NAME", bizRecommendRecordPageParam.getSearchKey())
+                    .or().like("u2.ACCOUNT", bizRecommendRecordPageParam.getSearchKey()));
         }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        queryWrapper.eq("t.delete_flag", CommonDeleteFlagEnum.NOT_DELETE);
+        queryWrapper.orderByAsc("t.create_time");
+        return baseMapper.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
 
     @Override

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/mapper/mapping/BizUserMapper.xml

@@ -14,6 +14,7 @@
             ACCOUNT_BALANCE,
             VOUCHER_BALANCE,
             CREATE_TIME,
+            USER_STATUS,
             PHONE
         FROM SYS_USER
         ${ew.customSqlSegment}

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java

@@ -184,8 +184,8 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
         queryWrapper.lambda().eq(CommonEntity::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
         queryWrapper.lambda().orderByDesc(CommonEntity::getCreateTime);
         Page<BizMemberUserResult> bizMemberUserResultPage = baseMapper.memberPage(CommonPageRequest.defaultPage(), queryWrapper);
-        for(BizMemberUserResult bizMemberUserResult : bizMemberUserResultPage.getRecords()){
-            if(ObjectUtil.isNotEmpty(bizMemberUserResult.getPhone())){
+        for (BizMemberUserResult bizMemberUserResult : bizMemberUserResultPage.getRecords()) {
+            if (ObjectUtil.isNotEmpty(bizMemberUserResult.getPhone())) {
                 bizMemberUserResult.setPhone(CommonCryptogramUtil.doSm4CbcDecrypt(bizMemberUserResult.getPhone()));
             }
         }
@@ -837,8 +837,8 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
             throw new CommonException("该手机号已注册，请勿重复注册");
         }
         bizUser.setAccount(wxUserRegisterParam.getPhone());
-        //bizUser.setPhone(CommonCryptogramUtil.doSm4CbcEncrypt(wxUserRegisterParam.getPhone()));
         bizUser.setPhone(wxUserRegisterParam.getPhone());
+        bizUser.setAvatar(CommonAvatarUtil.generateImg(bizUser.getName()));
         // 设置默认密码
         bizUser.setPassword(CommonCryptogramUtil.doHashValue(devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_PASSWORD_KEY)));
         // 设置状态