generated from root/miduo_server
订单功能修改
parent
6a90300fe6
commit
5dbde85c79
|
@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.jmfy.WebSecurityConfig;
|
import com.jmfy.WebSecurityConfig;
|
||||||
import com.jmfy.dao.*;
|
import com.jmfy.dao.*;
|
||||||
|
import com.jmfy.handler.HeFuManager;
|
||||||
import com.jmfy.model.*;
|
import com.jmfy.model.*;
|
||||||
import com.jmfy.model.config.SRechargeCommodityConfig;
|
import com.jmfy.model.config.SRechargeCommodityConfig;
|
||||||
import com.jmfy.model.vo.OrderExcelVo;
|
import com.jmfy.model.vo.OrderExcelVo;
|
||||||
|
@ -12,6 +13,7 @@ import com.jmfy.utils.*;
|
||||||
import org.apache.poi.hssf.usermodel.*;
|
import org.apache.poi.hssf.usermodel.*;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.ui.ModelMap;
|
import org.springframework.ui.ModelMap;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
@ -37,18 +39,25 @@ import java.util.stream.Collectors;
|
||||||
*/
|
*/
|
||||||
@Controller
|
@Controller
|
||||||
public class OrderInfoController {
|
public class OrderInfoController {
|
||||||
@Resource
|
|
||||||
private UserInfoDao userInfoDao;
|
|
||||||
@Resource
|
|
||||||
private GSUserDao gsUserDao;
|
|
||||||
@Resource
|
@Resource
|
||||||
private ChannelInfoDao channelInfoDao;
|
private ChannelInfoDao channelInfoDao;
|
||||||
@Resource
|
@Resource
|
||||||
private CUserDao cUserDao;
|
private CUserDao cUserDao;
|
||||||
@Resource
|
|
||||||
private SeqUtils seqUtils;
|
private static UserInfoDao userInfoDao;
|
||||||
@Resource
|
private static GSUserDao gsUserDao;
|
||||||
private ServerInfoDao serverInfoDao;
|
private static SeqUtils seqUtils;
|
||||||
|
private static ServerInfoDao serverInfoDao;
|
||||||
|
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
public OrderInfoController(UserInfoDao userInfoDao, ServerInfoDao serverInfoDao, SeqUtils seqUtils, GSUserDao gsUserDao) {
|
||||||
|
OrderInfoController.userInfoDao = userInfoDao;
|
||||||
|
OrderInfoController.serverInfoDao = serverInfoDao;
|
||||||
|
OrderInfoController.seqUtils = seqUtils;
|
||||||
|
OrderInfoController.gsUserDao = gsUserDao;
|
||||||
|
}
|
||||||
|
|
||||||
private static final Logger LOGGER = LoggerFactory.getLogger(OrderInfoController.class);
|
private static final Logger LOGGER = LoggerFactory.getLogger(OrderInfoController.class);
|
||||||
|
|
||||||
|
@ -62,7 +71,7 @@ public class OrderInfoController {
|
||||||
|
|
||||||
@RequestMapping(value = "/exportExcelRequest", method = {RequestMethod.POST, RequestMethod.GET})
|
@RequestMapping(value = "/exportExcelRequest", method = {RequestMethod.POST, RequestMethod.GET})
|
||||||
public @ResponseBody
|
public @ResponseBody
|
||||||
int exportExcelRequest(HttpServletRequest request) throws Exception {
|
int exportExcelRequest(HttpServletRequest request) {
|
||||||
String name = request.getParameter("name");
|
String name = request.getParameter("name");
|
||||||
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
|
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
|
||||||
TaskKit.scheduleWithFixedOne(() -> {
|
TaskKit.scheduleWithFixedOne(() -> {
|
||||||
|
@ -70,8 +79,7 @@ public class OrderInfoController {
|
||||||
List<Corder> orders = findOrders(parameterMap);
|
List<Corder> orders = findOrders(parameterMap);
|
||||||
exportOrderExcel(name,orders);
|
exportOrderExcel(name,orders);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LoginController.addQueue("订单列表《"+name+"》导出报错2");
|
LOGGER.error("订单列表导出报错:{},error:{}",name,e.getMessage(),e);
|
||||||
e.printStackTrace();
|
|
||||||
}
|
}
|
||||||
},1);
|
},1);
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -86,7 +94,7 @@ public class OrderInfoController {
|
||||||
|
|
||||||
@RequestMapping(value = "/deleteExcel", method = {RequestMethod.POST, RequestMethod.GET})
|
@RequestMapping(value = "/deleteExcel", method = {RequestMethod.POST, RequestMethod.GET})
|
||||||
public @ResponseBody
|
public @ResponseBody
|
||||||
int deleteExcel(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
int deleteExcel(HttpServletRequest request) {
|
||||||
String path = request.getParameter("path");
|
String path = request.getParameter("path");
|
||||||
File file = new File(path);
|
File file = new File(path);
|
||||||
// 删除文件
|
// 删除文件
|
||||||
|
@ -99,13 +107,9 @@ public class OrderInfoController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取下载订单列表
|
* 获取下载订单列表
|
||||||
* @param request
|
|
||||||
* @param map
|
|
||||||
* @return
|
|
||||||
* @throws Exception
|
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/getOrderExcelList", method = {RequestMethod.POST, RequestMethod.GET})
|
@RequestMapping(value = "/getOrderExcelList", method = {RequestMethod.POST, RequestMethod.GET})
|
||||||
public String getOrderExcelList(HttpServletRequest request, ModelMap map) throws Exception {
|
public String getOrderExcelList(ModelMap map) {
|
||||||
ArrayList<OrderExcelVo> excelVos = new ArrayList<>();
|
ArrayList<OrderExcelVo> excelVos = new ArrayList<>();
|
||||||
getOrderExcelVoList(excelVos,getPath());
|
getOrderExcelVoList(excelVos,getPath());
|
||||||
map.put("excelVos",excelVos);
|
map.put("excelVos",excelVos);
|
||||||
|
@ -114,8 +118,6 @@ public class OrderInfoController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取下载订单列表
|
* 获取下载订单列表
|
||||||
* @param excelVos
|
|
||||||
* @param path
|
|
||||||
*/
|
*/
|
||||||
private void getOrderExcelVoList(List<OrderExcelVo> excelVos, String path){
|
private void getOrderExcelVoList(List<OrderExcelVo> excelVos, String path){
|
||||||
// 获取文件信息
|
// 获取文件信息
|
||||||
|
@ -175,8 +177,6 @@ public class OrderInfoController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询订单
|
* 查询订单
|
||||||
* @return
|
|
||||||
* @throws Exception
|
|
||||||
*/
|
*/
|
||||||
private List<Corder> findOrders(HashMap<String, String> parameterMap) throws Exception {
|
private List<Corder> findOrders(HashMap<String, String> parameterMap) throws Exception {
|
||||||
// 参数
|
// 参数
|
||||||
|
@ -210,8 +210,8 @@ public class OrderInfoController {
|
||||||
});
|
});
|
||||||
|
|
||||||
// 渠道信息
|
// 渠道信息
|
||||||
List<ChannelInfo> channelInfos = channelInfoDao.getChannelInfoList();
|
// List<ChannelInfo> channelInfos = channelInfoDao.getChannelInfoList();
|
||||||
Map<String, String> channelMap = channelInfos.stream().collect(Collectors.toMap(ChannelInfo::getId, ChannelInfo::getName, (key1, key2) -> key2));
|
// Map<String, String> channelMap = channelInfos.stream().collect(Collectors.toMap(ChannelInfo::getId, ChannelInfo::getName, (key1, key2) -> key2));
|
||||||
|
|
||||||
// 循环遍历
|
// 循环遍历
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
@ -223,10 +223,10 @@ public class OrderInfoController {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// 渠道id cc值验证
|
// 渠道id cc值验证
|
||||||
String ccId = Optional.ofNullable(cgPayOrder.getCc_id()).orElse("-1");
|
// String ccId = Optional.ofNullable(cgPayOrder.getCc_id()).orElse("-1");
|
||||||
if (!packId.equals("ALLORDER") && !ccId.equals(packId)){
|
// if (!packId.equals("ALLORDER") && !ccId.equals(packId)){
|
||||||
continue;
|
// continue;
|
||||||
}
|
// }
|
||||||
// 玩家账号id验证
|
// 玩家账号id验证
|
||||||
String accountid = cgPayOrder.getUserId();
|
String accountid = cgPayOrder.getUserId();
|
||||||
if (userInfo!=null &&!accountid.equals(userInfo.getId())){
|
if (userInfo!=null &&!accountid.equals(userInfo.getId())){
|
||||||
|
@ -259,7 +259,7 @@ public class OrderInfoController {
|
||||||
corder.setRegisterTime("");
|
corder.setRegisterTime("");
|
||||||
corder.setOpenId("");
|
corder.setOpenId("");
|
||||||
// 渠道id赋值
|
// 渠道id赋值
|
||||||
corder.setCc_id(channelMap.getOrDefault(ccId,ccId));
|
corder.setCc_id("");
|
||||||
|
|
||||||
// 获取订单配置
|
// 获取订单配置
|
||||||
SRechargeCommodityConfig config = SRechargeCommodityConfig.sdkRechargeCommodityConfigMap.get(cgPayOrder.getGoodsId());
|
SRechargeCommodityConfig config = SRechargeCommodityConfig.sdkRechargeCommodityConfigMap.get(cgPayOrder.getGoodsId());
|
||||||
|
@ -449,9 +449,8 @@ public class OrderInfoController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "toOrderPage",method = RequestMethod.GET)
|
@RequestMapping(value = "toOrderPage",method = RequestMethod.GET)
|
||||||
public String toOrderPage(ModelMap map,HttpSession session){
|
public String toOrderPage(ModelMap map,HttpSession session) throws Exception {
|
||||||
String account = (String) session.getAttribute(WebSecurityConfig.SESSION_KEY);
|
String account = (String) session.getAttribute(WebSecurityConfig.SESSION_KEY);
|
||||||
try {
|
|
||||||
List<ServerInfo> allServerInfo = serverInfoDao.getAllServerInfo();
|
List<ServerInfo> allServerInfo = serverInfoDao.getAllServerInfo();
|
||||||
map.addAttribute("serverInfo",allServerInfo);
|
map.addAttribute("serverInfo",allServerInfo);
|
||||||
|
|
||||||
|
@ -461,20 +460,12 @@ public class OrderInfoController {
|
||||||
CAdmin admin = cUserDao.findAdmin(account);
|
CAdmin admin = cUserDao.findAdmin(account);
|
||||||
List<ChannelInfo> infos = channelInfoDao.getChannelInfoListByIds(admin.getChannelPack());
|
List<ChannelInfo> infos = channelInfoDao.getChannelInfoListByIds(admin.getChannelPack());
|
||||||
map.addAttribute("channelPackInfo",infos);
|
map.addAttribute("channelPackInfo",infos);
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return "findOrder";
|
return "findOrder";
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "toExporOrderPage",method = RequestMethod.GET)
|
@RequestMapping(value = "toExporOrderPage",method = RequestMethod.GET)
|
||||||
public String toExporOrderPage(ModelMap map){
|
public String toExporOrderPage(ModelMap map) throws Exception {
|
||||||
List<gameName> allGameName = null;
|
List<gameName> allGameName = serverInfoDao.getAllGameInfo();;
|
||||||
try {
|
|
||||||
allGameName = serverInfoDao.getAllGameInfo();
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
map.addAttribute("allGameName",allGameName);
|
map.addAttribute("allGameName",allGameName);
|
||||||
return "exporOrder";
|
return "exporOrder";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue