From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/PreviewInfoServiceImpl.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/PreviewInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/PreviewInfoServiceImpl.java
index 0b57b02..2a4f1c3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/PreviewInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/PreviewInfoServiceImpl.java
@@ -119,9 +119,9 @@
if (StringUtil.isNullOrEmpty(time))
throw new PreviewInfoException(1, "鎻愮幇鏃堕棿涓嶈兘涓虹┖");
- Date parse = TimeUtil.parseDotCommon2(time);
- if (parse == null)
- throw new PreviewInfoException(1, "璇疯緭鍏ユ纭殑鏃堕棿鏍煎紡锛屽锛�2020.01.01 01:01");
+ Date receiveTime = TimeUtil.parseYYYYMMDD_HHMM(time);
+ if (receiveTime == null)
+ throw new PreviewInfoException(1, "璇疯緭鍏ユ纭殑鏃堕棿鏍煎紡");
Gson gson = new Gson();
@@ -131,7 +131,7 @@
extract.setName(alipay.getName());
extract.setAccount(alipay.getAccount());
extract.setMoney(money);
- extract.setReceiveTime(TimeUtil.parseDotCommon2(time));
+ extract.setReceiveTime(receiveTime);
extract.setId(java.lang.System.currentTimeMillis());
String id = StringUtil.Md5(uid + "#" + PreviewEnum.extractRecord.name());
@@ -256,12 +256,9 @@
throw new PreviewInfoException(1, "璇疯緭鍏ヨ鍗曞彿");
if(StringUtil.isNullOrEmpty(time))
throw new PreviewInfoException(1, "璇疯緭鍏ュ垱寤烘椂闂�");
- Date date = TimeUtil.parseDotCommon2(time);
+ Date date = TimeUtil.parseYYYYMMDD_HHMM(time);
if (date == null)
- throw new PreviewInfoException(1, "璇疯緭鍏ユ纭殑鏃堕棿鏍煎紡锛屽锛�2020.01.01 01:01");
-
- // 杞崲鏍煎紡
- time = TimeUtil.formatYMDHHMM(date);
+ throw new PreviewInfoException(1, "璇疯緭鍏ユ纭殑鏃堕棿鏍煎紡");
InputStream drawStream = null;
if ("ios".equalsIgnoreCase(platform)) {
--
Gitblit v1.8.0