From 150a19b58d53ecc56fda26cb6568bc2d8bfc6be6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 08 十月 2023 09:59:04 +0800
Subject: [PATCH] UUID
---
server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java | 4
server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java | 8 +-
server/services/src/main/java/com/doumee/dao/business/model/WxBill.java | 6 +-
server/services/src/main/java/com/doumee/dao/business/model/AliBillDetail.java | 2
server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java | 4
server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java | 4
server/services/src/main/java/com/doumee/dao/business/model/Ad.java | 4
server/services/src/main/java/com/doumee/dao/business/model/RentSite.java | 4
server/services/src/main/java/com/doumee/dao/business/model/Sites.java | 4
server/services/src/main/java/com/doumee/dao/business/model/Holidays.java | 6 +-
server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java | 6 +-
server/services/src/main/java/com/doumee/service/business/WxBillService.java | 2
server/services/src/main/java/com/doumee/dao/business/model/Bikes.java | 8 +-
server/services/src/main/java/com/doumee/core/constants/Constants.java | 4 +
server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 4
server/services/src/main/java/com/doumee/dao/business/model/Locks.java | 4
server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 10 +-
server/services/src/main/java/com/doumee/dao/business/model/Refund.java | 6 +-
server/services/src/main/java/com/doumee/dao/business/model/Member.java | 8 +-
server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java | 6 +-
server/services/src/main/java/com/doumee/dao/business/model/Transactions.java | 4
server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java | 31 +++++++++-
22 files changed, 83 insertions(+), 56 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index 51d2fe3..3bc8d32 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -45,7 +45,9 @@
int fail = 3;
int over = 4;
}
-
+public static String getUUID(){
+ return UUID.randomUUID().toString().replace("-","");
+}
public interface RedisKeys {
public static final String submission_period_key = "sp_";
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java b/server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java
index b121f44..ccc5df0 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java
@@ -26,7 +26,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +35,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Ad.java b/server/services/src/main/java/com/doumee/dao/business/model/Ad.java
index 11f5b9f..9117011 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Ad.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Ad.java
@@ -26,7 +26,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +35,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/AliBillDetail.java b/server/services/src/main/java/com/doumee/dao/business/model/AliBillDetail.java
index 8869ffa..38bbbca 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/AliBillDetail.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/AliBillDetail.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "浜ゆ槗鏃堕棿")
@ExcelColumn(name="浜ゆ槗鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date billDate;
@ApiModelProperty(value = "鍟嗘埛鍙�")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java b/server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java
index d0091cb..d1d6641 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java
@@ -26,7 +26,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +35,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java b/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java
index 3985b2f..8aabe01 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java
@@ -27,7 +27,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -36,7 +36,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -93,7 +93,7 @@
@ApiModelProperty(value = "澶勭悊鏃堕棿")
@ExcelColumn(name="澶勭悊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date dealDate;
@ApiModelProperty(value = "澶勭悊澶囨敞")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
index 924aebf..422aa82 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
@@ -26,7 +26,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +35,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -76,12 +76,12 @@
@ApiModelProperty(value = "鏈�杩戠鍊熸椂闂�")
@ExcelColumn(name="鏈�杩戠鍊熸椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date lastRentData;
@ApiModelProperty(value = "鍑哄敭鏃堕棿")
@ExcelColumn(name="鍑哄敭鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date soldoutDate;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
index 64be7d3..999fcfb 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -28,7 +28,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -37,7 +37,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Holidays.java b/server/services/src/main/java/com/doumee/dao/business/model/Holidays.java
index 1513c92..cfc85f2 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Holidays.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Holidays.java
@@ -26,7 +26,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +35,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -52,7 +52,7 @@
@ApiModelProperty(value = "鏃ユ湡")
@ExcelColumn(name="鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date holiday;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Locks.java b/server/services/src/main/java/com/doumee/dao/business/model/Locks.java
index 85ba04c..c760d3e 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Locks.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Locks.java
@@ -26,7 +26,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +35,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Member.java b/server/services/src/main/java/com/doumee/dao/business/model/Member.java
index 87049ef..b607224 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Member.java
@@ -27,7 +27,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -36,7 +36,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -81,12 +81,12 @@
@ApiModelProperty(value = "娉ㄥ唽鏃堕棿")
@ExcelColumn(name="娉ㄥ唽鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date registerDate;
@ApiModelProperty(value = "鏈�杩戠杞︽椂闂�")
@ExcelColumn(name="鏈�杩戠杞︽椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date lastRendId;
@ApiModelProperty(value = "鎵嬫満鍙�")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
index 3df5f90..816c03d 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
@@ -27,7 +27,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -36,7 +36,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -77,7 +77,7 @@
@ApiModelProperty(value = "绉熻溅鏃堕棿")
@ExcelColumn(name="绉熻溅鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date rentDate;
@ApiModelProperty(value = "绉熻溅鎸囦护缂栫爜")
@@ -94,7 +94,7 @@
@ApiModelProperty(value = "杩樿溅鏃堕棿")
@ExcelColumn(name="杩樿溅鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date backDate;
@ApiModelProperty(value = "杩樿溅鎸囦护缂栫爜")
@@ -131,7 +131,7 @@
@ApiModelProperty(value = "缁撶畻鏃堕棿")
@ExcelColumn(name="缁撶畻鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date closeDate;
@ApiModelProperty(value = "缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�", example = "1")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java b/server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java
index 3ee20dd..b86c513 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java
@@ -26,7 +26,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +35,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java b/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java
index 244f5ec..1d0f72b 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java
@@ -26,7 +26,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +35,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -52,12 +52,12 @@
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@ExcelColumn(name="寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
@ExcelColumn(name="缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@ApiModelProperty(value = "浼樺厛绾э紙鍗囧簭锛�", example = "1")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Refund.java b/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
index 9c9819e..b241569 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
@@ -27,7 +27,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -36,7 +36,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -81,7 +81,7 @@
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
@ExcelColumn(name="瀹屾垚鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date doneDate;
@ApiModelProperty(value = "閫�娆剧被鍨� 0缁撶畻閫�娆� 1寮哄埗缁撶畻閫�娆� 2缁撶畻鍚庨��娆�", example = "1")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/RentSite.java b/server/services/src/main/java/com/doumee/dao/business/model/RentSite.java
index 2cd49f2..93af9b8 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/RentSite.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/RentSite.java
@@ -27,7 +27,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -36,7 +36,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Sites.java b/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
index 628443f..a87698f 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
@@ -26,7 +26,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +35,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java b/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java
index 86b2c6e..5abe37d 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java
@@ -27,7 +27,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -36,7 +36,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java b/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java
index 017e5db..d739a99 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java
@@ -24,7 +24,7 @@
private String id;
@ApiModelProperty(value = "鎬讳氦鏄撳崟鏁�", example = "1")
- @ExcelColumn(name="鎬讳氦鏄撳崟鏁�")
+ @ExcelColumn(name="鏀舵浜ゆ槗鍗曟暟")
private Integer sumBill;
@ApiModelProperty(value = "閫�娆剧殑璁㈠崟鏁�", example = "1")
@@ -43,8 +43,8 @@
@ExcelColumn(name="鍏呭�煎埜閫�娆炬�婚噾棰�")
private BigDecimal sumCouponRefundFee;
- @ApiModelProperty(value = "鎵嬬画璐规�婚噾棰�", example = "1")
- @ExcelColumn(name="鎵嬬画璐规�婚噾棰�")
+ @ApiModelProperty(value = "鏀舵鎵嬬画璐规�婚噾棰�", example = "1")
+ @ExcelColumn(name="鏀舵鎵嬬画璐规�婚噾棰�")
private BigDecimal sumCmmsAmt;
@ApiModelProperty(value = "璁㈠崟鎬婚噾棰�", example = "1")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java b/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
index cbc78bd..84215f0 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "浜ゆ槗鏃堕棿")
@ExcelColumn(name="浜ゆ槗鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date billDate;
@ApiModelProperty(value = "鍏紬璐﹀彿ID")
@@ -108,12 +108,12 @@
@ApiModelProperty(value = "閫�娆剧敵璇锋椂闂�")
@ExcelColumn(name="閫�娆剧敵璇锋椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date refundApplyDate;
@ApiModelProperty(value = "閫�娆炬垚鍔熸椂闂�")
@ExcelColumn(name="閫�娆炬垚鍔熸椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date refundSuccessDate;
@ApiModelProperty(value = "閫�娆剧姸鎬�")
diff --git a/server/services/src/main/java/com/doumee/service/business/WxBillService.java b/server/services/src/main/java/com/doumee/service/business/WxBillService.java
index d799558..27244f4 100644
--- a/server/services/src/main/java/com/doumee/service/business/WxBillService.java
+++ b/server/services/src/main/java/com/doumee/service/business/WxBillService.java
@@ -94,5 +94,5 @@
* @return long
*/
long count(WxBill wxBill);
- void getWxBill();
+ void getWxBill(String billDate);
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
index d38bd2d..429e6eb 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
@@ -8,8 +8,10 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.WxMiniConfig;
+import com.doumee.core.wx.WxPayProperties;
import com.doumee.dao.business.WxBillDetailMapper;
import com.doumee.dao.business.WxBillMapper;
+import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.WxBill;
import com.doumee.dao.business.model.WxBillDetail;
import com.doumee.service.business.WxBillService;
@@ -22,6 +24,7 @@
import com.github.binarywang.wxpay.bean.result.WxPayBillResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -157,10 +160,11 @@
}
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
- public void getWxBill() {
+ public void getWxBill(String billDate) {
// 鑾峰彇浜ゆ槗璐﹀崟鏁版嵁
WxPayDownloadBillRequest request = new WxPayDownloadBillRequest();
- String billDate = DateUtil.beforeDateToStr(1);
+// String billDate = DateUtil.beforeDateToStr(1);
+ Date ydate = DateUtil.addDaysToDate(new Date(), -1);
request.setBillDate(billDate);
request.setBillType("SUCCESS");
WxPayBillResult response = null;
@@ -217,10 +221,23 @@
}
wxBillMapper.delete(new UpdateWrapper<WxBill>().lambda().eq( WxBill::getId, bill.getId()));
wxBillDetailMapper.delete(new UpdateWrapper<WxBillDetail>().lambda().eq( WxBillDetail::getPid, bill.getId()));
+
+// getTotalAndIncome(bill,ydate);//缁熻缁撶畻閲戦鍜岃嚜琛岃溅鏀跺叆
+ //鎬荤粨绠楅噾棰濓紙鏀舵閲戦-鏀舵鎵嬬画璐�-閫�娆鹃噾棰�-閫�娆炬墜缁垂锛堣礋鏁帮級锛�
+ bill.setTotal(bill.getSumSuccessFee().subtract(bill.getSumCmmsAmt()).subtract(bill.getSumRefundFee()).subtract(bill.getSumRefundCmmsAmt()));
+// //鑷杞︽敹鍏ワ紙鏀舵閲戦-鏀舵鎵嬬画璐�-閫�娆鹃噾棰�-閫�娆炬墜缁垂锛堣礋鏁帮級锛�
+// bill.setBikeFee(bill.getSumSuccessFee().subtract(bill.getSumRefundFee()));
wxBillMapper.insert(bill);
if(detailList.size()>0){
wxBillDetailMapper.insertBatch(detailList);
}
+ }
+ private void getTotalAndIncome(WxBill bill,Date date) {
+ QueryWrapper<Goodsorder> queryWrapper = new QueryWrapper<>();
+ queryWrapper.apply("to_char(create_date, 'yyyy-MM-dd') = {0}", date);
+ queryWrapper.lambda().eq(Goodsorder::getIsdeleted, Constants.ZERO);
+ queryWrapper.lambda().eq(Goodsorder::getStatus, Constants.goodsorderStatus.over);//宸茬祼绠�
+ queryWrapper.select("sum(money) as totalMoney","sum(close_money) as totalCloseMoney");
}
private List<WxBillDetail> getDetialModelByInfo(WxBill bill, List<WxPayBillInfo> billInfoList) {
@@ -261,7 +278,15 @@
detail.setRateRemark(info.getFeeRemark());//璐圭巼澶囨敞
detail.setRefundSuccessDate(DateUtil.getDateFromString2(info.getRefundSuccessTime()));//鎴愬姛閫�娆炬椂闂�
detail.setRefundApplyDate(DateUtil.getDateFromString2(info.getRefundTime())); //鐢宠閫�娆炬椂闂�
-
+ //璁＄畻鑷杞︽敹鍏ワ紝鍖归厤鏉ヨ嚜鑷杞﹀皬绋嬪簭鐨勬墍鏈夋敮浠樻垚鍔熷拰閫�娆炬垚鍔熺殑閲戦锛屼綔涓鸿嚜琛岃溅鏀跺叆锛堢疮璁℃敹娆鹃噾棰�-绱閫�娆炬垚鍔熼噾棰濓級
+ if(StringUtils.equals(detail.getAppid(), WxMiniConfig.wxPayService.getConfig().getAppId())){
+ //鑷杞︽敹鍏ョ疮璁℃敹娆鹃噾棰�
+ bill.setBikeFee(bill.getBikeFee().add(detail.getSettlementTotalFee()));
+ if(StringUtils.equals(detail.getRefundSuccessStatus(),"SUCCESS")){
+ //濡傛灉閫�娆炬垚鍔燂紝鎵ｉ櫎閫�娆鹃噾棰�
+ bill.setBikeFee(bill.getBikeFee().subtract(detail.getApplyRefundFee()));
+ }
+ }
detailList.add(detail);
}
}
--
Gitblit v1.9.3