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 | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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..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
@@ -43,12 +43,9 @@
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;
@@ -109,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();
@@ -204,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) {
@@ -333,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) {
@@ -400,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);
@@ -418,7 +415,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 +435,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