|
|
@@ -815,14 +815,14 @@ func refundAuto() {
|
|
|
})
|
|
|
TiDb.UpdateOrDeleteBySql(`UPDATE dwd_f_csm_customer_info SET is_transfer=1 WHERE clue_id = ?`, clueId)
|
|
|
} else {
|
|
|
- order1Sql := fmt.Sprintf(`select refund_status from dataexport_order a INNER JOIN jy_order_detail b on a.order_code=b.order_code and a.user_id in (%s) and b.product_type in (%s) and order_status = 1 and vip_endtime>"%s" ORDER BY b.service_endtime desc `, strings.Join(personArr, ","), strings.Join(productArr, ","), findNowTime)
|
|
|
+ order1Sql := fmt.Sprintf(`select a.id from dataexport_order a INNER JOIN jy_order_detail b on a.order_code=b.order_code and a.user_id in (%s) and b.product_type in (%s) and order_status = 1 and b.service_endtime>"%s" ORDER BY b.service_endtime desc `, strings.Join(personArr, ","), strings.Join(productArr, ","), findNowTime)
|
|
|
order1 := Mysql.SelectBySql(order1Sql)
|
|
|
if order1 == nil || len(*order1) == 0 {
|
|
|
isOk := false
|
|
|
- order3Sql := fmt.Sprintf(`select a.refund_status, b.product_type AS productType,b.service_starttime,b.service_endtime ,b.filter AS productFilter
|
|
|
+ order3Sql := fmt.Sprintf(`select a.* , b.product_type AS productType,b.service_starttime,b.service_endtime ,b.filter AS productFilter
|
|
|
from dataexport_order a INNER JOIN jy_order_detail b
|
|
|
on a.order_code=b.order_code and a.user_id in (%s) and b.product_type in (%s)
|
|
|
- and order_status = 1 and vip_endtime<"%s" ORDER BY b.service_endtime desc `,
|
|
|
+ and order_status = 1 and b.service_endtime<"%s" ORDER BY b.service_endtime desc `,
|
|
|
strings.Join(personArr, ","), strings.Join(productArr, ","), findNowTime)
|
|
|
_, vip_endtime := getOrderData(order3Sql)
|
|
|
if vip_endtime != "" {
|
|
|
@@ -1980,7 +1980,6 @@ func GetOrderProduct(productType string, file string) (string, int64, int64) {
|
|
|
level := int64(0)
|
|
|
switch productType {
|
|
|
case "大会员":
|
|
|
-
|
|
|
level = gconv.Int64(fileJson["comboId"])
|
|
|
if level == 0 {
|
|
|
level = gconv.Int64(fileJson["level"])
|
WH01243