Merge branch 'dev/v1.2.7_dx' of moapp/MessageCenter into feature/v1.2.7

rpc/internal/logic/appletterpushlogic.go

@@ -57,11 +57,16 @@ func (l *AppLetterPushLogic) AppLetterPush(in *message.WxTmplMsgRequest) (*messa
 			rData, _ := entity.MQFW.FindOneByField("user", query, fmt.Sprintf(`{"_id":1,"s_appponetype":1,"s_appversion":1,"s_nmae":1,"s_nmae":1,"s_jpushid":1,"s_opushid":1,"s_m_openid":1,"o_pushset.%s.i_apppush":1}`, pushConfig.Switch))
 			if rData != nil && len(*rData) > 0 {
 				userData = *rData
-			}
-
-			if err = common.AppPushMsg(userData, pushConfig.Switch, in.Url, in.Title, in.Detail); err != nil {
+				if err = common.AppPushMsg(userData, pushConfig.Switch, in.Url, in.Title, in.Detail); err != nil {
+					return &message.SendMsgResponse{
+						Total:   0,
+						Message: err.Error(),
+					}, err
+				}
+			} else {
 				return &message.SendMsgResponse{
-					Total: 1,
+					Total:   0,
+					Message: "查询用户信息失败",
 				}, err
 			}
 		}