Merge branch 'feature/xgh/2406企微托管' into 'developer'

Feature/xgh/2406企微托管

See merge request !1944

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java

@@ -66,7 +66,7 @@ public enum NoticeMessageTypeEnum {
     CUSTOMER_APPLY_ORDER_REFUND(4005, "客户申请退单通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "customer_apply_order_refund", "/pages/route/index?pageType=", "hbapp_customer_order_detail", "customerApplyChargebackOrder", "haobanNotice"),
     CUSTOMER_SUCCESS_ORDER_REFUND(4006, "客户成功退单通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "customer_success_order_refund", "/pages/route/index?pageType=", "hbapp_user_bill_detail", "customerChargebackOrderSuccess", "haobanNotice"),
     FRIEND_DEL_STAFF(4007,"删除好友通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(),"friend_del_staff","/pages/route/index?pageType=","hbapp_customer_detail","friendDelStaff","haobanNotice"),
-    HAOBAN_OPEN_STAFF_LOGOUT(4008,"企微托管账号退出登录", NoticeMessageCategoryTypeEnum.AUTHORIZED.getType(),"haoban_open_staff_logout","/pages/route/index?pageType=","hbapp_customer_detail","haobanOpenStaffLogout","haobanNotice"),
+    HAOBAN_OPEN_STAFF_LOGOUT(4008,"企微托管账号退出登录", NoticeMessageCategoryTypeEnum.AUTHORIZED.getType(),"haoban_open_staff_logout","/pages/route/index?pageType=","hbapp_video_auth","haobanOpenStaffLogout","haobanNotice"),
 
 
     // 订单- 待发货订单提醒

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/QywxCallbackController.java

@@ -204,8 +204,11 @@ public class QywxCallbackController extends WebBaseController {
         }else if (msgtype==16) {
             msg.setMsgtype(OpenQwMsgTypeEnum.VOICE);
             msg.setContent(json.getString("语音消息"));
+            msg.setFileSize(json.getInteger("voice_size"));
+            msg.setAeskey(json.getString("aes_key"));
+            msg.setFileId(json.getString("voice_id"));
         }else if (msgtype==40) {
-            // 2语音  1视频
+            // 2语音电话  1视频电话
             int callType = json.getIntValue("invitetype") ;
             if(!this.setTelType(callType,msg)) {
                 return;