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/order/pdd/PDDOrderServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/pdd/PDDOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/pdd/PDDOrderServiceImpl.java
index 2720fff..e31d5af 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/pdd/PDDOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/pdd/PDDOrderServiceImpl.java
@@ -28,7 +28,7 @@
PDDOrder old = pddOrderMapper.selectByOrderSN(order.getOrderSn());
if (old != null) {
// 鏇存柊璁㈠崟淇℃伅
- if (order.getOrderStatus().intValue() != old.getOrderStatus()) {// 鐘舵�佹敼鍙樹簡鎵嶆洿鏀硅鍗曚俊鎭�
+ if ((order.getOrderStatus().intValue() != old.getOrderStatus())||(old.getOrderStatus()==2 && old.getOrderReceiveTime()==null)) {// 鐘舵�佹敼鍙樹簡鎵嶆洿鏀硅鍗曚俊鎭�
PDDOrder update = new PDDOrder();
update.setId(old.getId());
update.setOrderStatus(order.getOrderStatus());
@@ -71,4 +71,26 @@
return pddOrderMapper.listByStatus(status, (page - 1) * pageSize, pageSize);
}
+
+ @Override
+ public Long countOrderByDay(String preDay) {
+ return pddOrderMapper.countOrderByDay(preDay);
+ }
+
+
+ @Override
+ public List<PDDOrder> listQuery(long start, int count, String key) {
+ return pddOrderMapper.listQuery(start, count, key);
+ }
+
+ @Override
+ public long countQuery(String key) {
+ Long count = pddOrderMapper.countQuery(key);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
+
}
--
Gitblit v1.8.0