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/order/tb/TaoBaoWeiQuanOrderServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoWeiQuanOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoWeiQuanOrderServiceImpl.java
index 18d4286..8e0830f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoWeiQuanOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoWeiQuanOrderServiceImpl.java
@@ -6,6 +6,7 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
@@ -13,6 +14,7 @@
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.order.UserOrderWeiQuanRecordService;
import com.yeshi.fanli.service.inter.order.msg.MsgOrderDetailService;
import com.yeshi.fanli.service.inter.order.msg.UserOrderMsgNotificationService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
@@ -32,6 +34,10 @@
@Resource
private CommonOrderService commonOrderService;
+ @Resource
+ private UserOrderWeiQuanRecordService userOrderWeiQuanRecordService;
+
+ @Transactional(rollbackFor = Exception.class)
@Override
public void addWeiQuanOrder(TaoBaoWeiQuanOrder order) {
if (order == null)
@@ -41,8 +47,7 @@
.selectByOrderIdAndOrderItemId(order.getOrderId(), order.getOrderItemId());
if (taoBaoWeiQuanOrder != null) {
// 宸茬粡鏄渶鏂扮殑鐘舵�佷簡
- if (taoBaoWeiQuanOrder.getState() != null && (taoBaoWeiQuanOrder.getState().contains("缁存潈鎴愬姛")
- || taoBaoWeiQuanOrder.getState().contains("缁存潈澶辫触")))
+ if (taoBaoWeiQuanOrder.getState() != null && (taoBaoWeiQuanOrder.getState().contains("缁存潈鎴愬姛")))
return;
// 鏇存柊閲戦锛岀姸鎬佷笌鏃堕棿
TaoBaoWeiQuanOrder update = new TaoBaoWeiQuanOrder();
@@ -65,21 +70,28 @@
updateCommonOrder.setState(CommonOrder.STATE_WQ);
updateCommonOrder.setUpdateTime(new Date());
commonOrderService.updateByPrimaryKeySelective(updateCommonOrder);
+ userOrderWeiQuanRecordService.addTaoBaoWeiQuan(taoBaoWeiQuanOrder);
}
- List<MsgOrderDetail> msgList = msgOrderDetailService.listMsgOrderByOrderId(order.getOrderId());
- for (MsgOrderDetail msg : msgList) {
- if (msg.getType() == MsgTypeOrderTypeEnum.fanli) {
- userOrderMsgNotificationService.orderFanLiStateChanged(msg.getUser().getId(),
- order.getOrderId(), Constant.SOURCE_TYPE_TAOBAO, null, null, CommonOrder.STATE_WQ);
- } else if (msg.getType() == MsgTypeOrderTypeEnum.invite) {
- userOrderMsgNotificationService.orderInviteStateChanged(msg.getUser().getId(),
- order.getOrderId(), Constant.SOURCE_TYPE_TAOBAO, null, null, CommonOrder.STATE_WQ);
- } else if (msg.getType() == MsgTypeOrderTypeEnum.share) {
- userOrderMsgNotificationService.orderShareStateChanged(msg.getUser().getId(),
- order.getOrderId(), Constant.SOURCE_TYPE_TAOBAO, null, null, CommonOrder.STATE_WQ);
- }
- }
+ // 缁存潈鐘舵�佷笉闇�瑕佹秷鎭�
+ // List<MsgOrderDetail> msgList =
+ // msgOrderDetailService.listMsgOrderByOrderId(order.getOrderId());
+ // for (MsgOrderDetail msg : msgList) {
+ // if (msg.getType() == MsgTypeOrderTypeEnum.fanli) {
+ // userOrderMsgNotificationService.orderFanLiStateChanged(msg.getUser().getId(),
+ // order.getOrderId(), Constant.SOURCE_TYPE_TAOBAO, null,
+ // null, CommonOrder.STATE_WQ);
+ // } else if (msg.getType() == MsgTypeOrderTypeEnum.invite)
+ // {
+ // userOrderMsgNotificationService.orderInviteStateChanged(msg.getUser().getId(),
+ // order.getOrderId(), Constant.SOURCE_TYPE_TAOBAO, null,
+ // null, CommonOrder.STATE_WQ);
+ // } else if (msg.getType() == MsgTypeOrderTypeEnum.share) {
+ // userOrderMsgNotificationService.orderShareStateChanged(msg.getUser().getId(),
+ // order.getOrderId(), Constant.SOURCE_TYPE_TAOBAO, null,
+ // null, CommonOrder.STATE_WQ);
+ // }
+ // }
}
} catch (Exception e) {
@@ -88,6 +100,18 @@
order.setCreateTime(new Date());
order.setUpdateTime(new Date());
taoBaoWeiQuanOrderMapper.insertSelective(order);
+ if (order.getState().contains("缁存潈鎴愬姛")) {
+ // 鏇存敼CommonOrder鐨勭姸鎬�
+ CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,
+ order.getOrderItemId());
+ if (commonOrder != null) {
+ CommonOrder updateCommonOrder = new CommonOrder(commonOrder.getId());
+ updateCommonOrder.setState(CommonOrder.STATE_WQ);
+ updateCommonOrder.setUpdateTime(new Date());
+ commonOrderService.updateByPrimaryKeySelective(updateCommonOrder);
+ userOrderWeiQuanRecordService.addTaoBaoWeiQuan(order);
+ }
+ }
}
}
--
Gitblit v1.8.0