|
@@ -95,9 +95,14 @@ WHERE %s and jod.status =1 order by dor.create_time desc`, whereSql))
|
|
|
serviceList []int
|
|
|
)
|
|
|
startTime := common.Int64All((*userData)["i_member_starttime"])
|
|
|
+ if startTime > 0 {
|
|
|
+ sTime = time.Unix(startTime, 0).Format("2006-01-02 15:04:05")
|
|
|
+ }
|
|
|
+
|
|
|
bigEnd := common.Int64All((*userData)["i_member_endtime"])
|
|
|
- sTime = time.Unix(startTime, 0).Format("2006-01-02 15:04:05")
|
|
|
- eTime = time.Unix(bigEnd, 0).Format("2006-01-02 15:04:05")
|
|
|
+ if bigEnd > 0 {
|
|
|
+ eTime = time.Unix(bigEnd, 0).Format("2006-01-02 15:04:05")
|
|
|
+ }
|
|
|
|
|
|
orderData, _ := g.DB().Query(ctx, `SELECT a.product_code,a.id,a.service_type,a.order_code,b.create_time,a.service_starttime,a.service_endtime,a.filter FROM jy_order_detail a
|
|
|
INNER JOIN dataexport_order b on a.order_code = b.order_code
|
|
@@ -214,8 +219,14 @@ WHERE a.status = 1 and b.user_phone = ? and b.buy_subject = 1 and a.product_type
|
|
|
}
|
|
|
}
|
|
|
vipExist = gconv.Int((*userData)["i_vip_status"]) > 0
|
|
|
- endTime = time.Unix(common.Int64All((*userData)["l_vip_endtime"]), 0).Format("2006-01-02 15:04:05")
|
|
|
- startTime = time.Unix(common.Int64All((*userData)["l_vip_starttime"]), 0).Format("2006-01-02 15:04:05")
|
|
|
+ l_vip_endtime := common.Int64All((*userData)["l_vip_endtime"])
|
|
|
+ if l_vip_endtime > 0 {
|
|
|
+ endTime = time.Unix(l_vip_endtime, 0).Format("2006-01-02 15:04:05")
|
|
|
+ }
|
|
|
+ l_vip_starttime := common.Int64All((*userData)["l_vip_starttime"])
|
|
|
+ if l_vip_endtime > 0 {
|
|
|
+ startTime = time.Unix(l_vip_starttime, 0).Format("2006-01-02 15:04:05")
|
|
|
+ }
|
|
|
if vipExist {
|
|
|
vipInfo := common.ObjToMap((*userData)["o_vipjy"])
|
|
|
buySet := common.ObjToMap((*vipInfo)["o_buyset"])
|