Merge branch 'master' of lvjian/wxservice into master

更改联系我们的菜单位置和内容

src/main/java/com/ematou/wxservice/mp/handler/WeChatClickEventMessageHandler.java

@@ -61,10 +61,10 @@ public class WeChatClickEventMessageHandler implements WeChatMessageHandler {
 
         String content = "【前海电商（深圳）供应链集团有限公司】\n" +
                 "\n" +
-                "我们在这里！↓↓↓mo-[嘿哈]\n" +
+                "我们在这里！↓↓↓[嘿哈]\n" +
                 "地址：深圳市前海深港合作区南山街道桂湾片区二单元前海卓越金融中心（一期）7号楼1705\n" +
                 "\n" +
-                "或者直接拨打电话 0755-21628282mo-[握手]\n" +
+                "或者直接拨打电话 0755-21628282,18124754870[握手]\n" +
                 "我们热情的等着您~";
         return WeChatMpXmlOutMessage.TEXT().content(content).toUser(weChatMessage.getFromUser()).fromUser(weChatMessage.getToUser()).build();
     }

src/main/java/com/ematou/wxservice/mp/handler/WeChatSubscribeEventHandler.java

@@ -25,7 +25,7 @@ public class WeChatSubscribeEventHandler implements WeChatMessageHandler {
 
         WeChatMpXmlOutNewsMessage.Item item = new WeChatMpXmlOutNewsMessage.Item();
         item.setTitle("欢迎关注【e码头】");
-        item.setDescription(">>>点击绑定手机号,立即取件/寄件!");
+        item.setDescription(">>>点击绑定手机号,立即取件!");
         item.setPicUrl("https://wxservice.ds-bay.com/images/emtnew.png");
         item.setUrl("https://wxservice.ds-bay.com/view/binding?openid="+weChatMessage.getFromUser());
         return WeChatMpXmlOutMessage.NEWS().addArticle(item).toUser(weChatMessage.getFromUser()).fromUser(weChatMessage.getToUser()).build();

src/main/java/com/ematou/wxservice/mp/menu/MenuButtonManager.java

@@ -46,23 +46,23 @@ public class MenuButtonManager {
         ClickButton myCodeBtn = new ClickButton("我的取件码", WeChatConstant.EventType.CLICK.toLowerCase(), WeChatConstant.CustomEventKey.MY_TAKE_PARCEL_CODE);
         ClickButton scanPush = new ClickButton("扫码取件", WeChatConstant.EventType.SCANCODE_PUSH.toLowerCase(), WeChatConstant.CustomEventKey.SCANCODE_PUSH_BUTTON);
         //ClickButton myHistoryBtn = new ClickButton("取件历史", WeChatConstant.EventType.CLICK.toLowerCase(), WeChatConstant.CustomEventKey.MY_HISTORY_RECORD);
-        ViewButton addressEntryBtn = new ViewButton("收货地址管理", WeChatConstant.EventType.VIEW.toLowerCase(), "http://kmall-test.ds-bay.com:8080/qrcode/verification.html");
+        //ViewButton addressEntryBtn = new ViewButton("收货地址管理", WeChatConstant.EventType.VIEW.toLowerCase(), "http://kmall-test.ds-bay.com:8080/qrcode/verification.html");
         MenuButton takeParcelMenuButton = new MenuButton("取件服务");
-        takeParcelMenuButton.setSub_button(Arrays.asList(scanPush, addressEntryBtn)); // myCodeBtn  我的取件码菜单屏蔽
+        takeParcelMenuButton.setSub_button(Arrays.asList(scanPush)); // myCodeBtn  我的取件码菜单屏蔽
 
         ViewButton companyState = new ViewButton("公司状态", WeChatConstant.EventType.VIEW.toLowerCase(), "http://mp.weixin.qq.com/mp/homepage?__biz=MzIwMTI2MTg1MA==&hid=3&sn=da0db13971baf7a27bf639f2f7eaebbe&scene=18#wechat_redirect");
         ViewButton companyInfo = new ViewButton("公司简介", WeChatConstant.EventType.VIEW.toLowerCase(), "http://mp.weixin.qq.com/s?__biz=MzIwMTI2MTg1MA==&mid=503159833&idx=1&sn=fbddc8c56f960d7912cee60c959c42e8&chksm=0ef9aa6c398e237a862143c4f4c7314c0159a77e87ad4fd39a89d22181bcb05aedc9a816c8b2&scene=18#wechat_redirect");
         ViewButton showNews = new ViewButton("展会快讯", WeChatConstant.EventType.VIEW.toLowerCase(), "http://mp.weixin.qq.com/mp/homepage?__biz=MzIwMTI2MTg1MA==&hid=4&sn=89a19c85a4742d13eb3e4ceab2179ba8&scene=18#wechat_redirect");
         ViewButton industryReport = new ViewButton("行业周报", WeChatConstant.EventType.VIEW.toLowerCase(), "http://mp.weixin.qq.com/mp/homepage?__biz=MzIwMTI2MTg1MA==&hid=1&sn=f7becf0ef818d4a57a4ca4acfde72613&scene=18#wechat_redirect");
         ClickButton policySupport = new ClickButton("政策支持", WeChatConstant.EventType.CLICK.toLowerCase(), WeChatConstant.CustomEventKey.POLICY_SUPPORT);
+        ClickButton callCompanyBtn = new ClickButton("联系我们", WeChatConstant.EventType.CLICK.toLowerCase(), WeChatConstant.CustomEventKey.CALL_COMPANY);
         MenuButton companyMenuButton = new MenuButton("公司信息");
-        companyMenuButton.setSub_button(Arrays.asList(companyState, companyInfo, showNews, policySupport, industryReport));
+        companyMenuButton.setSub_button(Arrays.asList(companyState, companyInfo, showNews, policySupport, industryReport, callCompanyBtn));
 
         ViewButton supplier = new ViewButton("供应商拓展", WeChatConstant.EventType.VIEW.toLowerCase(), "http://mp.weixin.qq.com/mp/homepage?__biz=MzIwMTI2MTg1MA==&hid=2&sn=cd51f61ada3218168fe3af6c3318b6ca&scene=18#wechat_redirect");
         ViewButton showGoods = new ViewButton("货源展示区", WeChatConstant.EventType.VIEW.toLowerCase(), "https://mp.weixin.qq.com/bizmall/mallshelf?id=&t=mall/list&biz=MzIwMTI2MTg1MA==&shelf_id=5&showwxpaytitle=1#wechat_redirect");
-        ClickButton callCompanyBtn = new ClickButton("联系我们", WeChatConstant.EventType.CLICK.toLowerCase(), WeChatConstant.CustomEventKey.CALL_COMPANY);
         MenuButton goodsMenuButton = new MenuButton("货源展示");
-        goodsMenuButton.setSub_button(Arrays.asList(supplier, showGoods, callCompanyBtn));
+        goodsMenuButton.setSub_button(Arrays.asList(supplier, showGoods));
 
         HashMap<String, List<Button>> map = new HashMap<>();
         map.put("button", Arrays.asList(companyMenuButton, goodsMenuButton, takeParcelMenuButton));