|
@@ -272,14 +272,17 @@ func (this *pdfExportPackStruct) PackQuery(accountId string, vip *jy.BigVipBaseM
|
|
if err != nil {
|
|
if err != nil {
|
|
return nil, err
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
+ //查询共享账户
|
|
|
|
+ shareAccount := fmt.Sprintf("%s%s", ParentResourceIdPrefix, accountId)
|
|
if vip != nil && vip.Pid != "" {
|
|
if vip != nil && vip.Pid != "" {
|
|
- pAccount, err := JyPdfExportPack.accountQuery(fmt.Sprintf("%s%s", ParentResourceIdPrefix, vip.Pid))
|
|
|
|
- if err != nil {
|
|
|
|
- return nil, err
|
|
|
|
- }
|
|
|
|
- //合并自账号和祝账号
|
|
|
|
- account = account.merge(pAccount)
|
|
|
|
|
|
+ shareAccount = fmt.Sprintf("%s%s", ParentResourceIdPrefix, vip.Pid)
|
|
|
|
+ }
|
|
|
|
+ shareAccountRes, err := JyPdfExportPack.accountQuery(shareAccount)
|
|
|
|
+ if err != nil {
|
|
|
|
+ return nil, err
|
|
}
|
|
}
|
|
|
|
+ //合并自账号和祝账号
|
|
|
|
+ account = account.merge(shareAccountRes)
|
|
return account, nil
|
|
return account, nil
|
|
}
|
|
}
|
|
|
|
|