From fdb089cb8bee6099efcbd7b0ca2672c63cbb6784 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 11 十一月 2019 09:33:56 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java
index 1e585a4..ea3f9c8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java
@@ -140,6 +140,10 @@
order.setOrderNo(orderNo);
banLiShopOrderMapper.updateByPrimaryKeySelective(update);
+ // 澧炲姞閿�閲�
+ banLiShopGoodsSetService.addSalesCount(order.getGoodsSet().getId(), 1);
+ banLiShopGoodsService.addSalesCount(order.getGoods().getId(), 1);
+
// 璁㈠崟娣诲姞鎴愬姛 ,寤舵椂閫氱煡鍚庣画
sendPlaceOrderMsg(order.getId(), order.getUid());
}
@@ -186,12 +190,12 @@
@Override
public List<BanLiShopOrder> listByUid(Long uid, int page, int pageSize) {
- return banLiShopOrderMapper.listByUid(null, uid, (page - 1) * pageSize, pageSize);
+ return banLiShopOrderMapper.listByUidAndState(null, uid, (page - 1) * pageSize, pageSize);
}
@Override
public long countByUid(Long uid) {
- return banLiShopOrderMapper.countByUid(null, uid);
+ return banLiShopOrderMapper.countByUidAndState(null, uid);
}
@Override
@@ -389,6 +393,7 @@
update.setState(BanLiShopOrder.STATE_REJECT);
update.setStateDesc(msg);
update.setUpdateTime(new Date());
+ update.setRejectTime(new Date());
banLiShopOrderMapper.updateByPrimaryKeySelective(update);
transactionManager.commit(transactionStatus);
} catch (Exception e) {
@@ -452,4 +457,14 @@
return banLiShopOrderMapper.selectByOrderNo(orderNo);
}
+ @Override
+ public List<BanLiShopOrder> listByUidAndState(Long uid, List<Integer> stateList, int page, int pageSize) {
+ return banLiShopOrderMapper.listByUidAndState(stateList, uid, (page - 1) * pageSize, pageSize);
+ }
+
+ @Override
+ public long countByUidAndState(Long uid, List<Integer> stateList) {
+ return banLiShopOrderMapper.countByUidAndState(stateList, uid);
+ }
+
}
--
Gitblit v1.8.0