Skip to content

G
gdtel-gztel-school-center
Commit 89267374 by 陈浩建
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	apply-net/src/main/java/com/winsun/controller/DankuanController.java
parents 659a9a8c bb7a69bd
Showing with 48 additions and 28 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
......@@ -186,6 +186,7 @@ public class DankuanController {
return ResponseData.error("网络超时，请重试!");
}
if (insert == 1) {
orderV.setOrderId(orderView.getOrderId());
orderV.setOrderSeq(orderView.getOrderSeq());
orderV.setWebOrderAmount(webOrderAmount);
return ResponseData.success(orderV, "订单提交完成！");
......@@ -212,6 +213,8 @@ public class DankuanController {
String uuid = UUID.randomUUID().toString();
String id = uuid.split("-")[0] + uuid.split("-")[1];
order.setId(id);
order.setId(id);
SimpleDateFormat sd = new SimpleDateFormat("yyyyMMdd");
SimpleDateFormat sd2 = new SimpleDateFormat("yyyyMM");
String orderNumber = "YRYM" + sd.format(new Date()) + id.substring(1, 12);
......@@ -412,7 +415,7 @@ public class DankuanController {
/**
* 支付接口
*
* @param orderSeq
* @param orderId
* @param ipay
* @param userId
* @param request
......@@ -421,19 +424,19 @@ public class DankuanController {
* @throws Exception
*/
@PostMapping(value = "orderPay")
public ResponseData<Object> toPaymentPlatformPage(@RequestParam("orderSeq") String orderSeq, @RequestParam("ipay") String ipay, @RequestParam("userId") String userId, HttpServletRequest request, HttpServletResponse response){
public ResponseData<Object> toPaymentPlatformPage(@RequestParam("orderId") String orderId, @RequestParam("ipay") String ipay, @RequestParam("userId") String userId, HttpServletRequest request, HttpServletResponse response) throws Exception {
String uuid = UUID.randomUUID().toString();
try {
boolean boo1 = redisLockUtil.redisLock(orderSeq,uuid,10);
boolean boo1 = redisLockUtil.redisLock(orderId,uuid,10);
if(!boo1){
return ResponseData.error("已在支付中");
}
String result = JsoupMethodZhifu(orderSeq, ipay, userId, request, response);
String result = JsoupMethodZhifu(orderId, ipay, userId, request, response);
return ResponseData.success(result);
}catch (Exception e){
e.getMessage();
}finally {
redisLockUtil.deleteLock(orderSeq);
redisLockUtil.deleteLock(orderId);
}
return ResponseData.error("订单异常");
}
......@@ -442,18 +445,17 @@ public class DankuanController {
* @author ljh
* @Description:支付请求
*/
public String JsoupMethodZhifu(String orderSeq, String ipay, String userId,
public String JsoupMethodZhifu(String orderId, String ipay, String userId,
HttpServletRequest request, HttpServletResponse response) throws Exception {
log.info("----------首先发送支付请求接口----------");
//查询订单信息
Order order = orderMapper.selectById(orderId);
OrderView orderView = orderViewMapper.selectById(order.getKdOrderId());
String uuid = UUID.randomUUID().toString();
String id = uuid.split("-")[0] + uuid.split("-")[1];
//修改支付方式
Wrapper<OrderView> wrapper = new EntityWrapper<>();
wrapper.eq("orderSeq", orderSeq);
//查询订单信息
OrderView orderView = orderViewMapper.selectList(wrapper).get(0);
wrapper.eq("order_id", orderId);
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("ipay", ipay);
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
......@@ -466,13 +466,16 @@ public class RongHeController {
//支付成功回调的页面
/* String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/
/* String MERCHANTURL = "http://167460x6b0.51mypc.cn/ciop/rongHe/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/
String MERCHANTURL = "http://chengfengluo.ngrok2.xiaomiqiu.cn/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id;
// 正式地址
String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id;
// String MERCHANTURL = "http://chengfengluo.ngrok2.xiaomiqiu.cn/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id;
map.put("MERCHANTURL", MERCHANTURL);
// }
// 融合回调后端接口地址
// map.put("BACKDROPURL", Constant.TOMCATURL + "/rongHe/toSubmisOrderPreser");
// map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/rongHe/toSubmisOrderPreser");
map.put("BACKDROPURL", "http://chengfengluo.ngrok2.xiaomiqiu.cn/ciop/rongHe/toSubmisOrderPreser");
//正式地址
map.put("BACKDROPURL", "https://dx.dianyuanjiangli.com/apply-net/ciop/rongHe/toSubmisOrderPreser");
String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.APPK;//商户标识
//* 将值转换为大写 *//*
......
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
......@@ -353,13 +353,13 @@ public class IntelligenceSendOrder {
int count)
throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(50000)
.setConnectTimeout(50000)
.setConnectionRequestTimeout(50000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......@@ -796,7 +796,7 @@ public class IntelligenceSendOrder {
throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String, String> signMap = new HashMap<String, String>(); // 待签名参数
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(500000)
......@@ -1041,13 +1041,13 @@ public class IntelligenceSendOrder {
}
}
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(500000)
.setConnectTimeout(500000)
.setConnectionRequestTimeout(500000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......@@ -1572,13 +1572,13 @@ public class IntelligenceSendOrder {
}
// 3、提交订单到智能平台
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(500000)
.setConnectTimeout(500000)
.setConnectionRequestTimeout(500000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......
migration/src/main/java/com/winsun/migration/service/impl/MigrationServiceImpl.java
......@@ -183,7 +183,8 @@ public class MigrationServiceImpl implements IMigrationService {
this.insertYRYMUser();
this.migrationSchoolPackage();
// 此为新增（只要运行一次）
// this.migrationSchoolPackage();
}
/**
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
......@@ -399,11 +399,13 @@ public class OrderController extends BaseController {
Map<String,Object> map = new HashMap<>();
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）"))) {
map.put("error","无数据权限");
return map;
}
// 添加权限
Wrapper<Order> wrapper = new EntityWrapper();
wrapper.isNull("kd_order_id");
wrapper.notIn("user_type",3,5,9,10);
......@@ -447,6 +449,11 @@ public class OrderController extends BaseController {
@Permission(menuname = "查询订单信息", value = "broadBandOrder", method = RequestMethod.POST)
public ResponseData<Page<BroadBandOrder>> getBroadBandOrder(BroadBandOrder broadBandOrder) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）", "修改身份证"))) {
ResponseData.error("无权限查询订单");
}
Page<BroadBandOrder> page = new Page<>(broadBandOrder.getPageNo(), broadBandOrder.getPageSize());
broadBandOrder.setPageStart((broadBandOrder.getPageNo() - 1) * broadBandOrder.getPageSize());
List<BroadBandOrder> broadBandOrders = orderMapper.selectBroadBandOrderList(page, broadBandOrder);
......
service-manager/src/main/java/com/winsun/controller/OrderViewController.java
......@@ -62,7 +62,7 @@ public class OrderViewController extends BaseController {
@RequestParam("status") String status, @RequestParam("ordername") String ordername,
@RequestParam(name = "pageNo") int pageIndex, @RequestParam(name = "pageSize") int pageSize) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员","县分管理员（订单）", "修改身份证"))) {
return ResponseData.error("无数据权限");
}
String dateFormat = "YYYY-MM-DD";
......
service-manager/src/main/java/com/winsun/controller/PackageController.java
......@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.plugins.Page;
import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.bean.Package;
import com.winsun.bean.SchoolPackage;
import com.winsun.constant.FilePath;
......@@ -168,6 +169,12 @@ public class PackageController extends BaseController {
@RequestParam("voice") String voice,
@RequestParam(name = "pageNo", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员"))) {
return ResponseData.error("无数据权限");
}
Wrapper<Package> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(name), "package_name", name, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(monthFee), "month_fee", monthFee, SqlLike.DEFAULT);
......
service-manager/src/main/java/com/winsun/controller/ProductController.java
......@@ -130,7 +130,7 @@ public class ProductController extends BaseController {
public ResponseData<Map<String,Object>> listProduct(@RequestParam(name = "productUniversity", required = false) String productUniversity, @RequestParam(name = "productRegion", required = false) String productRegion,
@RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员"))) {
return ResponseData.error("无数据权限");
}
Wrapper<Product> wrapper = new EntityWrapper();
......
service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java
......@@ -181,7 +181,7 @@ public class SchoolManagementController extends BaseController {
@RequestParam(name = "pageSize", required = false) int pageSize,
@RequestParam("networkName") String networkName) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员"))) {
return ResponseData.error("无数据权限");
}
Wrapper<School> wrapper = new EntityWrapper();
......
service-manager/src/main/java/com/winsun/controller/StudentCardVerifyController.java
......@@ -172,7 +172,7 @@ public class StudentCardVerifyController extends BaseController {
@Permission(menuname = "修改学生不限量证件信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updateProduct(@RequestParam("ids") String ids,@RequestParam("state") Integer state) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "业务稽核","稽核员"))) {
return ResponseData.error("无数据权限");
}
List<String> list1 = Arrays.asList(ids.split(",")); //[a, b, c]
......
service-manager/src/main/java/com/winsun/controller/UniversityInfoController.java
......@@ -131,7 +131,7 @@ public class UniversityInfoController extends BaseController {
public ResponseData<Page<UniversityInfo>> listUniversityInfo(@RequestParam("universityName") String universityName, @RequestParam("universityRegion") String universityRegion,
@RequestParam(name = "pageNo") int pageIndex, @RequestParam(name = "pageSize") int pageSize) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员"))) {
return ResponseData.error("无数据权限");
}
Wrapper<UniversityInfo> wrapper = new EntityWrapper();
......
task/src/main/java/com/winsun/TimingTask/RhZhiNenTask.java
......@@ -58,7 +58,7 @@ public class RhZhiNenTask {
* 下发智能平台订单
*
*/
@Scheduled(cron = "0 0/5 0 * * ? ")
@Scheduled(cron = "0 0/6 * * * ? ")
// @Scheduled(fixedRate=2800000)
public void sendZhiNengOrder() {
log.info("智能平台定时器下单启动");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment