From 251a533b9c12e7d423b31473721a59580cab5b58 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 25 七月 2020 13:07:13 +0800
Subject: [PATCH] 将商品服务剥离出主项目
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
index f78a52f..8d1f26f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -17,7 +17,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.entity.accept.AdminAcceptData;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -42,7 +44,6 @@
import com.yeshi.fanli.exception.NotExistObjectException;
import com.yeshi.fanli.exception.ObjectStateException;
import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.count.UserInfoCountService;
@@ -50,15 +51,11 @@
import com.yeshi.fanli.service.inter.money.extract.ExtractCountService;
import com.yeshi.fanli.service.inter.money.extract.ExtractService;
import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
-import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
-import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
-import com.yeshi.fanli.service.inter.push.PushRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
import net.sf.json.JSONObject;
@@ -90,6 +87,9 @@
@Resource
private CommonOrderCountService commonOrderCountService;
+ @Resource
+ private UserInfoService userInfoService;
+
/**
* 鏂规硶璇存槑: 閫氳繃鎻愮幇璇锋眰 鍙痡sonP鏂瑰紡
*
@@ -99,7 +99,7 @@
* @param request
*/
@RequestMapping(value = "passExtractJP")
- public void passExtractJP(String callback, Long id, String code, PrintWriter out, HttpServletRequest request) {
+ public void passExtractJP(AdminAcceptData acceptData, String callback, Long id, String code, PrintWriter out, HttpServletRequest request) {
/* 妫�楠屾槸鍚︾櫥闄� */
AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
@@ -145,7 +145,7 @@
* @author mawurui createTime 2018骞�3鏈�14鏃� 涓嬪崍3:15:55
*/
@RequestMapping(value = "rejectExtractJP")
- public void rejectExtractJP(String callback, Long id, String code, String reason, PrintWriter out,
+ public void rejectExtractJP(AdminAcceptData acceptData, String callback, Long id, String code, String reason, PrintWriter out,
HttpServletRequest request) {
/* 妫�楠屾槸鍚︾櫥闄� */
AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
@@ -242,7 +242,7 @@
* @param out
*/
@RequestMapping(value = "getFinishRecordList")
- public void getFinishRecordList(String callback, Integer pageIndex, String key, String startTime, String endTime,
+ public void getFinishRecordList(AdminAcceptData acceptData, String callback, Integer pageIndex, String key, String startTime, String endTime,
PrintWriter out) {
try {
@@ -325,7 +325,7 @@
* @param request
*/
@RequestMapping(value = "getMyAuditedList")
- public void getMyAuditedList(String callback, Integer pageIndex, String key, String timeSlot, Integer state,
+ public void getMyAuditedList(AdminAcceptData acceptData, String callback, Integer pageIndex, String key, String timeSlot, Integer state,
PrintWriter out, HttpServletRequest request) {
try {
@@ -475,6 +475,10 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇风櫥褰�"));
return;
}
+ SystemEnum system = userInfoService.getUserSystem(uid);
+ acceptData.setSystem(system);
+
+
// 鏌ヨ鍚屽簵閾哄晢鍝侊紝鍚屽晢鍝佽鍗曡秴杩囦竴瀹氭暟閲忕殑
List<Integer> typeList = new ArrayList<>();
typeList.add(HongBaoV2.TYPE_ZIGOU);
@@ -496,7 +500,7 @@
* @param out
*/
@RequestMapping(value = "getMyAuditedCount")
- public void getMyAuditedCount(String callback, HttpServletRequest request, PrintWriter out) {
+ public void getMyAuditedCount(AdminAcceptData acceptData, String callback, HttpServletRequest request, PrintWriter out) {
AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
@@ -536,7 +540,7 @@
* @param out
*/
@RequestMapping(value = "getIaskInfo")
- public void getIaskInfo(String callback, Long extractId, HttpServletRequest request, PrintWriter out) {
+ public void getIaskInfo(AdminAcceptData acceptData, String callback, Long extractId, HttpServletRequest request, PrintWriter out) {
try {
String surplusTime = "";
@@ -709,7 +713,7 @@
* @param out
*/
@RequestMapping(value = "getByUidList")
- public void getByUidList(String callback, Integer pageIndex, Long uid, HttpServletRequest request,
+ public void getByUidList(AdminAcceptData acceptData, String callback, Integer pageIndex, Long uid, HttpServletRequest request,
PrintWriter out) {
try {
if (uid == null) {
@@ -770,7 +774,7 @@
* @param out
*/
@RequestMapping(value = "countByUid")
- public void countByUid(String callback, Long uid, HttpServletRequest request, PrintWriter out) {
+ public void countByUid(AdminAcceptData acceptData, String callback, Long uid, HttpServletRequest request, PrintWriter out) {
try {
@@ -810,7 +814,7 @@
* @param out
*/
@RequestMapping(value = "checkMoney")
- public void checkMoney(String callback, String uid, PrintWriter out) {
+ public void checkMoney(AdminAcceptData acceptData, String callback, String uid, PrintWriter out) {
if (StringUtil.isNullOrEmpty(uid)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("UID涓嶈兘涓虹┖"));
@@ -834,7 +838,7 @@
* @param out
*/
@RequestMapping(value = "downAutoExtractTxt")
- public void downAutoExtractTxt(String callback, HttpServletResponse response, PrintWriter out) {
+ public void downAutoExtractTxt(AdminAcceptData acceptData, String callback, HttpServletResponse response, PrintWriter out) {
try {
List<String> list = extractService.getAutoExtractOpenIds();
if (list == null || list.size() <= 1) {
@@ -877,7 +881,7 @@
* @param out
*/
@RequestMapping(value = "uploadExcel", method = RequestMethod.POST)
- public void uploadExcel(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+ public void uploadExcel(AdminAcceptData acceptData, @RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
if (file == null) {
out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓嶈兘涓虹┖锛�"));
return;
@@ -912,7 +916,7 @@
* @param out
*/
@RequestMapping(value = "preAutoUser")
- public void preAutoUser(String callback, Integer pageIndex, PrintWriter out) {
+ public void preAutoUser(AdminAcceptData acceptData, String callback, Integer pageIndex, PrintWriter out) {
try {
List<UserInfo> list = extractService.preAutoUser();
if (list == null || list.isEmpty()) {
--
Gitblit v1.8.0