From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 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 7cbc72c..4ae9ff4 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
@@ -31,11 +31,13 @@
 import com.yeshi.fanli.entity.taobao.PidUser;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
+import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
 import com.yeshi.fanli.service.inter.order.PidOrderService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
 import com.yeshi.fanli.service.inter.user.UserNotificationService;
+import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
 import com.yeshi.fanli.util.CMQManager;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -91,6 +93,9 @@
 
 	// @Resource
 	// private LostOrderService lostOrderService;
+	
+	@Resource	
+	private UserShareGoodsGroupService userShareGoodsGroupService;
 
 	@Override
 	@Transactional
@@ -257,7 +262,8 @@
 		// 鍙湅鏈夌敤鎴稩d鐨勬儏鍐�
 		if (orders.get(0).getUserInfo() != null) {
 			// 鏍规嵁绗竴涓殑璁㈠崟鍒涘缓鏃堕棿鏉ョ‘瀹氳繑鍒╂瘮渚�
-			BigDecimal rate = hongBaoManageService.getShareRate(orders.get(0).getOrderCreateTime().getTime());
+			BigDecimal rate = hongBaoManageService.getShareRate(orders.get(0).getOrderCreateTime().getTime())
+					.divide(new BigDecimal("100"));
 			List<HongBao> hbList = hongBaoMapper.selectByOrderId(orderId);
 			if (hbList.size() <= 0) {// 杩樻病鏈夊姞鍏ョ孩鍖�
 				// 鍔犲叆绾㈠寘
@@ -288,6 +294,18 @@
 						}
 
 						hongBaoMapper.insertSelective(hongBao);
+						
+						//缁熻鍒嗕韩璁㈠崟鐨勬暟鎹�
+						try {
+							userShareGoodsGroupService.updateOrderRecord(hongBao);
+						} catch (UserShareGoodsRecordException e1) {
+							try {
+								LogHelper.errorDetailInfo(e1);
+							} catch (Exception e) {
+								e.printStackTrace();
+							}
+						}
+						
 
 						try {
 							// 绗笁鏂规彁鎴愯鍗曡缁熻鐨勯�氱煡

--
Gitblit v1.8.0