From 5a4040ba6977febaff8d73e4ed27fefaceb24167 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 29 Sep 2020 11:19:23 +0800
Subject: [PATCH] Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into pay_master
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 7 ++++---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductAllVo.java | 5 ++++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductAllVo.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductAllVo.java
index a7b782c..f3612d4 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductAllVo.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductAllVo.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -16,7 +18,8 @@
/**
* 产品id
*/
- private Long Id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
/**
* 产品名称
*/
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
index 5c3e1ac..23df499 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
@@ -457,6 +457,7 @@
data.isShare = (data.isShare.indexOf("不") == 0) ? 0 : 1;
if (!strUtil.isEmpty(data.beginTime) && !strUtil.isEmpty(data.endTime)) {
if (dateUtil.compareDate(data.endTime, data.beginTime)) {
+ data.id=data.id+'';
tempDataList(data);
waitRecharge();
} else {
@@ -565,8 +566,8 @@
var listDetailData = new Array();
$.each(listData, function (index, item) {
var detailData = {
- orderId: orderData.id,
- proId: item.id,
+ orderId: orderData.id+'',
+ proId: item.id+'',
proType: item.proType,
proName: item.proName,
isShare: item.isShare,
@@ -595,7 +596,7 @@
"");
layer.msg(data.msg, {
icon: 1,
- time: 3000
+ time: 2000
}, function () {
admin
.finishPopupCenter();
--
Gitblit v1.8.0