From 8b505f74e1094fd67f86373ab9e9f80b54bca54e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 11 十月 2019 12:12:53 +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/order/tb/TaoBaoPunishOrderServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoPunishOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoPunishOrderServiceImpl.java
index 78e8130..4c095ee 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoPunishOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoPunishOrderServiceImpl.java
@@ -84,6 +84,20 @@
hongBaoV2Service.updateByPrimaryKeySelective(update);
}
}
+ } else if (hongBaoOder.getHongBaoV2() != null
+ && hongBaoOder.getHongBaoV2().getState() == HongBaoV2.STATE_YILINGQU) {
+ List<HongBaoV2> childList = hongBaoV2Service.listChildrenById(hongBaoOder.getHongBaoV2().getId());
+ for (HongBaoV2 child : childList) {
+ if ((child.getState() == HongBaoV2.STATE_BUKELINGQU
+ || child.getState() == HongBaoV2.STATE_KELINGQU)) {
+ //鏈埌璐︾殑瀛愮孩鍖呬篃闇�瑕佸け鏁�
+ HongBaoV2 update = new HongBaoV2(child.getId());
+ update.setUpdateTime(new Date());
+ update.setState(HongBaoV2.STATE_SHIXIAO);
+ update.setBeizhu("鑱旂洘杩濊");
+ hongBaoV2Service.updateByPrimaryKeySelective(update);
+ }
+ }
}
}
}
--
Gitblit v1.8.0