更新手机端预制卡业务填写ICCID后下单地址

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

@@ -198,6 +198,7 @@ public class SingleBroadToIntegrateController {
                                                        @RequestParam("rhTime") String rhTime,
                                                        @RequestParam("rhTime") String rhTime,
                                                        @RequestParam("hehuorenId") String hehuorenId,
                                                        @RequestParam("hehuorenId") String hehuorenId,
                                                        @RequestParam("imgUrl") String imgUrl,
                                                        @RequestParam("imgUrl") String imgUrl,
+                                                       @RequestParam("customerStudentId") String customerStudentId,
                                                        @RequestParam(value = "sell",required = false) String sell) {
                                                        @RequestParam(value = "sell",required = false) String sell) {
         ToIntegrateOrderParam toIntegrateOrderParam = new ToIntegrateOrderParam();
         ToIntegrateOrderParam toIntegrateOrderParam = new ToIntegrateOrderParam();
         toIntegrateOrderParam.setName(name);
         toIntegrateOrderParam.setName(name);
@@ -264,7 +265,9 @@ public class SingleBroadToIntegrateController {
         orderView.setProductName(product.getProductTitle()); // 产品名称
         orderView.setProductName(product.getProductTitle()); // 产品名称
         orderView.setOrderSetMeal(universityInfo.getExpenses()); // 套餐
         orderView.setOrderSetMeal(universityInfo.getExpenses()); // 套餐
         orderView.setOrderUniversityName(universityInfo.getUniversityName()); // 学校
         orderView.setOrderUniversityName(universityInfo.getUniversityName()); // 学校
+        orderView.setOrderCustomerStudentId(customerStudentId);
         orderView.setOrderName(toIntegrateOrderParam.getName()); // 姓名
         orderView.setOrderName(toIntegrateOrderParam.getName()); // 姓名
+        orderView.setHehuorenId(toIntegrateOrderParam.getHehuorenId()); // 合伙人ID
         orderView.setOrderDate(new Date()); // 提交时间
         orderView.setOrderDate(new Date()); // 提交时间
         orderView.setStatus(OrderStatus.PENDINGSUBMISSION.getId()); // 订单状态(待提交)
         orderView.setStatus(OrderStatus.PENDINGSUBMISSION.getId()); // 订单状态(待提交)
         orderView.setOrderRegion(universityInfo.getUniversityRegion()); // 区域
         orderView.setOrderRegion(universityInfo.getUniversityRegion()); // 区域

common/src/main/java/com/winsun/utils/WxInterfacesUtil.java

@@ -162,7 +162,7 @@ public class WxInterfacesUtil {
 		String url = "https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token="+access_token;
 		String url = "https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token="+access_token;
 		            
 		            
 		JSONObject obj = new JSONObject();
 		JSONObject obj = new JSONObject();
-		obj.put("group", "网迅");
+		obj.put("group", "");
 		obj.put("msgtype", "news");
 		obj.put("msgtype", "news");
 		
 		
 		JSONObject newsObj = new JSONObject();
 		JSONObject newsObj = new JSONObject();

core-service/src/main/java/com/winsun/item/modular/system/controller/LoginPwdController.java

@@ -558,7 +558,7 @@ public class LoginPwdController extends BaseController {
 
 
         paramsMap.put("apph5", "1"); //APPH5标识 固定：1
         paramsMap.put("apph5", "1"); //APPH5标识 固定：1
         paramsMap.put("appid", appId); // 终端编码
         paramsMap.put("appid", appId); // 终端编码
-        paramsMap.put("apph5Type", "1"); // 入口类型  网迅固定：1
+        paramsMap.put("apph5Type", "1"); // 入口类型  固定：1
         paramsMap.put("lzstaffcity", ""); // 揽装人县分
         paramsMap.put("lzstaffcity", ""); // 揽装人县分
         paramsMap.put("lzstaffmsc", ""); // 揽装人营服
         paramsMap.put("lzstaffmsc", ""); // 揽装人营服
         paramsMap.put("lzstaffname", ""); // 揽装人姓名
         paramsMap.put("lzstaffname", ""); // 揽装人姓名

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

@@ -3,8 +3,10 @@ package com.winsun.controller;
 import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.common.model.ResponseData;
+import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.bean.AuthCode;
 import com.winsun.bean.AuthCode;
 import com.winsun.mapper.AuthCodeMapper;
 import com.winsun.mapper.AuthCodeMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -24,14 +26,18 @@ public class AuthCodeController extends BaseController {
     private static AuthCodeMapper authCodeMapper;
     private static AuthCodeMapper authCodeMapper;
 
 
     // 查询验证码
     // 查询验证码
-    @Permission(menuname = "查询验证码",value = "queryAuthCode",method = RequestMethod.POST)
-    public ResponseData<List<AuthCode>> queryAuthCodeList(@RequestParam(name = "id",required = false) String id){
-
+    @Permission(menuname = "查询验证码", value = "queryAuthCode", method = RequestMethod.POST)
+    public ResponseData<List<AuthCode>> queryAuthCodeList(@RequestParam(name = "id", required = false) String id) {
+        ShiroUser shiroUser = getShiroUser();
+        if (!shiroUser.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员", "验证码"))) {
+            ResponseData.error("无权限修改订单");
+        }
         List<AuthCode> queryAuthCodeList = authCodeMapper.queryAuthCode(id);
         List<AuthCode> queryAuthCodeList = authCodeMapper.queryAuthCode(id);
-        return ResponseData.success(queryAuthCodeList,"查询完毕！");
+        return ResponseData.success(queryAuthCodeList, "查询完毕！");
     }
     }
+
     @Autowired
     @Autowired
-    public AuthCodeController(AuthCodeMapper authCodeMapper){
+    public AuthCodeController(AuthCodeMapper authCodeMapper) {
         AuthCodeController.authCodeMapper = authCodeMapper;
         AuthCodeController.authCodeMapper = authCodeMapper;
     }
     }
 }
 }