|
@@ -113,68 +113,68 @@ public class PayController extends HttpServlet {
|
|
@PostMapping("/aliReturnCall")
|
|
@PostMapping("/aliReturnCall")
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public String aliReturnCall(HttpServletRequest request) throws Exception {
|
|
public String aliReturnCall(HttpServletRequest request) throws Exception {
|
|
- Map<String, String> params = new HashMap<>();
|
|
|
|
- Map<String, String[]> requestParams = request.getParameterMap();
|
|
|
|
- for (String name : requestParams.keySet()) {
|
|
|
|
- String[] values = requestParams.get(name);
|
|
|
|
- String valueStr = String.join(",", values);
|
|
|
|
- params.put(name, valueStr);
|
|
|
|
- }
|
|
|
|
- if (aliPayService.checkReturnParam(params)) {
|
|
|
|
- String passbackParams = URLDecoder.decode(params.get("passback_params"), "UTF-8");
|
|
|
|
- if ("company".equals(passbackParams)) {
|
|
|
|
- CompanyErp company = companyManager.getById(params.get("out_trade_no"));
|
|
|
|
- //如果结束时间大于当前时间,那么就从现在加起
|
|
|
|
- Date currentDate = company.getEndUseTime();
|
|
|
|
- if (new Date().compareTo(company.getEndUseTime()) > 0) {
|
|
|
|
- currentDate = new Date();
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- // 使用 加上套餐包的天数
|
|
|
|
- Calendar calendar = Calendar.getInstance();
|
|
|
|
- calendar.setTime(currentDate);
|
|
|
|
- calendar.add(Calendar.DAY_OF_MONTH, company.getThisDay());
|
|
|
|
-
|
|
|
|
- company.setEndUseTime(calendar.getTime());
|
|
|
|
- company.setMoney(company.getMoney().add(company.getThisMoney()));
|
|
|
|
- company.setRoleId(company.getThisRoleId());
|
|
|
|
- company.setUserNum(company.getThisUserNum());
|
|
|
|
- company.setCompanyPackageId(company.getThisCompanyPackageId());
|
|
|
|
-
|
|
|
|
- company.setThisDay(0);
|
|
|
|
- company.setThisCompanyPackageId(0L);
|
|
|
|
- company.setThisMoney(new BigDecimal(0));
|
|
|
|
- company.setThisRoleId(0L);
|
|
|
|
- company.setThisUserNum(0);
|
|
|
|
-
|
|
|
|
- companyManager.updateById(company);
|
|
|
|
-// // 不管换没换套餐 把新的套餐权限赋值到公司的admin账号上
|
|
|
|
- AdminUser user = adminUserMapper.selectOne(new LambdaQueryWrapper<AdminUser>()
|
|
|
|
- .eq(AdminUser::getCompanyId, company.getId())
|
|
|
|
- .eq(AdminUser::getUsername, "admin").last("limit 1"));
|
|
|
|
- //把这个管理员能看到的所有页面保存起来
|
|
|
|
- RoleDO roleDO = roleMapper.selectById(company.getThisRoleId());
|
|
|
|
- List<Menus> menusList = JsonUtil.jsonToList(roleDO.getAuthIds(), Menus.class);
|
|
|
|
- List<Menus> list = new ArrayList<>();
|
|
|
|
- assert menusList != null;
|
|
|
|
- for (Menus menu : menusList) {
|
|
|
|
- if (CollUtil.isNotEmpty(menu.getChildren())) {
|
|
|
|
- list.add(menu);
|
|
|
|
- getMenus(list, menu);
|
|
|
|
- } else {
|
|
|
|
- list.add(menu);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- //这个角色所有已勾选的菜单
|
|
|
|
- Set<Menus> collect = list.stream().filter(Menus::isChecked).collect(Collectors.toSet());
|
|
|
|
- for (Menus menus1 : collect) {
|
|
|
|
- menus1.setChildren(collect.stream().filter(item -> item.getParentId().equals(menus1.getId())).collect(Collectors.toList()));
|
|
|
|
- }
|
|
|
|
- List<Menus> collect2 = collect.stream().filter(item -> item.getParentId() == 0).collect(Collectors.toList());
|
|
|
|
- user.setAuthIds(JSON.toJSONString(collect2));
|
|
|
|
- adminUserMapper.updateById(user);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+// Map<String, String> params = new HashMap<>();
|
|
|
|
+// Map<String, String[]> requestParams = request.getParameterMap();
|
|
|
|
+// for (String name : requestParams.keySet()) {
|
|
|
|
+// String[] values = requestParams.get(name);
|
|
|
|
+// String valueStr = String.join(",", values);
|
|
|
|
+// params.put(name, valueStr);
|
|
|
|
+// }
|
|
|
|
+// if (aliPayService.checkReturnParam(params)) {
|
|
|
|
+// String passbackParams = URLDecoder.decode(params.get("passback_params"), "UTF-8");
|
|
|
|
+// if ("company".equals(passbackParams)) {
|
|
|
|
+// CompanyErp company = companyManager.getById(params.get("out_trade_no"));
|
|
|
|
+// //如果结束时间大于当前时间,那么就从现在加起
|
|
|
|
+// Date currentDate = company.getEndUseTime();
|
|
|
|
+// if (new Date().compareTo(company.getEndUseTime()) > 0) {
|
|
|
|
+// currentDate = new Date();
|
|
|
|
+//
|
|
|
|
+// }
|
|
|
|
+// // 使用 加上套餐包的天数
|
|
|
|
+// Calendar calendar = Calendar.getInstance();
|
|
|
|
+// calendar.setTime(currentDate);
|
|
|
|
+// calendar.add(Calendar.DAY_OF_MONTH, company.getThisDay());
|
|
|
|
+//
|
|
|
|
+// company.setEndUseTime(calendar.getTime());
|
|
|
|
+// company.setMoney(company.getMoney().add(company.getThisMoney()));
|
|
|
|
+// company.setRoleId(company.getThisRoleId());
|
|
|
|
+// company.setUserNum(company.getThisUserNum());
|
|
|
|
+// company.setCompanyPackageId(company.getThisCompanyPackageId());
|
|
|
|
+//
|
|
|
|
+// company.setThisDay(0);
|
|
|
|
+// company.setThisCompanyPackageId(0L);
|
|
|
|
+// company.setThisMoney(new BigDecimal(0));
|
|
|
|
+// company.setThisRoleId(0L);
|
|
|
|
+// company.setThisUserNum(0);
|
|
|
|
+//
|
|
|
|
+// companyManager.updateById(company);
|
|
|
|
+//// // 不管换没换套餐 把新的套餐权限赋值到公司的admin账号上
|
|
|
|
+// AdminUser user = adminUserMapper.selectOne(new LambdaQueryWrapper<AdminUser>()
|
|
|
|
+// .eq(AdminUser::getCompanyId, company.getId())
|
|
|
|
+// .eq(AdminUser::getUsername, "admin").last("limit 1"));
|
|
|
|
+// //把这个管理员能看到的所有页面保存起来
|
|
|
|
+// RoleDO roleDO = roleMapper.selectById(company.getThisRoleId());
|
|
|
|
+// List<Menus> menusList = JsonUtil.jsonToList(roleDO.getAuthIds(), Menus.class);
|
|
|
|
+// List<Menus> list = new ArrayList<>();
|
|
|
|
+// assert menusList != null;
|
|
|
|
+// for (Menus menu : menusList) {
|
|
|
|
+// if (CollUtil.isNotEmpty(menu.getChildren())) {
|
|
|
|
+// list.add(menu);
|
|
|
|
+// getMenus(list, menu);
|
|
|
|
+// } else {
|
|
|
|
+// list.add(menu);
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// //这个角色所有已勾选的菜单
|
|
|
|
+// Set<Menus> collect = list.stream().filter(Menus::isChecked).collect(Collectors.toSet());
|
|
|
|
+// for (Menus menus1 : collect) {
|
|
|
|
+// menus1.setChildren(collect.stream().filter(item -> item.getParentId().equals(menus1.getId())).collect(Collectors.toList()));
|
|
|
|
+// }
|
|
|
|
+// List<Menus> collect2 = collect.stream().filter(item -> item.getParentId() == 0).collect(Collectors.toList());
|
|
|
|
+// user.setAuthIds(JSON.toJSONString(collect2));
|
|
|
|
+// adminUserMapper.updateById(user);
|
|
|
|
+// }
|
|
|
|
+// }
|
|
return "success";
|
|
return "success";
|
|
}
|
|
}
|
|
|
|
|