From 512f368d7d8e71ee72a8f71dd7d2146f4c64f774 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 02 六月 2021 18:54:58 +0800
Subject: [PATCH] 特价相关bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index f6a4a5a..8f6c41d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -368,6 +368,8 @@
CommonOrderGoodsVO commonGoodsVO = new CommonOrderGoodsVO();
PropertyUtils.copyProperties(commonGoodsVO, goods);
commonGoodsVO.setGoodsType(sourceType);
+ commonGoodsVO.setPlaceOrderTime(TimeUtil.getGernalTime(order.getThirdCreateTime().getTime(),"yyyy.MM.dd HH:mm"));
+
// 娣樺疂鍟嗗搧鍥剧墖澶勭悊
String picture = commonGoodsVO.getPicture();
@@ -384,6 +386,11 @@
if (totalSettlement == null || totalSettlement.compareTo(new BigDecimal(0)) <= 0) {
totalSettlement = commonOrder.getTotalPayment();
}
+ if (totalSettlement== null || totalSettlement.compareTo(new BigDecimal(0)) <= 0)
+ commonGoodsVO.setPayState("鏈粯娆�/宸查��娆�");
+ else
+ commonGoodsVO.setPayState("宸蹭粯娆�");
+
commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
// 閭�璇疯鍗曚俊鎭繚鎶�
@@ -1745,6 +1752,7 @@
} catch (Exception e) {
e.printStackTrace();
}
+ commonGoodsVO.setPlaceOrderTime(TimeUtil.getGernalTime(commonOrder.getThirdCreateTime().getTime(),"yyyy.MM.dd HH:mm"));
String picture = commonGoodsVO.getPicture();
if (!StringUtil.isNullOrEmpty(picture) && !picture.contains("320x320")) {
@@ -1771,6 +1779,10 @@
if (totalSettlement == null || totalSettlement.compareTo(new BigDecimal(0)) <= 0) {
totalSettlement = commonOrder.getTotalPayment();
}
+ if (totalSettlement== null || totalSettlement.compareTo(new BigDecimal(0)) <= 0)
+ commonGoodsVO.setPayState("鏈粯娆�/宸查��娆�");
+ else
+ commonGoodsVO.setPayState("宸蹭粯娆�");
// 瀹炰粯娆�
commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
@@ -2110,6 +2122,7 @@
if (commonGoodsVO.getGoodsType() == null) {
commonGoodsVO.setGoodsType(sourceType);
}
+ commonGoodsVO.setPlaceOrderTime(TimeUtil.getGernalTime(order.getThirdCreateTime().getTime(),"yyyy.MM.dd HH:mm"));
// 娣樺疂鍟嗗搧鍥剧墖澶勭悊
String picture = commonGoodsVO.getPicture();
@@ -2126,6 +2139,11 @@
if (totalSettlement == null || totalSettlement.compareTo(new BigDecimal(0)) <= 0) {
totalSettlement = commonOrder.getTotalPayment();
}
+ if (totalSettlement== null || totalSettlement.compareTo(new BigDecimal(0)) <= 0)
+ commonGoodsVO.setPayState("鏈粯娆�/宸查��娆�");
+ else
+ commonGoodsVO.setPayState("宸蹭粯娆�");
+
commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
// 閭�璇疯鍗曚俊鎭繚鎶�
--
Gitblit v1.8.0