Merge branch 'master' of zyh/wxservice into master

src/main/java/com/ematou/wxservice/common/constant/WeChatConstant.java

@@ -67,6 +67,7 @@ public class WeChatConstant {
         public static final String LOCATION = "LOCATION";
         public static final String CLICK = "CLICK";
         public static final String VIEW = "VIEW";
+        public static final String MINIPROGRAM = "miniprogram";
         public static final String MASS_SEND_JOB_FINISH = "MASSSENDJOBFINISH";
         /**
          * 扫码推事件的事件推送

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

@@ -45,10 +45,12 @@ 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);
+        MiniProgramButton miniProgramButton = new MiniProgramButton("小程序",WeChatConstant.EventType.MINIPROGRAM.toLowerCase(),"http://mp.weixin.qq.com","wx1f09731935da5dd7","/pages/index/index");
+
         //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");
         MenuButton takeParcelMenuButton = new MenuButton("取件服务");
-        takeParcelMenuButton.setSub_button(Arrays.asList(scanPush)); // myCodeBtn  我的取件码菜单屏蔽
+        takeParcelMenuButton.setSub_button(Arrays.asList(scanPush,miniProgramButton)); // 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");