From 50361d9b29962f66b05df0732820840c6531f84f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 29 十月 2019 14:23:27 +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/TaoBaoWeiQuanOrderServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 b65453f..97c3127 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
@@ -12,6 +12,7 @@
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;
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.msg.MsgOrderDetailService;
import com.yeshi.fanli.service.inter.order.msg.UserOrderMsgNotificationService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
@@ -27,6 +28,9 @@
@Resource
private MsgOrderDetailService msgOrderDetailService;
+
+ @Resource
+ private CommonOrderService commonOrderService;
@Override
public void addWeiQuanOrder(TaoBaoWeiQuanOrder order) {
@@ -53,6 +57,16 @@
try {
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);
+ }
+
List<MsgOrderDetail> msgList = msgOrderDetailService.listMsgOrderByOrderId(order.getOrderId());
for (MsgOrderDetail msg : msgList) {
if (msg.getType() == MsgTypeOrderTypeEnum.fanli) {
--
Gitblit v1.8.0