From d2357693d74ec048ed19e483ea29f87d823cde5f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 七月 2019 16:26:23 +0800
Subject: [PATCH] 资金明细添加京东，拼多多兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
index cf726e1..6137af1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
@@ -41,6 +41,7 @@
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
import com.yeshi.fanli.vo.user.UserInfoExtraVO;
@@ -134,7 +135,9 @@
type = null; // 鎵�鏈夌被鍨嬭鍗�
}
- if (goodsType != null && goodsType == 0) {
+ if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ } else if (goodsType != null && goodsType == 0){
goodsType = null; // 鎵�鏈夊钩鍙拌鍗�
}
@@ -636,7 +639,7 @@
try {
isS = orderService.addOrder(or);
if (isS) {
- CMQManager.getInstance().addTaoBaoOrderMsg(order, orderList);
+ CMQManager.getInstance().addTaoBaoOrderMsg(order);
// 鍔犲叆鍒癓ostOrder
LostOrder lo = new LostOrder();
lo.setCreateTime(System.currentTimeMillis());
--
Gitblit v1.8.0