清空订单

taoshihan1991 · Dec 8, 2020 · 147cb23 · 147cb23
1 parent a034f35
commit 147cb23
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 9 deletions.
diff --git a/controller/orders.go b/controller/orders.go
@@ -3,11 +3,19 @@ package controller
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/taoshihan1991/miaosha/redis"
+	"strconv"
 )
 
 func GetOrders(c *gin.Context) {
+	start := c.Query("start")
+	stop := c.Query("stop")
+	startNum, _ := strconv.ParseInt(start, 10, 64)
+	stopNum, _ := strconv.ParseInt(stop, 10, 64)
+	if stopNum == 0 {
+		stopNum = 10
+	}
 	redis.NewRedis()
-	list := redis.GetOrders()
+	list := redis.GetOrders(startNum, stopNum)
 	c.JSON(200, gin.H{
 		"code": 200,
 		"msg":  "success",

diff --git a/controller/product.go b/controller/product.go
@@ -19,6 +19,7 @@ func GetProduct(c *gin.Context) {
 	saleTime, err := strconv.ParseInt(info["saletime"], 10, 64)
 	if err != nil || saleTime < now {
 		redis.SetProduct(id)
+		redis.OrderDel()
 		info = redis.ProductInfo(id)
 	}
 	c.JSON(200, gin.H{
@@ -67,7 +68,7 @@ func GetKillUrl(c *gin.Context) {
 	urlPath := fmt.Sprintf("product:%s,%d", id, time.Now().UnixNano())
 	token := utils.Md5(urlPath)
 	redis.SetStr(token, id, time.Second*10)
-	url := "/seckill/" + token
+	url := "seckill/" + token
 	c.JSON(200, gin.H{
 		"code": 200,
 		"msg":  "success",

diff --git a/front/static/js/config.js b/front/static/js/config.js
@@ -1 +1 @@
-var api="http://miaosha.sopans.com";
+var api="/";
diff --git a/front/static/js/detail.js b/front/static/js/detail.js
@@ -4,7 +4,7 @@
 $(function () {
     $.ajax({
         type: "GET",
-        url: api+"/product?id=1",
+        url: api+"product?id=1",
         success: function(res) {
             var product=res.data.product;
             $("#title").html(product.title);
@@ -69,7 +69,7 @@ $(function () {
         $(".buyBtn a").addClass("btn-disabled");
         $.ajax({
             type: "GET",
-            url: api+"/buy?id=1&session="+localStorage.getItem("session"),
+            url: api+"buy?id=1&session="+localStorage.getItem("session"),
             success: function(res) {
                 if(res.code==200){
                     url=res.data.url;
@@ -94,14 +94,14 @@ $(function () {
     });
     $.ajax({
         type: "GET",
-        url: api+"/userinfo?session="+localStorage.getItem("session"),
+        url: api+"userinfo?session="+localStorage.getItem("session"),
         success: function(res) {
             if(res.code!=200){
                 var name=prompt(res.msg);
                 if(name!=null&&name!=""){
                     $.ajax({
                         type: "POST",
-                        url: api + "/userinfo",
+                        url: api + "userinfo",
                         data: {name:name},
                         success: function (res) {
                             if(res.code==200){

diff --git a/redis/order.go b/redis/order.go
@@ -26,8 +26,8 @@ func InsertOrder(user string, productId string) {
 	SortedSetAdd("orders", string(msg), float64(time.Now().Unix()))
 	SetOrderDetail(productId, user, order.Time)
 }
-func GetOrders() []*Order {
-	list := SortedSetList("orders", 0, 10)
+func GetOrders(start int64, stop int64) []*Order {
+	list := SortedSetList("orders", start, stop)
 	rows := make([]*Order, 0)
 	for _, r := range list {
 		order := &Order{}
@@ -48,3 +48,14 @@ func OrderExist(user string) bool {
 	key := "order_detail:" + user
 	return HashExist(key, "ordertime")
 }
+func OrderDel() {
+	key := "orders"
+	itemKey := "order_detail:"
+	list := SortedSetList(key, 0, -1)
+	for _, r := range list {
+		order := &Order{}
+		json.Unmarshal([]byte(r), order)
+		DelKey(itemKey + order.User)
+	}
+	DelKey(key)
+}