From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java | 113 ++++++++++++++++++--------------------------------------
1 files changed, 36 insertions(+), 77 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..3bb2a63 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;
@@ -130,11 +131,19 @@
state = null; // 娓呯┖
}
+ // 杞崲鐘舵��
+ if (state != null && state == 5) {
+ orderState = 2; // 宸茬淮鏉�
+ state = null; // 娓呯┖
+ }
+
if (type != null && type == 0) {
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; // 鎵�鏈夊钩鍙拌鍗�
}
@@ -281,8 +290,13 @@
JSONObject data = new JSONObject();
data.put("userInfo", userInfo);
+ Integer goodsType = null; // 鐗堟湰鍖哄垎
+ if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ }
+
/* 鎬昏鍗曠粺璁� */
- Map<String, BigDecimal> countOrder = commonOrderService.countHistoryOrder(uid, null, null);
+ Map<String, BigDecimal> countOrder = commonOrderService.countHistoryOrder(uid, null, goodsType);
int self = 0;
if (countOrder.get("totalSelf") != null) {
self = countOrder.get("totalSelf").intValue();
@@ -306,7 +320,7 @@
data.put("invite", invite);
/* 浠婃棩璁㈠崟缁熻 */
- Map<String, BigDecimal> countToday = commonOrderService.countHistoryOrder(uid, 1, null);
+ Map<String, BigDecimal> countToday = commonOrderService.countHistoryOrder(uid, 1, goodsType);
int todaySelf = 0;
if (countToday.get("totalSelf") != null) {
@@ -334,7 +348,7 @@
data.put("today", todaydata);
/* 鏄ㄦ棩璁㈠崟缁熻 */
- Map<String, BigDecimal> countYesterday = commonOrderService.countHistoryOrder(uid, 2, null);
+ Map<String, BigDecimal> countYesterday = commonOrderService.countHistoryOrder(uid, 2, goodsType);
int yesterdaySelf = 0;
if (countYesterday.get("totalSelf") != null) {
yesterdaySelf = countYesterday.get("totalSelf").intValue();
@@ -367,73 +381,13 @@
}
-
- @RequestMapping(value = "getTotalOrderNum")
- public void getTotalOrderNum(AcceptData acceptData, Long uid, PrintWriter out) {
- if (uid == null) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
- return;
- }
-
- UserInfo user = userInfoService.selectByPKey(uid);
- if (user == null) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛涓嶅瓨鍦�"));
- return;
- }
-
- UserInfo userInfo = UserUtil.filterForClientUser(user);
-
- // 1.5.0 鐗堟湰涔嬪悗杩斿洖鏂扮殑绛夌骇
- String version = acceptData.getVersion();
- if (version != null && version.trim().length() > 0) {
- int versionCode = Integer.parseInt(version);
- String platform = acceptData.getPlatform();
-
- AppVersionInfo versionInfo = appVersionService.getByPlatformAndVersion(platform, "1.5.0");
- if (versionInfo != null) {
- int versionCode150 = versionInfo.getVersionCode();
- if (versionCode >= versionCode150) {
- UserInfoExtraVO userInfoExtra = userInfoExtraService.getInfoExtraVOByUid(user.getId());
- if (userInfoExtra != null && userInfoExtra.getUserRank() != null) {
- String picture = userInfoExtra.getUserRank().getPicture();
- String icon = userInfoExtra.getUserRank().getIcon();
-
- userInfo.setRankIcon(icon);
- userInfo.setRankNamePicture(picture);
- }
- }
- }
- }
-
- /* 鎬昏鍗曠粺璁� */
- Map<String, BigDecimal> countOrder = commonOrderService.countHistoryOrder(uid, null, null);
- int self = 0; // 杩斿埄璁㈠崟
- if (countOrder.get("totalSelf") != null) {
- self = countOrder.get("totalSelf").intValue();
- }
-
- int shared = 0; // 鍒嗕韩璁㈠崟
- if (countOrder.get("totalShared") != null) {
- shared = countOrder.get("totalShared").intValue();
- }
-
- int invite = 0; // 閭�璇疯鍗�
- if (countOrder.get("totalInvite") != null) {
- invite = countOrder.get("totalInvite").intValue();
- }
- int total = self + shared + invite;
-
- JSONObject data = new JSONObject();
- data.put("total", total);
- data.put("self", self);
- data.put("shared", shared);
- data.put("invite", invite);
- data.put("userInfo", userInfo);
- out.print(JsonUtil.loadTrueResult(data));
- }
-
-
-
+ /**
+ * 缁熻鍚勪釜骞冲彴鏁版嵁
+ * @param acceptData
+ * @param uid
+ * @param goodsType
+ * @param out
+ */
@RequestMapping(value = "getNearOrderNum", method = RequestMethod.POST)
public void getNearOrderNum(AcceptData acceptData, Long uid, Integer goodsType, PrintWriter out) {
@@ -442,10 +396,10 @@
return;
}
- if (goodsType != null && goodsType == 0) {
- goodsType = null;
+ if (goodsType == null || goodsType > 3 || goodsType < 1) {
+ out.print(JsonUtil.loadFalseResult(1, "骞冲彴绫诲瀷缂哄け鎴栦笉姝ｇ‘"));
+ return;
}
-
/* 浠婃棩璁㈠崟缁熻 */
Map<String, BigDecimal> countToday = commonOrderService.countHistoryOrder(uid, 1, goodsType);
@@ -525,9 +479,14 @@
BigDecimal sharemoney = new BigDecimal(0.00);
Object inviteCount = 0;
BigDecimal inviteMoney = new BigDecimal(0.00);
+
+ Integer goodsType = null; // 鐗堟湰鍖哄垎
+ if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ }
Map<String, Object> shareMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, 2, dateType, null,
- null);
+ null, goodsType);
if (shareMap != null) {
Object totalNum = shareMap.get("totalNum");
if (totalNum != null) {
@@ -542,7 +501,7 @@
// 閭�璇风粺璁�
Map<String, Object> inviteMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, 3, dateType, null,
- null);
+ null, goodsType);
if (inviteMap != null) {
Object totalNum = inviteMap.get("totalNum");
if (totalNum != null) {
@@ -636,7 +595,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