Merge branch 'main' of git-ssh.tornberg.me:mats/go-cart-actor
This commit is contained in:
@@ -10,7 +10,6 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"regexp"
|
|
||||||
"sort"
|
"sort"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -70,15 +69,15 @@ func isValidFileId(name string) (uint64, bool) {
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
func appendFileInfo(info fs.FileInfo, out *CartFileInfo) *CartFileInfo {
|
func appendFileInfo(info fs.FileInfo, out *CartFileInfo) *CartFileInfo {
|
||||||
sys := info.Sys()
|
//sys := info.Sys()
|
||||||
fmt.Printf("sys type %T", sys)
|
//fmt.Printf("sys type %T", sys)
|
||||||
out.Size = info.Size()
|
out.Size = info.Size()
|
||||||
out.Modified = info.ModTime()
|
out.Modified = info.ModTime()
|
||||||
//out.Accessed, _ = AccessTime(info)
|
//out.Accessed, _ = AccessTime(info)
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
var cartFileRe = regexp.MustCompile(`^(\d+)\.events\.log$`)
|
// var cartFileRe = regexp.MustCompile(`^(\d+)\.events\.log$`)
|
||||||
|
|
||||||
func listCartFiles(dir string) ([]*CartFileInfo, error) {
|
func listCartFiles(dir string) ([]*CartFileInfo, error) {
|
||||||
entries, err := os.ReadDir(dir)
|
entries, err := os.ReadDir(dir)
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ type ItemMeta struct {
|
|||||||
type CartItem struct {
|
type CartItem struct {
|
||||||
Id uint32 `json:"id"`
|
Id uint32 `json:"id"`
|
||||||
ItemId uint32 `json:"itemId,omitempty"`
|
ItemId uint32 `json:"itemId,omitempty"`
|
||||||
ParentId uint32 `json:"parentId,omitempty"`
|
ParentId *uint32 `json:"parentId,omitempty"`
|
||||||
Sku string `json:"sku"`
|
Sku string `json:"sku"`
|
||||||
Price Price `json:"price"`
|
Price Price `json:"price"`
|
||||||
TotalPrice Price `json:"totalPrice"`
|
TotalPrice Price `json:"totalPrice"`
|
||||||
|
|||||||
@@ -76,6 +76,8 @@ func AddItem(g *CartGrain, m *messages.AddItem) error {
|
|||||||
SellerId: m.SellerId,
|
SellerId: m.SellerId,
|
||||||
SellerName: m.SellerName,
|
SellerName: m.SellerName,
|
||||||
},
|
},
|
||||||
|
SaleStatus: m.SaleStatus,
|
||||||
|
ParentId: m.ParentId,
|
||||||
|
|
||||||
Price: *pricePerItem,
|
Price: *pricePerItem,
|
||||||
TotalPrice: *MultiplyPrice(*pricePerItem, int64(m.Quantity)),
|
TotalPrice: *MultiplyPrice(*pricePerItem, int64(m.Quantity)),
|
||||||
|
|||||||
Reference in New Issue
Block a user