From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 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 c963bf9..b0c2c8c 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,6 +10,7 @@
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;
@@ -59,8 +60,6 @@
@RequestMapping("admin/new/api/v1/order")
public class OrderAdminController {
- @Resource
- private OrderService orderService;
@Resource
private HongBaoV2CountService hongBaoV2CountService;
@@ -71,8 +70,6 @@
@Resource
private CommonOrderService commonOrderService;
- @Resource
- private TaoBaoOrderService taoBaoOrderService;
@Resource
private TaoBaoOrderCountService taoBaoOrderCountService;
@@ -94,9 +91,6 @@
@Resource
private UserMoneyDebtService userMoneyDebtService;
-
- @Resource
- private UserSystemCouponRecordService userSystemCouponRecordService;
@Resource
private ConfigService configService;
@@ -145,19 +139,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;
@@ -192,14 +184,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;
--
Gitblit v1.8.0