jianghan 5 сар өмнө
parent
commit
e920218b4f

+ 19 - 15
JySEPlatform/service/private_service.go

@@ -339,27 +339,31 @@ func (f *Private) Keydataaccount(world string) {
 	log.Println("Keydataaccount 新导出", len(exportIds))
 	log.Println("Keydataaccount 新导出", len(exportIds))
 	if resp.Data.ChargeType == 0 {
 	if resp.Data.ChargeType == 0 {
 		isExport := true
 		isExport := true
-		var reason []string
-		if int64(len(newIdArr)) > resp.Data.Num1 {
-			isExport = false
-			reason = append(reason, "企业数据流量包余额不足")
-		}
-		if int64(len(newIdArr)) > resp.Data.Num3 {
-			isExport = false
-			reason = append(reason, "超出您的每日导出限额")
-		}
-		if int64(len(newIdArr)) > resp.Data.Num5 {
-			isExport = false
-			reason = append(reason, "超出您的数据导出总量限额")
+		reason := make([]string, 0)
+		if resp.Data.Num2 == 0 && resp.Data.Num4 == 0 {
+			isExport = true
+		} else {
+			if int64(len(newIdArr)) > resp.Data.Num1 {
+				isExport = false
+				reason = append(reason, "企业数据流量包余额不足")
+			}
+			if int64(len(newIdArr)) > resp.Data.Num3 {
+				isExport = false
+				reason = append(reason, "超出您的每日导出限额")
+			}
+			if int64(len(newIdArr)) > resp.Data.Num5 {
+				isExport = false
+				reason = append(reason, "超出您的数据导出总量限额")
+			}
 		}
 		}
 		res := map[string]interface{}{
 		res := map[string]interface{}{
 			"count":      len(exportIds),
 			"count":      len(exportIds),
 			"newCount":   len(newIdArr),
 			"newCount":   len(newIdArr),
 			"chargeType": resp.Data.ChargeType,
 			"chargeType": resp.Data.ChargeType,
 			"current":    resp.Data.Num1,
 			"current":    resp.Data.Num1,
-			"num2":       qu.If(resp.Data.Num2 == 0, nil, resp.Data.Num2), // 每日导出限额
-			"num4":       qu.If(resp.Data.Num4 == 0, nil, resp.Data.Num4), // 导出总限额
-			"num3":       resp.Data.Num3,                                  //当日可导出余额
+			"num2":       resp.Data.Num2, // 每日导出限额
+			"num4":       resp.Data.Num4, // 导出总限额
+			"num3":       resp.Data.Num3, //当日可导出余额
 			"num5":       resp.Data.Num5,
 			"num5":       resp.Data.Num5,
 			"isExport":   isExport,
 			"isExport":   isExport,
 			"reason":     strings.Join(reason, "、"),
 			"reason":     strings.Join(reason, "、"),