root
/
pet-house
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed

This commit is contained in:
yan.y 2024-05-04 19:34:10 +08:00
parent abe0a27140
commit b75547f739
6 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
business/api/auth.go
View File

@ -4,12 +4,14 @@ import (
"encoding/json"
"github.com/kataras/iris/v12"
"github.com/kataras/iris/v12/context"
"go.uber.org/zap"
"io"
"pet-house.com/business/models"
"pet-house.com/business/utils"
"pet-house.com/core/server/database"
"pet-house.com/core/server/web"
"pet-house.com/core/server/web/web_iris"
"pet-house.com/core/server/zap_server"
)
type LoginRequest struct {
@ -55,6 +57,10 @@ func (p DefParty) login() web_iris.Party {
LoginError.DefFail(ctx, loginRequest, info.ErrMsg)
return
}
if len(info.Unionid) == 0 {
info.Unionid = info.Openid
}
zap_server.ZAPLOG.Info("codeLogin", zap.Any("info", info))
if len(loginRequest.NickName) == 0 {
loginRequest.NickName = defaultNickName
}
@ -62,7 +68,7 @@ func (p DefParty) login() web_iris.Party {
loginRequest.HeadImgUrl = defaultHeadImgUrl
}
var userInfo models.User
database.Instance().Model(&models.User{}).Where("open_id = ? or union_id = ?", info.Openid, info.Unionid).Find(&userInfo)
database.Instance().Model(&models.User{}).Where("open_id = ?", info.Openid).Find(&userInfo)
if userInfo.Id == 0 {
newUser := models.User{
NickName: loginRequest.NickName,
@ -74,7 +80,8 @@ func (p DefParty) login() web_iris.Party {
Mobile: "",
Role: 0,
}
database.Instance().Model(&models.User{}).Create(&newUser)
err := database.Instance().Create(&newUser).Error
zap_server.ZAPLOG.Info("create", zap.Any("err", err))
userInfo = newUser
}
token := genToken(userInfo.Id)

2
business/api/car.go
View File

@ -9,6 +9,7 @@ import (
"pet-house.com/business/models"
"pet-house.com/core/server/database"
"pet-house.com/core/server/web/web_iris"
"time"
)
var CarServiceNum = 1
@ -131,6 +132,7 @@ func (p DefParty) carServiceProcess() web_iris.Party {
if subOrderInfo.PayAmount == 0 {
subOrderInfo.PayAmount = subOrderInfo.TotalAmount
}
subOrderInfo.PayTime = time.Now()
subOrderInfo.PayRemark = carServiceProcessRequest.PayRemark
database.Instance().Save(&subOrderInfo)
var count int64

2
business/api/common.go
View File

@ -144,7 +144,7 @@ func DataInit() {
database.Instance().Model(&models.PetGoods{}).Find(&petGoodsList)
PetGoodsMap = make(map[string][]models.PetGoods)
for _, value := range petGoodsList {
key := strconv.Itoa(value.Assortment) + strconv.Itoa(value.PetType) + strconv.Itoa(value.Size)
key := strconv.Itoa(value.Assortment) + strconv.Itoa(value.PetType) + strconv.Itoa(value.Weight)
if _, ok := PetGoodsMap[key]; ok {
PetGoodsMap[key] = append(PetGoodsMap[key], value)
} else {

2
business/api/goods.go
View File

@ -46,7 +46,7 @@ func (p DefParty) goodsList() web_iris.Party {
//先取默认的商品
key := "0" + strconv.Itoa(userPetInfo.PetBaseInfo.PetType) + strconv.Itoa(userPetInfo.PetBaseInfo.Size)
goodsList := getPetGoodsList(key)
key1 := strconv.Itoa(userPetInfo.PetBaseInfo.Id) + strconv.Itoa(userPetInfo.PetBaseInfo.PetType) + strconv.Itoa(userPetInfo.PetBaseInfo.Size)
key1 := strconv.Itoa(userPetInfo.PetBaseInfo.Id) + strconv.Itoa(userPetInfo.PetBaseInfo.PetType) + strconv.Itoa(userPetInfo.PetInfo.Weight)
goodsList = append(goodsList, getPetGoodsList(key1)...)
Success(ctx, goodsListRequest, GoodsListResponse{goodsList})
})

4
business/api/order.go
View File

@ -220,9 +220,9 @@ func (p DefParty) orderList() web_iris.Party {
}
var orderList []models.OrderMain
if orderListRequest.Status == 0 {
database.Instance().Model(&models.OrderMain{}).Where("uid = ?", headerBaseInfo.Uid).Offset((orderListRequest.PageNo - 1) * orderListRequest.PageSize).Limit(orderListRequest.PageSize).Order(clause.OrderByColumn{Column: clause.Column{Name: "create_time"}, Desc: false}).Find(&orderList)
database.Instance().Model(&models.OrderMain{}).Where("uid = ?", headerBaseInfo.Uid).Offset((orderListRequest.PageNo - 1) * orderListRequest.PageSize).Limit(orderListRequest.PageSize).Order(clause.OrderByColumn{Column: clause.Column{Name: "create_time"}, Desc: true}).Find(&orderList)
} else {
database.Instance().Model(&models.OrderMain{}).Where("uid = ? and status = ?", headerBaseInfo.Uid, orderListRequest.Status).Offset((orderListRequest.PageNo - 1) * orderListRequest.PageSize).Limit(orderListRequest.PageSize).Order(clause.OrderByColumn{Column: clause.Column{Name: "create_time"}, Desc: false}).Find(&orderList)
database.Instance().Model(&models.OrderMain{}).Where("uid = ? and status = ?", headerBaseInfo.Uid, orderListRequest.Status).Offset((orderListRequest.PageNo - 1) * orderListRequest.PageSize).Limit(orderListRequest.PageSize).Order(clause.OrderByColumn{Column: clause.Column{Name: "create_time"}, Desc: true}).Find(&orderList)
}
var orderDetails []OrderDetail
for _, value := range orderList {

2
business/utils/wechat.go
View File

@ -83,7 +83,7 @@ type WxUserInfo struct {
}
func GetWxUserInfo(code string) (*response.JsCode2SessionResult, error) {
info, err := wxHelper.wechatService.GetUserService().Jscode2Session(code)
info, err := getWxaService().GetUserService().Jscode2Session(code)
if err != nil {
return nil, err
}