From c017a38ce24bfae8e9d1729210da8511ba85d29e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 18:03:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserClickLogMapper.xml | 19 ++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/WithdrawalRequestsService.java | 4
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java | 31 ++--
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/UserClickLogMapper.java | 5
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/UserClickLogService.java | 3
aa.json | 7 +
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java | 12 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserClickLogServiceImpl.java | 13 +
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 36 +++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/BalanceQuery.java | 23 +++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java | 4
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java | 4
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/WithdrawalRequestsMapper.java | 6
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 12 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java | 13 +
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java | 4
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/BalanceChangeRecordMapper.java | 5
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java | 12 +
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml | 6
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserClickLogController.java | 20 ++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/BalanceChangeRecordService.java | 3
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java | 13 +
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java | 4
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/dto/GoodsAreaDto.java | 4
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/WithQuery.java | 18 ++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserClickLog.java | 5
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml | 19 ++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java | 28 +++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java | 48 +++++-
29 files changed, 355 insertions(+), 26 deletions(-)
diff --git a/aa.json b/aa.json
new file mode 100644
index 0000000..cd2e2d8
--- /dev/null
+++ b/aa.json
@@ -0,0 +1,7 @@
+
+{
+ "province": "",
+ "city":"",
+ "area": "",
+ "vip": []
+}
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
index 0d93b14..f3d999c 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
@@ -54,6 +54,10 @@
private String userName;
@TableField(exist = false)
+ @ApiModelProperty("消费用户手机号")
+ private String userPhone;
+
+ @TableField(exist = false)
@ApiModelProperty("消费金额")
private BigDecimal amount;
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserClickLog.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserClickLog.java
index 608f339..61b9da2 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserClickLog.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserClickLog.java
@@ -49,5 +49,10 @@
@TableField("vip_id")
private Integer vipId;
+ @TableField(exist = false)
+ private String userName;
+ @TableField(exist = false)
+ private String userPhone;
+
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java
index b47c109..fb58e18 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java
@@ -3,10 +3,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.RequestParam;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -72,14 +76,22 @@
@ApiModelProperty(value = "开始时间")
@TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
@TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
@TableField(exist = false)
private List<Long> userIds;
+ @TableField(exist = false)
+ private Integer pageNum;
+ @TableField(exist = false)
+ private Integer pageSize;
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java
index 53c1da6..da4c39e 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java
@@ -62,6 +62,10 @@
@ApiModelProperty(value = "审核状态 1'待审核',2'审核通过',3'审核拒绝' ")
@TableField("audit_status")
private Integer auditStatus;
+ @TableField(exist = false)
+ private String userName;
+ @TableField(exist = false)
+ private String userPhone;
}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java
index 880312c..3e67c87 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java
@@ -11,6 +11,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.util.List;
/**
* <p>
@@ -124,5 +125,8 @@
@TableField("bound_shop_superiors_points")
private Integer boundShopSuperiorsPoints;
+ @TableField(exist = false)
+ private List<GoodsArea> goodsAreaList;
+
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java
index eb01dad..3ed2f97 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java
@@ -1,8 +1,13 @@
package com.ruoyi.account.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.account.api.model.BalanceChangeRecord;
+import com.ruoyi.account.api.model.UserClickLog;
+import com.ruoyi.account.dto.BalanceQuery;
+import com.ruoyi.account.dto.UserCancelQuery;
import com.ruoyi.account.service.BalanceChangeRecordService;
import com.ruoyi.common.core.domain.R;
+import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,6 +37,14 @@
balanceChangeRecordService.save(balanceChangeRecord);
return R.ok();
}
+
+ @PostMapping("/page")
+ @ApiOperation(value = "余额变更明细", tags = {"后台"})
+ public R<IPage<BalanceChangeRecord>> page(@RequestBody BalanceQuery agentQuery) {
+
+ return R.ok(balanceChangeRecordService.pageList(agentQuery));
+ }
+
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserClickLogController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserClickLogController.java
index 573ad60..abd5065 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserClickLogController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserClickLogController.java
@@ -1,8 +1,19 @@
package com.ruoyi.account.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.account.api.model.UserCancellationLog;
+import com.ruoyi.account.api.model.UserClickLog;
+import com.ruoyi.account.dto.UserCancelQuery;
+import com.ruoyi.account.service.UserClickLogService;
+import com.ruoyi.common.core.domain.R;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -15,6 +26,15 @@
@RestController
@RequestMapping("/user-click-log")
public class UserClickLogController {
+ @Resource
+ private UserClickLogService userClickLogService;
+ @PostMapping("/page")
+ @ApiOperation(value = "申请点击列表", tags = {"后台"})
+ public R<IPage<UserClickLog>> page(@RequestBody UserCancelQuery agentQuery) {
+
+ return R.ok(userClickLogService.pageList(agentQuery));
+ }
+
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
index d13afbd..fcd824e 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
@@ -128,8 +128,8 @@
*/
@GetMapping("/list")
@ApiOperation(value = "积分变更记录", tags = "管理后台-财务统计-用户积分统计")
- public R<IPage<UserPoint>> list(@ApiParam("页码") @RequestParam Integer pageNum, @ApiParam("大小") Integer pageSize, UserPoint userPoint) {
- IPage<UserPoint> userPointPage = userPointService.getUserPointPage(Page.of(pageNum, pageSize), userPoint);
+ public R<IPage<UserPoint>> list(UserPoint userPoint) {
+ IPage<UserPoint> userPointPage = userPointService.getUserPointPage(Page.of(userPoint.getPageNum(), userPoint.getPageSize()), userPoint);
return R.ok(userPointPage);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
index f64a14d..5486bc1 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
@@ -1,8 +1,13 @@
package com.ruoyi.account.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.account.api.model.BalanceChangeRecord;
+import com.ruoyi.account.api.model.WithdrawalRequests;
+import com.ruoyi.account.dto.WithQuery;
import com.ruoyi.account.dto.WithdrawalRequestsDTO;
import com.ruoyi.account.service.WithdrawalRequestsService;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -39,6 +44,13 @@
return AjaxResult.success();
}
+ @PostMapping("/page")
+ @ApiOperation(value = "提现申请", tags = {"后台"})
+ public R<IPage<WithdrawalRequests>> page(@RequestBody WithQuery withQuery){
+ return R.ok(withdrawalRequestsService.pageList(withQuery));
+
+ }
+
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/BalanceQuery.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/BalanceQuery.java
new file mode 100644
index 0000000..f102104
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/BalanceQuery.java
@@ -0,0 +1,23 @@
+package com.ruoyi.account.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class BalanceQuery {
+ @ApiModelProperty("用户名称")
+ private String name;
+
+ @ApiModelProperty("电话")
+ private String phone;
+ @ApiModelProperty("类型：1充值2提现3红包4分佣5商城购物")
+ private Integer changeType;
+
+ private LocalDate localDate1;
+ private LocalDate localDate2;
+ private Integer pageNum;
+ private Integer pageSize;
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/WithQuery.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/WithQuery.java
new file mode 100644
index 0000000..5acba8a
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/WithQuery.java
@@ -0,0 +1,18 @@
+package com.ruoyi.account.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class WithQuery {
+ @ApiModelProperty("用户名称")
+ private String name;
+
+ @ApiModelProperty("电话")
+ private String phone;
+ private Integer pageNum;
+ private Integer pageSize;
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/BalanceChangeRecordMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/BalanceChangeRecordMapper.java
index 50b4149..e157ab1 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/BalanceChangeRecordMapper.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/BalanceChangeRecordMapper.java
@@ -1,7 +1,12 @@
package com.ruoyi.account.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.BalanceChangeRecord;
+import com.ruoyi.account.dto.BalanceQuery;
+import org.apache.ibatis.annotations.Param;
public interface BalanceChangeRecordMapper extends BaseMapper<BalanceChangeRecord> {
+ IPage<BalanceChangeRecord> pageList(@Param("page") Page<BalanceChangeRecord> page,@Param("agentQuery") BalanceQuery agentQuery);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/UserClickLogMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/UserClickLogMapper.java
index 6709c3e..f378e8c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/UserClickLogMapper.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/UserClickLogMapper.java
@@ -1,7 +1,11 @@
package com.ruoyi.account.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.UserClickLog;
+import com.ruoyi.account.dto.UserCancelQuery;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -13,4 +17,5 @@
*/
public interface UserClickLogMapper extends BaseMapper<UserClickLog> {
+ IPage<UserClickLog> pageList(@Param("page") Page<UserClickLog> page,@Param("agentQuery") UserCancelQuery agentQuery);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/WithdrawalRequestsMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/WithdrawalRequestsMapper.java
index bf8d9b9..24d6d58 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/WithdrawalRequestsMapper.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/WithdrawalRequestsMapper.java
@@ -1,7 +1,12 @@
package com.ruoyi.account.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.account.api.model.WithdrawalRequests;
+import com.ruoyi.account.dto.WithQuery;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -13,4 +18,5 @@
*/
public interface WithdrawalRequestsMapper extends BaseMapper<WithdrawalRequests> {
+ IPage<WithdrawalRequests> pageList(@Param("page") Page<UserClickLog> page, @Param("withQuery")WithQuery withQuery);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/BalanceChangeRecordService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/BalanceChangeRecordService.java
index d5e6f2a..4a8a9d3 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/BalanceChangeRecordService.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/BalanceChangeRecordService.java
@@ -1,7 +1,10 @@
package com.ruoyi.account.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.BalanceChangeRecord;
+import com.ruoyi.account.dto.BalanceQuery;
public interface BalanceChangeRecordService extends IService<BalanceChangeRecord> {
+ IPage<BalanceChangeRecord> pageList(BalanceQuery agentQuery);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/UserClickLogService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/UserClickLogService.java
index 2547e12..93107c2 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/UserClickLogService.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/UserClickLogService.java
@@ -1,7 +1,9 @@
package com.ruoyi.account.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.UserClickLog;
+import com.ruoyi.account.dto.UserCancelQuery;
/**
* <p>
@@ -13,4 +15,5 @@
*/
public interface UserClickLogService extends IService<UserClickLog> {
+ IPage<UserClickLog> pageList(UserCancelQuery agentQuery);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/WithdrawalRequestsService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/WithdrawalRequestsService.java
index c0d5daf..002530a 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/WithdrawalRequestsService.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/WithdrawalRequestsService.java
@@ -1,7 +1,9 @@
package com.ruoyi.account.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.WithdrawalRequests;
+import com.ruoyi.account.dto.WithQuery;
import com.ruoyi.account.dto.WithdrawalRequestsDTO;
/**
@@ -18,4 +20,6 @@
* 提现申请
*/
void withdrawalApply(WithdrawalRequestsDTO params);
+
+ IPage<WithdrawalRequests> pageList(WithQuery withQuery);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java
index b59c292..8291e71 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java
@@ -1,11 +1,23 @@
package com.ruoyi.account.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.BalanceChangeRecord;
+import com.ruoyi.account.api.model.UserClickLog;
+import com.ruoyi.account.dto.BalanceQuery;
import com.ruoyi.account.mapper.BalanceChangeRecordMapper;
import com.ruoyi.account.service.BalanceChangeRecordService;
import org.springframework.stereotype.Service;
@Service
public class BalanceChangeRecordServiceImpl extends ServiceImpl<BalanceChangeRecordMapper, BalanceChangeRecord> implements BalanceChangeRecordService {
+ @Override
+ public IPage<BalanceChangeRecord> pageList(BalanceQuery agentQuery) {
+ Page<BalanceChangeRecord> page = new Page<>();
+ page.setCurrent(agentQuery.getPageNum());
+ page.setSize(agentQuery.getPageSize());
+ IPage<BalanceChangeRecord> shopIPage = this.baseMapper.pageList(page, agentQuery);
+ return shopIPage;
+ }
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserClickLogServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserClickLogServiceImpl.java
index 8260111..3dea2e2 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserClickLogServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserClickLogServiceImpl.java
@@ -1,9 +1,14 @@
package com.ruoyi.account.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.model.AgentApplication;
+import com.ruoyi.account.dto.UserCancelQuery;
import com.ruoyi.account.mapper.UserClickLogMapper;
import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.account.service.UserClickLogService;
+import com.ruoyi.other.api.domain.Shop;
import org.springframework.stereotype.Service;
/**
@@ -17,4 +22,12 @@
@Service
public class UserClickLogServiceImpl extends ServiceImpl<UserClickLogMapper, UserClickLog> implements UserClickLogService {
+ @Override
+ public IPage<UserClickLog> pageList(UserCancelQuery agentQuery) {
+ Page<UserClickLog> page = new Page<>();
+ page.setCurrent(agentQuery.getPageNum());
+ page.setSize(agentQuery.getPageSize());
+ IPage<UserClickLog> shopIPage = this.baseMapper.pageList(page, agentQuery);
+ return shopIPage;
+ }
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
index babf3ab..30754e1 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
@@ -1,9 +1,13 @@
package com.ruoyi.account.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.account.api.model.WithdrawalRequests;
+import com.ruoyi.account.dto.WithQuery;
import com.ruoyi.account.dto.WithdrawalRequestsDTO;
import com.ruoyi.account.mapper.WithdrawalRequestsMapper;
import com.ruoyi.account.service.VipSettingService;
@@ -77,4 +81,13 @@
save(withdrawalRequests);
}
+ @Override
+ public IPage<WithdrawalRequests> pageList(WithQuery withQuery) {
+ Page<UserClickLog> page = new Page<>();
+ page.setCurrent(withQuery.getPageNum());
+ page.setSize(withQuery.getPageSize());
+ IPage<WithdrawalRequests> shopIPage = this.baseMapper.pageList(page, withQuery);
+ return shopIPage;
+ }
+
}
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml
index 7364121..bdeadcf 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml
@@ -2,4 +2,23 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.account.mapper.BalanceChangeRecordMapper">
+ <select id="pageList" resultType="com.ruoyi.account.api.model.BalanceChangeRecord">
+ select t1.*,t2.name as userName,t2.phone as userPhone
+ from t_balance_change_record t1
+ left join t_app_user t2 on t1.app_user_id = t2.id
+ <where>
+ <if test="agentQuery.name != null and agentQuery.name != ''">
+ and t2.name like concat('%',#{agentQuery.name},'%')
+ </if>
+ <if test="agentQuery.phone != null and agentQuery.phone != ''">
+ and t2.phone like concat('%',#{agentQuery.phone},'%')
+ </if>
+ <if test="agentQuery.changeType != null">
+ and t1.change_type = #{agentQuery.changeType}
+ </if>
+ <if test="agentQuery.localDate1 != null">
+ and DATE(t1.create_time) between #{agentQuery.localDate1} and #{agentQuery.localDate2}
+ </if>
+ </where>
+ </select>
</mapper>
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserClickLogMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserClickLogMapper.xml
index 7d8875c..5e45818 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserClickLogMapper.xml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserClickLogMapper.xml
@@ -15,5 +15,24 @@
<sql id="Base_Column_List">
id, del_flag, create_time, app_user_id, vip_id
</sql>
+ <select id="pageList" resultType="com.ruoyi.account.api.model.UserClickLog">
+ select t1.* ,t2.phone as userPhone,t2.name as userName
+ from t_user_click_log t1
+ left join t_app_user t2 on t1.app_user_id = t2.id
+ <where>
+ <if test="agentQuery.phone != null and agentQuery.phone != ''">
+ and t2.phone like concat('%',#{agentQuery.phone},'%')
+ </if>
+ <if test="agentQuery.name != null and agentQuery.name != ''">
+ and t2.name like concat('%',#{agentQuery.name},'%')
+ </if>
+ <if test="agentQuery.vipId != null">
+ and t1.vip_id = #{agentQuery.vipId}
+ </if>
+ <if test="agentQuery.localDate1 != null">
+ and DATE(t1.create_time) between #{agentQuery.localDate1} and #{agentQuery.localDate2}
+ </if>
+ </where>
+ </select>
</mapper>
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml
index 7360c4b..ddfb739 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml
@@ -19,5 +19,11 @@
<sql id="Base_Column_List">
id, del_flag, create_time, app_user_id, withdrawal_amount, withdrawal_method, account_holder, bank_card_number, audit_status
</sql>
+ <select id="pageList" resultType="com.ruoyi.account.api.model.WithdrawalRequests">
+ select t1.*,t2.name as userName,t2.phone as userPhone
+ from t_withdrawal_requests t1
+ left join t_app_user t2 on t1.app_user_id = t2.id
+
+ </select>
</mapper>
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java
index b892292..038d8f0 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java
@@ -1,8 +1,17 @@
package com.ruoyi.other.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.account.api.model.UserClickLog;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.other.api.domain.RechargeSet;
+import com.ruoyi.other.service.RechargeSetService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -15,6 +24,21 @@
@RestController
@RequestMapping("/recharge-set")
public class RechargeSetController {
+ @Resource
+ private RechargeSetService rechargeSetService;
+
+ @GetMapping("/list")
+ @ApiOperation(value = "充值设置查询", tags = {"后台"})
+ public R<List<RechargeSet>> list() {
+ return R.ok(rechargeSetService.list());
+ }
+ @PostMapping("/set")
+ @ApiOperation(value = "充值设置", tags = {"后台"})
+ public R<List<RechargeSet>> detail(@RequestBody List<RechargeSet> rechargeSets) {
+ boolean remove = rechargeSetService.remove(Wrappers.lambdaQuery());
+ rechargeSetService.saveBatch(rechargeSets);
+ return R.ok();
+ }
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java
index dfef420..5b5b1f6 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java
@@ -6,15 +6,13 @@
import com.ruoyi.other.api.domain.RedPackegeSet;
import com.ruoyi.other.service.RedPackegeSetService;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -58,17 +56,20 @@
* 添加红包配置
*/
@ApiOperation(value = "添加红包配置", tags = {"管理后台-活动管理-签到红包"})
- @GetMapping("/addRedPackegeSet")
- public R<Void> addRedPackegeSet(RedPackegeSet redPackegeSet){
- RedPackegeSet one = redPackegeSetService.getOne(null);
- if (one==null){
- redPackegeSet.setId(1);
- redPackegeSetService.save(redPackegeSet);
- }else {
- if (one.getId()==null){
- return R.fail("参数错误");
+ @PostMapping("/addRedPackegeSet")
+ @Transactional(rollbackFor = Exception.class)
+ public R<Void> addRedPackegeSet(@RequestBody List<RedPackegeSet> redPackegeSets){
+ for (RedPackegeSet redPackegeSet : redPackegeSets) {
+ RedPackegeSet one = redPackegeSetService.getOne(null);
+ if (one==null){
+ redPackegeSet.setId(1);
+ redPackegeSetService.save(redPackegeSet);
+ }else {
+ if (one.getId()==null){
+ return R.fail("参数错误");
+ }
+ redPackegeSetService.updateById(redPackegeSet);
}
- redPackegeSetService.updateById(redPackegeSet);
}
return R.ok();
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index ecb2180..607cb6c 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -16,6 +16,8 @@
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.vo.NearbyShopVO;
import com.ruoyi.other.vo.ShopDetailVO;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -51,6 +53,8 @@
private ShopScoreService shopScoreService;
@Resource
private TokenService tokenService;
+ @Resource
+ private SysUserClient sysUserClient;
@@ -129,6 +133,38 @@
return R.ok(shopService.cheUserByPhone(phone));
}
+ /**
+ * 重置密码
+ */
+ @GetMapping ("/resetPassword")
+ @ApiOperation(value = "重置密码", tags = {"管理后台-门店管理"})
+ public R<Void> resetPassword(@RequestParam(value = "ids") String ids) {
+ String[] idsArr = ids.split(",");
+ for (String id : idsArr) {
+ Shop shop = shopService.getById(Integer.valueOf(id));
+ R<SysUser> sysUser = sysUserClient.getSysUser(shop.getAppUserId());
+ SysUser userData = sysUser.getData();
+ userData.setPassword(getLastSixDigits(userData.getPhonenumber()));
+ sysUserClient.resetPassword(userData);
+ }
+ return R.ok();
+ }
+
+ /**
+ * 获取手机号的后六位。
+ *
+ * @param phoneNumber 以字符串形式提供的手机号
+ * @return 手机号的后六位
+ * @throws IllegalArgumentException 如果手机号长度不足六位
+ */
+ public String getLastSixDigits(String phoneNumber) {
+ if (phoneNumber == null || phoneNumber.length() < 6) {
+ throw new IllegalArgumentException("手机号长度不足六位");
+ }
+ // 取字符串的最后六位
+ return phoneNumber.substring(phoneNumber.length() - 6);
+ }
+
/**
* 附近门店列表
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/dto/GoodsAreaDto.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/dto/GoodsAreaDto.java
new file mode 100644
index 0000000..e020603
--- /dev/null
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/dto/GoodsAreaDto.java
@@ -0,0 +1,4 @@
+package com.ruoyi.other.dto;
+
+public class GoodsAreaDto {
+}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
index 6e1ea7f..211121b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
@@ -27,10 +27,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -186,8 +183,20 @@
// 特殊地区售价设置
List<GoodsArea> goodsAreaList = goods.getGoodsAreaList();
if (!CollectionUtils.isEmpty(goodsAreaList)){
- goodsAreaService.saveBatch(goodsAreaList);
+ for (GoodsArea goodsArea : goodsAreaList) {
+ List<GoodsArea> goodsAreaList1 = goodsArea.getGoodsAreaList();
+ for (GoodsArea area : goodsAreaList1) {
+ area.setProvince(goodsArea.getProvince());
+ area.setCity(goodsArea.getCity());
+ area.setDistricts(goodsArea.getDistricts());
+ area.setProvinceCode(goodsArea.getProvinceCode());
+ area.setCityCode(goodsArea.getCityCode());
+ area.setDistrictsCode(goodsArea.getDistrictsCode());
+ }
+ goodsAreaService.saveBatch(goodsAreaList1);
+ }
}
+
}
@Override
@@ -207,7 +216,20 @@
// 特殊地区售价设置
List<GoodsArea> goodsAreaList = goods.getGoodsAreaList();
- goodsAreaService.updateBatchById(goodsAreaList);
+ if (!CollectionUtils.isEmpty(goodsAreaList)){
+ for (GoodsArea goodsArea : goodsAreaList) {
+ List<GoodsArea> goodsAreaList1 = goodsArea.getGoodsAreaList();
+ for (GoodsArea area : goodsAreaList1) {
+ area.setProvince(goodsArea.getProvince());
+ area.setCity(goodsArea.getCity());
+ area.setDistricts(goodsArea.getDistricts());
+ area.setProvinceCode(goodsArea.getProvinceCode());
+ area.setCityCode(goodsArea.getCityCode());
+ area.setDistrictsCode(goodsArea.getDistrictsCode());
+ }
+ goodsAreaService.updateBatchById(goodsAreaList1);
+ }
+ }
}
@Override
@@ -231,7 +253,19 @@
// 特殊地区售价设置
List<GoodsArea> goodsAreaList = goodsAreaService.list(new LambdaQueryWrapper<GoodsArea>()
.eq(GoodsArea::getGoodsId, goodsId));
- goods.setGoodsAreaList(goodsAreaList);
+
+ Map<String, List<GoodsArea>> listMap = goodsAreaList.stream()
+ .collect(Collectors.groupingBy(goodsArea ->
+ goodsArea.getProvinceCode() + goodsArea.getCityCode() + goodsArea.getDistrictsCode()));
+
+ List<GoodsArea> goodsAreaList1 = new ArrayList<>();
+ listMap.forEach((s, goodsAreas) -> {
+ GoodsArea goodsArea = goodsAreas.get(0);
+ goodsArea.setGoodsAreaList(goodsAreas);
+ goodsAreaList1.add(goodsArea);
+ });
+
+ goods.setGoodsAreaList(goodsAreaList1);
return goods;
}
}
--
Gitblit v1.7.1