From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderProcessServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderProcessServiceImpl.java
index 8507938..094f1e5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderProcessServiceImpl.java
@@ -9,6 +9,7 @@
import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
+import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.elme.ElmeHongBaoOrderMap;
import com.yeshi.fanli.entity.elme.ElmeOrder;
@@ -21,6 +22,7 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.order.msg.UserOrderMsgNotificationService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
@@ -47,7 +49,10 @@
@Resource
private UserOrderMsgNotificationService userOrderMsgNotificationService;
- @Transactional
+ @Resource
+ private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+
+ @Transactional(rollbackFor=Exception.class)
@Override
public void processOrder(ElmeOrder elmeOrder) throws ElmeOrderException {
try {
@@ -62,11 +67,20 @@
ElmeHongBaoOrderMap map = elmeHongBaoOrderMapService.selectByOrderId(elmeOrder.getId());
if (map == null)// 璁㈠崟涓嶅瓨鍦�
{
- String rid = elmeOrder.getRid();
- if (StringUtil.isNullOrEmpty(rid))
+ Long uid = null;
+ if (StringUtil.isNullOrEmpty(elmeOrder.getChannelId())) {//鏂扮増鏈�
+ UserExtraTaoBaoInfo extra = userExtraTaoBaoInfoService.getByRelationId(elmeOrder.getRid());
+ if (extra != null)
+ uid = extra.getUser().getId();
+ } else {//鑰佺増鏈�
+ uid = Long.parseLong(elmeOrder.getRid());
+ }
+
+ if (uid == null)
return;
+
// 鏌ヨ鏄犲皠鐢ㄦ埛
- UserInfo user = userInfoService.selectByPKey(Long.parseLong(rid));
+ UserInfo user = userInfoService.selectByPKey(uid);
if (user == null)
return;
// 鍒堕�爃ongbao
@@ -120,7 +134,7 @@
new BigDecimal(100)));
if (elmeOrder.getIsSettle() == true)
hongBao.setPreGetTime(new Date(elmeOrder.getOrderDate().getTime() + 1000 * 60 * 60 * 24 * 15L));
- if (elmeOrder.getPayMoney().compareTo(new BigDecimal(0)) <= 0)
+ if (elmeOrder.getPayMoney().compareTo(new BigDecimal(0)) <= 0||(elmeOrder.getState()!=null&&elmeOrder.getState()==0))
hongBao.setState(HongBaoV2.STATE_SHIXIAO);
else {
if (elmeOrder.getIsSettle() == true) {
--
Gitblit v1.8.0