Browse Source

fix:edit whatsapp/getQrcode

jimmyyem 2 months ago
parent
commit
2d6205b4ad

+ 1 - 1
crontask/send_msg.go

@@ -264,7 +264,7 @@ func getFileName(photoUrl string) string {
 
 
 func hasAll(array []uint64, target uint64) bool {
 func hasAll(array []uint64, target uint64) bool {
 	for _, val := range array {
 	for _, val := range array {
-		if val == 0 {
+		if val == target {
 			return true
 			return true
 		}
 		}
 	}
 	}

+ 4 - 0
desc/wechat/whatsapp.api

@@ -166,6 +166,10 @@ type (
 	}
 	}
 	getQrcodeResp {
 	getQrcodeResp {
 		BaseDataInfo
 		BaseDataInfo
+		Data QrcodeListInfo `json:"data"`
+	}
+	QrcodeListInfo {
+		BaseListInfo
 		Data []Qrcode `json:"data"`
 		Data []Qrcode `json:"data"`
 	}
 	}
 	Qrcode {
 	Qrcode {

+ 2 - 1
internal/logic/whatsapp/get_qrcode_logic.go

@@ -39,7 +39,7 @@ func (l *GetQrcodeLogic) GetQrcode(req *types.GetQrcodeReq) (*types.GetQrcodeRes
 					generateQrImage = *v.GenerateQrImage
 					generateQrImage = *v.GenerateQrImage
 				}
 				}
 
 
-				resp.Data = append(resp.Data, types.Qrcode{
+				resp.Data.Data = append(resp.Data.Data, types.Qrcode{
 					Phone:            *v.PhoneNumber,
 					Phone:            *v.PhoneNumber,
 					QrdlCode:         *v.QrdlCode,
 					QrdlCode:         *v.QrdlCode,
 					GenerateQrImage:  generateQrImage,
 					GenerateQrImage:  generateQrImage,
@@ -49,6 +49,7 @@ func (l *GetQrcodeLogic) GetQrcode(req *types.GetQrcodeReq) (*types.GetQrcodeRes
 				})
 				})
 			}
 			}
 		}
 		}
+		resp.Data.Total = uint64(len(resp.Data.Data))
 	}
 	}
 
 
 	return &resp, nil
 	return &resp, nil

+ 6 - 0
internal/types/types.go

@@ -3562,6 +3562,12 @@ type GetQrcodeReq struct {
 // swagger:model getQrcodeResp
 // swagger:model getQrcodeResp
 type GetQrcodeResp struct {
 type GetQrcodeResp struct {
 	BaseDataInfo
 	BaseDataInfo
+	Data QrcodeListInfo `json:"data"`
+}
+
+// swagger:model QrcodeListInfo
+type QrcodeListInfo struct {
+	BaseListInfo
 	Data []Qrcode `json:"data"`
 	Data []Qrcode `json:"data"`
 }
 }