From bc9d4bf3fddcb3107f8509159a250f7a5a5f8ae5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 六月 2021 17:13:01 +0800
Subject: [PATCH] 特价bug修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 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 6e21610..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);
// 閭�璇疯鍗曚俊鎭繚鎶�
@@ -1376,7 +1383,7 @@
&& oldCommonOrder.getSourceType() != Constant.SOURCE_TYPE_JD)
|| oldCommonOrder.getState() == CommonOrder.STATE_SX
|| oldCommonOrder.getState() == CommonOrder.STATE_WQ
- || (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
+ || (oldCommonOrder.getState().intValue() == commonOrder.getState()&&oldCommonOrder.getPayment().compareTo(commonOrder.getPayment())==0)) {
return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE);
}
// 浜ゆ槗ID涓�鑷存墠淇敼
@@ -1489,16 +1496,16 @@
@Override
public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
- Integer type, Integer orderState, String startTime, String endTime, Integer source, List<Long> listShopId,
+ List<Integer> typeList, Integer orderState, String startTime, String endTime, Integer source, List<Long> listShopId,
List<Long> listGoodsId, Date minTime, BigDecimal money, BigDecimal payment, SystemEnum system) throws CommonOrderException {
List<CommonOrderVO> list = null;
if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
- list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, type, orderState,
+ list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, typeList, orderState,
startTime, endTime, source, payment, system);
} else {
- list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime,
+ list = commonOrderMapper.listQuery(start, count, keyType, key, state, typeList, orderState, startTime, endTime,
source, listShopId, listGoodsId, minTime, money, payment, system);
}
@@ -1684,14 +1691,14 @@
}
@Override
- public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
+ public long countQuery(Integer keyType, String key, Integer state, List<Integer> typeList, Integer orderState,
String startTime, String endTime, Integer source, List<Long> listShopId, List<Long> listGoodsId,
Date minTime, BigDecimal money, BigDecimal payment, SystemEnum system) throws CommonOrderException {
if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
- return commonOrderMapper.countQueryWithNoChild(keyType, key, state, type, orderState, startTime, endTime,
+ return commonOrderMapper.countQueryWithNoChild(keyType, key, state, typeList, orderState, startTime, endTime,
source, payment, system);
} else {
- return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source,
+ return commonOrderMapper.countQuery(keyType, key, state, typeList, orderState, startTime, endTime, source,
listShopId, listGoodsId, minTime, money, payment, system);
}
}
@@ -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);
// 閭�璇疯鍗曚俊鎭繚鎶�
@@ -2228,8 +2246,8 @@
/* 璁㈠崟鐘舵�� 杞崲澶勭悊 */
String orderStateContent = "";
- if(!StringUtil.isNullOrEmpty(order.getOrderStateDesc()))
- orderStateContent=order.getOrderStateDesc();
+ if (!StringUtil.isNullOrEmpty(order.getOrderStateDesc()))
+ orderStateContent = order.getOrderStateDesc();
else {
if (CommonOrder.STATE_FK == orderState) {
orderStateContent = "宸蹭粯娆�";
--
Gitblit v1.8.0