From 81832f53a54e322910585717db9d37b74d855357 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 19 七月 2019 15:48:32 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java | 6 ++++--
1 files changed, 4 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 e13d1ac..9950a2f 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; // 鎵�鏈夊钩鍙拌鍗�
}
@@ -403,7 +406,6 @@
}
}
}
-
}
/* 鎬昏鍗曠粺璁� */
--
Gitblit v1.8.0