jd
/
back
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: price

Browse Source
master
howell 3 years ago
parent 6794af1462
commit 64dd3c5ddf
10 changed files with 101 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
internal/api/manage/activity/query.go
Unescape View File

@ -83,7 +83,7 @@ type queryActListResp struct {
// CreateAt formatime.Second `gorm:"column:created_at" json:"createAt"`
//}
// 活动页的活动列表
// QueryNewActivityList 活动页的活动列表
func QueryNewActivityList(c *gin.Context) {
var limit int64 = 20

15
internal/api/mobile/goods/detail.go
Unescape View File

@ -59,6 +59,7 @@ type priceSub struct {
DiscountPrice decimal.Decimal `gorm:"column:discount_price" json:"discountPrice"`
Commission decimal.Decimal `gorm:"column:commission" json:"commission"`
Ferme decimal.Decimal `json:"ferme"`
SalePrice decimal.Decimal `json:"sale_price"`
}
type allPrice struct {
@ -66,8 +67,8 @@ type allPrice struct {
DiscountPrice decimal.Decimal `gorm:"column:discount_price" json:"discountPrice"`
Commission decimal.Decimal `gorm:"column:commission" json:"commission"`
PurchasePrice decimal.Decimal `gorm:"column:purchase_price" json:"purchasePrice"`
Min uint `gorm:"column:min" json:"min"`
Limit uint `gorm:"column:limit" json:"limit"`
Min uint `gorm:"column:min_num" json:"min"`
Limit uint `gorm:"column:limit_num" json:"limit"`
SalePrice decimal.Decimal `gorm:"column:sale_price" json:"sale_price"`
}
@ -328,8 +329,8 @@ func QueryGoodsDetailNew(c *gin.Context) {
"MIN(discount_price) AS discount_price, " +
"MIN(commission) AS commission, " +
"MIN(purchase_price) AS purchase_price, " +
"MIN(min_num) AS min, " +
"MIN(limit_num) AS limit "
"MIN(min_num) AS min_num, " +
"MIN(limit_num) AS limit_num "
dbc.DB.Table((&goods.Sku{}).TableName()).Select(selectMinPriceStr).First(&minAllPrice, "goods_id = ?", p.GoodsID)
minAllPrice.SalePrice = minAllPrice.GetSalePrice(u1.Level)
@ -338,8 +339,8 @@ func QueryGoodsDetailNew(c *gin.Context) {
"MAX(discount_price) AS discount_price, " +
"MAX(commission) AS commission, " +
"MAX(purchase_price) AS purchase_price, " +
"MAX(min_num) AS min, " +
"MAX(limit_num) AS limit "
"MAX(min_num) AS min_num, " +
"MAX(limit_num) AS limit_num "
dbc.DB.Table((&goods.Sku{}).TableName()).Select(selectMaxPriceStr).First(&maxAllPrice, "goods_id = ?", p.GoodsID)
maxAllPrice.SalePrice = maxAllPrice.GetSalePrice(u1.Level)
@ -360,11 +361,13 @@ func QueryGoodsDetailNew(c *gin.Context) {
OriginalPrice: minAllPrice.OriginalPrice,
DiscountPrice: minAllPrice.DiscountPrice,
Commission: minCommission1.Add(minCommission2).Add(minCommission3),
SalePrice: minAllPrice.SalePrice,
},
priceSub{
OriginalPrice: maxAllPrice.OriginalPrice,
DiscountPrice: maxAllPrice.DiscountPrice,
Commission: maxCommission1.Add(maxCommission2).Add(maxCommission3),
SalePrice: minAllPrice.SalePrice,
},
}
//if summary.IsFerme == goods2.RecookGoodsInfoIsFermeTrue {

4
internal/dbc/mysql.go
Unescape View File

@ -42,7 +42,7 @@ func SetupMysql() {
} else {
c = &MysqlConfig{
Dsn: "db_recook_super:sduEb9MTSiqhweXGpxa0@123@tcp(127.0.0.1:3306)/db_recook?timeout=3s&readTimeout=3s&writeTimeout=3s&parseTime=true&loc=Local&charset=utf8mb4,utf8",
Dsn: "db_recook_super:sduEb9MTSiqhweXGpxa0@123@tcp(139.196.147.232:3306)/db_recook?timeout=3s&readTimeout=3s&writeTimeout=3s&parseTime=true&loc=Local&charset=utf8mb4,utf8",
Idle: 10,
Active: 500,
}
@ -99,7 +99,7 @@ func SetupNewMysql() {
err := mysql2.InitMysql(&mysql2.DbConfig{
Username: "db_recook_super",
Password: "sduEb9MTSiqhweXGpxa0@123",
Host: "127.0.0.1",
Host: "139.196.147.232",
Port: 3306,
Extend: "timeout=3s&readTimeout=3s&writeTimeout=3s&parseTime=true&loc=Local&charset=utf8mb4,utf8\n",
LogLevel: 4,

5
internal/gateway/app/v1.go
Unescape View File

@ -3,6 +3,7 @@ package app
import (
"recook/internal/api/mobile/bill"
"recook/internal/api/mobile/live"
"recook/internal/secure"
_ "recook/internal/secure"
"recook/internal/v2/router/middleware"
@ -54,9 +55,9 @@ func SetupRouter(v1 *gin.RouterGroup) {
}
v1.Group("activity").POST("/detail", activity.QueryActivityDetail)
//测试时注销
v1.Use(authorize())
//v1.Use(authorize())
//测试完成后注销注销
//v1.Use(secure.FakeEcrypt())
v1.Use(secure.FakeEcrypt())
v1.Use(decrypt())
{

10
internal/v2/controller/app/jyy/jyy.go
Unescape View File

@ -3,6 +3,7 @@ package jyy
import (
"recook/internal/back"
"recook/internal/v2/logic/app/jyy"
"recook/tools"
"github.com/gin-gonic/gin"
)
@ -20,7 +21,12 @@ func (o Proxy) Activities(c *gin.Context) {
back.Suc(c, "ok", res)
}
func (o Proxy) ActivityGoods(c *gin.Context) {
res, _ := jyy.Logic.Activities()
func (o Proxy) ShopCartEntries(c *gin.Context) {
var args jyy.ArgsEntryReq
if err := tools.ParseParams(&args, c); err != nil {
back.Err(c, err.Error())
return
}
res := jyy.Logic.ShopCartEntries(args)
back.Suc(c, "ok", res)
}

48
internal/v2/logic/app/jyy/jyy.go
Unescape View File

@ -1,7 +1,10 @@
package jyy
import (
"fmt"
"github.com/shopspring/decimal"
"recook/internal/v2/model/jyy"
goods2 "recook/internal/v2/model/recook/goods"
"time"
"git.oa00.com/go/mysql"
@ -22,3 +25,48 @@ func (o logic) Activities() (res jyy.Activity, err error) {
mysql.Db.Where("status = 1").Order("order_sort asc").Order("id desc").Find(&res)
return
}
type ArgsEntryReq struct {
UserID uint `json:"user_id"`
}
type ShopCartSku struct {
ID uint `json:"id"`
DiscountPrice decimal.Decimal `json:"discount_price"`
SalePrice decimal.Decimal `json:"sale_price"`
Quantity decimal.Decimal `json:"quantity"`
Limit uint `json:"limit"`
Min uint `json:"min"`
SkuName string `json:"skuName"`
}
type ShopCartEntry struct {
GoodsID uint `json:"goods_id"`
GoodsName string `json:"goods_name"`
MainPhoto string `json:"main_photo"`
SkuList []ShopCartSku `json:"sku_list"`
SalePublish bool `json:"sale_publish"`
}
type ShopCartEntries struct {
GoodsList []ShopCartEntry `json:"goods_list"`
}
func (o logic) ShopCartEntries(args ArgsEntryReq) (res ShopCartEntries) {
sc := make([]jyy.ShopCartEntry, 0)
mysql.Db.Model(&jyy.ShopCartEntry{}).Where("user_id = ?", args.UserID).Find(&sc)
ids := make([]uint, 0)
idsMap := make(map[uint]uint, 0)
for _, v := range sc {
ids = append(ids, v.SkuID)
idsMap[v.SkuID] = v.Quantity
}
skuList := make([]goods2.RecookGoodsSkuModel, 0)
mysql.Db.Preload("GoodsInfo.MainPhoto").Where("id in (?)", ids).Find(&skuList)
for _, v := range skuList {
// todo
fmt.Println(v.GoodsInfo.MainPhoto.Url)
}
return
}

28
internal/v2/model/jyy/jyy.go
Unescape View File

@ -7,14 +7,14 @@ import (
"gorm.io/gorm"
)
type Goods struct {
ID int `json:"id"`
GoodsID uint `json:"-"`
}
func (o Goods) TableName() string {
return "jyy_goods_info"
}
//type Goods struct {
// ID int `json:"id"`
// GoodsID uint `json:"-"`
//}
//
//func (o Goods) TableName() string {
// return "jyy_goods_info"
//}
type Banner struct {
ID int `json:"id"`
@ -67,3 +67,15 @@ func (o *ActivityGoods) AfterFind(db *gorm.DB) error {
o.GoodsName = o.GoodsInfo.GoodsName
return nil
}
type ShopCartEntry struct {
ID uint `json:"id"`
SkuID uint `json:"sku_id"`
GoodsID uint `json:"goods_id"`
UserID uint `json:"user_id"`
Quantity uint `json:"quantity"`
}
func (o ShopCartEntry) TableName() string {
return "jyy_shop_cart"
}

1
internal/v2/model/recook/goods/recookGoodsSku.go
Unescape View File

@ -50,6 +50,7 @@ type RecookGoodsSkuModel struct {
Limit int `json:"limit" gorm:"column:limit_num"`
Min int `json:"min" gorm:"column:min_num"`
SaleInventory uint `json:"sale_inventory"`
GoodsInfo *RecookGoodsInfoModel `json:"-" gorm:"foreignKey:goods_id"`
}
// TableName sets the insert table name for this struct type

8
internal/v2/router/app.go
Unescape View File

@ -221,7 +221,13 @@ func routerApp(appRouter *gin.RouterGroup) {
proxy := jyy.Proxy{}
{
activityRouter.POST("list", proxy.Activities)
activityRouter.POST("entry", proxy.ActivityGoods)
}
}
ShopCartRouter := appRouter.Group("shop_cart")
{
proxy := jyy.Proxy{}
{
ShopCartRouter.POST("list", proxy.ShopCartEntries)
}
}

Write Preview
Loading…
Cancel
Save