From 075f6eceec6908178ba53b40b7794e2f90f74c92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:40:10 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java | 1 +
1 files changed, 1 insertions(+), 0 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 5746171..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
@@ -298,6 +298,7 @@
//缁熻鍒嗕韩璁㈠崟鐨勬暟鎹�
try {
+ hongBao.setAuctionId(order.getAuctionId());
userShareGoodsGroupService.updateOrderRecord(hongBao);
} catch (UserShareGoodsRecordException e1) {
try {
--
Gitblit v1.8.0