|
|
@@ -272,7 +272,7 @@ func (this *pdfExportPackStruct) PackQuery(accountId string, vip *jy.BigVipBaseM
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
- //查询共享账户
|
|
|
+ //查询个人版本共享账户
|
|
|
shareAccount := fmt.Sprintf("%s%s", ParentResourceIdPrefix, accountId)
|
|
|
if vip != nil && vip.Pid != "" {
|
|
|
shareAccount = fmt.Sprintf("%s%s", ParentResourceIdPrefix, vip.Pid)
|
|
|
@@ -333,9 +333,9 @@ func (this *pdfExportPackStruct) accountQuery(accountId string) (*AccountPdfPack
|
|
|
// Merge 合并主账号资源
|
|
|
func (appi *AccountPdfPackItem) merge(pAccount *AccountPdfPackItem) *AccountPdfPackItem {
|
|
|
var (
|
|
|
- winnerMinEndTime = qutil.If(appi.WINNER.MinEndTime != "" && appi.WINNER.MinEndTime < pAccount.WINNER.MinEndTime, appi.WINNER.MinEndTime, pAccount.WINNER.MinEndTime).(string)
|
|
|
- buyerMinEndTime = qutil.If(appi.BUYER.MinEndTime != "" && appi.BUYER.MinEndTime < pAccount.BUYER.MinEndTime, appi.BUYER.MinEndTime, pAccount.BUYER.MinEndTime).(string)
|
|
|
- marketMinEndTime = qutil.If(appi.MARKET.MinEndTime != "" && appi.MARKET.MinEndTime < pAccount.MARKET.MinEndTime, appi.MARKET.MinEndTime, pAccount.MARKET.MinEndTime).(string)
|
|
|
+ winnerMinEndTime = qutil.If(pAccount.WINNER.MinEndTime == "" || (appi.WINNER.MinEndTime != "" && appi.WINNER.MinEndTime < pAccount.WINNER.MinEndTime), appi.WINNER.MinEndTime, pAccount.WINNER.MinEndTime).(string)
|
|
|
+ buyerMinEndTime = qutil.If(pAccount.BUYER.MinEndTime == "" || (appi.BUYER.MinEndTime != "" && appi.BUYER.MinEndTime < pAccount.BUYER.MinEndTime), appi.BUYER.MinEndTime, pAccount.BUYER.MinEndTime).(string)
|
|
|
+ marketMinEndTime = qutil.If(pAccount.MARKET.MinEndTime == "" || (appi.MARKET.MinEndTime != "" && appi.MARKET.MinEndTime < pAccount.MARKET.MinEndTime), appi.MARKET.MinEndTime, pAccount.MARKET.MinEndTime).(string)
|
|
|
)
|
|
|
return &AccountPdfPackItem{
|
|
|
WINNER: AccountPdfPack{
|
