From b4e46b2f4e06cfb5ce32f5bb1cca55ca637776e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 07 一月 2020 18:14:54 +0800
Subject: [PATCH] elatic
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 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 d2a9893..19fc51c 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
@@ -13,15 +13,17 @@
import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.order.LostOrderMapper;
+import com.yeshi.fanli.dto.ChartTDO;
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.util.Constant;
+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
@@ -42,6 +44,9 @@
@Resource
private UserOrderMsgNotificationService userOrderMsgNotificationService;
+ @Resource
+ private TaoBaoPunishOrderService taoBaoPunishOrderService;
+
@Transactional
@Override
public int addLostOrder(LostOrder lostOrder) {
@@ -50,6 +55,14 @@
if (type == null) { // 榛樿涓烘窐瀹濊鍗�
lostOrder.setType(1);
type = 1;
+ }
+
+ // 鏄惁澶勪簬杩濊璁㈠崟涓�
+ if (type == 1) {
+ int count = taoBaoPunishOrderService.countByTradeParentId(orderId);
+ if (count > 0) {
+ return -1001;
+ }
}
// 璁㈠崟鏄惁宸茬敵璇�
@@ -72,12 +85,12 @@
}
// 鏄惁涓哄垎浜禋璁㈠崟
- if (hongBaoOrderService.countByOrderNoAndHongBaoType(orderId, HongBaoV2.TYPE_SHARE_GOODS) > 0)
+ if (hongBaoOrderService.countByOrderNoAndHongBaoType(orderId, HongBaoV2.TYPE_SHARE_GOODS, type) > 0)
return -5;
// 娆℃暟闄愬埗
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;
}
@@ -105,7 +118,7 @@
lostOrderwriteLock.unlock();
}
- Order or = orderService.getSystemOrderByUid(Constant.TAOBAO, lostOrder.getUserInfo().getId());
+ Order or = orderService.getSystemOrderByUid(type, lostOrder.getUserInfo().getId());
if (or != null) {
boolean b = Utils.isUserOrder(or.getOrderId(), lostOrder.getOrderId());
if (b) {
@@ -292,23 +305,24 @@
* @return
*/
@Override
- public List<LostOrder> listQuery(long start, int count, String key, Integer state, Integer handleType) {
- return lostOrderMapper.listQuery(start, count, key, state, handleType);
+ public List<LostOrder> listQuery(long start, int count, String key, Integer state, Integer handleType,
+ Integer type) {
+ return lostOrderMapper.listQuery(start, count, key, state, handleType, type);
}
@Override
- public long countQuery(String key, Integer state, Integer handleType) {
- return lostOrderMapper.countQuery(key, state, handleType);
+ public long countQuery(String key, Integer state, Integer handleType, Integer type) {
+ return lostOrderMapper.countQuery(key, state, handleType, type);
}
@Override
- public List<Map<String, Object>> countLostNum(Integer dateType, Integer resultCode, String year, String startTime,
+ public List<ChartTDO> countLostNum(Integer dateType, Integer resultCode, String year, String startTime,
String endTime) throws Exception {
return lostOrderMapper.countLostNum(dateType, resultCode, year, startTime, endTime);
}
@Override
- public List<Map<String, Object>> countAppealMoney(Integer dateType, String year, String startTime, String endTime)
+ public List<ChartTDO> countAppealMoney(Integer dateType, String year, String startTime, String endTime)
throws Exception {
return lostOrderMapper.countAppealMoney(dateType, year, startTime, endTime);
}
@@ -318,4 +332,9 @@
return lostOrderMapper.listByStateAndResultCode(state, resultCode, (page - 1) * pageSize, pageSize);
}
+ @Override
+ public void saveLostOrder(LostOrder lostOrder) {
+ lostOrderMapper.insertSelective(lostOrder);
+ }
+
}
--
Gitblit v1.8.0