Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sys/web/OfficeController.java

@@ -249,11 +249,11 @@ public class OfficeController extends BaseController {
             t.setIsSon(c.getIsSon());
             officeService.save(t);
             //微信端
-            Integer wxOfficeIdByParentIdService = officeService.findWxOfficeIdByParentIdService(office.getId());
-            String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
-            Integer wxOfficeIdByIdSerice= officeService.findWxOfficeIdByIdSerice(office.getId());
-            WxDepartment wxDepartment = new WxDepartment(wxOfficeIdByIdSerice,office.getName(),wxOfficeIdByParentIdService);
-            AddressDepartment.updateDepartment(accessToken,wxDepartment);
+//            Integer wxOfficeIdByParentIdService = officeService.findWxOfficeIdByParentIdService(office.getId());
+//            String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
+//            Integer wxOfficeIdByIdSerice= officeService.findWxOfficeIdByIdSerice(office.getId());
+//            WxDepartment wxDepartment = new WxDepartment(wxOfficeIdByIdSerice,office.getName(),wxOfficeIdByParentIdService);
+//            AddressDepartment.updateDepartment(accessToken,wxDepartment);
             addMessage(redirectAttributes, "修改成功");
             String id = "0".equals(office.getParentId()) ? "" : office.getParentId();
             return "redirect:" + adminPath + "/sys/office/list";
@@ -262,10 +262,10 @@ public class OfficeController extends BaseController {
             office.setIsSon(c.getIsSon());
             office.setWxOfficeId(wxOfficeIdService);
             officeService.save(office);//保存
-            Integer wxOfficeIdByParentIdService = officeService.findWxOfficeIdByParentIdService(office.getId());
-            String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
-            WxDepartment wxDepartment = new WxDepartment(new Integer(wxOfficeIdService),office.getName(),wxOfficeIdByParentIdService);
-            AddressDepartment.createDepartment(accessToken,wxDepartment);
+//            Integer wxOfficeIdByParentIdService = officeService.findWxOfficeIdByParentIdService(office.getId());
+//            String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
+//            WxDepartment wxDepartment = new WxDepartment(new Integer(wxOfficeIdService),office.getName(),wxOfficeIdByParentIdService);
+//            AddressDepartment.createDepartment(accessToken,wxDepartment);
         }
         String str = "0";
         //如果是添加分公司，则分配相应部门和岗位
@@ -353,9 +353,9 @@ public class OfficeController extends BaseController {
             return "redirect:" + Global.getAdminPath() + "/sys/office/?repage";
         }
         officeService.logicDelete(office);
-        String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
-        Integer wxOfficeIdByIdSerice= officeService.findWxOfficeIdByIdSerice(office.getId());
-        AddressDepartment.deleteDepartment(accessToken,String.valueOf(wxOfficeIdByIdSerice));
+//        String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
+//        Integer wxOfficeIdByIdSerice= officeService.findWxOfficeIdByIdSerice(office.getId());
+//        AddressDepartment.deleteDepartment(accessToken,String.valueOf(wxOfficeIdByIdSerice));
         if(UserUtils.getSelectCompany().getId().equals(office.getId())){
             systemService.removeSession(UserUtils.getUser());
             return "modules/sys/sysLogin";

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

@@ -4,6 +4,7 @@ import com.google.gson.Gson;
 import com.jeeplus.modules.wexinpackage.access.entity.WeChatUser;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import net.sf.json.JSONObject;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/jeeplus/modules/wexinpackage/access/web/WeChatCallbackController.java

@@ -37,7 +37,7 @@ public class WeChatCallbackController extends BaseController {
         if ("GET".equals(method)){
             doGet(request,response);
         }else {
-            doPost(request,response);
+//            doPost(request,response);
         }
     }
     private void doGet(HttpServletRequest request, HttpServletResponse response){
@@ -69,7 +69,7 @@ public class WeChatCallbackController extends BaseController {
         String sReqMsgSig = request.getParameter("msg_signature");
         String sReqTimeStamp = request.getParameter("timestamp");
         String sReqNonce = request.getParameter("nonce");
-//        try {
+        try {
             BufferedReader reader = request.getReader();
             char[] buf = new char[512];
             int len = 0;
@@ -85,11 +85,11 @@ public class WeChatCallbackController extends BaseController {
             String sMsg = wxcpt.DecryptMsg(sReqMsgSig, sReqTimeStamp, sReqNonce, content);
             weChatCallbackService.getMapOperation(sMsg,request);
             // 循环所有子元素
-//        } catch (Exception e) {
-//            // TODO
-//            // 解密失败，失败原因请查看异常
-//            e.printStackTrace();
-//        }
+        } catch (Exception e) {
+            // TODO
+            // 解密失败，失败原因请查看异常
+            e.printStackTrace();
+        }
     }
 
 //    public void getSaveUser(List children,HttpServletRequest request){

src/main/java/com/jeeplus/modules/wexintheorder/dao/TheLeadershipDao.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 @MyBatisDao
 public interface TheLeadershipDao extends CrudDao<TheLeadership> {
-    public User findUser(String wechatId);
+    public User findUser(String name);
 
     //增加
     Integer insertLeaderShip(TheLeadership theLeadership);

src/main/java/com/jeeplus/modules/wexintheorder/service/TheLeadershipService.java

@@ -35,8 +35,8 @@ public class TheLeadershipService extends CrudService<TheLeadershipDao, TheLeade
        User
     */
     //查找用户关联信息
-    public User findUser(String weChatId){
-        return theLeadershipDao.findUser(weChatId);
+    public User findUser(String name){
+        return theLeadershipDao.findUser(name);
     }
     //获取部门name
     public String findOffice(String id){

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

@@ -3,11 +3,16 @@ package com.jeeplus.modules.wexintheorder.web;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.wexinpackage.access.entity.WeChatUser;
+import com.jeeplus.modules.wexinpackage.access.util.access.AccessTokenUtil;
+import com.jeeplus.modules.wexinpackage.access.util.access.AddressBookUtil;
+import com.jeeplus.modules.wexinpackage.access.util.access.WeChatParamsUtil;
 import com.jeeplus.modules.wexintheorder.Utils.OrderUtils;
 import com.jeeplus.modules.wexintheorder.entity.TheLeadership;
 import com.jeeplus.modules.wexintheorder.entity.TheOrder;
 import com.jeeplus.modules.wexintheorder.service.TheLeadershipService;
 import com.jeeplus.modules.wexintheorder.service.TheOrderService;
+import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -29,7 +34,27 @@ public class TheOrderController extends BaseController {
     @Autowired
     private TheLeadershipService theLeadershipService;
 
-
+    @RequestMapping(value = "orderFromTest")
+    public String getOrderForm(Model model){
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String userId = "XuShuai";
+        WeChatUser weChatUser = new WeChatUser();
+        weChatUser.setName("张三");
+        //回显
+        TheOrder userOrderEcho = getUserOrderEcho("张三");
+        //验证今天是否预定过餐
+        //获取工作日 -- 第二天
+        String addOrMinusDayString = OrderUtils.getAddOrMinusDayString(1, dateFormat);
+        //验证是否存在订单  --true未为存在
+        boolean planOrder = getPlanOrder(userId, addOrMinusDayString);
+        if (planOrder){
+            userOrderEcho.setExits("0");//已经选择过了
+        }else {
+            userOrderEcho.setExits("1");//未预定
+        }
+        model.addAttribute("theOrder",userOrderEcho);
+        return "modules/weixin/theorder/orderMeal";//返回一个界面
+    }
     //页面显示
     @RequestMapping(value = "orderFrom")
     public String getOrderFrom(Model model, HttpServletRequest request,@RequestParam String code){
@@ -38,7 +63,11 @@ public class TheOrderController extends BaseController {
                 DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                 String userId = OrderUtils.findUserId(code);//获取useerid
                 //回显
-                TheOrder userOrderEcho = getUserOrderEcho(userId);
+                //获取acton
+                String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
+                String user = AddressBookUtil.getUser(accessToken, userId);
+                String name = getMaps(user);
+                TheOrder userOrderEcho = getUserOrderEcho(name);
                 //验证今天是否预定过餐
                 //获取工作日 -- 第二天
                 String addOrMinusDayString = OrderUtils.getAddOrMinusDayString(1, dateFormat);
@@ -59,10 +88,10 @@ public class TheOrderController extends BaseController {
     }
 
     //获取部门以及分管领导信息--回显FROM
-    public TheOrder getUserOrderEcho(String weChatUserId){
+    public TheOrder getUserOrderEcho(String name){
         TheOrder theOrder = new TheOrder();
         //查询用户
-        User user = theLeadershipService.findUser(weChatUserId);
+        User user = theLeadershipService.findUser(name);
         String userId = user.getId();//获取用户id
         //获取用户user
         //添加回显对象
@@ -202,4 +231,15 @@ public class TheOrderController extends BaseController {
             theOrder.setSpecific("");
         }
     }
+
+    public String getMaps(String sMsg){
+        String name = "";
+        JSONObject jsonObject = JSONObject.fromObject(sMsg);
+        try {
+            name = jsonObject.getString("name");
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return name;
+    }
 }

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -261,24 +261,24 @@ public class WorkStaffBasicInfoController extends BaseController {
 			WorkStaffBasicInfo t = workStaffBasicInfoService.get(workStaffBasicInfo.getId());//从数据库取出记录的值
 			MyBeanUtils.copyBeanNotNull2Bean(workStaffBasicInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
 			workStaffBasicInfoService.save(t,request);//保存
-			String officeId = workStaffBasicInfo.getOffice().getId();
-			Integer weChatId = 1;
-			if (null!=officeId){
-				weChatId = weChatCallbackService.findWeChatId(officeId);
-			}
-			String accessToken = AccessTokenUtil. getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
-			WeChatUser weChatUser = AddressBookUtil.replaceUser(workStaffBasicInfo,weChatId);
-			AddressBookUtil.updateUser(accessToken,weChatUser);
+//			String officeId = workStaffBasicInfo.getOffice().getId();
+//			Integer weChatId = 1;
+//			if (null!=officeId){
+//				weChatId = weChatCallbackService.findWeChatId(officeId);
+//			}
+//			String accessToken = AccessTokenUtil. getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
+//			WeChatUser weChatUser = AddressBookUtil.replaceUser(workStaffBasicInfo,weChatId);
+//			AddressBookUtil.updateUser(accessToken,weChatUser);
 		}else{//新增表单保存
 			workStaffBasicInfoService.save(workStaffBasicInfo,request);//保存
-			String officeId = workStaffBasicInfo.getOffice().getId();
-			Integer weChatId = 1;
-			if (null!=officeId){
-				weChatId = weChatCallbackService.findWeChatId(officeId);
-			}
-			String accessToken = AccessTokenUtil. getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
-			WeChatUser weChatUser = AddressBookUtil.replaceUser(workStaffBasicInfo,weChatId);
-			AddressBookUtil.createUser(accessToken,weChatUser);
+//			String officeId = workStaffBasicInfo.getOffice().getId();
+//			Integer weChatId = 1;
+//			if (null!=officeId){
+//				weChatId = weChatCallbackService.findWeChatId(officeId);
+//			}
+//			String accessToken = AccessTokenUtil. getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
+//			WeChatUser weChatUser = AddressBookUtil.replaceUser(workStaffBasicInfo,weChatId);
+//			AddressBookUtil.createUser(accessToken,weChatUser);
 		}
 		addMessage(redirectAttributes, "保存员工信息成功");
         if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())){
@@ -338,7 +338,7 @@ public class WorkStaffBasicInfoController extends BaseController {
 	@RequestMapping(value = "delete")
 	public String delete(WorkStaffBasicInfo workStaffBasicInfo, RedirectAttributes redirectAttributes) {
 		workStaffBasicInfoService.delete(workStaffBasicInfo);
-		AddressBookUtil.deleteUser(AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId,WeChatParamsUtil.contactsSecret),workStaffBasicInfo.getNo());
+//		AddressBookUtil.deleteUser(AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId,WeChatParamsUtil.contactsSecret),workStaffBasicInfo.getNo());
 		addMessage(redirectAttributes, "删除员工信息成功");
 		return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/?repage";
 	}

src/main/resources/mappings/modules/wexintheorder/TheLeadershipDao.xml

@@ -103,18 +103,20 @@
 	</update>
 
 
-
-	<!-- 根据id查找部门分管领导信息 -->
 	<select id="findUser" resultType="com.jeeplus.modules.sys.entity.User">
-		SELECT
-		<include refid="userColumns"/>
-		FROM sys_user a
-		LEFT JOIN sys_user_office uo ON uo.user_id = a.id AND uo.company_id = #{companyId} AND uo.status = '3' AND uo.del_flag = '0'
-		LEFT JOIN sys_office s ON s.id = uo.company_id
-		LEFT JOIN sys_office o ON o.id = uo.office_id
-		LEFT JOIN sys_office bo ON bo.id = o.branch_office
-		WHERE a.we_chat_id = #{wechatId}
+		SELECT a.id from sys_user a WHERE a.name = #{name}
 	</select>
+	<!-- 根据id查找部门分管领导信息 -->
+	<!--<select id="findUser" resultType="com.jeeplus.modules.sys.entity.User">-->
+		<!--SELECT-->
+		<!--<include refid="userColumns"/>-->
+		<!--FROM sys_user a-->
+		<!--LEFT JOIN sys_user_office uo ON uo.user_id = a.id AND uo.company_id = #{companyId} AND uo.status = '3' AND uo.del_flag = '0'-->
+		<!--LEFT JOIN sys_office s ON s.id = uo.company_id-->
+		<!--LEFT JOIN sys_office o ON o.id = uo.office_id-->
+		<!--LEFT JOIN sys_office bo ON bo.id = o.branch_office-->
+		<!--WHERE a.name = #{name}-->
+	<!--</select>-->
 
 	<select id="findOffice" resultType="java.lang.String">
 		select o.name from sys_office o where id = #{id}

src/main/webapp/static/wechat/wechat-btn.css

@@ -2,48 +2,44 @@
 			color: #d9eef7;
 			border: solid 1px #0076a3;
 			background: #0095cd;
-			height: 20px;
 			background: -webkit-gradient(linear, left top, left bottom, from(#00adee), to(#0078a5));
 			background: -moz-linear-gradient(top,  #00adee,  #0078a5);
 			filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5');
 		}
 		.blue:hover {
 			background: #007ead;
-			height: 20px;
 			background: -webkit-gradient(linear, left top, left bottom, from(#0095cc), to(#00678e));
 			background: -moz-linear-gradient(top,  #0095cc,  #00678e);
 			filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#0095cc', endColorstr='#00678e');
 		}
 		.blue:active {
 			color: #80bed6;
-			height: 20px;
 			background: -webkit-gradient(linear, left top, left bottom, from(#0078a5), to(#00adee));
 			background: -moz-linear-gradient(top,  #0078a5,  #00adee);
 			filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#0078a5', endColorstr='#00adee');
 		}
-		.button {
+		.button-2 {
 			display: inline-block;
 			outline: none;
 			cursor: pointer;
 			text-align: center;
-			height: 20px;
 			text-decoration: none;
+			height: 150px;
+			width:150px;
 			font: 11px/100% 'Microsoft yahei',Arial, Helvetica, sans-serif;
 			padding: .5em 2em .55em;
 			text-shadow: 0 1px 1px rgba(0,0,0,.3);
-			-webkit-border-radius: .5em; 
+			-webkit-border-radius: .5em;
 			-moz-border-radius: .5em;
 			border-radius: 50%;
 			-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2);
 			-moz-box-shadow: 0 1px 2px rgba(0,0,0,.2);
 			box-shadow: 0 1px 2px rgba(0,0,0,.2);
 		}
-		.button:hover {
+		.button-2:hover {
 			text-decoration: none;
-			height: 20px;
 		}
-		.button:active {
-			height: 20px;
+		.button-2:active {
 			position: relative;
 			top: 1px;
 		}
@@ -56,8 +52,3 @@
 
 
 
-
-
-
-
-

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

@@ -16,9 +16,24 @@
     <link rel="stylesheet" href="/static/wechat/wechat-btn.css"/>
 </head>
 <style>
-
+    .bottem_div{
+        position: fixed;
+        bottom: 10px;
+        width: 100%;
+        margin: auto;
+        text-align: center;
+        font-size: 12px;
+        color: #333;
+    }
+    .btn_span_list{
+        height: 20px;
+        line-height: 20px;
+    }
 </style>
 <body>
+    <div style="text-align: center;padding: 10px;">
+        江苏兴光临时订餐系统
+    </div>
     <%--<div class="weui-cells weui-cells_form">--%>
         <form id="subForm" method="post">
             <div class="weui-cell">
@@ -78,18 +93,27 @@
         </form>
         <div class="weui-cell">
         </div>
-        <div style="height: 10px"></div>
     <%--</div>--%>
-    <div class="" style="text-align: center">
-        <div class="weui-cells__title"><h4>预订餐</h4></div>
-        <div class="weui-cells__tips">请预定工作日的用餐，0-16点可以预订</div>
-        <c:if test="${theOrder.exits == '1'}">
-            <button class="button blue" id="buttonPlan" onclick="plan()"><span id="plan">预订餐</span><br><span id="spantime"></span></button>
-        </c:if>
-        <c:if test="${theOrder.exits == '0'}">
-            <button class="button blue" id="buttonPlan" style="background:#999999;height: 7em;width: 7em" disabled><span>已预定</span></button>
-        </c:if>
+    <div class="" style="text-align: center;">
+        <div class="weui-cells__title"><h4>预定<span id="currentDate"></span>订工作餐</h4></div>
+                <c:if test="${theOrder.exits == '1'}">
+                    <div class="button-2 blue" id="buttonPlan" onclick="plan()">
+                        <div style="line-height: 150px;height:150px;padding-top: 55px">
+                            <span class="btn_span_list" id="plan">预订餐</span><br><span class="btn_span_list" id="spantime"></span>
+                        </div>
+                    </div>
+                        </c:if>
+                <c:if test="${theOrder.exits == '0'}">
+                    <div class="button-2 blue" id="buttonPlan" style="background:#999999;" disabled>
+                        <div style="line-height: 150px;height:150px;padding-top: 55px">
+                            <span class="btn_span_list">已订餐</span>
+                        </div>
+                    </div>
+                </c:if>
+            </div>
+        <div class="weui-cells__tips"style="width: 100%;text-align: center">请在0：00-16：00前预订第二天的用餐</div>
     </div>
+    <div class="bottem_div">兴光信息技术支持</div>
 </body>
 <script type="text/javascript">
     var d=new Date();
@@ -123,6 +147,8 @@
     timer = setInterval("CountDown()", 1000);
 </script>
 <script>
+    var currDate = GetDate();
+    $("#currentDate").html(currDate);
 //订餐方法
     function plan() {
         changeStatus();
@@ -219,5 +245,15 @@
             $("#specific").val("");
         }
     }
+    //获取年月日
+    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>