统一交易订单号

src/main/java/org/springblade/ldt/account/controller/AccountController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/account/dto/AccountDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/account/entity/Account.java

@@ -27,7 +27,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @TableName("ldt_account")

src/main/java/org/springblade/ldt/account/mapper/AccountMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface AccountMapper extends BaseMapper<Account> {
 

src/main/java/org/springblade/ldt/account/service/IAccountService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface IAccountService extends BaseService<Account> {
 

src/main/java/org/springblade/ldt/account/service/impl/AccountServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Service
 public class AccountServiceImpl extends BaseServiceImpl<AccountMapper, Account> implements IAccountService {

src/main/java/org/springblade/ldt/account/vo/AccountVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/account/wrapper/AccountWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public class AccountWrapper extends BaseEntityWrapper<Account, AccountVO>  {
 

src/main/java/org/springblade/ldt/activity/controller/ActivityController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/activity/controller/JoinRecordController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/activity/dto/ActivityDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/activity/dto/JoinRecordDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/activity/entity/Activity.java

@@ -29,7 +29,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-03
+ * @since 2021-09-08
  */
 @Data
 @TableName("ldt_activity")
@@ -75,11 +75,10 @@ public class Activity extends BaseEntity {
 		@ApiModelProperty(value = "活动描述")
 		private String intro;
 	/**
-	 * 商场id，不管发起者是商户还是商场都要传
-	 * 方便小程序查询
-	 */
-	@ApiModelProperty(value = "商场id")
-	private Long mallId;
+	* 商场id
+	*/
+		@ApiModelProperty(value = "商场id")
+		private Long mallId;
 	/**
 	* 发起账户
 	*/

src/main/java/org/springblade/ldt/activity/entity/JoinRecord.java

@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-03
+ * @since 2021-09-08
  */
 @Data
 @TableName("ldt_join_record")
@@ -49,10 +49,10 @@ public class JoinRecord extends BaseEntity {
 		@ApiModelProperty(value = "参与者ID")
 		private Long joinId;
 	/**
-	 * 参与者类型，MALL/SHOP
-	 */
-	@ApiModelProperty(value = "joinType")
-	private String joinType;
+	* MALL/SHOP
+	*/
+		@ApiModelProperty(value = "MALL/SHOP")
+		private String joinType;
 	/**
 	* 参与者标题
 	*/

src/main/java/org/springblade/ldt/activity/mapper/ActivityMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface ActivityMapper extends BaseMapper<Activity> {
 

src/main/java/org/springblade/ldt/activity/mapper/JoinRecordMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface JoinRecordMapper extends BaseMapper<JoinRecord> {
 

src/main/java/org/springblade/ldt/activity/mapper/JoinRecordMapper.xml

@@ -18,7 +18,6 @@
         <result column="join_name" property="joinName"/>
         <result column="discount" property="discount"/>
         <result column="join_logo" property="joinLogo"/>
-        <result column="join_type" property="joinType"/>
     </resultMap>
 
 

src/main/java/org/springblade/ldt/activity/service/IActivityService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface IActivityService extends BaseService<Activity> {
 

src/main/java/org/springblade/ldt/activity/service/IJoinRecordService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface IJoinRecordService extends BaseService<JoinRecord> {
 

src/main/java/org/springblade/ldt/activity/service/impl/ActivityServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Service
 public class ActivityServiceImpl extends BaseServiceImpl<ActivityMapper, Activity> implements IActivityService {

src/main/java/org/springblade/ldt/activity/service/impl/JoinRecordServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Service
 public class JoinRecordServiceImpl extends BaseServiceImpl<JoinRecordMapper, JoinRecord> implements IJoinRecordService {

src/main/java/org/springblade/ldt/activity/vo/ActivityVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/activity/vo/JoinRecordVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/activity/wrapper/ActivityWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public class ActivityWrapper extends BaseEntityWrapper<Activity, ActivityVO>  {
 

src/main/java/org/springblade/ldt/activity/wrapper/JoinRecordWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public class JoinRecordWrapper extends BaseEntityWrapper<JoinRecord, JoinRecordVO>  {
 

src/main/java/org/springblade/ldt/agent/controller/AgentBillsController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/agent/controller/AgentRecordController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/agent/dto/AgentBillsDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/agent/dto/AgentRecordDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/agent/entity/AgentBills.java

@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @TableName("ldt_agent_bills")
@@ -73,6 +73,11 @@ public class AgentBills extends BaseEntity {
 	*/
 		@ApiModelProperty(value = "交易金额")
 		private BigDecimal price;
+	/**
+	* 交易订单号
+	*/
+		@ApiModelProperty(value = "交易订单号")
+		private Long tradeNo;
 
 
 }

src/main/java/org/springblade/ldt/agent/entity/AgentRecord.java

@@ -27,7 +27,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @TableName("ldt_agent_record")
@@ -63,9 +63,9 @@ public class AgentRecord extends BaseEntity {
 		@ApiModelProperty(value = "城市编码")
 		private String areaCode;
 	/**
-	* 是否启用
+	* 是否启用 0未激活 1已激活
 	*/
-		@ApiModelProperty(value = "是否启用")
+		@ApiModelProperty(value = "是否启用 0未激活 1已激活")
 		private Integer enable;
 
 

src/main/java/org/springblade/ldt/agent/mapper/AgentBillsMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface AgentBillsMapper extends BaseMapper<AgentBills> {
 

src/main/java/org/springblade/ldt/agent/mapper/AgentBillsMapper.xml

@@ -19,6 +19,7 @@
         <result column="type" property="type"/>
         <result column="fee" property="fee"/>
         <result column="price" property="price"/>
+        <result column="trade_no" property="tradeNo"/>
     </resultMap>
 
 

src/main/java/org/springblade/ldt/agent/mapper/AgentRecordMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface AgentRecordMapper extends BaseMapper<AgentRecord> {
 

src/main/java/org/springblade/ldt/agent/service/IAgentBillsService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface IAgentBillsService extends BaseService<AgentBills> {
 

src/main/java/org/springblade/ldt/agent/service/IAgentRecordService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface IAgentRecordService extends BaseService<AgentRecord> {
 

src/main/java/org/springblade/ldt/agent/service/impl/AgentBillsServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Service
 public class AgentBillsServiceImpl extends BaseServiceImpl<AgentBillsMapper, AgentBills> implements IAgentBillsService {

src/main/java/org/springblade/ldt/agent/service/impl/AgentRecordServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Service
 public class AgentRecordServiceImpl extends BaseServiceImpl<AgentRecordMapper, AgentRecord> implements IAgentRecordService {

src/main/java/org/springblade/ldt/agent/vo/AgentBillsVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/agent/vo/AgentRecordVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/agent/wrapper/AgentBillsWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public class AgentBillsWrapper extends BaseEntityWrapper<AgentBills, AgentBillsVO>  {
 

src/main/java/org/springblade/ldt/agent/wrapper/AgentRecordWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public class AgentRecordWrapper extends BaseEntityWrapper<AgentRecord, AgentRecordVO>  {
 

src/main/java/org/springblade/ldt/bills/controller/BalanceBillsController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/bills/controller/BillsController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/bills/controller/PlatformBillsController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/bills/controller/PointBillsController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/bills/controller/WithdrawRecController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/bills/dto/BalanceBillsDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/dto/BillsDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/dto/PlatformBillsDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/dto/PointBillsDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/dto/WithdrawRecDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/entity/BalanceBills.java

@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @TableName("ldt_balance_bills")
@@ -78,6 +78,11 @@ public class BalanceBills extends BaseEntity {
 	*/
 		@ApiModelProperty(value = "交易类型")
 		private String type;
+	/**
+	* 交易订单号
+	*/
+		@ApiModelProperty(value = "交易订单号")
+		private Long tradeNo;
 
 
 }

src/main/java/org/springblade/ldt/bills/entity/Bills.java

@@ -29,7 +29,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @TableName("ldt_bills")

src/main/java/org/springblade/ldt/bills/entity/PlatformBills.java

@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @TableName("ldt_platform_bills")
@@ -68,6 +68,11 @@ public class PlatformBills extends BaseEntity {
 	*/
 		@ApiModelProperty(value = "交易金额")
 		private BigDecimal price;
+	/**
+	* 交易订单号
+	*/
+		@ApiModelProperty(value = "交易订单号")
+		private Long tradeNo;
 
 
 }

src/main/java/org/springblade/ldt/bills/entity/PointBills.java

@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @TableName("ldt_point_bills")
@@ -103,6 +103,11 @@ public class PointBills extends BaseEntity {
 	*/
 		@ApiModelProperty(value = "渠道积分兑率")
 		private BigDecimal channelPointRate;
+	/**
+	* 交易订单号
+	*/
+		@ApiModelProperty(value = "交易订单号")
+		private Long tradeNo;
 
 
 }

src/main/java/org/springblade/ldt/bills/entity/WithdrawRec.java

@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @TableName("ldt_withdraw_rec")

src/main/java/org/springblade/ldt/bills/mapper/BalanceBillsMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface BalanceBillsMapper extends BaseMapper<BalanceBills> {
 

src/main/java/org/springblade/ldt/bills/mapper/BalanceBillsMapper.xml

@@ -20,6 +20,7 @@
         <result column="receive_id" property="receiveId"/>
         <result column="pay_status" property="payStatus"/>
         <result column="type" property="type"/>
+        <result column="trade_no" property="tradeNo"/>
     </resultMap>
 
 

src/main/java/org/springblade/ldt/bills/mapper/BillsMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface BillsMapper extends BaseMapper<Bills> {
 

src/main/java/org/springblade/ldt/bills/mapper/PlatformBillsMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface PlatformBillsMapper extends BaseMapper<PlatformBills> {
 

src/main/java/org/springblade/ldt/bills/mapper/PlatformBillsMapper.xml

@@ -18,6 +18,7 @@
         <result column="type" property="type"/>
         <result column="fee" property="fee"/>
         <result column="price" property="price"/>
+        <result column="trade_no" property="tradeNo"/>
     </resultMap>
 
 

src/main/java/org/springblade/ldt/bills/mapper/PointBillsMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface PointBillsMapper extends BaseMapper<PointBills> {
 

src/main/java/org/springblade/ldt/bills/mapper/PointBillsMapper.xml

@@ -25,6 +25,7 @@
         <result column="channel_name" property="channelName"/>
         <result column="is_cheak" property="isCheak"/>
         <result column="channel_point_rate" property="channelPointRate"/>
+        <result column="trade_no" property="tradeNo"/>
     </resultMap>
 
 

src/main/java/org/springblade/ldt/bills/mapper/WithdrawRecMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface WithdrawRecMapper extends BaseMapper<WithdrawRec> {
 

src/main/java/org/springblade/ldt/bills/service/IBalanceBillsService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface IBalanceBillsService extends BaseService<BalanceBills> {
 

src/main/java/org/springblade/ldt/bills/service/IBillsService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface IBillsService extends BaseService<Bills> {
 

src/main/java/org/springblade/ldt/bills/service/IPlatformBillsService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface IPlatformBillsService extends BaseService<PlatformBills> {
 

src/main/java/org/springblade/ldt/bills/service/IPointBillsService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface IPointBillsService extends BaseService<PointBills> {
 

src/main/java/org/springblade/ldt/bills/service/IWithdrawRecService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface IWithdrawRecService extends BaseService<WithdrawRec> {
 

src/main/java/org/springblade/ldt/bills/service/impl/BalanceBillsServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Service
 public class BalanceBillsServiceImpl extends BaseServiceImpl<BalanceBillsMapper, BalanceBills> implements IBalanceBillsService {

src/main/java/org/springblade/ldt/bills/service/impl/BillsServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Service
 public class BillsServiceImpl extends BaseServiceImpl<BillsMapper, Bills> implements IBillsService {

src/main/java/org/springblade/ldt/bills/service/impl/PlatformBillsServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Service
 public class PlatformBillsServiceImpl extends BaseServiceImpl<PlatformBillsMapper, PlatformBills> implements IPlatformBillsService {

src/main/java/org/springblade/ldt/bills/service/impl/PointBillsServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Service
 public class PointBillsServiceImpl extends BaseServiceImpl<PointBillsMapper, PointBills> implements IPointBillsService {

src/main/java/org/springblade/ldt/bills/service/impl/WithdrawRecServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Service
 public class WithdrawRecServiceImpl extends BaseServiceImpl<WithdrawRecMapper, WithdrawRec> implements IWithdrawRecService {

src/main/java/org/springblade/ldt/bills/vo/BalanceBillsVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/vo/BillsVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/vo/PlatformBillsVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/vo/PointBillsVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/vo/WithdrawRecVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/wrapper/BalanceBillsWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public class BalanceBillsWrapper extends BaseEntityWrapper<BalanceBills, BalanceBillsVO>  {
 

src/main/java/org/springblade/ldt/bills/wrapper/BillsWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public class BillsWrapper extends BaseEntityWrapper<Bills, BillsVO>  {
 

src/main/java/org/springblade/ldt/bills/wrapper/PlatformBillsWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public class PlatformBillsWrapper extends BaseEntityWrapper<PlatformBills, PlatformBillsVO>  {
 

src/main/java/org/springblade/ldt/bills/wrapper/PointBillsWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public class PointBillsWrapper extends BaseEntityWrapper<PointBills, PointBillsVO>  {
 

src/main/java/org/springblade/ldt/bills/wrapper/WithdrawRecWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public class WithdrawRecWrapper extends BaseEntityWrapper<WithdrawRec, WithdrawRecVO>  {
 

src/main/java/org/springblade/ldt/channel/controller/PointChannelController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/channel/dto/PointChannelDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/channel/entity/PointChannel.java

@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @TableName("ldt_point_channel")

src/main/java/org/springblade/ldt/channel/mapper/PointChannelMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface PointChannelMapper extends BaseMapper<PointChannel> {
 

src/main/java/org/springblade/ldt/channel/service/IPointChannelService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface IPointChannelService extends BaseService<PointChannel> {
 

src/main/java/org/springblade/ldt/channel/service/impl/PointChannelServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Service
 public class PointChannelServiceImpl extends BaseServiceImpl<PointChannelMapper, PointChannel> implements IPointChannelService {

src/main/java/org/springblade/ldt/channel/vo/PointChannelVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/channel/wrapper/PointChannelWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public class PointChannelWrapper extends BaseEntityWrapper<PointChannel, PointChannelVO>  {
 

src/main/java/org/springblade/ldt/feedback/controller/FeedbackController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/feedback/dto/FeedbackDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/feedback/entity/Feedback.java

@@ -27,7 +27,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @TableName("ldt_feedback")

src/main/java/org/springblade/ldt/feedback/mapper/FeedbackMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface FeedbackMapper extends BaseMapper<Feedback> {
 

src/main/java/org/springblade/ldt/feedback/service/IFeedbackService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 public interface IFeedbackService extends BaseService<Feedback> {
 

src/main/java/org/springblade/ldt/feedback/service/impl/FeedbackServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Service
 public class FeedbackServiceImpl extends BaseServiceImpl<FeedbackMapper, Feedback> implements IFeedbackService {

src/main/java/org/springblade/ldt/feedback/vo/FeedbackVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-06
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)