|
@@ -180,11 +180,12 @@ func convertProductOrderDetailDTO(order orderDao.ProductOrder) (orderDetailDTO P
|
|
|
access, err := merchant.GetUserSubscribe(order.TemplateUserID, order.ProductID)
|
|
|
if err != nil {
|
|
|
logger.Error("获取用户订阅信息失败:%v,templateUserId:%d,productId :%d", err, order.TemplateUserID, order.ProductID)
|
|
|
- }
|
|
|
- if access.ProductType == productTransMap[productDao.Package] {
|
|
|
- orderDetailDTO.ValidDuration = "永久有效"
|
|
|
} else {
|
|
|
- orderDetailDTO.ValidDuration = fmt.Sprintf("%s~%s", access.BeginDate, access.EndDate)
|
|
|
+ if access.ProductType == productTransMap[productDao.Package] {
|
|
|
+ orderDetailDTO.ValidDuration = "永久有效"
|
|
|
+ } else {
|
|
|
+ orderDetailDTO.ValidDuration = fmt.Sprintf("%s~%s", access.BeginDate, access.EndDate)
|
|
|
+ }
|
|
|
}
|
|
|
} else {
|
|
|
product, err := productDao.GetMerchantProductById(order.ProductID)
|