From c84d8ecd97d111b01db9cfd807300d0491a95bc8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 08 一月 2019 16:38:34 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java | 54 +++++-------------------------------------------------
1 files changed, 5 insertions(+), 49 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java
index 4ae9ff4..f62f34d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java
@@ -45,6 +45,7 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.AccountDetailsFactory;
import com.yeshi.fanli.util.factory.HongBaoFactory;
+import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
@Service
@@ -297,6 +298,7 @@
//缁熻鍒嗕韩璁㈠崟鐨勬暟鎹�
try {
+ hongBao.setAuctionId(order.getAuctionId());
userShareGoodsGroupService.updateOrderRecord(hongBao);
} catch (UserShareGoodsRecordException e1) {
try {
@@ -474,22 +476,6 @@
// 缁撶畻鍒拌处鎴�
@Override
- public void balanceOrder() {
- // 鑾峰彇鍒拌鏈�25鏃ュ彲缁撶畻鐨勮鍗�
- List<PidOrder> list = pidOrderMapper.getCanBalanceList(1000);
- if (list != null) {
- Map<String, List<PidOrder>> map = parseOrderMap(list);
- Iterator<String> its = map.keySet().iterator();
- while (its.hasNext()) {
- String orderId = its.next();
- List<PidOrder> orders = map.get(orderId);
- for (int i = 0; i < orders.size(); i++)
- balanceOrder(orders.get(i));
- }
- }
- }
-
- @Override
public void compareOrderAndHongBao() {
List<PidOrder> list = pidOrderMapper.selectByState("璁㈠崟浠樻", 100);
list.addAll(pidOrderMapper.selectByState("璁㈠崟缁撶畻", 100));
@@ -519,39 +505,6 @@
}
}
- @Transactional
- @Override
- public void balanceOrder(PidOrder pidOrder) {
- if (pidOrder.getHongBao() == null)
- return;
- // 鏌ユ壘绾㈠寘
- HongBao hongBao = hongBaoMapper.selectByPrimaryKey(pidOrder.getHongBao().getId());
- if (hongBao.getState() == HongBao.STATE_SHIXIAO || hongBao.getState() == HongBao.STATE_YILINGQU)
- return;
-
- HongBao updateHongBao = new HongBao();
- updateHongBao.setId(hongBao.getId());
- updateHongBao.setGetTime(System.currentTimeMillis());
- updateHongBao.setState(HongBao.STATE_YILINGQU);
- hongBaoMapper.updateByPrimaryKeySelective(updateHongBao);
-
- // 鍔犲叆鐢ㄦ埛浣欓
- userInfoMapper.addHongBaoByUid(hongBao.getUserInfo().getId(), hongBao.getMoney());
- // 鍔犲叆璐︽埛鏄庣粏
- AccountDetails ad = AccountDetailsFactory.create("+" + hongBao.getMoney(), AccountDetailsFactory.SHARE_GOODS,
- null, null, hongBao.getUserInfo());
- accountDetailsMapper.insertSelective(ad);
- try {
- userNotificationService.tiChengRecieved(hongBao.getUserInfo().getId(), hongBao.getMoney());
- } catch (Exception e) {
- }
-
- PidOrder updatePidOrder = new PidOrder();
- updatePidOrder.setId(pidOrder.getId());
- updatePidOrder.setAccountBalance(true);
- updatePidOrder.setAccountBalanceTime(new Date());
- pidOrderMapper.updateByPrimaryKeySelective(updatePidOrder);
- }
@Override
public void weiQuan(String orderId) {
@@ -587,6 +540,9 @@
AccountDetails ad = AccountDetailsFactory.create("-" + hongBao.getMoney(),
AccountDetailsFactory.SHARE_GOODS_DRAWBACK, null, null, hongBao.getUserInfo());
accountDetailsMapper.insertSelective(ad);
+
+
+
// 缁存潈閫氱煡
try {
--
Gitblit v1.8.0