diff --git a/CatmDogd-Mall-Front-test/api/model/AppTourist.js b/CatmDogd-Mall-Front-test/api/model/AppTourist.js deleted file mode 100644 index fbf1052..0000000 --- a/CatmDogd-Mall-Front-test/api/model/AppTourist.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询游客列表 -export function listAppTourist(query) { - return request({ - url: '/model/AppTourist/list', - method: 'get', - params: query - }) -} - -// 查询游客详细 -export function getAppTourist(id) { - return request({ - url: '/model/AppTourist/' + id, - method: 'get' - }) -} - -// 新增游客 -export function addAppTourist(data) { - return request({ - url: '/model/AppTourist', - method: 'post', - data: data - }) -} - -// 修改游客 -export function updateAppTourist(data) { - return request({ - url: '/model/AppTourist', - method: 'put', - data: data - }) -} - -// 删除游客 -export function delAppTourist(id) { - return request({ - url: '/model/AppTourist/' + id, - method: 'delete' - }) -} diff --git a/CatmDogd-Mall-Front-test/src/api/model/Wallet.js b/CatmDogd-Mall-Front-test/src/api/model/Wallet.js deleted file mode 100644 index e233f3a..0000000 --- a/CatmDogd-Mall-Front-test/src/api/model/Wallet.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询钱包列表 -export function listWallet(query) { - return request({ - url: '/model/Wallet/list', - method: 'get', - params: query - }) -} - -// 查询钱包详细 -export function getWallet(id) { - return request({ - url: '/model/Wallet/' + id, - method: 'get' - }) -} - -// 新增钱包 -export function addWallet(data) { - return request({ - url: '/model/Wallet', - method: 'post', - data: data - }) -} - -// 修改钱包 -export function updateWallet(data) { - return request({ - url: '/model/Wallet', - method: 'put', - data: data - }) -} - -// 删除钱包 -export function delWallet(id) { - return request({ - url: '/model/Wallet/' + id, - method: 'delete' - }) -} diff --git a/CatmDogd-Mall-Front-test/src/views/model/Wallet/index.vue b/CatmDogd-Mall-Front-test/src/views/model/Wallet/index.vue deleted file mode 100644 index 1426036..0000000 --- a/CatmDogd-Mall-Front-test/src/views/model/Wallet/index.vue +++ /dev/null @@ -1,278 +0,0 @@ - - - diff --git a/CatmDogd-Mall-Front-test/views/model/AppTourist/index.vue b/CatmDogd-Mall-Front-test/views/model/AppTourist/index.vue deleted file mode 100644 index 5bb15e5..0000000 --- a/CatmDogd-Mall-Front-test/views/model/AppTourist/index.vue +++ /dev/null @@ -1,269 +0,0 @@ - - - diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletUserController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletUserController.java index 428fab8..376d26c 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletUserController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletUserController.java @@ -2,13 +2,14 @@ package com.ruoyi.applet.contoller; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.model.domain.AppUsers; import com.ruoyi.model.service.IAppTouristService; +import com.ruoyi.model.service.IAppUsersService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @Api(description = "用户") @RestController @@ -18,9 +19,29 @@ public class AppletUserController extends BaseController { @Autowired private IAppTouristService appTouristService; + @Autowired + private IAppUsersService appUsersService; + @ApiOperation("游客模式") @GetMapping("/touristOne") public AjaxResult getTouristOne(){ return AjaxResult.success(appTouristService.getAppTouristLimitOne()); } + + @ApiOperation("单个用户") + @GetMapping("/userById/{id}") + public AjaxResult getUserById(@PathVariable Long id){ + return AjaxResult.success(appUsersService.selectAppUsersByUserId(id)); + } + + /** + * 带条件查询所有用户 + * @param appUsers + * @return + */ + @ApiOperation("所有用户") + @GetMapping("/allUsers") + public TableDataInfo selectAllUsers(@RequestBody AppUsers appUsers){ + return getDataTable(appUsersService.selectAppUsersList(appUsers)); + } } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletWalletController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletWalletController.java index 0950f54..75e1ead 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletWalletController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletWalletController.java @@ -1,13 +1,17 @@ package com.ruoyi.applet.contoller; import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.model.service.IAppTransactionDetailsService; +import com.ruoyi.model.service.IAppWalletService; +import com.ruoyi.model.service.IAppWithdrawalConfigService; import com.ruoyi.model.service.ITransactionDetailsService; -import com.ruoyi.model.service.IWalletService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -15,13 +19,22 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/applet/wallet") public class AppletWalletController extends BaseController { + + //钱包 + @Autowired + private IAppWalletService appWalletService; + + //钱包提现配置 + @Autowired + private IAppWithdrawalConfigService appWithdrawalConfigService; + @Autowired - private IWalletService walletService; + private IAppTransactionDetailsService appTransactionDetailsService; @ApiOperation("钱包列表") - @GetMapping("/getWalletList") - public TableDataInfo getWalletList(){ - return getDataTable(walletService.getWalletList()); + @GetMapping("/getWalletList/{userId}") + public TableDataInfo getAppWalletByUserId(@PathVariable Long userId){ + return getDataTable(appWalletService.getAppWalletByUserId(userId)); } @Autowired private ITransactionDetailsService transactionDetailsService; @@ -31,4 +44,16 @@ public class AppletWalletController extends BaseController { public TableDataInfo getTransactionDetailsList(){ return getDataTable(transactionDetailsService.getTransactionDetailsList()); } + + @ApiOperation("钱包提现规则") + @GetMapping("/getAppWithdrawal") + public AjaxResult getAppWithdrawalConfig(){ + return AjaxResult.success(appWithdrawalConfigService.getAppWithdrawalConfig()); + } + + @ApiOperation("交易明细记录") + @GetMapping("/getTransactionDetails/{wid}") + public TableDataInfo getAppTransactionDetailsByWid(@PathVariable Long wid){ + return getDataTable(appTransactionDetailsService.getAppTransactionDetailsByWid(wid)); + } } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/WalletController.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/WalletController.java deleted file mode 100644 index e5fae8d..0000000 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/WalletController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.ruoyi.model.controller; - -import java.io.IOException; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.model.domain.Wallet; -import com.ruoyi.model.service.IWalletService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 钱包Controller - * - * @author ruoyi - * @date 2025-03-05 - */ -@RestController -@RequestMapping("/model/Wallet") -public class WalletController extends BaseController -{ - @Autowired - private IWalletService walletService; - - /** - * 查询钱包列表 - */ - @PreAuthorize("@ss.hasPermi('model:Wallet:list')") - @GetMapping("/list") - public TableDataInfo list(Wallet wallet) - { - startPage(); - List list = walletService.selectWalletList(wallet); - return getDataTable(list); - } - - /** - * 导出钱包列表 - */ - @PreAuthorize("@ss.hasPermi('model:Wallet:export')") - @Log(title = "钱包", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, Wallet wallet) throws IOException { - List list = walletService.selectWalletList(wallet); - ExcelUtil util = new ExcelUtil(Wallet.class); - util.exportExcel(response, list, "钱包数据"); - } - - /** - * 获取钱包详细信息 - */ - @PreAuthorize("@ss.hasPermi('model:Wallet:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(walletService.selectWalletById(id)); - } - - /** - * 新增钱包 - */ - @PreAuthorize("@ss.hasPermi('model:Wallet:add')") - @Log(title = "钱包", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody Wallet wallet) - { - return toAjax(walletService.insertWallet(wallet)); - } - - /** - * 修改钱包 - */ - @PreAuthorize("@ss.hasPermi('model:Wallet:edit')") - @Log(title = "钱包", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody Wallet wallet) - { - return toAjax(walletService.updateWallet(wallet)); - } - - /** - * 删除钱包 - */ - @PreAuthorize("@ss.hasPermi('model:Wallet:remove')") - @Log(title = "钱包", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(walletService.deleteWalletByIds(ids)); - } -} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/Wallet.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/Wallet.java deleted file mode 100644 index 992eeba..0000000 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/Wallet.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.ruoyi.model.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 钱包对象 wallet - * - * @author ruoyi - * @date 2025-03-05 - */ -public class Wallet extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 钱包编号 */ - private Long id; - - /** 钱包金额 */ - @Excel(name = "钱包金额") - private Long price; - - /** 交易明细编号 */ - @Excel(name = "交易明细编号") - private Long tid; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setPrice(Long price) - { - this.price = price; - } - - public Long getPrice() - { - return price; - } - public void setTid(Long tid) - { - this.tid = tid; - } - - public Long getTid() - { - return tid; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("price", getPrice()) - .append("tid", getTid()) - .toString(); - } -} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/WalletMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/WalletMapper.java deleted file mode 100644 index f9d5e02..0000000 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/WalletMapper.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.ruoyi.model.mapper; - -import java.util.List; -import com.ruoyi.model.domain.Wallet; - -/** - * 钱包Mapper接口 - * - * @author ruoyi - * @date 2025-03-05 - */ -public interface WalletMapper -{ - /** - * 查询钱包 - * - * @param id 钱包主键 - * @return 钱包 - */ - public Wallet selectWalletById(Long id); - - /** - * 查询钱包列表 - * - * @param wallet 钱包 - * @return 钱包集合 - */ - public List selectWalletList(Wallet wallet); - - /** - * 新增钱包 - * - * @param wallet 钱包 - * @return 结果 - */ - public int insertWallet(Wallet wallet); - - /** - * 修改钱包 - * - * @param wallet 钱包 - * @return 结果 - */ - public int updateWallet(Wallet wallet); - - /** - * 删除钱包 - * - * @param id 钱包主键 - * @return 结果 - */ - public int deleteWalletById(Long id); - - /** - * 批量删除钱包 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteWalletByIds(Long[] ids); - - /** - * 查询钱包列表 - * - * @return 钱包集合 - */ - public List getWalletList(); -} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IWalletService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IWalletService.java deleted file mode 100644 index ac2ab57..0000000 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IWalletService.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.ruoyi.model.service; - -import java.util.List; -import com.ruoyi.model.domain.Wallet; - -/** - * 钱包Service接口 - * - * @author ruoyi - * @date 2025-03-05 - */ -public interface IWalletService -{ - /** - * 查询钱包 - * - * @param id 钱包主键 - * @return 钱包 - */ - public Wallet selectWalletById(Long id); - - /** - * 查询钱包列表 - * - * @param wallet 钱包 - * @return 钱包集合 - */ - public List selectWalletList(Wallet wallet); - - /** - * 新增钱包 - * - * @param wallet 钱包 - * @return 结果 - */ - public int insertWallet(Wallet wallet); - - /** - * 修改钱包 - * - * @param wallet 钱包 - * @return 结果 - */ - public int updateWallet(Wallet wallet); - - /** - * 批量删除钱包 - * - * @param ids 需要删除的钱包主键集合 - * @return 结果 - */ - public int deleteWalletByIds(Long[] ids); - - /** - * 删除钱包信息 - * - * @param id 钱包主键 - * @return 结果 - */ - public int deleteWalletById(Long id); - - /** - * 查询钱包列表 - * - * @return 钱包集合 - */ - public List getWalletList(); -} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/WalletServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/WalletServiceImpl.java deleted file mode 100644 index 0630632..0000000 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/WalletServiceImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.ruoyi.model.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.model.mapper.WalletMapper; -import com.ruoyi.model.domain.Wallet; -import com.ruoyi.model.service.IWalletService; - -/** - * 钱包Service业务层处理 - * - * @author ruoyi - * @date 2025-03-05 - */ -@Service -public class WalletServiceImpl implements IWalletService -{ - @Autowired - private WalletMapper walletMapper; - - /** - * 查询钱包 - * - * @param id 钱包主键 - * @return 钱包 - */ - @Override - public Wallet selectWalletById(Long id) - { - return walletMapper.selectWalletById(id); - } - - /** - * 查询钱包列表 - * - * @param wallet 钱包 - * @return 钱包 - */ - @Override - public List selectWalletList(Wallet wallet) - { - return walletMapper.selectWalletList(wallet); - } - - /** - * 新增钱包 - * - * @param wallet 钱包 - * @return 结果 - */ - @Override - public int insertWallet(Wallet wallet) - { - return walletMapper.insertWallet(wallet); - } - - /** - * 修改钱包 - * - * @param wallet 钱包 - * @return 结果 - */ - @Override - public int updateWallet(Wallet wallet) - { - return walletMapper.updateWallet(wallet); - } - - /** - * 批量删除钱包 - * - * @param ids 需要删除的钱包主键 - * @return 结果 - */ - @Override - public int deleteWalletByIds(Long[] ids) - { - return walletMapper.deleteWalletByIds(ids); - } - - /** - * 删除钱包信息 - * - * @param id 钱包主键 - * @return 结果 - */ - @Override - public int deleteWalletById(Long id) - { - return walletMapper.deleteWalletById(id); - } - - @Override - public List getWalletList() { - return walletMapper.getWalletList(); - } -} diff --git a/ruoyi-catdog/src/main/resources/mapper/model/WalletMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/WalletMapper.xml deleted file mode 100644 index 6f77a41..0000000 --- a/ruoyi-catdog/src/main/resources/mapper/model/WalletMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - select id, price, tid from wallet - - - - - - - - - insert into wallet - - id, - price, - tid, - - - #{id}, - #{price}, - #{tid}, - - - - - update wallet - - price = #{price}, - tid = #{tid}, - - where id = #{id} - - - - delete from wallet where id = #{id} - - - - delete from wallet where id in - - #{id} - - - \ No newline at end of file