diff --git a/src/main/java/com/quinn/common/wx/AccBillDTO.java b/src/main/java/com/quinn/common/wx/AccBillDTO.java index ec86072..79c1282 100644 --- a/src/main/java/com/quinn/common/wx/AccBillDTO.java +++ b/src/main/java/com/quinn/common/wx/AccBillDTO.java @@ -61,7 +61,7 @@ public class AccBillDTO implements Serializable { private String moneyIcon; - private Date date; + private String date; private String remark; } diff --git a/src/main/java/com/quinn/mapper/AccBillMapper.java b/src/main/java/com/quinn/mapper/AccBillMapper.java index 36457f7..3c82589 100644 --- a/src/main/java/com/quinn/mapper/AccBillMapper.java +++ b/src/main/java/com/quinn/mapper/AccBillMapper.java @@ -17,6 +17,6 @@ import java.util.List; */ public interface AccBillMapper extends BaseMapper { - List listAccToday(String userId, Date date); + List listAccToday(String userId, String date); AccBillDTO getAccBill(Integer sid); } diff --git a/src/main/java/com/quinn/pojo/AccBill.java b/src/main/java/com/quinn/pojo/AccBill.java index 6ca2e57..fae575f 100644 --- a/src/main/java/com/quinn/pojo/AccBill.java +++ b/src/main/java/com/quinn/pojo/AccBill.java @@ -53,7 +53,7 @@ public class AccBill implements Serializable { @ApiModelProperty(value = "-1 转账 -2 还款") private Integer moneyType; - private Date date; + private String date; private String remark; diff --git a/src/main/java/com/quinn/service/impl/AccBillServiceImpl.java b/src/main/java/com/quinn/service/impl/AccBillServiceImpl.java index 5601ce3..853b54d 100644 --- a/src/main/java/com/quinn/service/impl/AccBillServiceImpl.java +++ b/src/main/java/com/quinn/service/impl/AccBillServiceImpl.java @@ -5,6 +5,7 @@ import com.quinn.pojo.AccBill; import com.quinn.mapper.AccBillMapper; import com.quinn.service.AccBillService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.quinn.utils.QuinnUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -27,7 +28,7 @@ public class AccBillServiceImpl extends ServiceImpl impl @Override public List listAccToday(String userId) { - return accBillMapper.listAccToday(userId,new Date()); + return accBillMapper.listAccToday(userId, QuinnUtils.getViewStrFromDate(new Date())); } @Override diff --git a/src/main/resources/sql/account.sql b/src/main/resources/sql/account.sql index 7204cdf..8879f79 100644 --- a/src/main/resources/sql/account.sql +++ b/src/main/resources/sql/account.sql @@ -16,14 +16,14 @@ CREATE TABLE `qn_acc_bill` ( `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '自增id', `name` varchar(255) NOT NULL, `user_id` varchar(200) NOT NULL, - `money` double(9,2) NOT NULL COMMENT '金额', - `balance` double(9,2) NOT NULL COMMENT '余额', + `money` double(9,2) NOT NULL DEFAULT 0 COMMENT '金额', + `balance` double(9,2) NOT NULL DEFAULT 0 COMMENT '余额', `bill_type` varchar(20) DEFAULT NULL COMMENT '账单类型', `from_account` int(10) DEFAULT NULL COMMENT '转账&还款需要', `account` int(10) DEFAULT NULL COMMENT '账户分类ID', `money_type` int(10) DEFAULT NULL COMMENT '-1 转账 -2 还款', `money_type_icon` varchar(255) DEFAULT NULL, - `date` datetime DEFAULT NULL, + `date` date DEFAULT NULL, `remark` varchar(500) DEFAULT NULL, `gmt_create` datetime NOT NULL COMMENT '收藏创建时间', PRIMARY KEY (`id`)