From fe646416d8d46de7b896ddbf65a3ad0cd30b729b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 七月 2020 16:05:56 +0800
Subject: [PATCH] 大淘客与好单库与主包剥离
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 b0c2c8c..76c6795 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
@@ -109,7 +109,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();
@@ -204,11 +204,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) {
@@ -333,7 +333,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) {
@@ -400,7 +400,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);
@@ -418,7 +418,7 @@
@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) {
@@ -438,7 +438,7 @@
@RequestMapping(value = "countOrderInfo")
- public void countOrderInfo(String callback, Long uid, PrintWriter out) {
+ public void countOrderInfo(AdminAcceptData acceptData,String callback, Long uid, PrintWriter out) {
JSONObject data = new JSONObject();
/* --------- 鏈湀绱 ------------*/
--
Gitblit v1.8.0