From 972d3bc71115ec977dccf835fbcd148da3bcc86c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 03 九月 2019 16:41:49 +0800
Subject: [PATCH] 统计可用的免单券数量-countUsableFreeCouponForBuy
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 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 7d76c49..b1b4406 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
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
@@ -108,14 +109,24 @@
* @param out
*/
@RequestMapping(value = "getorder", method = RequestMethod.POST)
- public void getOrder(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type, Integer orderState,
- String orderNo, String startTime, String endTime, Integer slotTime, boolean needCount, Integer dateType,
- Integer goodsType, PrintWriter out) {
-
+ public void getOrder(AcceptData acceptData, Integer page, Long uid, Integer state,
+ @RequestParam(name = "type",required = false) String type1, Integer orderState, String orderNo, String startTime, String endTime,
+ Integer slotTime, Boolean needCount, Integer dateType, Integer goodsType, PrintWriter out) {
+ Integer type = null;
+
+ if (StringUtil.isNullOrEmpty(type1)) {
+ type = null;
+ } else {
+ type = Integer.parseInt(type1);
+ }
+
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
+
+ if (needCount == null)
+ needCount = false;
if (page == null || page < 1) {
page = 1;
@@ -131,6 +142,12 @@
state = null; // 娓呯┖
}
+ // 杞崲鐘舵��
+ if (state != null && state == 5) {
+ orderState = 2; // 宸茬淮鏉�
+ state = null; // 娓呯┖
+ }
+
if (type != null && type == 0) {
type = null; // 鎵�鏈夌被鍨嬭鍗�
}
@@ -284,8 +301,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();
@@ -309,7 +331,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) {
@@ -337,7 +359,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();
@@ -468,9 +490,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) {
@@ -485,7 +512,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) {
--
Gitblit v1.8.0