fix:
This commit is contained in:
parent
7e22f0ed55
commit
920b0a8450
|
@ -371,6 +371,12 @@ func UpgradeMember(c *gin.Context) {
|
||||||
// RespJson(c, status.InternalServerError, nil)
|
// RespJson(c, status.InternalServerError, nil)
|
||||||
// return
|
// return
|
||||||
//}
|
//}
|
||||||
|
|
||||||
|
if user.Gender != 0 {
|
||||||
|
logger.Error("user member genre err:")
|
||||||
|
RespJson(c, status.ShortMemberNotUpgradeMember, nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
if req.MemberGenre == 0 {
|
if req.MemberGenre == 0 {
|
||||||
req.MemberGenre = model.GetMemberGenreFromLevel(req.MemberLevel)
|
req.MemberGenre = model.GetMemberGenreFromLevel(req.MemberLevel)
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@ package status
|
||||||
//40x 客户端请求问题
|
//40x 客户端请求问题
|
||||||
//50x 服务器错误。
|
//50x 服务器错误。
|
||||||
|
|
||||||
//错误码的前3位是http status code
|
// 错误码的前3位是http status code
|
||||||
const (
|
const (
|
||||||
//10x 消息
|
//10x 消息
|
||||||
|
|
||||||
|
@ -108,6 +108,7 @@ const (
|
||||||
CouponReceived = 500525 // 你已兑换过该券
|
CouponReceived = 500525 // 你已兑换过该券
|
||||||
CouponPromotionalUnused = 500526 // 您有未使用的专属续费券
|
CouponPromotionalUnused = 500526 // 您有未使用的专属续费券
|
||||||
DepositRestraint = 500527 // 押金受限
|
DepositRestraint = 500527 // 押金受限
|
||||||
|
ShortMemberNotUpgradeMember = 500530 // 短期会员暂不升级
|
||||||
ToastErr = 600 // 报错
|
ToastErr = 600 // 报错
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -173,16 +174,17 @@ var statusDesc = map[int]string{
|
||||||
AwardOffShelves: "奖品已下架",
|
AwardOffShelves: "奖品已下架",
|
||||||
AwardExchangeOut: "奖品已兑完",
|
AwardExchangeOut: "奖品已兑完",
|
||||||
|
|
||||||
GoodsNotSale: "商品已下架",
|
GoodsNotSale: "商品已下架",
|
||||||
StateNotCancel: "状态不能取消",
|
StateNotCancel: "状态不能取消",
|
||||||
UserFocusHasCoupon: "你已经兑换了优惠券",
|
UserFocusHasCoupon: "你已经兑换了优惠券",
|
||||||
UserApplyDepositRefund: "你有退保证金申请,不能借卡",
|
UserApplyDepositRefund: "你有退保证金申请,不能借卡",
|
||||||
UserNotMember: "仅开通过会员的用户可兑换",
|
UserNotMember: "仅开通过会员的用户可兑换",
|
||||||
CouponReceived: "你已兑换过该券",
|
CouponReceived: "你已兑换过该券",
|
||||||
CouponPromotionalUnused: "您有未使用的专属续费券",
|
CouponPromotionalUnused: "您有未使用的专属续费券",
|
||||||
DepositRestraint: "押金受限",
|
DepositRestraint: "押金受限",
|
||||||
NotMember: "非会员",
|
NotMember: "非会员",
|
||||||
HadReceiveReward: "已经领取过了",
|
HadReceiveReward: "已经领取过了",
|
||||||
|
ShortMemberNotUpgradeMember: "短期会员暂不支持升级",
|
||||||
}
|
}
|
||||||
|
|
||||||
var statusMsg = map[int]string{
|
var statusMsg = map[int]string{
|
||||||
|
@ -249,12 +251,13 @@ var statusMsg = map[int]string{
|
||||||
MoneySufficient: "余额不足",
|
MoneySufficient: "余额不足",
|
||||||
UserVmNotEnough: "积分余额不足",
|
UserVmNotEnough: "积分余额不足",
|
||||||
|
|
||||||
UserFocusHasCoupon: "你已经兑换了优惠券",
|
UserFocusHasCoupon: "你已经兑换了优惠券",
|
||||||
UserApplyDepositRefund: "你有退保证金申请,不能借卡",
|
UserApplyDepositRefund: "你有退保证金申请,不能借卡",
|
||||||
UserNotMember: "仅开通过会员的用户可兑换",
|
UserNotMember: "仅开通过会员的用户可兑换",
|
||||||
CouponReceived: "你已兑换过该券",
|
CouponReceived: "你已兑换过该券",
|
||||||
CouponPromotionalUnused: "您有未使用的专属续费券",
|
CouponPromotionalUnused: "您有未使用的专属续费券",
|
||||||
DepositRestraint: "押金受限",
|
DepositRestraint: "押金受限",
|
||||||
|
ShortMemberNotUpgradeMember: "短期会员暂不支持升级",
|
||||||
|
|
||||||
AwardOffShelves: "奖品已下架",
|
AwardOffShelves: "奖品已下架",
|
||||||
AwardExchangeOut: "奖品已兑完",
|
AwardExchangeOut: "奖品已兑完",
|
||||||
|
|
|
@ -45,8 +45,9 @@ const (
|
||||||
)
|
)
|
||||||
|
|
||||||
// 商品
|
// 商品
|
||||||
//go:generate goqueryset -in mall.go
|
|
||||||
// gen:qs
|
// gen:qs
|
||||||
|
//
|
||||||
|
//go:generate goqueryset -in mall.go
|
||||||
type Goods struct {
|
type Goods struct {
|
||||||
Model
|
Model
|
||||||
|
|
||||||
|
@ -69,7 +70,7 @@ type Goods struct {
|
||||||
DiscountList string `json:"discount_list" gorm:"type:text;"` // 折扣
|
DiscountList string `json:"discount_list" gorm:"type:text;"` // 折扣
|
||||||
SpecIndex string `json:"spec_index" gorm:"index"` // 1_3
|
SpecIndex string `json:"spec_index" gorm:"index"` // 1_3
|
||||||
|
|
||||||
//PriceVm uint32 `json:"price_vm"` // 积分价格
|
PriceVm uint32 `json:"price_vm"` // 积分价格
|
||||||
PriceRm uint32 `json:"price_rm"` // 人民币价格
|
PriceRm uint32 `json:"price_rm"` // 人民币价格
|
||||||
PriceOriginal uint32 `json:"price_original"` // 市场价
|
PriceOriginal uint32 `json:"price_original"` // 市场价
|
||||||
DeliveryFee uint32 `json:"delivery_fee"` // 邮费
|
DeliveryFee uint32 `json:"delivery_fee"` // 邮费
|
||||||
|
|
|
@ -32,7 +32,7 @@ func ConfigAppRouter(r gin.IRouter) {
|
||||||
// //api.POST("upload_user_info", controller.UploadUserInfo) // 上传用户信息
|
// //api.POST("upload_user_info", controller.UploadUserInfo) // 上传用户信息
|
||||||
//api.POST("wxpay/notice", controller.PushWXPayNotice) // 微信推送支付通知
|
//api.POST("wxpay/notice", controller.PushWXPayNotice) // 微信推送支付通知
|
||||||
// TODO两边都改
|
// TODO两边都改
|
||||||
api.GET("wxpay/notice", controller.HmPushWXPayNotice) // 河马推送支付通知
|
api.GET("wxpay/notice", controller.HmPushWXPayNotice) // 推送支付通知
|
||||||
api.POST("wxpay/notice", controller.PushWXPayNotice) // 微信推送支付通知
|
api.POST("wxpay/notice", controller.PushWXPayNotice) // 微信推送支付通知
|
||||||
api.POST("wxpay_refund/notice", controller.PushWXPayRefundNotice) // 微信推送支付退款通知
|
api.POST("wxpay_refund/notice", controller.PushWXPayRefundNotice) // 微信推送支付退款通知
|
||||||
api.POST("aliyun/sts_token", controller.AliyunStsTokenGet) // 阿里云上传图片token
|
api.POST("aliyun/sts_token", controller.AliyunStsTokenGet) // 阿里云上传图片token
|
||||||
|
|
Loading…
Reference in New Issue
Block a user