From 18118188e370e45f6e1bd43e5b33fd4c4a156655 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 08 Apr 2024 16:01:44 +0800
Subject: [PATCH] 微信支付+获取用户的openid

---
 src/main/java/org/springblade/modules/property/entity/PropertyChargeRecord.java |  108 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 94 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyChargeRecord.java b/src/main/java/org/springblade/modules/property/entity/PropertyChargeRecord.java
index 9767dc7..bb97fac 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyChargeRecord.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyChargeRecord.java
@@ -1,47 +1,127 @@
 package org.springblade.modules.property.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
 @TableName("jczz_property_charge_record")
 @ApiModel(value = "PropertyChargeRecord", description = "物业缴费记录")
-public class PropertyChargeRecord extends BaseEntity {
+public class PropertyChargeRecord  {
 
 
-	//物业公司的deptId
+	/** 主键 */
+	@ApiModelProperty(value = "主键ID", example = "")
+	@TableId(value = "id", type = IdType.ASSIGN_ID)
+	private Long id;
+
+	/** 物业公司id */
+	@ApiModelProperty(value = "物业公司id", example = "")
+	@TableField("property_id")
 	private String propertyId;
 
+	/** 订单号 */
+	@ApiModelProperty(value = "订单号", example = "")
+	@TableField("order_no")
+	private String orderNo;
 
-	//缴费项id
+	/** 缴费项id */
+	@ApiModelProperty(value = "缴费项id", example = "")
+	@TableField("charge_id")
 	private String chargeId;
 
-	//编号
+	/** 缴费单号 */
+	@ApiModelProperty(value = "缴费单号", example = "")
+	@TableField("no")
 	private String no;
 
-	//付款人id
+	/** 付款人id */
+	@ApiModelProperty(value = "付款人id", example = "")
+	@TableField("pay_user")
 	private String payUser;
 
-	//付款时间
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	/** 付费时间 */
+	@ApiModelProperty(value = "付费时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField("pay_time")
 	private Date payTime;
 
-	//缴费方式
+	/** 付款方式 */
+	@ApiModelProperty(value = "付款方式", example = "")
+	@TableField("pay_func")
 	private String payFunc;
 
-	//付款金额
-	private String payPrice;
+	/** 付款金额 */
+	@ApiModelProperty(value = "付款金额(分)", example = "")
+	@TableField("pay_price")
+	private BigDecimal payPrice;
 
-	//付款房屋的houseCode
-	private String payHouse;
+	/** 房屋编码 */
+	@ApiModelProperty(value = "房屋编码", example = "")
+	@TableField("house_code")
+	private String houseCode;
 
-	//缴费内容
+	/** 缴费内容 */
+	@ApiModelProperty(value = "缴费内容", example = "")
+	@TableField("pay_content")
 	private String payContent;
+
+	/** 创建时间 */
+	@ApiModelProperty(value = "创建时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField("create_time")
+	private Date createTime;
+
+	/** 创建人 */
+	@ApiModelProperty(value = "创建人", example = "")
+	@TableField("create_user")
+	private Long createUser;
+
+	/** 创建部门 */
+	@ApiModelProperty(value = "创建部门", example = "")
+	@TableField("create_dept")
+	private Long createDept;
+
+	/** 修改人 */
+	@ApiModelProperty(value = "修改人", example = "")
+	@TableField("update_user")
+	private Long updateUser;
+
+	/** 修改时间 */
+	@ApiModelProperty(value = "修改时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField("update_time")
+	private Date updateTime;
+
+	/** 状态(1、待支付;2、已支付;99取消支付) */
+	@ApiModelProperty(value = "状态(1、待支付;2、已支付;99取消支付)", example = "")
+	@TableField("status")
+	private Integer status;
+
+	/** 是否已删除 */
+	@ApiModelProperty(value = "是否已删除", example = "")
+	@TableField("is_deleted")
+	private Integer isDeleted;
+
+	/** 开始时间 */
+	@ApiModelProperty(value = "开始时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField("start_time")
+	private Date startTime;
+
+	/** 到期时间 */
+	@ApiModelProperty(value = "到期时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField("end_time")
+	private Date endTime;
 }

--
Gitblit v1.9.3