Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/wexinpackage/access/util/access/WeChatParamsUtil.java

@@ -7,7 +7,7 @@ public class WeChatParamsUtil {
     //token
     public final static String token ="9ZmhR1CRrGIOSMxCcznVccQN8f3XX2w4GMoacioSkovFuJdCwMBvTHsJpGf67bUVtkHEqLzYIyaamn9dEyPJKcVxgIeERJpAwa9uNtW68EXYwOBvR2blpiQ3aM9l7ndqMJThfEWlcUz8oBzOh6XZPQqTcLwb95yHhwQO14KdIXj6Q1nko9rjp-9c-LsrzoS_SNu4TxTqTqoYj5ztp3J9Wg";
     //企业id
-    public final static String corpId ="wwb8c36b4b35675fe9";
+    public final static String corpId ="ww24ca7e7771df9148";
     //应用的凭证密钥
     public final static String agentSecret = "kekm2UtL_82xFr6tMi4N2cWQFMHNKhLD-0bwIIaUQP0";
     //通讯录秘钥 (获取tokenid)

src/main/java/com/jeeplus/modules/wexintheorder/Utils/OrderUtils.java

@@ -93,10 +93,13 @@ public class OrderUtils {
     public static String findUserId(String code){
         String url = "https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo?access_token=ACCESS_TOKEN&code=CODE";//获取用户信息
         String accessToken = AccessTokenUtil.getAccessTokenTotal(WeChatParamsUtil.corpId, WeChatParamsUtil.agentSecret);
+        System.out.println("accessToken=============="+accessToken);
         String string = "";
         if (accessToken != null) {
             String sureUrl = url.replace("ACCESS_TOKEN", accessToken).replace("CODE",code);
+            System.out.println("url============="+sureUrl);
             JSONObject jsonObject = RequestAccess.httpRequest(sureUrl, "POST", null);
+            System.out.println("jsonObject========="+jsonObject);
             string = jsonObject.getString("UserId");
             if (null != jsonObject) {
                 if (0 != jsonObject.getInt("errcode")) {
@@ -202,20 +205,20 @@ public class OrderUtils {
 
     //提示拼接
     public static String getMsg(TheOrder theOrder,String addOrMinusDayString){
-        String msg1 = "预订<span style = 'font-weight:bold'>"+addOrMinusDayString+"</span>工作餐成功。";
-        String msg4 = "<span style = 'font-weight:bold'>"+theOrder.getTeam()+"</span>团队,";
-        String msg5 = "<span style = 'font-weight:bold'>"+theOrder.getDepartment()+"</span>部门";
-        String msg2 = "<span style = 'font-weight:bold'>"+theOrder.getDepartment()+"/"+theOrder.getSpecific()+"</span>部门。";
-        String msg3 = "提示:团队部门可取消预订后</br>重新修改,再次预订";
+        String msg1 = "预订<span style = 'font-weight:bold;color: #333' >"+addOrMinusDayString+"</span>工作餐成功。";
+        String msg4 = "<span style = 'font-weight:bold;color: #333'>"+theOrder.getTeam()+"</span>团队";
+        String msg5 = "<span style = 'font-weight:bold;color: #333'>"+theOrder.getDepartment()+"</span>部门";
+        String msg2 = "<span style = 'font-weight:bold;color: #333'>"+theOrder.getDepartment()+"/"+theOrder.getSpecific()+"</span>部门。";
+        String msg3 = "<br/><span style='font-size:14px;color:#666;'>提示:团队部门可在取消预订后</br>重新修改,再次预订</span>";
         String msg = "";
         if (null!=theOrder.getDepartment()&&!"".equals(theOrder.getDepartment())){
             if (!theOrder.getDepartment().equals("其他")){
-                msg = msg1+"</br>"+msg4+msg2+"</br>"+msg3;
+                msg = msg1+"</br>"+msg4+","+msg2+"</br>"+msg3;
             }else {
-                msg = msg1+"</br>"+msg4+msg5+"</br>"+msg3;
+                msg = msg1+"</br>"+msg4+","+msg5+"</br>"+msg3;
             }
         }else {
-            msg = msg1+"</br>"+msg4+"</br>"+msg3;
+            msg = msg1+"</br>"+msg4+"。"+"</br>"+msg3;
         }
         return msg;
     }

src/main/java/com/jeeplus/modules/wexintheorder/web/TheOrderController.java

@@ -67,6 +67,7 @@ public class TheOrderController extends BaseController {
                 Boolean session = OrderUtils.getSession(request, code);
                 if (session){
                     userId = (String)request.getSession().getAttribute("userId");
+                    System.out.println(userId);
                 }else {
                     userId = OrderUtils.findUserId(code);//获取useerid
                     request.getSession().setAttribute("userId",userId);
@@ -74,6 +75,7 @@ public class TheOrderController extends BaseController {
                 //回显
                 //获取acton
                 String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
+                System.out.println("accessToken=============="+accessToken);
                 String user = AddressBookUtil.getUser(accessToken, userId);
                 if (user.equals("flagOrder")){
                     return "modules/weixin/theorder/requestError";

src/main/webapp/webpage/modules/weixin/theorder/orderMeal.jsp

@@ -122,8 +122,15 @@
             </div>
             <%--<input class="weui-input" type="text" name="team" id='team' value="${theOrder.team}" onChange="teamChange()"/>--%>
         </form>
+
     </div>
+
+
+
         <div class="" style="text-align: center;border-radius: 50%;">
+            <div class="weui-cells__title" style="color: red;">
+                提示：请认真选填团队及部门，避免订餐失败。
+            </div>
             <div class="weui-cells__title"><h4 style="font-weight: 100;">预订<span id="currentDate" style="color:#666;"></span>工作餐</h4></div>
                     <c:if test="${theOrder.exits == '1'}">
                         <c:if test="${theOrder.dateStart == '1'}">
@@ -158,7 +165,7 @@
                         </c:if>
                     </c:if>
                 </div>
-            <div class="" style="width: 100%;text-align: center;font-size: 14px;color: #666666;">请在0:00-16:00前预订第二天的用餐</div>
+            <div class="" style="width: 100%;text-align: center;font-size: 14px;color: #666666;margin-top: 8px">请在0:00-16:00前预订第二天的用餐</div>
         </div>
         <div id="loadDiv" style="display: none;" class="weui-toast weui_loading_toast weui-toast--visible"><div class="weui_loading"><i class="weui-loading weui-icon_toast"></i></div><p class="weui-toast_content">请稍后...</p></div>
         <div class="bottem_div">兴光信息技术支持</div>
@@ -208,6 +215,8 @@
     timer = setInterval("CountDown()", 1000);
 </script>
 <script>
+    var currDate = GetDate();
+    $("#currentDate").html(currDate);
 //订餐方法
     function plan() {
         changeStatus();
@@ -387,5 +396,15 @@
         $("#cancelPlanDiv").addClass("notclick");
         $("#cancelPlanDiv").attr("style","background:#dcdbdb");
     }
+    //获取年月日
+    function GetDate(){
+        var currDate = new Date();
+        var now = new Date();
+        now.setTime(currDate.getTime()+24*60*60*1000)
+        var year = now.getFullYear();      　　 //年
+        var month = now.getMonth() + 1;     //月
+        var day = now.getDate();            　　//日
+        return year+"年"+month+"月"+day+"日";
+    }
 </script>
 </html>