|
@@ -61,39 +61,39 @@ func ReportBillsDownload1(c *gin.Context, apictx *ApiSession) (interface{}, erro
|
|
|
typeBills := map[string]interface{}{}
|
|
|
redisCli := apictx.Svc.Redis
|
|
|
reportBillKey := "report-bill-list:" + apictx.User.Parent
|
|
|
- isExist := redisCli.Exists(apictx.CreateRepoCtx().Ctx, reportBillKey).Val()
|
|
|
- fmt.Println("是否存在:", isExist)
|
|
|
+ redisCli.Del(apictx.CreateRepoCtx().Ctx, reportBillKey)
|
|
|
+ // isExist := redisCli.Exists(apictx.CreateRepoCtx().Ctx, reportBillKey).Val()
|
|
|
// 不存在这个key时
|
|
|
- if isExist < 1 {
|
|
|
- if len(purchases) > 0 {
|
|
|
- for _, purchase := range purchases {
|
|
|
-
|
|
|
- member := "purchase_" + purchase.Id.Hex()
|
|
|
- score := purchase.CompleteTime.Unix()
|
|
|
- redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
- typeBills[member] = purchase
|
|
|
- }
|
|
|
+ // if isExist < 1 {
|
|
|
+ if len(purchases) > 0 {
|
|
|
+ for _, purchase := range purchases {
|
|
|
+
|
|
|
+ member := "purchase_" + purchase.Id.Hex()
|
|
|
+ score := purchase.CompleteTime.Unix()
|
|
|
+ redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
+ typeBills[member] = purchase
|
|
|
}
|
|
|
- if len(produces) > 0 {
|
|
|
- for _, produce := range produces {
|
|
|
- member := "produce_" + produce.Id.Hex()
|
|
|
- score := produce.CompleteTime.Unix()
|
|
|
- redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
- typeBills[member] = produce
|
|
|
- }
|
|
|
+ }
|
|
|
+ if len(produces) > 0 {
|
|
|
+ for _, produce := range produces {
|
|
|
+ member := "produce_" + produce.Id.Hex()
|
|
|
+ score := produce.CompleteTime.Unix()
|
|
|
+ redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
+ typeBills[member] = produce
|
|
|
}
|
|
|
- if len(products) > 0 {
|
|
|
- for _, product := range products {
|
|
|
- member := "product_" + product.Id.Hex()
|
|
|
- score := product.CompleteTime.Unix()
|
|
|
- redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
- typeBills[member] = product
|
|
|
- }
|
|
|
+ }
|
|
|
+ if len(products) > 0 {
|
|
|
+ for _, product := range products {
|
|
|
+ member := "product_" + product.Id.Hex()
|
|
|
+ score := product.CompleteTime.Unix()
|
|
|
+ redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
+ typeBills[member] = product
|
|
|
}
|
|
|
- // 设置过期时间
|
|
|
- redisCli.Expire(apictx.CreateRepoCtx().Ctx, reportBillKey, 1*time.Second)
|
|
|
-
|
|
|
}
|
|
|
+ // 设置过期时间
|
|
|
+ // redisCli.Expire(apictx.CreateRepoCtx().Ctx, reportBillKey, 1*time.Second)
|
|
|
+
|
|
|
+ // }
|
|
|
|
|
|
total, err := redisCli.ZCard(apictx.CreateRepoCtx().Ctx, reportBillKey).Uint64()
|
|
|
fmt.Println("单据总数量: ", total)
|
|
@@ -383,37 +383,38 @@ func ReportBillsDownload(c *gin.Context, apictx *ApiSession) (interface{}, error
|
|
|
typeBills := map[string]interface{}{}
|
|
|
redisCli := apictx.Svc.Redis
|
|
|
reportBillKey := "report-bill-list:" + apictx.User.Parent
|
|
|
- isExist := redisCli.Exists(apictx.CreateRepoCtx().Ctx, reportBillKey).Val()
|
|
|
+ redisCli.Del(apictx.CreateRepoCtx().Ctx, reportBillKey)
|
|
|
+ // isExist := redisCli.Exists(apictx.CreateRepoCtx().Ctx, reportBillKey).Val()
|
|
|
// 不存在这个key时
|
|
|
- if isExist < 1 {
|
|
|
- if len(purchases) > 0 {
|
|
|
- for _, purchase := range purchases {
|
|
|
- member := "purchase_" + purchase.Id.Hex()
|
|
|
- score := purchase.CompleteTime.Unix()
|
|
|
- redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
- typeBills[member] = purchase
|
|
|
- }
|
|
|
+ // if isExist < 1 {
|
|
|
+ if len(purchases) > 0 {
|
|
|
+ for _, purchase := range purchases {
|
|
|
+ member := "purchase_" + purchase.Id.Hex()
|
|
|
+ score := purchase.CompleteTime.Unix()
|
|
|
+ redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
+ typeBills[member] = purchase
|
|
|
}
|
|
|
- if len(produces) > 0 {
|
|
|
- for _, produce := range produces {
|
|
|
- member := "produce_" + produce.Id.Hex()
|
|
|
- score := produce.CompleteTime.Unix()
|
|
|
- redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
- typeBills[member] = produce
|
|
|
- }
|
|
|
+ }
|
|
|
+ if len(produces) > 0 {
|
|
|
+ for _, produce := range produces {
|
|
|
+ member := "produce_" + produce.Id.Hex()
|
|
|
+ score := produce.CompleteTime.Unix()
|
|
|
+ redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
+ typeBills[member] = produce
|
|
|
}
|
|
|
- if len(products) > 0 {
|
|
|
- for _, product := range products {
|
|
|
- member := "product_" + product.Id.Hex()
|
|
|
- score := product.CompleteTime.Unix()
|
|
|
- redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
- typeBills[member] = product
|
|
|
- }
|
|
|
+ }
|
|
|
+ if len(products) > 0 {
|
|
|
+ for _, product := range products {
|
|
|
+ member := "product_" + product.Id.Hex()
|
|
|
+ score := product.CompleteTime.Unix()
|
|
|
+ redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
+ typeBills[member] = product
|
|
|
}
|
|
|
- // 设置过期时间
|
|
|
- redisCli.Expire(apictx.CreateRepoCtx().Ctx, reportBillKey, 1*time.Second)
|
|
|
-
|
|
|
}
|
|
|
+ // 设置过期时间
|
|
|
+ // redisCli.Expire(apictx.CreateRepoCtx().Ctx, reportBillKey, 1*time.Second)
|
|
|
+
|
|
|
+ // }
|
|
|
|
|
|
total, err := redisCli.ZCard(apictx.CreateRepoCtx().Ctx, reportBillKey).Uint64()
|
|
|
fmt.Println("单据总数量: ", total)
|
|
@@ -665,35 +666,35 @@ func ReportListDownload(c *gin.Context, apictx *ApiSession) (interface{}, error)
|
|
|
redisCli := apictx.Svc.Redis
|
|
|
|
|
|
reportBillKey := "report-bill-list:" + apictx.User.Parent
|
|
|
-
|
|
|
- isExist := redisCli.Exists(apictx.CreateRepoCtx().Ctx, reportBillKey).Val()
|
|
|
+ redisCli.Del(apictx.CreateRepoCtx().Ctx, reportBillKey)
|
|
|
+ // isExist := redisCli.Exists(apictx.CreateRepoCtx().Ctx, reportBillKey).Val()
|
|
|
// 不存在这个key时
|
|
|
- if isExist < 1 {
|
|
|
- if len(purchases) > 0 {
|
|
|
- for _, purchase := range purchases {
|
|
|
- member := "purchase_" + purchase.Id.Hex()
|
|
|
- score := purchase.CompleteTime.Unix()
|
|
|
- redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
- }
|
|
|
+ // if isExist < 1 {
|
|
|
+ if len(purchases) > 0 {
|
|
|
+ for _, purchase := range purchases {
|
|
|
+ member := "purchase_" + purchase.Id.Hex()
|
|
|
+ score := purchase.CompleteTime.Unix()
|
|
|
+ redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
}
|
|
|
- if len(produces) > 0 {
|
|
|
- for _, produce := range produces {
|
|
|
- member := "produce_" + produce.Id.Hex()
|
|
|
- score := produce.CompleteTime.Unix()
|
|
|
- redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
- }
|
|
|
+ }
|
|
|
+ if len(produces) > 0 {
|
|
|
+ for _, produce := range produces {
|
|
|
+ member := "produce_" + produce.Id.Hex()
|
|
|
+ score := produce.CompleteTime.Unix()
|
|
|
+ redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
}
|
|
|
- if len(products) > 0 {
|
|
|
- for _, product := range products {
|
|
|
- member := "product_" + product.Id.Hex()
|
|
|
- score := product.CompleteTime.Unix()
|
|
|
- redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
- }
|
|
|
+ }
|
|
|
+ if len(products) > 0 {
|
|
|
+ for _, product := range products {
|
|
|
+ member := "product_" + product.Id.Hex()
|
|
|
+ score := product.CompleteTime.Unix()
|
|
|
+ redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
}
|
|
|
- // 设置过期时间
|
|
|
- redisCli.Expire(apictx.CreateRepoCtx().Ctx, reportBillKey, 1*time.Second)
|
|
|
-
|
|
|
}
|
|
|
+ // 设置过期时间
|
|
|
+ // redisCli.Expire(apictx.CreateRepoCtx().Ctx, reportBillKey, 1*time.Second)
|
|
|
+
|
|
|
+ // }
|
|
|
|
|
|
total, err := redisCli.ZCard(apictx.CreateRepoCtx().Ctx, reportBillKey).Uint64()
|
|
|
fmt.Println(total)
|
|
@@ -810,35 +811,35 @@ func ReportList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
redisCli := apictx.Svc.Redis
|
|
|
|
|
|
reportBillKey := "report-bill-list:" + apictx.User.Parent
|
|
|
-
|
|
|
- isExist := redisCli.Exists(apictx.CreateRepoCtx().Ctx, reportBillKey).Val()
|
|
|
+ redisCli.Del(apictx.CreateRepoCtx().Ctx, reportBillKey)
|
|
|
+ // isExist := redisCli.Exists(apictx.CreateRepoCtx().Ctx, reportBillKey).Val()
|
|
|
// 不存在这个key时
|
|
|
- if isExist < 1 {
|
|
|
- if len(purchases) > 0 {
|
|
|
- for _, purchase := range purchases {
|
|
|
- member := "purchase_" + purchase.Id.Hex()
|
|
|
- score := purchase.CompleteTime.Unix()
|
|
|
- redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
- }
|
|
|
+ // if isExist < 1 {
|
|
|
+ if len(purchases) > 0 {
|
|
|
+ for _, purchase := range purchases {
|
|
|
+ member := "purchase_" + purchase.Id.Hex()
|
|
|
+ score := purchase.CompleteTime.Unix()
|
|
|
+ redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
}
|
|
|
- if len(produces) > 0 {
|
|
|
- for _, produce := range produces {
|
|
|
- member := "produce_" + produce.Id.Hex()
|
|
|
- score := produce.CompleteTime.Unix()
|
|
|
- redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
- }
|
|
|
+ }
|
|
|
+ if len(produces) > 0 {
|
|
|
+ for _, produce := range produces {
|
|
|
+ member := "produce_" + produce.Id.Hex()
|
|
|
+ score := produce.CompleteTime.Unix()
|
|
|
+ redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
}
|
|
|
- if len(products) > 0 {
|
|
|
- for _, product := range products {
|
|
|
- member := "product_" + product.Id.Hex()
|
|
|
- score := product.CompleteTime.Unix()
|
|
|
- redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
- }
|
|
|
+ }
|
|
|
+ if len(products) > 0 {
|
|
|
+ for _, product := range products {
|
|
|
+ member := "product_" + product.Id.Hex()
|
|
|
+ score := product.CompleteTime.Unix()
|
|
|
+ redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
|
|
|
}
|
|
|
- // 设置过期时间
|
|
|
- redisCli.Expire(apictx.CreateRepoCtx().Ctx, reportBillKey, 1*time.Second)
|
|
|
-
|
|
|
}
|
|
|
+ // 设置过期时间
|
|
|
+ // redisCli.Expire(apictx.CreateRepoCtx().Ctx, reportBillKey, 1*time.Second)
|
|
|
+
|
|
|
+ // }
|
|
|
|
|
|
total, err := redisCli.ZCard(apictx.CreateRepoCtx().Ctx, reportBillKey).Uint64()
|
|
|
if err != nil {
|