From 207dc8655711cddac2653e18b51e58a88dba2084 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 06 三月 2020 18:14:36 +0800
Subject: [PATCH] 发圈处理
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
index ec90d57..0572dd7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.order;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -16,12 +17,13 @@
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.LostOrder;
import com.yeshi.fanli.entity.bus.user.Order;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.msg.UserOrderMsgNotificationService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoPunishOrderService;
+import com.yeshi.fanli.service.inter.order.msg.UserOrderMsgNotificationService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoPunishOrderService;
import com.yeshi.fanli.util.Utils;
@Service
@@ -88,7 +90,7 @@
// 娆℃暟闄愬埗
long count = lostOrderMapper.countTodayAppeal(lostOrder.getUserInfo().getId());
- String countMax = configService.get("order_appeal_count_day");
+ String countMax = configService.get(ConfigKeyEnum.orderAppealCountDay.getKey());
if (countMax != null && countMax.trim().length() > 0 && count >= Long.parseLong(countMax)) {
return -7;
}
@@ -236,11 +238,11 @@
update.setId(lo.getId());
update.setResultCode(LostOrder.RESULT_CODE_SUCCESS);
lostOrderMapper.updateByPrimaryKeySelective(update);
- Order order = orderService.findOrderByOrderIdAndType(orderId, Order.ORDER_TYPE_TAOBAO);
+ Order order = orderService.findOrderByOrderIdAndType(orderId, orderType);
if (order != null)
// 娣诲姞閫氱煡
userOrderMsgNotificationService.orderFoundSuccess(lo.getUserInfo().getId(), lo.getOrderId(),
- order.getMoney(), 1, new Date(lo.getHandleTime()));
+ order.getMoney(), orderType, new Date(lo.getHandleTime()));
}
}
}
@@ -314,15 +316,13 @@
}
@Override
- public List<Map<String, Object>> countLostNum(Integer dateType, Integer resultCode, String year, String startTime,
- String endTime) throws Exception {
- return lostOrderMapper.countLostNum(dateType, resultCode, year, startTime, endTime);
+ public Integer countLostOrderNum(String preDay) {
+ return lostOrderMapper.countLostOrderNum(preDay);
}
@Override
- public List<Map<String, Object>> countAppealMoney(Integer dateType, String year, String startTime, String endTime)
- throws Exception {
- return lostOrderMapper.countAppealMoney(dateType, year, startTime, endTime);
+ public BigDecimal countAppealMoney(String preDay) {
+ return lostOrderMapper.countAppealMoney(preDay);
}
@Override
--
Gitblit v1.8.0