|
|
@@ -106,7 +106,7 @@ WHERE %s and jod.status =1 order by dor.create_time desc`, whereSql))
|
|
|
|
|
|
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
|
|
|
-WHERE a.status = 1 and b.user_phone = ? and b.buy_subject = 1 and a.product_type like '%大会员%' ORDER BY b.create_time desc `, param.Phone)
|
|
|
+WHERE a.status = 1 and a.is_service_open=1 and b.user_phone = ? and b.buy_subject = 1 and a.product_type like '%大会员%' ORDER BY b.create_time desc `, param.Phone)
|
|
|
if !orderData.IsEmpty() {
|
|
|
for _, m2 := range orderData.List() {
|
|
|
var ttt model.JyBigProductFilter
|
|
|
@@ -204,7 +204,7 @@ WHERE a.status = 1 and b.user_phone = ? and b.buy_subject = 1 and a.product_typ
|
|
|
)
|
|
|
orderData, _ := g.DB().Query(ctx, `SELECT a.id,a.service_type,a.order_code,b.create_time FROM jy_order_detail a
|
|
|
INNER JOIN dataexport_order b on a.order_code = b.order_code
|
|
|
-WHERE a.status = 1 and b.user_phone = ? and b.buy_subject = 1 and a.product_type like '%VIP订阅%' ORDER BY b.create_time desc `, param.Phone)
|
|
|
+WHERE a.status = 1 and b.user_phone = ? and a.is_service_open=1 and b.buy_subject = 1 and a.product_type like '%VIP订阅%' ORDER BY b.create_time desc `, param.Phone)
|
|
|
if !orderData.IsEmpty() {
|
|
|
for _, m2 := range orderData.List() {
|
|
|
if linkedId == 0 {
|
|
|
@@ -404,7 +404,7 @@ func SpecialService(ctx context.Context, phone, productType string, buySubject i
|
|
|
|
|
|
orderData, _ := g.DB().Query(ctx, fmt.Sprintf(`SELECT jod.product_code,jod.service_endtime,jod.id,jod.service_starttime,jod.service_type,jod.order_code,dor.create_time FROM dataexport_order dor
|
|
|
INNER JOIN jy_order_detail jod on dor.order_code = jod.order_code
|
|
|
-WHERE %s and dor.product_type = '%s' and jod.status =1 ORDER BY dor.create_time desc `, phone, productType))
|
|
|
+WHERE %s and dor.product_type = '%s' and jod.is_service_open=1 and jod.status =1 ORDER BY dor.create_time desc `, phone, productType))
|
|
|
if !orderData.IsEmpty() {
|
|
|
for _, m2 := range orderData.List() {
|
|
|
if linkedId == 0 {
|
