Merge remote-tracking branch 'origin/master'

apply-net/src/main/java/com/winsun/controller/DankuanController.java

@@ -503,7 +503,7 @@ public class DankuanController {
         /**
          * 测试后提交代码要恢复正式环境地址
          */
-        String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/dkSuccessful?id="+userId;
+        String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/kdyToSuccessPage?id="+userId + "&kdId=" + orderSeq;
         map.put("MERCHANTURL", MERCHANTURL);
         //单宽回调后端接口地址
         // 正式环境

apply-net/src/main/java/com/winsun/controller/RongHeController.java

@@ -477,7 +477,7 @@ public class RongHeController {
             /**
              * 测试后提交代码要恢复正式环境地址
              */
-            String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/dkSuccessful?id="+userId;
+            String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/kdyToSuccessPage?id="+userId + "&kdId=" + orderSeq;
             map.put("MERCHANTURL", MERCHANTURL);
             // 融合回调后端接口地址
             //正式地址

service-manager/src/main/java/com/winsun/controller/OrderController.java

@@ -400,7 +400,7 @@ 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;
         }
@@ -476,7 +476,7 @@ public class OrderController extends BaseController {
                                           @RequestParam(value = "site",required = false) String site, @RequestParam(value = "remarks",required = false) String remarks,@RequestParam(value = "orderStatus",required = false) String order_status) {
         ShiroUser user = getShiroUser();
 
-        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）", "修改身份证"))) {
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员","系统管理员", "县分管理员（订单）", "修改身份证"))) {
             ResponseData.error("无权限修改订单");
         }