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/ExtractAdminController.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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 d50eaee..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;
@@ -85,6 +87,9 @@
@Resource
private CommonOrderCountService commonOrderCountService;
+ @Resource
+ private UserInfoService userInfoService;
+
/**
* 鏂规硶璇存槑: 閫氳繃鎻愮幇璇锋眰 鍙痡sonP鏂瑰紡
*
@@ -94,7 +99,7 @@
* @param request
*/
@RequestMapping(value = "passExtractJP")
- public void passExtractJP(AdminAcceptData acceptData,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);
@@ -140,7 +145,7 @@
* @author mawurui createTime 2018骞�3鏈�14鏃� 涓嬪崍3:15:55
*/
@RequestMapping(value = "rejectExtractJP")
- public void rejectExtractJP(AdminAcceptData acceptData,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);
@@ -237,7 +242,7 @@
* @param out
*/
@RequestMapping(value = "getFinishRecordList")
- public void getFinishRecordList(AdminAcceptData acceptData,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 {
@@ -320,7 +325,7 @@
* @param request
*/
@RequestMapping(value = "getMyAuditedList")
- public void getMyAuditedList(AdminAcceptData acceptData,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 {
@@ -470,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);
@@ -491,7 +500,7 @@
* @param out
*/
@RequestMapping(value = "getMyAuditedCount")
- public void getMyAuditedCount(AdminAcceptData acceptData,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);
@@ -531,7 +540,7 @@
* @param out
*/
@RequestMapping(value = "getIaskInfo")
- public void getIaskInfo(AdminAcceptData acceptData,String callback, Long extractId, HttpServletRequest request, PrintWriter out) {
+ public void getIaskInfo(AdminAcceptData acceptData, String callback, Long extractId, HttpServletRequest request, PrintWriter out) {
try {
String surplusTime = "";
@@ -704,7 +713,7 @@
* @param out
*/
@RequestMapping(value = "getByUidList")
- public void getByUidList(AdminAcceptData acceptData,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) {
@@ -765,7 +774,7 @@
* @param out
*/
@RequestMapping(value = "countByUid")
- public void countByUid(AdminAcceptData acceptData,String callback, Long uid, HttpServletRequest request, PrintWriter out) {
+ public void countByUid(AdminAcceptData acceptData, String callback, Long uid, HttpServletRequest request, PrintWriter out) {
try {
@@ -805,7 +814,7 @@
* @param out
*/
@RequestMapping(value = "checkMoney")
- public void checkMoney(AdminAcceptData acceptData,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涓嶈兘涓虹┖"));
@@ -829,7 +838,7 @@
* @param out
*/
@RequestMapping(value = "downAutoExtractTxt")
- public void downAutoExtractTxt(AdminAcceptData acceptData,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) {
@@ -872,7 +881,7 @@
* @param out
*/
@RequestMapping(value = "uploadExcel", method = RequestMethod.POST)
- public void uploadExcel(AdminAcceptData acceptData,@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;
@@ -907,7 +916,7 @@
* @param out
*/
@RequestMapping(value = "preAutoUser")
- public void preAutoUser(AdminAcceptData acceptData,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