diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index c05117037..e1f52caf9 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1627,9 +1627,11 @@ func DeleteStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor } } //删除抖店映射 + //if vendorID == model.VendorIDDD { if _, err1 := dao.ExecuteSQL(db, "DELETE FROM freight_template WHERE freight_template.store_id = ? ", storeID); err != nil { err = fmt.Errorf("%v,%v", err, err1) } + //} return num, err } diff --git a/business/jxutils/enterprise_msg/enterprise_send_msg.go b/business/jxutils/enterprise_msg/enterprise_send_msg.go index 9c496c079..adf659e61 100644 --- a/business/jxutils/enterprise_msg/enterprise_send_msg.go +++ b/business/jxutils/enterprise_msg/enterprise_send_msg.go @@ -1,30 +1,31 @@ package enterprise_msg import ( + "fmt" enterprise "git.rosy.net.cn/baseapi/platformapi/enterprise_wechat" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" ) var enterpriseUserIdMap = map[string]string{ - "18080188338": "ShiFeng", - "13541389991": "ZhuMin", - "18982250714": "LaoZhaoTongXue", - "15680070110": "LiRongWei", - "18582617275": "TangXiaoLei", - "18583684218": "JingXiCaiShi-YanXiaoKang18583684218", - "17344357115": "YuanYe", - "18011597879": "YunYing7879", - "13608076295": "ZhangJiaLin", - "18981810340": "LiuLei", - "18744776542": "WuTingQi", - "17358644830": "ShengTianBanZi1376", - "15729837802": "ZhangShuWei", - "1": "2f43b42fd833d1e77420a8dae7419000", // 未设置号码 - "15928865396": "HeJiaMeng2", - "18780171617": "TianQinXin", - "17381914617": "TianQinXin2", - "15881105234": "WenShiQi", + "18080188338": "ShiFeng", + "13541389991": "ZhuMin", + "18982250714": "LaoZhaoTongXue", + "15680070110": "LiRongWei", + "18582617275": "TangXiaoLei", + "18583684218": "JingXiCaiShi-YanXiaoKang18583684218", + "17344357115": "YuanYe", + "18011597879": "YunYing7879", + "13608076295": "ZhangJiaLin", + "18981810340": "LiuLei", + "187447 76542": "WuTingQi", + "17358644830": "ShengTianBanZi1376", + "15729837802": "ZhangShuWei", + "1": "2f43b42fd833d1e77420a8dae7419000", // 未设置号码 + "15928865396": "HeJiaMeng2", + "18780171617": "TianQinXin", + "17381914617": "TianQinXin2", + "15881105234": "WenShiQi", } // SendUserMessage 发送文本卡片 @@ -35,11 +36,32 @@ func SendUserMessage(phone, title, description, url string) error { if id, ok := enterpriseUserIdMap[phone]; ok { enterpriseUserId = id } else { - enterpriseUserId, err = api.EnterpriseChatMin.GetUserIdByMobile(phone) + userList, err := api.EnterpriseChatMin.GetEnterpriseStaffInfo(enterprise.ParentDepartmentId) if err != nil { - enterpriseUserId = enterpriseUserIdMap["18981810340"] + globals.SugarLogger.Errorf("获取企业微信全职人员信息错误 : %v", err) + return err + } + for _, v := range userList { + if v.Mobile == "" { + api.EnterpriseChatMin.SendMsgToUserTypeText(&enterprise.SendTextMsgReq{ + Touser: "ShiFeng", + Msgtype: enterprise.MsgTypeText, + Agentid: enterprise.EnterpriseAgentid, + Text: struct { + Content string `json:"content"` + }{Content: fmt.Sprintf("用户[%s]未添加企业微信联系电话,请联系添加电话号码[企业微信联系电话与京西系统保持一致!]", v.Name)}, + Safe: 0, + EnableIdTrans: 0, + EnableDuplicateCheck: 0, + DuplicateCheckInterval: 0, + }) + continue + } + if v.Mobile == phone { + enterpriseUserId = v.Userid + } + enterpriseUserIdMap[v.Mobile] = v.Userid } - enterpriseUserIdMap[phone] = enterpriseUserId } err = api.EnterpriseChatMin.SendMsgToUserTypeText(&enterprise.SendTextMsgReq{ @@ -55,24 +77,6 @@ func SendUserMessage(phone, title, description, url string) error { DuplicateCheckInterval: 0, }) return err - // - //msg := &enterprise.EnterpriseSendMsgReq{ - // Touser: enterpriseUserId, - // Msgtype: enterprise.MsgTypeTextCard, - // Agentid: enterprise.EnterpriseAgentid, - // Textcard: enterprise.TextCardObject{ - // Title: title, - // Description: description, - // Url: url, - // Btntxt: "详情", - // }, - //} - //return api.EnterpriseChatMin.SendMsgToUser(msg) -} - -// SendUserMessageText 发送文本消息 -func SendUserMessageText() { - } func SendEnterpriseUserMessage(msgType, phone, title, content string) (err error) {