lianghanqiang 4 лет назад
Родитель
Сommit
0c6313f895
100 измененных файлов с 7 добавлено и 5314 удалено
  1. 1 0
      src/main/java/org/springblade/common/enums/OrderType.java
  2. 5 2
      src/main/java/org/springblade/gateway/client_gateway/controller/ClientUserController.java
  3. 1 1
      src/main/java/org/springblade/gateway/shop_gateway/controller/ShopTradeController.java
  4. 0 128
      src/main/java/org/springblade/ldt/account/controller/AccountController.java
  5. 0 34
      src/main/java/org/springblade/ldt/account/dto/AccountDTO.java
  6. 0 67
      src/main/java/org/springblade/ldt/account/entity/Account.java
  7. 0 42
      src/main/java/org/springblade/ldt/account/mapper/AccountMapper.java
  8. 0 19
      src/main/java/org/springblade/ldt/account/mapper/AccountMapper.xml
  9. 0 41
      src/main/java/org/springblade/ldt/account/service/IAccountService.java
  10. 0 41
      src/main/java/org/springblade/ldt/account/service/impl/AccountServiceImpl.java
  11. 0 36
      src/main/java/org/springblade/ldt/account/vo/AccountVO.java
  12. 0 49
      src/main/java/org/springblade/ldt/account/wrapper/AccountWrapper.java
  13. 0 128
      src/main/java/org/springblade/ldt/activity/controller/ActivityController.java
  14. 0 128
      src/main/java/org/springblade/ldt/activity/controller/JoinRecordController.java
  15. 0 34
      src/main/java/org/springblade/ldt/activity/dto/ActivityDTO.java
  16. 0 34
      src/main/java/org/springblade/ldt/activity/dto/JoinRecordDTO.java
  17. 0 127
      src/main/java/org/springblade/ldt/activity/entity/Activity.java
  18. 0 71
      src/main/java/org/springblade/ldt/activity/entity/JoinRecord.java
  19. 0 42
      src/main/java/org/springblade/ldt/activity/mapper/ActivityMapper.java
  20. 0 31
      src/main/java/org/springblade/ldt/activity/mapper/ActivityMapper.xml
  21. 0 42
      src/main/java/org/springblade/ldt/activity/mapper/JoinRecordMapper.java
  22. 0 20
      src/main/java/org/springblade/ldt/activity/mapper/JoinRecordMapper.xml
  23. 0 41
      src/main/java/org/springblade/ldt/activity/service/IActivityService.java
  24. 0 41
      src/main/java/org/springblade/ldt/activity/service/IJoinRecordService.java
  25. 0 41
      src/main/java/org/springblade/ldt/activity/service/impl/ActivityServiceImpl.java
  26. 0 41
      src/main/java/org/springblade/ldt/activity/service/impl/JoinRecordServiceImpl.java
  27. 0 36
      src/main/java/org/springblade/ldt/activity/vo/ActivityVO.java
  28. 0 36
      src/main/java/org/springblade/ldt/activity/vo/JoinRecordVO.java
  29. 0 49
      src/main/java/org/springblade/ldt/activity/wrapper/ActivityWrapper.java
  30. 0 49
      src/main/java/org/springblade/ldt/activity/wrapper/JoinRecordWrapper.java
  31. 0 128
      src/main/java/org/springblade/ldt/agent/controller/AgentRecordController.java
  32. 0 34
      src/main/java/org/springblade/ldt/agent/dto/AgentRecordDTO.java
  33. 0 76
      src/main/java/org/springblade/ldt/agent/entity/AgentRecord.java
  34. 0 42
      src/main/java/org/springblade/ldt/agent/mapper/AgentRecordMapper.java
  35. 0 21
      src/main/java/org/springblade/ldt/agent/mapper/AgentRecordMapper.xml
  36. 0 41
      src/main/java/org/springblade/ldt/agent/service/IAgentRecordService.java
  37. 0 41
      src/main/java/org/springblade/ldt/agent/service/impl/AgentRecordServiceImpl.java
  38. 0 36
      src/main/java/org/springblade/ldt/agent/vo/AgentRecordVO.java
  39. 0 49
      src/main/java/org/springblade/ldt/agent/wrapper/AgentRecordWrapper.java
  40. 0 128
      src/main/java/org/springblade/ldt/bills/controller/BalanceBillsController.java
  41. 0 128
      src/main/java/org/springblade/ldt/bills/controller/BillsController.java
  42. 0 128
      src/main/java/org/springblade/ldt/bills/controller/PlatformBillsController.java
  43. 0 128
      src/main/java/org/springblade/ldt/bills/controller/PointBillsController.java
  44. 0 128
      src/main/java/org/springblade/ldt/bills/controller/WithdrawRecController.java
  45. 0 34
      src/main/java/org/springblade/ldt/bills/dto/BalanceBillsDTO.java
  46. 0 34
      src/main/java/org/springblade/ldt/bills/dto/BillsDTO.java
  47. 0 34
      src/main/java/org/springblade/ldt/bills/dto/PlatformBillsDTO.java
  48. 0 34
      src/main/java/org/springblade/ldt/bills/dto/PointBillsDTO.java
  49. 0 34
      src/main/java/org/springblade/ldt/bills/dto/WithdrawRecDTO.java
  50. 0 92
      src/main/java/org/springblade/ldt/bills/entity/BalanceBills.java
  51. 0 133
      src/main/java/org/springblade/ldt/bills/entity/Bills.java
  52. 0 77
      src/main/java/org/springblade/ldt/bills/entity/PlatformBills.java
  53. 0 92
      src/main/java/org/springblade/ldt/bills/entity/PointBills.java
  54. 0 122
      src/main/java/org/springblade/ldt/bills/entity/WithdrawRec.java
  55. 0 42
      src/main/java/org/springblade/ldt/bills/mapper/BalanceBillsMapper.java
  56. 0 24
      src/main/java/org/springblade/ldt/bills/mapper/BalanceBillsMapper.xml
  57. 0 42
      src/main/java/org/springblade/ldt/bills/mapper/BillsMapper.java
  58. 0 32
      src/main/java/org/springblade/ldt/bills/mapper/BillsMapper.xml
  59. 0 42
      src/main/java/org/springblade/ldt/bills/mapper/PlatformBillsMapper.java
  60. 0 21
      src/main/java/org/springblade/ldt/bills/mapper/PlatformBillsMapper.xml
  61. 0 42
      src/main/java/org/springblade/ldt/bills/mapper/PointBillsMapper.java
  62. 0 24
      src/main/java/org/springblade/ldt/bills/mapper/PointBillsMapper.xml
  63. 0 42
      src/main/java/org/springblade/ldt/bills/mapper/WithdrawRecMapper.java
  64. 0 30
      src/main/java/org/springblade/ldt/bills/mapper/WithdrawRecMapper.xml
  65. 0 41
      src/main/java/org/springblade/ldt/bills/service/IBalanceBillsService.java
  66. 0 41
      src/main/java/org/springblade/ldt/bills/service/IBillsService.java
  67. 0 41
      src/main/java/org/springblade/ldt/bills/service/IPlatformBillsService.java
  68. 0 41
      src/main/java/org/springblade/ldt/bills/service/IPointBillsService.java
  69. 0 41
      src/main/java/org/springblade/ldt/bills/service/IWithdrawRecService.java
  70. 0 41
      src/main/java/org/springblade/ldt/bills/service/impl/BalanceBillsServiceImpl.java
  71. 0 41
      src/main/java/org/springblade/ldt/bills/service/impl/BillsServiceImpl.java
  72. 0 41
      src/main/java/org/springblade/ldt/bills/service/impl/PlatformBillsServiceImpl.java
  73. 0 41
      src/main/java/org/springblade/ldt/bills/service/impl/PointBillsServiceImpl.java
  74. 0 41
      src/main/java/org/springblade/ldt/bills/service/impl/WithdrawRecServiceImpl.java
  75. 0 36
      src/main/java/org/springblade/ldt/bills/vo/BalanceBillsVO.java
  76. 0 36
      src/main/java/org/springblade/ldt/bills/vo/BillsVO.java
  77. 0 36
      src/main/java/org/springblade/ldt/bills/vo/PlatformBillsVO.java
  78. 0 36
      src/main/java/org/springblade/ldt/bills/vo/PointBillsVO.java
  79. 0 36
      src/main/java/org/springblade/ldt/bills/vo/WithdrawRecVO.java
  80. 0 49
      src/main/java/org/springblade/ldt/bills/wrapper/BalanceBillsWrapper.java
  81. 0 49
      src/main/java/org/springblade/ldt/bills/wrapper/BillsWrapper.java
  82. 0 49
      src/main/java/org/springblade/ldt/bills/wrapper/PlatformBillsWrapper.java
  83. 0 49
      src/main/java/org/springblade/ldt/bills/wrapper/PointBillsWrapper.java
  84. 0 49
      src/main/java/org/springblade/ldt/bills/wrapper/WithdrawRecWrapper.java
  85. 0 128
      src/main/java/org/springblade/ldt/feedback/controller/FeedbackController.java
  86. 0 34
      src/main/java/org/springblade/ldt/feedback/dto/FeedbackDTO.java
  87. 0 76
      src/main/java/org/springblade/ldt/feedback/entity/Feedback.java
  88. 0 42
      src/main/java/org/springblade/ldt/feedback/mapper/FeedbackMapper.java
  89. 0 21
      src/main/java/org/springblade/ldt/feedback/mapper/FeedbackMapper.xml
  90. 0 41
      src/main/java/org/springblade/ldt/feedback/service/IFeedbackService.java
  91. 0 41
      src/main/java/org/springblade/ldt/feedback/service/impl/FeedbackServiceImpl.java
  92. 0 36
      src/main/java/org/springblade/ldt/feedback/vo/FeedbackVO.java
  93. 0 49
      src/main/java/org/springblade/ldt/feedback/wrapper/FeedbackWrapper.java
  94. 0 128
      src/main/java/org/springblade/ldt/mall/controller/MallController.java
  95. 0 34
      src/main/java/org/springblade/ldt/mall/dto/MallDTO.java
  96. 0 111
      src/main/java/org/springblade/ldt/mall/entity/Mall.java
  97. 0 42
      src/main/java/org/springblade/ldt/mall/mapper/MallMapper.java
  98. 0 28
      src/main/java/org/springblade/ldt/mall/mapper/MallMapper.xml
  99. 0 41
      src/main/java/org/springblade/ldt/mall/service/IMallService.java
  100. 0 41
      src/main/java/org/springblade/ldt/mall/service/impl/MallServiceImpl.java

+ 1 - 0
src/main/java/org/springblade/common/enums/OrderType.java

@@ -21,6 +21,7 @@ public enum OrderType {
 	 * 余额,积分交易
 	 * */
 	MALL_SEND("mall_send"),
+	SHOP_SEND("shop_send"),
 	PAY_CONSUMER("mall_send");
 
 	String name;

+ 5 - 2
src/main/java/org/springblade/gateway/client_gateway/controller/ClientUserController.java

@@ -17,6 +17,9 @@ 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 java.math.BigDecimal;
+
 /**
  * @author: lianghanqiang
  * @description:
@@ -39,8 +42,8 @@ public class ClientUserController {
 			user = new LoginUser();
 			user.setAgent(0);
 			user.setAvatar(loginDto.getAvatar());
-			user.setBalance(0.00);
-			user.setChannelPoint(0.00);
+			user.setBalance(BigDecimal.ZERO);
+			user.setChannelPoint(BigDecimal.ZERO);
 			user.setNickName(loginDto.getNickName());
 			user.setOpenid(loginDto.getOpenid());
 			user.setSex(StringUtil.isBlank(loginDto.getGender())? "0":loginDto.getGender());

+ 1 - 1
src/main/java/org/springblade/gateway/shop_gateway/controller/ShopTradeController.java

@@ -52,7 +52,7 @@ public class ShopTradeController {
 			.appId(codeOrder.getAppId())
 			.billsTitle(codeOrder.getBillsTitle())
 			.loginUser(loginUser)
-			.money(codeOrder.getMoney().doubleValue())
+			.money(codeOrder.getMoney())
 			.expireTime(codeOrder.getExpireTime())
 			.secret(codeOrder.getSecret())
 			.shopId(codeOrder.getShopId())

+ 0 - 128
src/main/java/org/springblade/ldt/account/controller/AccountController.java

@@ -1,128 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.account.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.ldt.account.entity.Account;
-import org.springblade.ldt.account.vo.AccountVO;
-import org.springblade.ldt.account.wrapper.AccountWrapper;
-import org.springblade.ldt.account.service.IAccountService;
-import org.springblade.core.boot.ctrl.BladeController;
-
-/**
- *  控制器
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("ldt_account/account")
-@Api(value = "", tags = "接口")
-public class AccountController extends BladeController {
-
-	private final IAccountService accountService;
-
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入account")
-	public R<AccountVO> detail(Account account) {
-		Account detail = accountService.getOne(Condition.getQueryWrapper(account));
-		return R.data(AccountWrapper.build().entityVO(detail));
-	}
-
-	/**
-	 * 分页 
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入account")
-	public R<IPage<AccountVO>> list(Account account, Query query) {
-		IPage<Account> pages = accountService.page(Condition.getPage(query), Condition.getQueryWrapper(account));
-		return R.data(AccountWrapper.build().pageVO(pages));
-	}
-
-
-	/**
-	 * 自定义分页 
-	 */
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入account")
-	public R<IPage<AccountVO>> page(AccountVO account, Query query) {
-		IPage<AccountVO> pages = accountService.selectAccountPage(Condition.getPage(query), account);
-		return R.data(pages);
-	}
-
-	/**
-	 * 新增 
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入account")
-	public R save(@Valid @RequestBody Account account) {
-		return R.status(accountService.save(account));
-	}
-
-	/**
-	 * 修改 
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入account")
-	public R update(@Valid @RequestBody Account account) {
-		return R.status(accountService.updateById(account));
-	}
-
-	/**
-	 * 新增或修改 
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入account")
-	public R submit(@Valid @RequestBody Account account) {
-		return R.status(accountService.saveOrUpdate(account));
-	}
-
-	
-	/**
-	 * 删除 
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(accountService.removeByIds(Func.toLongList(ids)));
-	}
-
-	
-}

+ 0 - 34
src/main/java/org/springblade/ldt/account/dto/AccountDTO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.account.dto;
-
-import org.springblade.ldt.account.entity.Account;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 数据传输对象实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class AccountDTO extends Account {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 67
src/main/java/org/springblade/ldt/account/entity/Account.java

@@ -1,67 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.account.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@TableName("ldt_account")
-@ApiModel(value = "Account对象", description = "Account对象")
-public class Account implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 账户ID
-	*/
-		@ApiModelProperty(value = "账户ID")
-		private Long id;
-	/**
-	* 账号,手机号
-	*/
-		@ApiModelProperty(value = "账号,手机号")
-		private String phone;
-	/**
-	* 密码
-	*/
-		@ApiModelProperty(value = "密码")
-		private String secret;
-	/**
-	* 账户类型,商家,商场
-	*/
-		@ApiModelProperty(value = "账户类型,商家,商场")
-		private String type;
-	/**
-	* 注册时间
-	*/
-		@ApiModelProperty(value = "注册时间")
-		private LocalDateTime createTime;
-
-
-}

+ 0 - 42
src/main/java/org/springblade/ldt/account/mapper/AccountMapper.java

@@ -1,42 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.account.mapper;
-
-import org.springblade.ldt.account.entity.Account;
-import org.springblade.ldt.account.vo.AccountVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-
-/**
- *  Mapper 接口
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface AccountMapper extends BaseMapper<Account> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param account
-	 * @return
-	 */
-	List<AccountVO> selectAccountPage(IPage page, AccountVO account);
-
-}

+ 0 - 19
src/main/java/org/springblade/ldt/account/mapper/AccountMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.ldt.account.mapper.AccountMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="accountResultMap" type="org.springblade.ldt.account.entity.Account">
-        <id column="id" property="id"/>
-        <result column="phone" property="phone"/>
-        <result column="secret" property="secret"/>
-        <result column="type" property="type"/>
-        <result column="create_time" property="createTime"/>
-    </resultMap>
-
-
-    <select id="selectAccountPage" resultMap="accountResultMap">
-        select * from ldt_account where is_deleted = 0
-    </select>
-
-</mapper>

+ 0 - 41
src/main/java/org/springblade/ldt/account/service/IAccountService.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.account.service;
-
-import org.springblade.ldt.account.entity.Account;
-import org.springblade.ldt.account.vo.AccountVO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface IAccountService extends IService<Account> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param account
-	 * @return
-	 */
-	IPage<AccountVO> selectAccountPage(IPage<AccountVO> page, AccountVO account);
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/account/service/impl/AccountServiceImpl.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.account.service.impl;
-
-import org.springblade.ldt.account.entity.Account;
-import org.springblade.ldt.account.vo.AccountVO;
-import org.springblade.ldt.account.mapper.AccountMapper;
-import org.springblade.ldt.account.service.IAccountService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务实现类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Service
-public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> implements IAccountService {
-
-	@Override
-	public IPage<AccountVO> selectAccountPage(IPage<AccountVO> page, AccountVO account) {
-		return page.setRecords(baseMapper.selectAccountPage(page, account));
-	}
-
-}

+ 0 - 36
src/main/java/org/springblade/ldt/account/vo/AccountVO.java

@@ -1,36 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.account.vo;
-
-import org.springblade.ldt.account.entity.Account;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-
-/**
- * 视图实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "AccountVO对象", description = "AccountVO对象")
-public class AccountVO extends Account {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 49
src/main/java/org/springblade/ldt/account/wrapper/AccountWrapper.java

@@ -1,49 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.account.wrapper;
-
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.ldt.account.entity.Account;
-import org.springblade.ldt.account.vo.AccountVO;
-import java.util.Objects;
-
-/**
- * 包装类,返回视图层所需的字段
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public class AccountWrapper extends BaseEntityWrapper<Account, AccountVO>  {
-
-	public static AccountWrapper build() {
-		return new AccountWrapper();
- 	}
-
-	@Override
-	public AccountVO entityVO(Account account) {
-		AccountVO accountVO = Objects.requireNonNull(BeanUtil.copy(account, AccountVO.class));
-
-		//User createUser = UserCache.getUser(account.getCreateUser());
-		//User updateUser = UserCache.getUser(account.getUpdateUser());
-		//accountVO.setCreateUserName(createUser.getName());
-		//accountVO.setUpdateUserName(updateUser.getName());
-
-		return accountVO;
-	}
-
-}

+ 0 - 128
src/main/java/org/springblade/ldt/activity/controller/ActivityController.java

@@ -1,128 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.ldt.activity.entity.Activity;
-import org.springblade.ldt.activity.vo.ActivityVO;
-import org.springblade.ldt.activity.wrapper.ActivityWrapper;
-import org.springblade.ldt.activity.service.IActivityService;
-import org.springblade.core.boot.ctrl.BladeController;
-
-/**
- *  控制器
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("ldt_activity/activity")
-@Api(value = "", tags = "接口")
-public class ActivityController extends BladeController {
-
-	private final IActivityService activityService;
-
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入activity")
-	public R<ActivityVO> detail(Activity activity) {
-		Activity detail = activityService.getOne(Condition.getQueryWrapper(activity));
-		return R.data(ActivityWrapper.build().entityVO(detail));
-	}
-
-	/**
-	 * 分页 
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入activity")
-	public R<IPage<ActivityVO>> list(Activity activity, Query query) {
-		IPage<Activity> pages = activityService.page(Condition.getPage(query), Condition.getQueryWrapper(activity));
-		return R.data(ActivityWrapper.build().pageVO(pages));
-	}
-
-
-	/**
-	 * 自定义分页 
-	 */
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入activity")
-	public R<IPage<ActivityVO>> page(ActivityVO activity, Query query) {
-		IPage<ActivityVO> pages = activityService.selectActivityPage(Condition.getPage(query), activity);
-		return R.data(pages);
-	}
-
-	/**
-	 * 新增 
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入activity")
-	public R save(@Valid @RequestBody Activity activity) {
-		return R.status(activityService.save(activity));
-	}
-
-	/**
-	 * 修改 
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入activity")
-	public R update(@Valid @RequestBody Activity activity) {
-		return R.status(activityService.updateById(activity));
-	}
-
-	/**
-	 * 新增或修改 
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入activity")
-	public R submit(@Valid @RequestBody Activity activity) {
-		return R.status(activityService.saveOrUpdate(activity));
-	}
-
-	
-	/**
-	 * 删除 
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(activityService.removeByIds(Func.toLongList(ids)));
-	}
-
-	
-}

+ 0 - 128
src/main/java/org/springblade/ldt/activity/controller/JoinRecordController.java

@@ -1,128 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.ldt.activity.entity.JoinRecord;
-import org.springblade.ldt.activity.vo.JoinRecordVO;
-import org.springblade.ldt.activity.wrapper.JoinRecordWrapper;
-import org.springblade.ldt.activity.service.IJoinRecordService;
-import org.springblade.core.boot.ctrl.BladeController;
-
-/**
- *  控制器
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("ldt_activity/joinrecord")
-@Api(value = "", tags = "接口")
-public class JoinRecordController extends BladeController {
-
-	private final IJoinRecordService joinRecordService;
-
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入joinRecord")
-	public R<JoinRecordVO> detail(JoinRecord joinRecord) {
-		JoinRecord detail = joinRecordService.getOne(Condition.getQueryWrapper(joinRecord));
-		return R.data(JoinRecordWrapper.build().entityVO(detail));
-	}
-
-	/**
-	 * 分页 
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入joinRecord")
-	public R<IPage<JoinRecordVO>> list(JoinRecord joinRecord, Query query) {
-		IPage<JoinRecord> pages = joinRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(joinRecord));
-		return R.data(JoinRecordWrapper.build().pageVO(pages));
-	}
-
-
-	/**
-	 * 自定义分页 
-	 */
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入joinRecord")
-	public R<IPage<JoinRecordVO>> page(JoinRecordVO joinRecord, Query query) {
-		IPage<JoinRecordVO> pages = joinRecordService.selectJoinRecordPage(Condition.getPage(query), joinRecord);
-		return R.data(pages);
-	}
-
-	/**
-	 * 新增 
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入joinRecord")
-	public R save(@Valid @RequestBody JoinRecord joinRecord) {
-		return R.status(joinRecordService.save(joinRecord));
-	}
-
-	/**
-	 * 修改 
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入joinRecord")
-	public R update(@Valid @RequestBody JoinRecord joinRecord) {
-		return R.status(joinRecordService.updateById(joinRecord));
-	}
-
-	/**
-	 * 新增或修改 
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入joinRecord")
-	public R submit(@Valid @RequestBody JoinRecord joinRecord) {
-		return R.status(joinRecordService.saveOrUpdate(joinRecord));
-	}
-
-	
-	/**
-	 * 删除 
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(joinRecordService.removeByIds(Func.toLongList(ids)));
-	}
-
-	
-}

+ 0 - 34
src/main/java/org/springblade/ldt/activity/dto/ActivityDTO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.dto;
-
-import org.springblade.ldt.activity.entity.Activity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 数据传输对象实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ActivityDTO extends Activity {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 34
src/main/java/org/springblade/ldt/activity/dto/JoinRecordDTO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.dto;
-
-import org.springblade.ldt.activity.entity.JoinRecord;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 数据传输对象实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class JoinRecordDTO extends JoinRecord {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 127
src/main/java/org/springblade/ldt/activity/entity/Activity.java

@@ -1,127 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@TableName("ldt_activity")
-@ApiModel(value = "Activity对象", description = "Activity对象")
-public class Activity implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 活动ID
-	*/
-		@ApiModelProperty(value = "活动ID")
-		private Long id;
-	/**
-	* 活动标题
-	*/
-		@ApiModelProperty(value = "活动标题")
-		private String title;
-	/**
-	* 活动海报
-	*/
-		@ApiModelProperty(value = "活动海报")
-		private String poster;
-	/**
-	* 供应价(活动折扣)
-	*/
-		@ApiModelProperty(value = "供应价(活动折扣)")
-		private Double discount;
-	/**
-	* 活动开始时间
-	*/
-		@ApiModelProperty(value = "活动开始时间")
-		private LocalDateTime beginTime;
-	/**
-	* 活动结束时间
-	*/
-		@ApiModelProperty(value = "活动结束时间")
-		private LocalDateTime endTime;
-	/**
-	* 审核状态(审核中,通过,拒绝)
-	*/
-		@ApiModelProperty(value = "审核状态(审核中,通过,拒绝)")
-		private String auditStatus;
-	/**
-	* 活动描述
-	*/
-		@ApiModelProperty(value = "活动描述")
-		private String intro;
-	/**
-	* 发起账户
-	*/
-		@ApiModelProperty(value = "发起账户")
-		private Long launchId;
-	/**
-	* 可选值:商家、商场
-	*/
-		@ApiModelProperty(value = "可选值:商家、商场")
-		private String launchType;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
-	/**
-	* 状态
-	*/
-		@ApiModelProperty(value = "状态")
-		private Integer status;
-	/**
-	* 是否已删除
-	*/
-		@ApiModelProperty(value = "是否已删除")
-		private Integer isDeleted;
-
-
-}

+ 0 - 71
src/main/java/org/springblade/ldt/activity/entity/JoinRecord.java

@@ -1,71 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@TableName("ldt_join_record")
-@ApiModel(value = "JoinRecord对象", description = "JoinRecord对象")
-public class JoinRecord implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 参与ID
-	*/
-		@ApiModelProperty(value = "参与ID")
-		private Long id;
-	/**
-	* 活动ID
-	*/
-		@ApiModelProperty(value = "活动ID")
-		private Long activityId;
-	/**
-	* 参与者ID
-	*/
-		@ApiModelProperty(value = "参与者ID")
-		private Long joinId;
-	/**
-	* 参与者标题
-	*/
-		@ApiModelProperty(value = "参与者标题")
-		private String joinName;
-	/**
-	* 参与折扣
-	*/
-		@ApiModelProperty(value = "参与折扣")
-		private Double discount;
-	/**
-	* 参与者logo
-	*/
-		@ApiModelProperty(value = "参与者logo")
-		private String joinLogo;
-
-
-}

+ 0 - 42
src/main/java/org/springblade/ldt/activity/mapper/ActivityMapper.java

@@ -1,42 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.mapper;
-
-import org.springblade.ldt.activity.entity.Activity;
-import org.springblade.ldt.activity.vo.ActivityVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-
-/**
- *  Mapper 接口
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface ActivityMapper extends BaseMapper<Activity> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param activity
-	 * @return
-	 */
-	List<ActivityVO> selectActivityPage(IPage page, ActivityVO activity);
-
-}

+ 0 - 31
src/main/java/org/springblade/ldt/activity/mapper/ActivityMapper.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.ldt.activity.mapper.ActivityMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="activityResultMap" type="org.springblade.ldt.activity.entity.Activity">
-        <id column="id" property="id"/>
-        <result column="title" property="title"/>
-        <result column="poster" property="poster"/>
-        <result column="discount" property="discount"/>
-        <result column="begin_time" property="beginTime"/>
-        <result column="end_time" property="endTime"/>
-        <result column="audit_status" property="auditStatus"/>
-        <result column="intro" property="intro"/>
-        <result column="launch_id" property="launchId"/>
-        <result column="launch_type" property="launchType"/>
-        <result column="create_user" property="createUser"/>
-        <result column="create_dept" property="createDept"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_user" property="updateUser"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="status" property="status"/>
-        <result column="is_deleted" property="isDeleted"/>
-    </resultMap>
-
-
-    <select id="selectActivityPage" resultMap="activityResultMap">
-        select * from ldt_activity where is_deleted = 0
-    </select>
-
-</mapper>

+ 0 - 42
src/main/java/org/springblade/ldt/activity/mapper/JoinRecordMapper.java

@@ -1,42 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.mapper;
-
-import org.springblade.ldt.activity.entity.JoinRecord;
-import org.springblade.ldt.activity.vo.JoinRecordVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-
-/**
- *  Mapper 接口
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface JoinRecordMapper extends BaseMapper<JoinRecord> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param joinRecord
-	 * @return
-	 */
-	List<JoinRecordVO> selectJoinRecordPage(IPage page, JoinRecordVO joinRecord);
-
-}

+ 0 - 20
src/main/java/org/springblade/ldt/activity/mapper/JoinRecordMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.ldt.activity.mapper.JoinRecordMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="joinRecordResultMap" type="org.springblade.ldt.activity.entity.JoinRecord">
-        <id column="id" property="id"/>
-        <result column="activity_id" property="activityId"/>
-        <result column="join_id" property="joinId"/>
-        <result column="join_name" property="joinName"/>
-        <result column="discount" property="discount"/>
-        <result column="join_logo" property="joinLogo"/>
-    </resultMap>
-
-
-    <select id="selectJoinRecordPage" resultMap="joinRecordResultMap">
-        select * from ldt_join_record where is_deleted = 0
-    </select>
-
-</mapper>

+ 0 - 41
src/main/java/org/springblade/ldt/activity/service/IActivityService.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.service;
-
-import org.springblade.ldt.activity.entity.Activity;
-import org.springblade.ldt.activity.vo.ActivityVO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface IActivityService extends IService<Activity> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param activity
-	 * @return
-	 */
-	IPage<ActivityVO> selectActivityPage(IPage<ActivityVO> page, ActivityVO activity);
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/activity/service/IJoinRecordService.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.service;
-
-import org.springblade.ldt.activity.entity.JoinRecord;
-import org.springblade.ldt.activity.vo.JoinRecordVO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface IJoinRecordService extends IService<JoinRecord> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param joinRecord
-	 * @return
-	 */
-	IPage<JoinRecordVO> selectJoinRecordPage(IPage<JoinRecordVO> page, JoinRecordVO joinRecord);
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/activity/service/impl/ActivityServiceImpl.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.service.impl;
-
-import org.springblade.ldt.activity.entity.Activity;
-import org.springblade.ldt.activity.vo.ActivityVO;
-import org.springblade.ldt.activity.mapper.ActivityMapper;
-import org.springblade.ldt.activity.service.IActivityService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务实现类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Service
-public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> implements IActivityService {
-
-	@Override
-	public IPage<ActivityVO> selectActivityPage(IPage<ActivityVO> page, ActivityVO activity) {
-		return page.setRecords(baseMapper.selectActivityPage(page, activity));
-	}
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/activity/service/impl/JoinRecordServiceImpl.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.service.impl;
-
-import org.springblade.ldt.activity.entity.JoinRecord;
-import org.springblade.ldt.activity.vo.JoinRecordVO;
-import org.springblade.ldt.activity.mapper.JoinRecordMapper;
-import org.springblade.ldt.activity.service.IJoinRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务实现类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Service
-public class JoinRecordServiceImpl extends ServiceImpl<JoinRecordMapper, JoinRecord> implements IJoinRecordService {
-
-	@Override
-	public IPage<JoinRecordVO> selectJoinRecordPage(IPage<JoinRecordVO> page, JoinRecordVO joinRecord) {
-		return page.setRecords(baseMapper.selectJoinRecordPage(page, joinRecord));
-	}
-
-}

+ 0 - 36
src/main/java/org/springblade/ldt/activity/vo/ActivityVO.java

@@ -1,36 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.vo;
-
-import org.springblade.ldt.activity.entity.Activity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-
-/**
- * 视图实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "ActivityVO对象", description = "ActivityVO对象")
-public class ActivityVO extends Activity {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 36
src/main/java/org/springblade/ldt/activity/vo/JoinRecordVO.java

@@ -1,36 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.vo;
-
-import org.springblade.ldt.activity.entity.JoinRecord;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-
-/**
- * 视图实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "JoinRecordVO对象", description = "JoinRecordVO对象")
-public class JoinRecordVO extends JoinRecord {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 49
src/main/java/org/springblade/ldt/activity/wrapper/ActivityWrapper.java

@@ -1,49 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.wrapper;
-
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.ldt.activity.entity.Activity;
-import org.springblade.ldt.activity.vo.ActivityVO;
-import java.util.Objects;
-
-/**
- * 包装类,返回视图层所需的字段
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public class ActivityWrapper extends BaseEntityWrapper<Activity, ActivityVO>  {
-
-	public static ActivityWrapper build() {
-		return new ActivityWrapper();
- 	}
-
-	@Override
-	public ActivityVO entityVO(Activity activity) {
-		ActivityVO activityVO = Objects.requireNonNull(BeanUtil.copy(activity, ActivityVO.class));
-
-		//User createUser = UserCache.getUser(activity.getCreateUser());
-		//User updateUser = UserCache.getUser(activity.getUpdateUser());
-		//activityVO.setCreateUserName(createUser.getName());
-		//activityVO.setUpdateUserName(updateUser.getName());
-
-		return activityVO;
-	}
-
-}

+ 0 - 49
src/main/java/org/springblade/ldt/activity/wrapper/JoinRecordWrapper.java

@@ -1,49 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.activity.wrapper;
-
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.ldt.activity.entity.JoinRecord;
-import org.springblade.ldt.activity.vo.JoinRecordVO;
-import java.util.Objects;
-
-/**
- * 包装类,返回视图层所需的字段
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public class JoinRecordWrapper extends BaseEntityWrapper<JoinRecord, JoinRecordVO>  {
-
-	public static JoinRecordWrapper build() {
-		return new JoinRecordWrapper();
- 	}
-
-	@Override
-	public JoinRecordVO entityVO(JoinRecord joinRecord) {
-		JoinRecordVO joinRecordVO = Objects.requireNonNull(BeanUtil.copy(joinRecord, JoinRecordVO.class));
-
-		//User createUser = UserCache.getUser(joinRecord.getCreateUser());
-		//User updateUser = UserCache.getUser(joinRecord.getUpdateUser());
-		//joinRecordVO.setCreateUserName(createUser.getName());
-		//joinRecordVO.setUpdateUserName(updateUser.getName());
-
-		return joinRecordVO;
-	}
-
-}

+ 0 - 128
src/main/java/org/springblade/ldt/agent/controller/AgentRecordController.java

@@ -1,128 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.agent.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.ldt.agent.entity.AgentRecord;
-import org.springblade.ldt.agent.vo.AgentRecordVO;
-import org.springblade.ldt.agent.wrapper.AgentRecordWrapper;
-import org.springblade.ldt.agent.service.IAgentRecordService;
-import org.springblade.core.boot.ctrl.BladeController;
-
-/**
- *  控制器
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("ldt_agent/agentrecord")
-@Api(value = "", tags = "接口")
-public class AgentRecordController extends BladeController {
-
-	private final IAgentRecordService agentRecordService;
-
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入agentRecord")
-	public R<AgentRecordVO> detail(AgentRecord agentRecord) {
-		AgentRecord detail = agentRecordService.getOne(Condition.getQueryWrapper(agentRecord));
-		return R.data(AgentRecordWrapper.build().entityVO(detail));
-	}
-
-	/**
-	 * 分页 
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入agentRecord")
-	public R<IPage<AgentRecordVO>> list(AgentRecord agentRecord, Query query) {
-		IPage<AgentRecord> pages = agentRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(agentRecord));
-		return R.data(AgentRecordWrapper.build().pageVO(pages));
-	}
-
-
-	/**
-	 * 自定义分页 
-	 */
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入agentRecord")
-	public R<IPage<AgentRecordVO>> page(AgentRecordVO agentRecord, Query query) {
-		IPage<AgentRecordVO> pages = agentRecordService.selectAgentRecordPage(Condition.getPage(query), agentRecord);
-		return R.data(pages);
-	}
-
-	/**
-	 * 新增 
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入agentRecord")
-	public R save(@Valid @RequestBody AgentRecord agentRecord) {
-		return R.status(agentRecordService.save(agentRecord));
-	}
-
-	/**
-	 * 修改 
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入agentRecord")
-	public R update(@Valid @RequestBody AgentRecord agentRecord) {
-		return R.status(agentRecordService.updateById(agentRecord));
-	}
-
-	/**
-	 * 新增或修改 
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入agentRecord")
-	public R submit(@Valid @RequestBody AgentRecord agentRecord) {
-		return R.status(agentRecordService.saveOrUpdate(agentRecord));
-	}
-
-	
-	/**
-	 * 删除 
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(agentRecordService.removeByIds(Func.toLongList(ids)));
-	}
-
-	
-}

+ 0 - 34
src/main/java/org/springblade/ldt/agent/dto/AgentRecordDTO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.agent.dto;
-
-import org.springblade.ldt.agent.entity.AgentRecord;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 数据传输对象实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class AgentRecordDTO extends AgentRecord {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 76
src/main/java/org/springblade/ldt/agent/entity/AgentRecord.java

@@ -1,76 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.agent.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@TableName("ldt_agent_record")
-@ApiModel(value = "AgentRecord对象", description = "AgentRecord对象")
-public class AgentRecord implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 代理记录ID
-	*/
-		@ApiModelProperty(value = "代理记录ID")
-		private Long id;
-	/**
-	* 用户ID
-	*/
-		@ApiModelProperty(value = "用户ID")
-		private Long accountId;
-	/**
-	* 城市合伙人、渠道代理商
-	*/
-		@ApiModelProperty(value = "城市合伙人、渠道代理商")
-		private String agentType;
-	/**
-	* 代理城市
-	*/
-		@ApiModelProperty(value = "代理城市")
-		private String agentArea;
-	/**
-	* 代理商邀请码
-	*/
-		@ApiModelProperty(value = "代理商邀请码")
-		private String agentCode;
-	/**
-	* 城市编码
-	*/
-		@ApiModelProperty(value = "城市编码")
-		private String areaCode;
-	/**
-	* 是否启用
-	*/
-		@ApiModelProperty(value = "是否启用")
-		private Integer enable;
-
-
-}

+ 0 - 42
src/main/java/org/springblade/ldt/agent/mapper/AgentRecordMapper.java

@@ -1,42 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.agent.mapper;
-
-import org.springblade.ldt.agent.entity.AgentRecord;
-import org.springblade.ldt.agent.vo.AgentRecordVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-
-/**
- *  Mapper 接口
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface AgentRecordMapper extends BaseMapper<AgentRecord> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param agentRecord
-	 * @return
-	 */
-	List<AgentRecordVO> selectAgentRecordPage(IPage page, AgentRecordVO agentRecord);
-
-}

+ 0 - 21
src/main/java/org/springblade/ldt/agent/mapper/AgentRecordMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.ldt.agent.mapper.AgentRecordMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="agentRecordResultMap" type="org.springblade.ldt.agent.entity.AgentRecord">
-        <id column="id" property="id"/>
-        <result column="account_id" property="accountId"/>
-        <result column="agent_type" property="agentType"/>
-        <result column="agent_area" property="agentArea"/>
-        <result column="agent_code" property="agentCode"/>
-        <result column="area_code" property="areaCode"/>
-        <result column="enable" property="enable"/>
-    </resultMap>
-
-
-    <select id="selectAgentRecordPage" resultMap="agentRecordResultMap">
-        select * from ldt_agent_record where is_deleted = 0
-    </select>
-
-</mapper>

+ 0 - 41
src/main/java/org/springblade/ldt/agent/service/IAgentRecordService.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.agent.service;
-
-import org.springblade.ldt.agent.entity.AgentRecord;
-import org.springblade.ldt.agent.vo.AgentRecordVO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface IAgentRecordService extends IService<AgentRecord> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param agentRecord
-	 * @return
-	 */
-	IPage<AgentRecordVO> selectAgentRecordPage(IPage<AgentRecordVO> page, AgentRecordVO agentRecord);
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/agent/service/impl/AgentRecordServiceImpl.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.agent.service.impl;
-
-import org.springblade.ldt.agent.entity.AgentRecord;
-import org.springblade.ldt.agent.vo.AgentRecordVO;
-import org.springblade.ldt.agent.mapper.AgentRecordMapper;
-import org.springblade.ldt.agent.service.IAgentRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务实现类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Service
-public class AgentRecordServiceImpl extends ServiceImpl<AgentRecordMapper, AgentRecord> implements IAgentRecordService {
-
-	@Override
-	public IPage<AgentRecordVO> selectAgentRecordPage(IPage<AgentRecordVO> page, AgentRecordVO agentRecord) {
-		return page.setRecords(baseMapper.selectAgentRecordPage(page, agentRecord));
-	}
-
-}

+ 0 - 36
src/main/java/org/springblade/ldt/agent/vo/AgentRecordVO.java

@@ -1,36 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.agent.vo;
-
-import org.springblade.ldt.agent.entity.AgentRecord;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-
-/**
- * 视图实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "AgentRecordVO对象", description = "AgentRecordVO对象")
-public class AgentRecordVO extends AgentRecord {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 49
src/main/java/org/springblade/ldt/agent/wrapper/AgentRecordWrapper.java

@@ -1,49 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.agent.wrapper;
-
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.ldt.agent.entity.AgentRecord;
-import org.springblade.ldt.agent.vo.AgentRecordVO;
-import java.util.Objects;
-
-/**
- * 包装类,返回视图层所需的字段
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public class AgentRecordWrapper extends BaseEntityWrapper<AgentRecord, AgentRecordVO>  {
-
-	public static AgentRecordWrapper build() {
-		return new AgentRecordWrapper();
- 	}
-
-	@Override
-	public AgentRecordVO entityVO(AgentRecord agentRecord) {
-		AgentRecordVO agentRecordVO = Objects.requireNonNull(BeanUtil.copy(agentRecord, AgentRecordVO.class));
-
-		//User createUser = UserCache.getUser(agentRecord.getCreateUser());
-		//User updateUser = UserCache.getUser(agentRecord.getUpdateUser());
-		//agentRecordVO.setCreateUserName(createUser.getName());
-		//agentRecordVO.setUpdateUserName(updateUser.getName());
-
-		return agentRecordVO;
-	}
-
-}

+ 0 - 128
src/main/java/org/springblade/ldt/bills/controller/BalanceBillsController.java

@@ -1,128 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.ldt.bills.entity.BalanceBills;
-import org.springblade.ldt.bills.vo.BalanceBillsVO;
-import org.springblade.ldt.bills.wrapper.BalanceBillsWrapper;
-import org.springblade.ldt.bills.service.IBalanceBillsService;
-import org.springblade.core.boot.ctrl.BladeController;
-
-/**
- *  控制器
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("ldt_bills/balancebills")
-@Api(value = "", tags = "接口")
-public class BalanceBillsController extends BladeController {
-
-	private final IBalanceBillsService balanceBillsService;
-
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入balanceBills")
-	public R<BalanceBillsVO> detail(BalanceBills balanceBills) {
-		BalanceBills detail = balanceBillsService.getOne(Condition.getQueryWrapper(balanceBills));
-		return R.data(BalanceBillsWrapper.build().entityVO(detail));
-	}
-
-	/**
-	 * 分页 
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入balanceBills")
-	public R<IPage<BalanceBillsVO>> list(BalanceBills balanceBills, Query query) {
-		IPage<BalanceBills> pages = balanceBillsService.page(Condition.getPage(query), Condition.getQueryWrapper(balanceBills));
-		return R.data(BalanceBillsWrapper.build().pageVO(pages));
-	}
-
-
-	/**
-	 * 自定义分页 
-	 */
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入balanceBills")
-	public R<IPage<BalanceBillsVO>> page(BalanceBillsVO balanceBills, Query query) {
-		IPage<BalanceBillsVO> pages = balanceBillsService.selectBalanceBillsPage(Condition.getPage(query), balanceBills);
-		return R.data(pages);
-	}
-
-	/**
-	 * 新增 
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入balanceBills")
-	public R save(@Valid @RequestBody BalanceBills balanceBills) {
-		return R.status(balanceBillsService.save(balanceBills));
-	}
-
-	/**
-	 * 修改 
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入balanceBills")
-	public R update(@Valid @RequestBody BalanceBills balanceBills) {
-		return R.status(balanceBillsService.updateById(balanceBills));
-	}
-
-	/**
-	 * 新增或修改 
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入balanceBills")
-	public R submit(@Valid @RequestBody BalanceBills balanceBills) {
-		return R.status(balanceBillsService.saveOrUpdate(balanceBills));
-	}
-
-	
-	/**
-	 * 删除 
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(balanceBillsService.removeByIds(Func.toLongList(ids)));
-	}
-
-	
-}

+ 0 - 128
src/main/java/org/springblade/ldt/bills/controller/BillsController.java

@@ -1,128 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.ldt.bills.entity.Bills;
-import org.springblade.ldt.bills.vo.BillsVO;
-import org.springblade.ldt.bills.wrapper.BillsWrapper;
-import org.springblade.ldt.bills.service.IBillsService;
-import org.springblade.core.boot.ctrl.BladeController;
-
-/**
- *  控制器
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("ldt_bills/bills")
-@Api(value = "", tags = "接口")
-public class BillsController extends BladeController {
-
-	private final IBillsService billsService;
-
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入bills")
-	public R<BillsVO> detail(Bills bills) {
-		Bills detail = billsService.getOne(Condition.getQueryWrapper(bills));
-		return R.data(BillsWrapper.build().entityVO(detail));
-	}
-
-	/**
-	 * 分页 
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入bills")
-	public R<IPage<BillsVO>> list(Bills bills, Query query) {
-		IPage<Bills> pages = billsService.page(Condition.getPage(query), Condition.getQueryWrapper(bills));
-		return R.data(BillsWrapper.build().pageVO(pages));
-	}
-
-
-	/**
-	 * 自定义分页 
-	 */
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入bills")
-	public R<IPage<BillsVO>> page(BillsVO bills, Query query) {
-		IPage<BillsVO> pages = billsService.selectBillsPage(Condition.getPage(query), bills);
-		return R.data(pages);
-	}
-
-	/**
-	 * 新增 
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入bills")
-	public R save(@Valid @RequestBody Bills bills) {
-		return R.status(billsService.save(bills));
-	}
-
-	/**
-	 * 修改 
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入bills")
-	public R update(@Valid @RequestBody Bills bills) {
-		return R.status(billsService.updateById(bills));
-	}
-
-	/**
-	 * 新增或修改 
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入bills")
-	public R submit(@Valid @RequestBody Bills bills) {
-		return R.status(billsService.saveOrUpdate(bills));
-	}
-
-	
-	/**
-	 * 删除 
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(billsService.removeByIds(Func.toLongList(ids)));
-	}
-
-	
-}

+ 0 - 128
src/main/java/org/springblade/ldt/bills/controller/PlatformBillsController.java

@@ -1,128 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.ldt.bills.entity.PlatformBills;
-import org.springblade.ldt.bills.vo.PlatformBillsVO;
-import org.springblade.ldt.bills.wrapper.PlatformBillsWrapper;
-import org.springblade.ldt.bills.service.IPlatformBillsService;
-import org.springblade.core.boot.ctrl.BladeController;
-
-/**
- *  控制器
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("ldt_bills/platformbills")
-@Api(value = "", tags = "接口")
-public class PlatformBillsController extends BladeController {
-
-	private final IPlatformBillsService platformBillsService;
-
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入platformBills")
-	public R<PlatformBillsVO> detail(PlatformBills platformBills) {
-		PlatformBills detail = platformBillsService.getOne(Condition.getQueryWrapper(platformBills));
-		return R.data(PlatformBillsWrapper.build().entityVO(detail));
-	}
-
-	/**
-	 * 分页 
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入platformBills")
-	public R<IPage<PlatformBillsVO>> list(PlatformBills platformBills, Query query) {
-		IPage<PlatformBills> pages = platformBillsService.page(Condition.getPage(query), Condition.getQueryWrapper(platformBills));
-		return R.data(PlatformBillsWrapper.build().pageVO(pages));
-	}
-
-
-	/**
-	 * 自定义分页 
-	 */
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入platformBills")
-	public R<IPage<PlatformBillsVO>> page(PlatformBillsVO platformBills, Query query) {
-		IPage<PlatformBillsVO> pages = platformBillsService.selectPlatformBillsPage(Condition.getPage(query), platformBills);
-		return R.data(pages);
-	}
-
-	/**
-	 * 新增 
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入platformBills")
-	public R save(@Valid @RequestBody PlatformBills platformBills) {
-		return R.status(platformBillsService.save(platformBills));
-	}
-
-	/**
-	 * 修改 
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入platformBills")
-	public R update(@Valid @RequestBody PlatformBills platformBills) {
-		return R.status(platformBillsService.updateById(platformBills));
-	}
-
-	/**
-	 * 新增或修改 
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入platformBills")
-	public R submit(@Valid @RequestBody PlatformBills platformBills) {
-		return R.status(platformBillsService.saveOrUpdate(platformBills));
-	}
-
-	
-	/**
-	 * 删除 
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(platformBillsService.removeByIds(Func.toLongList(ids)));
-	}
-
-	
-}

+ 0 - 128
src/main/java/org/springblade/ldt/bills/controller/PointBillsController.java

@@ -1,128 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.ldt.bills.entity.PointBills;
-import org.springblade.ldt.bills.vo.PointBillsVO;
-import org.springblade.ldt.bills.wrapper.PointBillsWrapper;
-import org.springblade.ldt.bills.service.IPointBillsService;
-import org.springblade.core.boot.ctrl.BladeController;
-
-/**
- *  控制器
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("ldt_bills/pointbills")
-@Api(value = "", tags = "接口")
-public class PointBillsController extends BladeController {
-
-	private final IPointBillsService pointBillsService;
-
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入pointBills")
-	public R<PointBillsVO> detail(PointBills pointBills) {
-		PointBills detail = pointBillsService.getOne(Condition.getQueryWrapper(pointBills));
-		return R.data(PointBillsWrapper.build().entityVO(detail));
-	}
-
-	/**
-	 * 分页 
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入pointBills")
-	public R<IPage<PointBillsVO>> list(PointBills pointBills, Query query) {
-		IPage<PointBills> pages = pointBillsService.page(Condition.getPage(query), Condition.getQueryWrapper(pointBills));
-		return R.data(PointBillsWrapper.build().pageVO(pages));
-	}
-
-
-	/**
-	 * 自定义分页 
-	 */
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入pointBills")
-	public R<IPage<PointBillsVO>> page(PointBillsVO pointBills, Query query) {
-		IPage<PointBillsVO> pages = pointBillsService.selectPointBillsPage(Condition.getPage(query), pointBills);
-		return R.data(pages);
-	}
-
-	/**
-	 * 新增 
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入pointBills")
-	public R save(@Valid @RequestBody PointBills pointBills) {
-		return R.status(pointBillsService.save(pointBills));
-	}
-
-	/**
-	 * 修改 
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入pointBills")
-	public R update(@Valid @RequestBody PointBills pointBills) {
-		return R.status(pointBillsService.updateById(pointBills));
-	}
-
-	/**
-	 * 新增或修改 
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入pointBills")
-	public R submit(@Valid @RequestBody PointBills pointBills) {
-		return R.status(pointBillsService.saveOrUpdate(pointBills));
-	}
-
-	
-	/**
-	 * 删除 
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(pointBillsService.removeByIds(Func.toLongList(ids)));
-	}
-
-	
-}

+ 0 - 128
src/main/java/org/springblade/ldt/bills/controller/WithdrawRecController.java

@@ -1,128 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.ldt.bills.entity.WithdrawRec;
-import org.springblade.ldt.bills.vo.WithdrawRecVO;
-import org.springblade.ldt.bills.wrapper.WithdrawRecWrapper;
-import org.springblade.ldt.bills.service.IWithdrawRecService;
-import org.springblade.core.boot.ctrl.BladeController;
-
-/**
- *  控制器
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("ldt_bills/withdrawrec")
-@Api(value = "", tags = "接口")
-public class WithdrawRecController extends BladeController {
-
-	private final IWithdrawRecService withdrawRecService;
-
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入withdrawRec")
-	public R<WithdrawRecVO> detail(WithdrawRec withdrawRec) {
-		WithdrawRec detail = withdrawRecService.getOne(Condition.getQueryWrapper(withdrawRec));
-		return R.data(WithdrawRecWrapper.build().entityVO(detail));
-	}
-
-	/**
-	 * 分页 
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入withdrawRec")
-	public R<IPage<WithdrawRecVO>> list(WithdrawRec withdrawRec, Query query) {
-		IPage<WithdrawRec> pages = withdrawRecService.page(Condition.getPage(query), Condition.getQueryWrapper(withdrawRec));
-		return R.data(WithdrawRecWrapper.build().pageVO(pages));
-	}
-
-
-	/**
-	 * 自定义分页 
-	 */
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入withdrawRec")
-	public R<IPage<WithdrawRecVO>> page(WithdrawRecVO withdrawRec, Query query) {
-		IPage<WithdrawRecVO> pages = withdrawRecService.selectWithdrawRecPage(Condition.getPage(query), withdrawRec);
-		return R.data(pages);
-	}
-
-	/**
-	 * 新增 
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入withdrawRec")
-	public R save(@Valid @RequestBody WithdrawRec withdrawRec) {
-		return R.status(withdrawRecService.save(withdrawRec));
-	}
-
-	/**
-	 * 修改 
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入withdrawRec")
-	public R update(@Valid @RequestBody WithdrawRec withdrawRec) {
-		return R.status(withdrawRecService.updateById(withdrawRec));
-	}
-
-	/**
-	 * 新增或修改 
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入withdrawRec")
-	public R submit(@Valid @RequestBody WithdrawRec withdrawRec) {
-		return R.status(withdrawRecService.saveOrUpdate(withdrawRec));
-	}
-
-	
-	/**
-	 * 删除 
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(withdrawRecService.removeByIds(Func.toLongList(ids)));
-	}
-
-	
-}

+ 0 - 34
src/main/java/org/springblade/ldt/bills/dto/BalanceBillsDTO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.dto;
-
-import org.springblade.ldt.bills.entity.BalanceBills;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 数据传输对象实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class BalanceBillsDTO extends BalanceBills {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 34
src/main/java/org/springblade/ldt/bills/dto/BillsDTO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.dto;
-
-import org.springblade.ldt.bills.entity.Bills;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 数据传输对象实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class BillsDTO extends Bills {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 34
src/main/java/org/springblade/ldt/bills/dto/PlatformBillsDTO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.dto;
-
-import org.springblade.ldt.bills.entity.PlatformBills;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 数据传输对象实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PlatformBillsDTO extends PlatformBills {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 34
src/main/java/org/springblade/ldt/bills/dto/PointBillsDTO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.dto;
-
-import org.springblade.ldt.bills.entity.PointBills;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 数据传输对象实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PointBillsDTO extends PointBills {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 34
src/main/java/org/springblade/ldt/bills/dto/WithdrawRecDTO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.dto;
-
-import org.springblade.ldt.bills.entity.WithdrawRec;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 数据传输对象实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class WithdrawRecDTO extends WithdrawRec {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 92
src/main/java/org/springblade/ldt/bills/entity/BalanceBills.java

@@ -1,92 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@TableName("ldt_balance_bills")
-@ApiModel(value = "BalanceBills对象", description = "BalanceBills对象")
-public class BalanceBills implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 余额交易明细ID
-	*/
-		@ApiModelProperty(value = "余额交易明细ID")
-		private Long id;
-	/**
-	* 交易金额
-	*/
-		@ApiModelProperty(value = "交易金额")
-		private Double price;
-	/**
-	* 交易账户--付款方
-	*/
-		@ApiModelProperty(value = "交易账户--付款方")
-		private Long payId;
-	/**
-	* 交易标题
-	*/
-		@ApiModelProperty(value = "交易标题")
-		private String title;
-	/**
-	* 交易时间
-	*/
-		@ApiModelProperty(value = "交易时间")
-		private LocalDateTime createTime;
-	/**
-	* 交易说明
-	*/
-		@ApiModelProperty(value = "交易说明")
-		private String desc;
-	/**
-	* 手续费
-	*/
-		@ApiModelProperty(value = "手续费")
-		private Double fee;
-	/**
-	* 交易账户--收款方
-	*/
-		@ApiModelProperty(value = "交易账户--收款方")
-		private Long receiveId;
-	/**
-	* 交易状态
-	*/
-		@ApiModelProperty(value = "交易状态")
-		private String status;
-	/**
-	* 交易类型
-	*/
-		@ApiModelProperty(value = "交易类型")
-		private String type;
-
-
-}

+ 0 - 133
src/main/java/org/springblade/ldt/bills/entity/Bills.java

@@ -1,133 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@TableName("ldt_bills")
-@ApiModel(value = "Bills对象", description = "Bills对象")
-public class Bills implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 付款流水号
-	*/
-		@ApiModelProperty(value = "付款流水号")
-		private Long id;
-	/**
-	* 付款方
-	*/
-		@ApiModelProperty(value = "付款方")
-		private Long payId;
-	/**
-	* 收款方
-	*/
-		@ApiModelProperty(value = "收款方")
-		private Long receiveId;
-	/**
-	* 金额原价
-	*/
-		@ApiModelProperty(value = "金额原价")
-		private String cost;
-	/**
-	* 折扣
-	*/
-		@ApiModelProperty(value = "折扣")
-		private Double discount;
-	/**
-	* 实付金额
-	*/
-		@ApiModelProperty(value = "实付金额")
-		private BigDecimal price;
-	/**
-	* 交易类型(用户付款,代理充值,商场充值)
-	*/
-		@ApiModelProperty(value = "交易类型(用户付款,代理充值,商场充值)")
-		private String type;
-	/**
-	* 付款方式
-	*/
-		@ApiModelProperty(value = "付款方式")
-		private String payway;
-	/**
-	* 付款渠道
-	*/
-		@ApiModelProperty(value = "付款渠道")
-		private String channel;
-	/**
-	* 渠道订单号
-	*/
-		@ApiModelProperty(value = "渠道订单号")
-		private String channelId;
-	/**
-	* 待付款,付款成功,取消付款
-	*/
-		@ApiModelProperty(value = "待付款,付款成功,取消付款")
-		private String paystatus;
-	/**
-	* 订单标题
-	*/
-		@ApiModelProperty(value = "订单标题")
-		private String title;
-	/**
-	* 订单描述
-	*/
-		@ApiModelProperty(value = "订单描述")
-		private String billDesc;
-	/**
-	* 订单超时时间
-	*/
-		@ApiModelProperty(value = "订单超时时间")
-		private LocalDateTime exTime;
-	/**
-	* appid
-	*/
-		@ApiModelProperty(value = "appid")
-		private String appid;
-	/**
-	* openid
-	*/
-		@ApiModelProperty(value = "openid")
-		private String openid;
-	/**
-	* 消耗积分
-	*/
-		@ApiModelProperty(value = "消耗积分")
-		private Double pointNum;
-	/**
-	* 消耗余额
-	*/
-		@ApiModelProperty(value = "消耗余额")
-		private Double balanceNum;
-
-
-}

+ 0 - 77
src/main/java/org/springblade/ldt/bills/entity/PlatformBills.java

@@ -1,77 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@TableName("ldt_platform_bills")
-@ApiModel(value = "PlatformBills对象", description = "PlatformBills对象")
-public class PlatformBills implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 平台收益明细id
-	*/
-		@ApiModelProperty(value = "平台收益明细id")
-		private Long id;
-	/**
-	* 支付方
-	*/
-		@ApiModelProperty(value = "支付方")
-		private Long payer;
-	/**
-	* 收款方
-	*/
-		@ApiModelProperty(value = "收款方")
-		private Long receiver;
-	/**
-	* 交易类型
-	*/
-		@ApiModelProperty(value = "交易类型")
-		private String type;
-	/**
-	* 手续费
-	*/
-		@ApiModelProperty(value = "手续费")
-		private Double fee;
-	/**
-	* 交易时间
-	*/
-		@ApiModelProperty(value = "交易时间")
-		private LocalDateTime createTime;
-	/**
-	* 交易金额
-	*/
-		@ApiModelProperty(value = "交易金额")
-		private Double price;
-
-
-}

+ 0 - 92
src/main/java/org/springblade/ldt/bills/entity/PointBills.java

@@ -1,92 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@TableName("ldt_point_bills")
-@ApiModel(value = "PointBills对象", description = "PointBills对象")
-public class PointBills implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 积分交易明细ID
-	*/
-		@ApiModelProperty(value = "积分交易明细ID")
-		private Long id;
-	/**
-	* 交易金额
-	*/
-		@ApiModelProperty(value = "交易金额")
-		private Double price;
-	/**
-	* 交易账户--付款方
-	*/
-		@ApiModelProperty(value = "交易账户--付款方")
-		private Long payId;
-	/**
-	* 交易标题
-	*/
-		@ApiModelProperty(value = "交易标题")
-		private String title;
-	/**
-	* 交易时间
-	*/
-		@ApiModelProperty(value = "交易时间")
-		private LocalDateTime createTime;
-	/**
-	* 交易说明
-	*/
-		@ApiModelProperty(value = "交易说明")
-		private String desc;
-	/**
-	* 手续费
-	*/
-		@ApiModelProperty(value = "手续费")
-		private Double fee;
-	/**
-	* 交易账户--收款方
-	*/
-		@ApiModelProperty(value = "交易账户--收款方")
-		private Long receiveId;
-	/**
-	* 交易状态
-	*/
-		@ApiModelProperty(value = "交易状态")
-		private String status;
-	/**
-	* 交易类型
-	*/
-		@ApiModelProperty(value = "交易类型")
-		private String type;
-
-
-}

+ 0 - 122
src/main/java/org/springblade/ldt/bills/entity/WithdrawRec.java

@@ -1,122 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@TableName("ldt_withdraw_rec")
-@ApiModel(value = "WithdrawRec对象", description = "WithdrawRec对象")
-public class WithdrawRec implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 提现记录id
-	*/
-		@ApiModelProperty(value = "提现记录id")
-		private Long id;
-	/**
-	* 提现用户类型: 1-商家
-	*/
-		@ApiModelProperty(value = "提现用户类型: 1-商家")
-		private Integer ownerType;
-	/**
-	* 提现用户id: 若owner_type = 1则为商家id
-	*/
-		@ApiModelProperty(value = "提现用户id: 若owner_type = 1则为商家id")
-		private Long ownerId;
-	/**
-	* 提现金额
-	*/
-		@ApiModelProperty(value = "提现金额")
-		private BigDecimal price;
-	/**
-	* 需扣积分价值
-	*/
-		@ApiModelProperty(value = "需扣积分价值")
-		private BigDecimal pointValue;
-	/**
-	* 实际提现金额
-	*/
-		@ApiModelProperty(value = "实际提现金额")
-		private BigDecimal actualPrice;
-	/**
-	* 提现手续费
-	*/
-		@ApiModelProperty(value = "提现手续费")
-		private BigDecimal fee;
-	/**
-	* 提现状态: 1-待确定 2-已到账 3-失败
-	*/
-		@ApiModelProperty(value = "提现状态: 1-待确定 2-已到账 3-失败")
-		private Integer withdrawStatus;
-	/**
-	* 提现订单号
-	*/
-		@ApiModelProperty(value = "提现订单号")
-		private String orderId;
-	/**
-	* 提现渠道:yeePay(易宝支付)
-	*/
-		@ApiModelProperty(value = "提现渠道:yeePay(易宝支付)")
-		private String channel;
-	/**
-	* 银行类型
-	*/
-		@ApiModelProperty(value = "银行类型")
-		private String bankCode;
-	/**
-	* 接收人真实姓名
-	*/
-		@ApiModelProperty(value = "接收人真实姓名")
-		private String receiverAccountName;
-	/**
-	* 接收人的银行账号
-	*/
-		@ApiModelProperty(value = "接收人的银行账号")
-		private String receiverAccountNo;
-	/**
-	* 到账类型,默认实时到账
-	*/
-		@ApiModelProperty(value = "到账类型,默认实时到账")
-		private String receiveType;
-	/**
-	* 提现到账的金额
-	*/
-		@ApiModelProperty(value = "提现到账的金额")
-		private BigDecimal receiveAmount;
-	/**
-	* 失败原因
-	*/
-		@ApiModelProperty(value = "失败原因")
-		private String failReason;
-
-
-}

+ 0 - 42
src/main/java/org/springblade/ldt/bills/mapper/BalanceBillsMapper.java

@@ -1,42 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.mapper;
-
-import org.springblade.ldt.bills.entity.BalanceBills;
-import org.springblade.ldt.bills.vo.BalanceBillsVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-
-/**
- *  Mapper 接口
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface BalanceBillsMapper extends BaseMapper<BalanceBills> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param balanceBills
-	 * @return
-	 */
-	List<BalanceBillsVO> selectBalanceBillsPage(IPage page, BalanceBillsVO balanceBills);
-
-}

+ 0 - 24
src/main/java/org/springblade/ldt/bills/mapper/BalanceBillsMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.ldt.bills.mapper.BalanceBillsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="balanceBillsResultMap" type="org.springblade.ldt.bills.entity.BalanceBills">
-        <id column="id" property="id"/>
-        <result column="price" property="price"/>
-        <result column="pay_id" property="payId"/>
-        <result column="title" property="title"/>
-        <result column="create_time" property="createTime"/>
-        <result column="desc" property="desc"/>
-        <result column="fee" property="fee"/>
-        <result column="receive_id" property="receiveId"/>
-        <result column="status" property="status"/>
-        <result column="type" property="type"/>
-    </resultMap>
-
-
-    <select id="selectBalanceBillsPage" resultMap="balanceBillsResultMap">
-        select * from ldt_balance_bills where is_deleted = 0
-    </select>
-
-</mapper>

+ 0 - 42
src/main/java/org/springblade/ldt/bills/mapper/BillsMapper.java

@@ -1,42 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.mapper;
-
-import org.springblade.ldt.bills.entity.Bills;
-import org.springblade.ldt.bills.vo.BillsVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-
-/**
- *  Mapper 接口
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface BillsMapper extends BaseMapper<Bills> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param bills
-	 * @return
-	 */
-	List<BillsVO> selectBillsPage(IPage page, BillsVO bills);
-
-}

+ 0 - 32
src/main/java/org/springblade/ldt/bills/mapper/BillsMapper.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.ldt.bills.mapper.BillsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="billsResultMap" type="org.springblade.ldt.bills.entity.Bills">
-        <id column="id" property="id"/>
-        <result column="pay_id" property="payId"/>
-        <result column="receive_id" property="receiveId"/>
-        <result column="cost" property="cost"/>
-        <result column="discount" property="discount"/>
-        <result column="price" property="price"/>
-        <result column="type" property="type"/>
-        <result column="payway" property="payway"/>
-        <result column="channel" property="channel"/>
-        <result column="channel_id" property="channelId"/>
-        <result column="paystatus" property="paystatus"/>
-        <result column="title" property="title"/>
-        <result column="bill_desc" property="billDesc"/>
-        <result column="ex_time" property="exTime"/>
-        <result column="appid" property="appid"/>
-        <result column="openid" property="openid"/>
-        <result column="point_num" property="pointNum"/>
-        <result column="balance_num" property="balanceNum"/>
-    </resultMap>
-
-
-    <select id="selectBillsPage" resultMap="billsResultMap">
-        select * from ldt_bills where is_deleted = 0
-    </select>
-
-</mapper>

+ 0 - 42
src/main/java/org/springblade/ldt/bills/mapper/PlatformBillsMapper.java

@@ -1,42 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.mapper;
-
-import org.springblade.ldt.bills.entity.PlatformBills;
-import org.springblade.ldt.bills.vo.PlatformBillsVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-
-/**
- *  Mapper 接口
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface PlatformBillsMapper extends BaseMapper<PlatformBills> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param platformBills
-	 * @return
-	 */
-	List<PlatformBillsVO> selectPlatformBillsPage(IPage page, PlatformBillsVO platformBills);
-
-}

+ 0 - 21
src/main/java/org/springblade/ldt/bills/mapper/PlatformBillsMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.ldt.bills.mapper.PlatformBillsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="platformBillsResultMap" type="org.springblade.ldt.bills.entity.PlatformBills">
-        <result column="id" property="id"/>
-        <result column="payer" property="payer"/>
-        <result column="receiver" property="receiver"/>
-        <result column="type" property="type"/>
-        <result column="fee" property="fee"/>
-        <result column="create_time" property="createTime"/>
-        <result column="price" property="price"/>
-    </resultMap>
-
-
-    <select id="selectPlatformBillsPage" resultMap="platformBillsResultMap">
-        select * from ldt_platform_bills where is_deleted = 0
-    </select>
-
-</mapper>

+ 0 - 42
src/main/java/org/springblade/ldt/bills/mapper/PointBillsMapper.java

@@ -1,42 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.mapper;
-
-import org.springblade.ldt.bills.entity.PointBills;
-import org.springblade.ldt.bills.vo.PointBillsVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-
-/**
- *  Mapper 接口
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface PointBillsMapper extends BaseMapper<PointBills> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param pointBills
-	 * @return
-	 */
-	List<PointBillsVO> selectPointBillsPage(IPage page, PointBillsVO pointBills);
-
-}

+ 0 - 24
src/main/java/org/springblade/ldt/bills/mapper/PointBillsMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.ldt.bills.mapper.PointBillsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="pointBillsResultMap" type="org.springblade.ldt.bills.entity.PointBills">
-        <id column="id" property="id"/>
-        <result column="price" property="price"/>
-        <result column="pay_id" property="payId"/>
-        <result column="title" property="title"/>
-        <result column="create_time" property="createTime"/>
-        <result column="desc" property="desc"/>
-        <result column="fee" property="fee"/>
-        <result column="receive_id" property="receiveId"/>
-        <result column="status" property="status"/>
-        <result column="type" property="type"/>
-    </resultMap>
-
-
-    <select id="selectPointBillsPage" resultMap="pointBillsResultMap">
-        select * from ldt_point_bills where is_deleted = 0
-    </select>
-
-</mapper>

+ 0 - 42
src/main/java/org/springblade/ldt/bills/mapper/WithdrawRecMapper.java

@@ -1,42 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.mapper;
-
-import org.springblade.ldt.bills.entity.WithdrawRec;
-import org.springblade.ldt.bills.vo.WithdrawRecVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-
-/**
- *  Mapper 接口
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface WithdrawRecMapper extends BaseMapper<WithdrawRec> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param withdrawRec
-	 * @return
-	 */
-	List<WithdrawRecVO> selectWithdrawRecPage(IPage page, WithdrawRecVO withdrawRec);
-
-}

+ 0 - 30
src/main/java/org/springblade/ldt/bills/mapper/WithdrawRecMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.ldt.bills.mapper.WithdrawRecMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="withdrawRecResultMap" type="org.springblade.ldt.bills.entity.WithdrawRec">
-        <id column="id" property="id"/>
-        <result column="owner_type" property="ownerType"/>
-        <result column="owner_id" property="ownerId"/>
-        <result column="price" property="price"/>
-        <result column="point_value" property="pointValue"/>
-        <result column="actual_price" property="actualPrice"/>
-        <result column="fee" property="fee"/>
-        <result column="withdraw_status" property="withdrawStatus"/>
-        <result column="order_id" property="orderId"/>
-        <result column="channel" property="channel"/>
-        <result column="bank_code" property="bankCode"/>
-        <result column="receiver_account_name" property="receiverAccountName"/>
-        <result column="receiver_account_no" property="receiverAccountNo"/>
-        <result column="receive_type" property="receiveType"/>
-        <result column="receive_amount" property="receiveAmount"/>
-        <result column="fail_reason" property="failReason"/>
-    </resultMap>
-
-
-    <select id="selectWithdrawRecPage" resultMap="withdrawRecResultMap">
-        select * from ldt_withdraw_rec where is_deleted = 0
-    </select>
-
-</mapper>

+ 0 - 41
src/main/java/org/springblade/ldt/bills/service/IBalanceBillsService.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.service;
-
-import org.springblade.ldt.bills.entity.BalanceBills;
-import org.springblade.ldt.bills.vo.BalanceBillsVO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface IBalanceBillsService extends IService<BalanceBills> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param balanceBills
-	 * @return
-	 */
-	IPage<BalanceBillsVO> selectBalanceBillsPage(IPage<BalanceBillsVO> page, BalanceBillsVO balanceBills);
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/bills/service/IBillsService.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.service;
-
-import org.springblade.ldt.bills.entity.Bills;
-import org.springblade.ldt.bills.vo.BillsVO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface IBillsService extends IService<Bills> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param bills
-	 * @return
-	 */
-	IPage<BillsVO> selectBillsPage(IPage<BillsVO> page, BillsVO bills);
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/bills/service/IPlatformBillsService.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.service;
-
-import org.springblade.ldt.bills.entity.PlatformBills;
-import org.springblade.ldt.bills.vo.PlatformBillsVO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface IPlatformBillsService extends IService<PlatformBills> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param platformBills
-	 * @return
-	 */
-	IPage<PlatformBillsVO> selectPlatformBillsPage(IPage<PlatformBillsVO> page, PlatformBillsVO platformBills);
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/bills/service/IPointBillsService.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.service;
-
-import org.springblade.ldt.bills.entity.PointBills;
-import org.springblade.ldt.bills.vo.PointBillsVO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface IPointBillsService extends IService<PointBills> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param pointBills
-	 * @return
-	 */
-	IPage<PointBillsVO> selectPointBillsPage(IPage<PointBillsVO> page, PointBillsVO pointBills);
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/bills/service/IWithdrawRecService.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.service;
-
-import org.springblade.ldt.bills.entity.WithdrawRec;
-import org.springblade.ldt.bills.vo.WithdrawRecVO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface IWithdrawRecService extends IService<WithdrawRec> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param withdrawRec
-	 * @return
-	 */
-	IPage<WithdrawRecVO> selectWithdrawRecPage(IPage<WithdrawRecVO> page, WithdrawRecVO withdrawRec);
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/bills/service/impl/BalanceBillsServiceImpl.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.service.impl;
-
-import org.springblade.ldt.bills.entity.BalanceBills;
-import org.springblade.ldt.bills.vo.BalanceBillsVO;
-import org.springblade.ldt.bills.mapper.BalanceBillsMapper;
-import org.springblade.ldt.bills.service.IBalanceBillsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务实现类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Service
-public class BalanceBillsServiceImpl extends ServiceImpl<BalanceBillsMapper, BalanceBills> implements IBalanceBillsService {
-
-	@Override
-	public IPage<BalanceBillsVO> selectBalanceBillsPage(IPage<BalanceBillsVO> page, BalanceBillsVO balanceBills) {
-		return page.setRecords(baseMapper.selectBalanceBillsPage(page, balanceBills));
-	}
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/bills/service/impl/BillsServiceImpl.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.service.impl;
-
-import org.springblade.ldt.bills.entity.Bills;
-import org.springblade.ldt.bills.vo.BillsVO;
-import org.springblade.ldt.bills.mapper.BillsMapper;
-import org.springblade.ldt.bills.service.IBillsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务实现类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Service
-public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements IBillsService {
-
-	@Override
-	public IPage<BillsVO> selectBillsPage(IPage<BillsVO> page, BillsVO bills) {
-		return page.setRecords(baseMapper.selectBillsPage(page, bills));
-	}
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/bills/service/impl/PlatformBillsServiceImpl.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.service.impl;
-
-import org.springblade.ldt.bills.entity.PlatformBills;
-import org.springblade.ldt.bills.vo.PlatformBillsVO;
-import org.springblade.ldt.bills.mapper.PlatformBillsMapper;
-import org.springblade.ldt.bills.service.IPlatformBillsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务实现类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Service
-public class PlatformBillsServiceImpl extends ServiceImpl<PlatformBillsMapper, PlatformBills> implements IPlatformBillsService {
-
-	@Override
-	public IPage<PlatformBillsVO> selectPlatformBillsPage(IPage<PlatformBillsVO> page, PlatformBillsVO platformBills) {
-		return page.setRecords(baseMapper.selectPlatformBillsPage(page, platformBills));
-	}
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/bills/service/impl/PointBillsServiceImpl.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.service.impl;
-
-import org.springblade.ldt.bills.entity.PointBills;
-import org.springblade.ldt.bills.vo.PointBillsVO;
-import org.springblade.ldt.bills.mapper.PointBillsMapper;
-import org.springblade.ldt.bills.service.IPointBillsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务实现类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Service
-public class PointBillsServiceImpl extends ServiceImpl<PointBillsMapper, PointBills> implements IPointBillsService {
-
-	@Override
-	public IPage<PointBillsVO> selectPointBillsPage(IPage<PointBillsVO> page, PointBillsVO pointBills) {
-		return page.setRecords(baseMapper.selectPointBillsPage(page, pointBills));
-	}
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/bills/service/impl/WithdrawRecServiceImpl.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.service.impl;
-
-import org.springblade.ldt.bills.entity.WithdrawRec;
-import org.springblade.ldt.bills.vo.WithdrawRecVO;
-import org.springblade.ldt.bills.mapper.WithdrawRecMapper;
-import org.springblade.ldt.bills.service.IWithdrawRecService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务实现类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Service
-public class WithdrawRecServiceImpl extends ServiceImpl<WithdrawRecMapper, WithdrawRec> implements IWithdrawRecService {
-
-	@Override
-	public IPage<WithdrawRecVO> selectWithdrawRecPage(IPage<WithdrawRecVO> page, WithdrawRecVO withdrawRec) {
-		return page.setRecords(baseMapper.selectWithdrawRecPage(page, withdrawRec));
-	}
-
-}

+ 0 - 36
src/main/java/org/springblade/ldt/bills/vo/BalanceBillsVO.java

@@ -1,36 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.vo;
-
-import org.springblade.ldt.bills.entity.BalanceBills;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-
-/**
- * 视图实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BalanceBillsVO对象", description = "BalanceBillsVO对象")
-public class BalanceBillsVO extends BalanceBills {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 36
src/main/java/org/springblade/ldt/bills/vo/BillsVO.java

@@ -1,36 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.vo;
-
-import org.springblade.ldt.bills.entity.Bills;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-
-/**
- * 视图实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BillsVO对象", description = "BillsVO对象")
-public class BillsVO extends Bills {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 36
src/main/java/org/springblade/ldt/bills/vo/PlatformBillsVO.java

@@ -1,36 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.vo;
-
-import org.springblade.ldt.bills.entity.PlatformBills;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-
-/**
- * 视图实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "PlatformBillsVO对象", description = "PlatformBillsVO对象")
-public class PlatformBillsVO extends PlatformBills {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 36
src/main/java/org/springblade/ldt/bills/vo/PointBillsVO.java

@@ -1,36 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.vo;
-
-import org.springblade.ldt.bills.entity.PointBills;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-
-/**
- * 视图实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "PointBillsVO对象", description = "PointBillsVO对象")
-public class PointBillsVO extends PointBills {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 36
src/main/java/org/springblade/ldt/bills/vo/WithdrawRecVO.java

@@ -1,36 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.vo;
-
-import org.springblade.ldt.bills.entity.WithdrawRec;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-
-/**
- * 视图实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "WithdrawRecVO对象", description = "WithdrawRecVO对象")
-public class WithdrawRecVO extends WithdrawRec {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 49
src/main/java/org/springblade/ldt/bills/wrapper/BalanceBillsWrapper.java

@@ -1,49 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.wrapper;
-
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.ldt.bills.entity.BalanceBills;
-import org.springblade.ldt.bills.vo.BalanceBillsVO;
-import java.util.Objects;
-
-/**
- * 包装类,返回视图层所需的字段
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public class BalanceBillsWrapper extends BaseEntityWrapper<BalanceBills, BalanceBillsVO>  {
-
-	public static BalanceBillsWrapper build() {
-		return new BalanceBillsWrapper();
- 	}
-
-	@Override
-	public BalanceBillsVO entityVO(BalanceBills balanceBills) {
-		BalanceBillsVO balanceBillsVO = Objects.requireNonNull(BeanUtil.copy(balanceBills, BalanceBillsVO.class));
-
-		//User createUser = UserCache.getUser(balanceBills.getCreateUser());
-		//User updateUser = UserCache.getUser(balanceBills.getUpdateUser());
-		//balanceBillsVO.setCreateUserName(createUser.getName());
-		//balanceBillsVO.setUpdateUserName(updateUser.getName());
-
-		return balanceBillsVO;
-	}
-
-}

+ 0 - 49
src/main/java/org/springblade/ldt/bills/wrapper/BillsWrapper.java

@@ -1,49 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.wrapper;
-
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.ldt.bills.entity.Bills;
-import org.springblade.ldt.bills.vo.BillsVO;
-import java.util.Objects;
-
-/**
- * 包装类,返回视图层所需的字段
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public class BillsWrapper extends BaseEntityWrapper<Bills, BillsVO>  {
-
-	public static BillsWrapper build() {
-		return new BillsWrapper();
- 	}
-
-	@Override
-	public BillsVO entityVO(Bills bills) {
-		BillsVO billsVO = Objects.requireNonNull(BeanUtil.copy(bills, BillsVO.class));
-
-		//User createUser = UserCache.getUser(bills.getCreateUser());
-		//User updateUser = UserCache.getUser(bills.getUpdateUser());
-		//billsVO.setCreateUserName(createUser.getName());
-		//billsVO.setUpdateUserName(updateUser.getName());
-
-		return billsVO;
-	}
-
-}

+ 0 - 49
src/main/java/org/springblade/ldt/bills/wrapper/PlatformBillsWrapper.java

@@ -1,49 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.wrapper;
-
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.ldt.bills.entity.PlatformBills;
-import org.springblade.ldt.bills.vo.PlatformBillsVO;
-import java.util.Objects;
-
-/**
- * 包装类,返回视图层所需的字段
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public class PlatformBillsWrapper extends BaseEntityWrapper<PlatformBills, PlatformBillsVO>  {
-
-	public static PlatformBillsWrapper build() {
-		return new PlatformBillsWrapper();
- 	}
-
-	@Override
-	public PlatformBillsVO entityVO(PlatformBills platformBills) {
-		PlatformBillsVO platformBillsVO = Objects.requireNonNull(BeanUtil.copy(platformBills, PlatformBillsVO.class));
-
-		//User createUser = UserCache.getUser(platformBills.getCreateUser());
-		//User updateUser = UserCache.getUser(platformBills.getUpdateUser());
-		//platformBillsVO.setCreateUserName(createUser.getName());
-		//platformBillsVO.setUpdateUserName(updateUser.getName());
-
-		return platformBillsVO;
-	}
-
-}

+ 0 - 49
src/main/java/org/springblade/ldt/bills/wrapper/PointBillsWrapper.java

@@ -1,49 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.wrapper;
-
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.ldt.bills.entity.PointBills;
-import org.springblade.ldt.bills.vo.PointBillsVO;
-import java.util.Objects;
-
-/**
- * 包装类,返回视图层所需的字段
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public class PointBillsWrapper extends BaseEntityWrapper<PointBills, PointBillsVO>  {
-
-	public static PointBillsWrapper build() {
-		return new PointBillsWrapper();
- 	}
-
-	@Override
-	public PointBillsVO entityVO(PointBills pointBills) {
-		PointBillsVO pointBillsVO = Objects.requireNonNull(BeanUtil.copy(pointBills, PointBillsVO.class));
-
-		//User createUser = UserCache.getUser(pointBills.getCreateUser());
-		//User updateUser = UserCache.getUser(pointBills.getUpdateUser());
-		//pointBillsVO.setCreateUserName(createUser.getName());
-		//pointBillsVO.setUpdateUserName(updateUser.getName());
-
-		return pointBillsVO;
-	}
-
-}

+ 0 - 49
src/main/java/org/springblade/ldt/bills/wrapper/WithdrawRecWrapper.java

@@ -1,49 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.bills.wrapper;
-
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.ldt.bills.entity.WithdrawRec;
-import org.springblade.ldt.bills.vo.WithdrawRecVO;
-import java.util.Objects;
-
-/**
- * 包装类,返回视图层所需的字段
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public class WithdrawRecWrapper extends BaseEntityWrapper<WithdrawRec, WithdrawRecVO>  {
-
-	public static WithdrawRecWrapper build() {
-		return new WithdrawRecWrapper();
- 	}
-
-	@Override
-	public WithdrawRecVO entityVO(WithdrawRec withdrawRec) {
-		WithdrawRecVO withdrawRecVO = Objects.requireNonNull(BeanUtil.copy(withdrawRec, WithdrawRecVO.class));
-
-		//User createUser = UserCache.getUser(withdrawRec.getCreateUser());
-		//User updateUser = UserCache.getUser(withdrawRec.getUpdateUser());
-		//withdrawRecVO.setCreateUserName(createUser.getName());
-		//withdrawRecVO.setUpdateUserName(updateUser.getName());
-
-		return withdrawRecVO;
-	}
-
-}

+ 0 - 128
src/main/java/org/springblade/ldt/feedback/controller/FeedbackController.java

@@ -1,128 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.feedback.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.ldt.feedback.entity.Feedback;
-import org.springblade.ldt.feedback.vo.FeedbackVO;
-import org.springblade.ldt.feedback.wrapper.FeedbackWrapper;
-import org.springblade.ldt.feedback.service.IFeedbackService;
-import org.springblade.core.boot.ctrl.BladeController;
-
-/**
- *  控制器
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("ldt_feedback/feedback")
-@Api(value = "", tags = "接口")
-public class FeedbackController extends BladeController {
-
-	private final IFeedbackService feedbackService;
-
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入feedback")
-	public R<FeedbackVO> detail(Feedback feedback) {
-		Feedback detail = feedbackService.getOne(Condition.getQueryWrapper(feedback));
-		return R.data(FeedbackWrapper.build().entityVO(detail));
-	}
-
-	/**
-	 * 分页 
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入feedback")
-	public R<IPage<FeedbackVO>> list(Feedback feedback, Query query) {
-		IPage<Feedback> pages = feedbackService.page(Condition.getPage(query), Condition.getQueryWrapper(feedback));
-		return R.data(FeedbackWrapper.build().pageVO(pages));
-	}
-
-
-	/**
-	 * 自定义分页 
-	 */
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入feedback")
-	public R<IPage<FeedbackVO>> page(FeedbackVO feedback, Query query) {
-		IPage<FeedbackVO> pages = feedbackService.selectFeedbackPage(Condition.getPage(query), feedback);
-		return R.data(pages);
-	}
-
-	/**
-	 * 新增 
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入feedback")
-	public R save(@Valid @RequestBody Feedback feedback) {
-		return R.status(feedbackService.save(feedback));
-	}
-
-	/**
-	 * 修改 
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入feedback")
-	public R update(@Valid @RequestBody Feedback feedback) {
-		return R.status(feedbackService.updateById(feedback));
-	}
-
-	/**
-	 * 新增或修改 
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入feedback")
-	public R submit(@Valid @RequestBody Feedback feedback) {
-		return R.status(feedbackService.saveOrUpdate(feedback));
-	}
-
-	
-	/**
-	 * 删除 
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(feedbackService.removeByIds(Func.toLongList(ids)));
-	}
-
-	
-}

+ 0 - 34
src/main/java/org/springblade/ldt/feedback/dto/FeedbackDTO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.feedback.dto;
-
-import org.springblade.ldt.feedback.entity.Feedback;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 数据传输对象实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class FeedbackDTO extends Feedback {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 76
src/main/java/org/springblade/ldt/feedback/entity/Feedback.java

@@ -1,76 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.feedback.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@TableName("ldt_feedback")
-@ApiModel(value = "Feedback对象", description = "Feedback对象")
-public class Feedback implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 反馈表
-	*/
-		@ApiModelProperty(value = "反馈表")
-		private Long id;
-	/**
-	* 反馈类型 1-用户反馈 2-商家反馈 3-商场反馈
-	*/
-		@ApiModelProperty(value = "反馈类型 1-用户反馈 2-商家反馈 3-商场反馈")
-		private String type;
-	/**
-	* 当type为1时为用户id  当type为2时为商家id,以此类推
-	*/
-		@ApiModelProperty(value = "当type为1时为用户id  当type为2时为商家id,以此类推")
-		private Long userId;
-	/**
-	* 反馈内容
-	*/
-		@ApiModelProperty(value = "反馈内容")
-		private String content;
-	/**
-	* 图片,多个用,隔开
-	*/
-		@ApiModelProperty(value = "图片,多个用,隔开")
-		private String pics;
-	/**
-	* 联系方式
-	*/
-		@ApiModelProperty(value = "联系方式")
-		private String phone;
-	/**
-	* 处理状态 0-待处理 1-已处理
-	*/
-		@ApiModelProperty(value = "处理状态 0-待处理 1-已处理")
-		private String handleStatus;
-
-
-}

+ 0 - 42
src/main/java/org/springblade/ldt/feedback/mapper/FeedbackMapper.java

@@ -1,42 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.feedback.mapper;
-
-import org.springblade.ldt.feedback.entity.Feedback;
-import org.springblade.ldt.feedback.vo.FeedbackVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-
-/**
- *  Mapper 接口
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface FeedbackMapper extends BaseMapper<Feedback> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param feedback
-	 * @return
-	 */
-	List<FeedbackVO> selectFeedbackPage(IPage page, FeedbackVO feedback);
-
-}

+ 0 - 21
src/main/java/org/springblade/ldt/feedback/mapper/FeedbackMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.ldt.feedback.mapper.FeedbackMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="feedbackResultMap" type="org.springblade.ldt.feedback.entity.Feedback">
-        <id column="id" property="id"/>
-        <result column="type" property="type"/>
-        <result column="user_id" property="userId"/>
-        <result column="content" property="content"/>
-        <result column="pics" property="pics"/>
-        <result column="phone" property="phone"/>
-        <result column="handle_status" property="handleStatus"/>
-    </resultMap>
-
-
-    <select id="selectFeedbackPage" resultMap="feedbackResultMap">
-        select * from ldt_feedback where is_deleted = 0
-    </select>
-
-</mapper>

+ 0 - 41
src/main/java/org/springblade/ldt/feedback/service/IFeedbackService.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.feedback.service;
-
-import org.springblade.ldt.feedback.entity.Feedback;
-import org.springblade.ldt.feedback.vo.FeedbackVO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface IFeedbackService extends IService<Feedback> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param feedback
-	 * @return
-	 */
-	IPage<FeedbackVO> selectFeedbackPage(IPage<FeedbackVO> page, FeedbackVO feedback);
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/feedback/service/impl/FeedbackServiceImpl.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.feedback.service.impl;
-
-import org.springblade.ldt.feedback.entity.Feedback;
-import org.springblade.ldt.feedback.vo.FeedbackVO;
-import org.springblade.ldt.feedback.mapper.FeedbackMapper;
-import org.springblade.ldt.feedback.service.IFeedbackService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务实现类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Service
-public class FeedbackServiceImpl extends ServiceImpl<FeedbackMapper, Feedback> implements IFeedbackService {
-
-	@Override
-	public IPage<FeedbackVO> selectFeedbackPage(IPage<FeedbackVO> page, FeedbackVO feedback) {
-		return page.setRecords(baseMapper.selectFeedbackPage(page, feedback));
-	}
-
-}

+ 0 - 36
src/main/java/org/springblade/ldt/feedback/vo/FeedbackVO.java

@@ -1,36 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.feedback.vo;
-
-import org.springblade.ldt.feedback.entity.Feedback;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-
-/**
- * 视图实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "FeedbackVO对象", description = "FeedbackVO对象")
-public class FeedbackVO extends Feedback {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 49
src/main/java/org/springblade/ldt/feedback/wrapper/FeedbackWrapper.java

@@ -1,49 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.feedback.wrapper;
-
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.ldt.feedback.entity.Feedback;
-import org.springblade.ldt.feedback.vo.FeedbackVO;
-import java.util.Objects;
-
-/**
- * 包装类,返回视图层所需的字段
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public class FeedbackWrapper extends BaseEntityWrapper<Feedback, FeedbackVO>  {
-
-	public static FeedbackWrapper build() {
-		return new FeedbackWrapper();
- 	}
-
-	@Override
-	public FeedbackVO entityVO(Feedback feedback) {
-		FeedbackVO feedbackVO = Objects.requireNonNull(BeanUtil.copy(feedback, FeedbackVO.class));
-
-		//User createUser = UserCache.getUser(feedback.getCreateUser());
-		//User updateUser = UserCache.getUser(feedback.getUpdateUser());
-		//feedbackVO.setCreateUserName(createUser.getName());
-		//feedbackVO.setUpdateUserName(updateUser.getName());
-
-		return feedbackVO;
-	}
-
-}

+ 0 - 128
src/main/java/org/springblade/ldt/mall/controller/MallController.java

@@ -1,128 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.mall.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.ldt.mall.entity.Mall;
-import org.springblade.ldt.mall.vo.MallVO;
-import org.springblade.ldt.mall.wrapper.MallWrapper;
-import org.springblade.ldt.mall.service.IMallService;
-import org.springblade.core.boot.ctrl.BladeController;
-
-/**
- *  控制器
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("ldt_mall/mall")
-@Api(value = "", tags = "接口")
-public class MallController extends BladeController {
-
-	private final IMallService mallService;
-
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入mall")
-	public R<MallVO> detail(Mall mall) {
-		Mall detail = mallService.getOne(Condition.getQueryWrapper(mall));
-		return R.data(MallWrapper.build().entityVO(detail));
-	}
-
-	/**
-	 * 分页 
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入mall")
-	public R<IPage<MallVO>> list(Mall mall, Query query) {
-		IPage<Mall> pages = mallService.page(Condition.getPage(query), Condition.getQueryWrapper(mall));
-		return R.data(MallWrapper.build().pageVO(pages));
-	}
-
-
-	/**
-	 * 自定义分页 
-	 */
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入mall")
-	public R<IPage<MallVO>> page(MallVO mall, Query query) {
-		IPage<MallVO> pages = mallService.selectMallPage(Condition.getPage(query), mall);
-		return R.data(pages);
-	}
-
-	/**
-	 * 新增 
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入mall")
-	public R save(@Valid @RequestBody Mall mall) {
-		return R.status(mallService.save(mall));
-	}
-
-	/**
-	 * 修改 
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入mall")
-	public R update(@Valid @RequestBody Mall mall) {
-		return R.status(mallService.updateById(mall));
-	}
-
-	/**
-	 * 新增或修改 
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入mall")
-	public R submit(@Valid @RequestBody Mall mall) {
-		return R.status(mallService.saveOrUpdate(mall));
-	}
-
-	
-	/**
-	 * 删除 
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(mallService.removeByIds(Func.toLongList(ids)));
-	}
-
-	
-}

+ 0 - 34
src/main/java/org/springblade/ldt/mall/dto/MallDTO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.mall.dto;
-
-import org.springblade.ldt.mall.entity.Mall;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 数据传输对象实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class MallDTO extends Mall {
-	private static final long serialVersionUID = 1L;
-
-}

+ 0 - 111
src/main/java/org/springblade/ldt/mall/entity/Mall.java

@@ -1,111 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.mall.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 实体类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Data
-@TableName("ldt_mall")
-@ApiModel(value = "Mall对象", description = "Mall对象")
-public class Mall implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 商场id
-	*/
-		@ApiModelProperty(value = "商场id")
-		private Long id;
-	/**
-	* 商场名称
-	*/
-		@ApiModelProperty(value = "商场名称")
-		private String mallName;
-	/**
-	* 所在区域编码
-	*/
-		@ApiModelProperty(value = "所在区域编码")
-		private String locationCode;
-	/**
-	* 所在区域
-	*/
-		@ApiModelProperty(value = "所在区域")
-		private String location;
-	/**
-	* 负责人名称
-	*/
-		@ApiModelProperty(value = "负责人名称")
-		private String personName;
-	/**
-	* 负责人联系方式
-	*/
-		@ApiModelProperty(value = "负责人联系方式")
-		private String personTel;
-	/**
-	* 商城logo
-	*/
-		@ApiModelProperty(value = "商城logo")
-		private String logo;
-	/**
-	* 会员数量
-	*/
-		@ApiModelProperty(value = "会员数量")
-		private Integer memberNum;
-	/**
-	* 账户余额
-	*/
-		@ApiModelProperty(value = "账户余额")
-		private Double balance;
-	/**
-	* 积分兑率
-	*/
-		@ApiModelProperty(value = "积分兑率")
-		private Double pointRate;
-	/**
-	* 账期(天)
-	*/
-		@ApiModelProperty(value = "账期(天)")
-		private Integer billDelay;
-	/**
-	* 商场描述
-	*/
-		@ApiModelProperty(value = "商场描述")
-		private String intro;
-	/**
-	* 积分
-	*/
-		@ApiModelProperty(value = "积分")
-		private Double point;
-	/**
-	* 是否启用会员中心
-	*/
-		@ApiModelProperty(value = "是否启用会员中心")
-		private Integer useMember;
-
-
-}

+ 0 - 42
src/main/java/org/springblade/ldt/mall/mapper/MallMapper.java

@@ -1,42 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.mall.mapper;
-
-import org.springblade.ldt.mall.entity.Mall;
-import org.springblade.ldt.mall.vo.MallVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-
-/**
- *  Mapper 接口
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface MallMapper extends BaseMapper<Mall> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param mall
-	 * @return
-	 */
-	List<MallVO> selectMallPage(IPage page, MallVO mall);
-
-}

+ 0 - 28
src/main/java/org/springblade/ldt/mall/mapper/MallMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.ldt.mall.mapper.MallMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="mallResultMap" type="org.springblade.ldt.mall.entity.Mall">
-        <id column="id" property="id"/>
-        <result column="mall_name" property="mallName"/>
-        <result column="location_code" property="locationCode"/>
-        <result column="location" property="location"/>
-        <result column="person_name" property="personName"/>
-        <result column="person_tel" property="personTel"/>
-        <result column="logo" property="logo"/>
-        <result column="member_num" property="memberNum"/>
-        <result column="balance" property="balance"/>
-        <result column="point_rate" property="pointRate"/>
-        <result column="bill_delay" property="billDelay"/>
-        <result column="intro" property="intro"/>
-        <result column="point" property="point"/>
-        <result column="use_member" property="useMember"/>
-    </resultMap>
-
-
-    <select id="selectMallPage" resultMap="mallResultMap">
-        select * from ldt_mall where is_deleted = 0
-    </select>
-
-</mapper>

+ 0 - 41
src/main/java/org/springblade/ldt/mall/service/IMallService.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.mall.service;
-
-import org.springblade.ldt.mall.entity.Mall;
-import org.springblade.ldt.mall.vo.MallVO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-public interface IMallService extends IService<Mall> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param mall
-	 * @return
-	 */
-	IPage<MallVO> selectMallPage(IPage<MallVO> page, MallVO mall);
-
-}

+ 0 - 41
src/main/java/org/springblade/ldt/mall/service/impl/MallServiceImpl.java

@@ -1,41 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.ldt.mall.service.impl;
-
-import org.springblade.ldt.mall.entity.Mall;
-import org.springblade.ldt.mall.vo.MallVO;
-import org.springblade.ldt.mall.mapper.MallMapper;
-import org.springblade.ldt.mall.service.IMallService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- *  服务实现类
- *
- * @author BladeX
- * @since 2021-08-27
- */
-@Service
-public class MallServiceImpl extends ServiceImpl<MallMapper, Mall> implements IMallService {
-
-	@Override
-	public IPage<MallVO> selectMallPage(IPage<MallVO> page, MallVO mall) {
-		return page.setRecords(baseMapper.selectMallPage(page, mall));
-	}
-
-}

Некоторые файлы не были показаны из-за большого количества измененных файлов