From 73a3d86a47d8da711b609cd224c63526f7d00f9b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 七月 2020 12:49:06 +0800
Subject: [PATCH] 比价相关的bug修复
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 101 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 68 insertions(+), 33 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
index 1d2a83c..9a80ead 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
@@ -10,15 +10,13 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.yeshi.utils.JsonUtil;
-import com.google.gson.Gson;
-import com.yeshi.fanli.controller.admin.utils.AdminUtils;
-import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.dto.common.CategoryInfoDTO;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.goods.CommonGoods;
@@ -45,26 +43,20 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
-import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.order.UserOrderWeiQuanRecordService;
-import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
-import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
-import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/order")
public class OrderAdminController {
- @Resource
- private OrderService orderService;
@Resource
private HongBaoV2CountService hongBaoV2CountService;
@@ -75,8 +67,6 @@
@Resource
private CommonOrderService commonOrderService;
- @Resource
- private TaoBaoOrderService taoBaoOrderService;
@Resource
private TaoBaoOrderCountService taoBaoOrderCountService;
@@ -100,9 +90,6 @@
private UserMoneyDebtService userMoneyDebtService;
@Resource
- private UserSystemCouponRecordService userSystemCouponRecordService;
-
- @Resource
private ConfigService configService;
@Resource
@@ -119,7 +106,7 @@
* @param out
*/
@RequestMapping(value = "countTaoBaoOrder")
- public void countTaoBaoOrder(String callback, HttpServletRequest request, PrintWriter out) {
+ public void countTaoBaoOrder(AdminAcceptData acceptData,String callback, HttpServletRequest request, PrintWriter out) {
try {
Map<String, Object> countByOdrerType = taoBaoOrderCountService.countByOdrerType();
@@ -149,19 +136,17 @@
* @param callback
* @param pageIndex
* @param pageSize
- * @param uid
* @param state
* @param type
* @param orderState
- * @param orderNo
* @param startTime
* @param endTime
* @param out
*/
@RequestMapping(value = "getUserOrderList")
- public void getUserOrderList(String callback, Integer pageIndex, Integer pageSize, Integer keyType, String key,
- Integer state, Integer type, Integer orderState, String startTime, String endTime, Integer sourceType,
- Integer riskType, BigDecimal payment, PrintWriter out) {
+ public void getUserOrderList(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, Integer keyType, String key,
+ Integer state, Integer type, Integer orderState, String startTime, String endTime, Integer sourceType,
+ Integer riskType, BigDecimal payment, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -196,14 +181,14 @@
if (riskType == 1) {
listGoodsId = commonOrderCountService.getSameGoodsOrderByUidAndHongBaoType(typeList, uid,
- Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameGoodsOrderCount.getKey())));
+ Integer.parseInt(configService.getValue(ConfigKeyEnum.adminMinSameGoodsOrderCount.getKey(),acceptData.getSystem())));
if (listGoodsId == null || listGoodsId.isEmpty()) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鍚屽晢鍝佽鍗�"));
return;
}
} else if (riskType == 2) {
listShopId = commonOrderCountService.getSameShopOrderByUidAndHongBaoType(typeList, uid,
- Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameShopOrderCount.getKey())));
+ Integer.parseInt(configService.getValue(ConfigKeyEnum.adminMinSameShopOrderCount.getKey(),acceptData.getSystem())));
if (listShopId == null || listShopId.isEmpty()) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鍚屽簵閾鸿鍗�"));
return;
@@ -216,11 +201,11 @@
// 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, keyType, key,
- state, type, orderState, startTime, endTime, sourceType, listShopId, listGoodsId, minTime, money, payment);
+ state, type, orderState, startTime, endTime, sourceType, listShopId, listGoodsId, minTime, money, payment,acceptData.getSystem());
// 缁熻鎬绘暟
long count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime,
- sourceType, listShopId, listGoodsId, minTime, money, payment);
+ sourceType, listShopId, listGoodsId, minTime, money, payment,acceptData.getSystem());
for (CommonOrderVO order : list) {
@@ -345,7 +330,7 @@
* @param out
*/
@RequestMapping(value = "getHistoryOrder")
- public void getHistoryOrder(String callback, Integer pageIndex, Integer pageSize, Long uid, Integer state,
+ public void getHistoryOrder(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, Long uid, Integer state,
Integer type, Integer orderState, String orderNo, String startTime, String endTime, PrintWriter out) {
if (uid == null) {
@@ -412,7 +397,7 @@
* @param out
*/
@RequestMapping(value = "getHistoryUnreceived")
- public void getHistoryUnreceived(String callback, Integer type, PrintWriter out) {
+ public void getHistoryUnreceived(AdminAcceptData acceptData,String callback, Integer type, PrintWriter out) {
try {
Long total = commonOrderCountService.countByState(1);
@@ -427,14 +412,10 @@
e.printStackTrace();
}
}
-
-
-
-
@RequestMapping(value = "uploadTaoBaoWeiQuanOrder")
- public void uploadWeiQuanOrder(String callback, HttpServletRequest request, PrintWriter out) {
+ public void uploadWeiQuanOrder(AdminAcceptData acceptData,String callback, HttpServletRequest request, PrintWriter out) {
try {
// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
if (request instanceof MultipartHttpServletRequest) {
@@ -452,6 +433,60 @@
}
}
-
+
+ @RequestMapping(value = "countOrderInfo")
+ public void countOrderInfo(AdminAcceptData acceptData,String callback, Long uid, PrintWriter out) {
+ JSONObject data = new JSONObject();
+
+ /* --------- 鏈湀绱 ------------*/
+ JSONObject month = new JSONObject();
+ // 鑷喘宸插埌璐�
+ month.put("selfNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 1, 1));
+ // 鍒嗕韩宸插埌璐�
+ month.put("shareNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 2, 1));
+ // 閭�璇峰凡鍒拌处
+ month.put("inviteNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 3, 1));
+ // 鑷喘鏈埌璐�
+ month.put("selfNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 1, 1));
+ // 鍒嗕韩鏈埌璐�
+ month.put("shareNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 2, 1));
+ // 閭�璇锋湭鍒拌处
+ month.put("inviteNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 3, 1));
+ data.put("month", month);
+
+
+ /* --------- 鍘嗗彶绱 ------------*/
+ JSONObject history = new JSONObject();
+ // 鑷喘宸插埌璐�
+ history.put("selfNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 1, null));
+ // 鍒嗕韩宸插埌璐�
+ history.put("shareNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 2, null));
+ // 閭�璇峰凡鍒拌处
+ history.put("inviteNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 3, null));
+ // 鑷喘鏈埌璐�
+ history.put("selfNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 1, null));
+ // 鍒嗕韩鏈埌璐�
+ history.put("shareNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 2, null));
+ // 閭�璇锋湭鍒拌处
+ history.put("inviteNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 3, null));
+ data.put("history", history);
+
+
+ /* --------- 浠樻閲戦澶т簬1 ------------*/
+ // 鑷喘宸插埌璐�
+ long selfAccountEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 1);
+ // 鍒嗕韩宸插埌璐�
+ long shareAccountEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 2);
+ // 鑷喘鏈埌璐�
+ long selfAccount = hongBaoV2CountService.countOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 1, null);
+ // 鍒嗕韩鏈埌璐�
+ long shareAccount = hongBaoV2CountService.countOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 2, null);
+ data.put("selfAccountEnd", selfAccountEnd);
+ data.put("shareAccountEnd", shareAccountEnd);
+ data.put("selfAccount", selfAccount);
+ data.put("shareAccount", shareAccount);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ }
+
}
--
Gitblit v1.8.0