liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
苏尹岚
2021-04-09 11:44:57 +08:00
parent 4078d6f8e3
commit dc1f8df8f6
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxstore/act/act.go
View File

@@ -459,10 +459,10 @@ func checkActValidation(act *model.Act, vendorIDs []int) (err error) {
} else if act.EndAt.Sub(act.BeginAt) < 0 { } else if act.EndAt.Sub(act.BeginAt) < 0 {
errList.AddErr(fmt.Errorf("活动开始时间必须小于活动结束时间")) errList.AddErr(fmt.Errorf("活动开始时间必须小于活动结束时间"))
} }
vendorIDMap := make(map[int]int) // vendorIDMap := make(map[int]int)
for _, vendorID := range vendorIDs { // for _, vendorID := range vendorIDs {
vendorIDMap[vendorID] = 1 // vendorIDMap[vendorID] = 1
} // }
if act.Type == model.ActSkuDirectDown || act.Type == model.ActSkuSecKill { if act.Type == model.ActSkuDirectDown || act.Type == model.ActSkuSecKill {
if act.PricePercentage == 0 { if act.PricePercentage == 0 {

7
controllers/auth2.go
View File

@@ -6,6 +6,8 @@ import (
"net/http" "net/http"
"strings" "strings"
"git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/baseapi/platformapi/weixinapi" "git.rosy.net.cn/baseapi/platformapi/weixinapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/auth2"
@@ -360,9 +362,8 @@ type UserInfoWithWeixin struct {
func (c *Auth2Controller) GetUserByMiniInfo() { func (c *Auth2Controller) GetUserByMiniInfo() {
c.callGetUserByMiniInfo(func(params *tAuth2GetUserByMiniInfoParams) (retVal interface{}, errCode string, err error) { c.callGetUserByMiniInfo(func(params *tAuth2GetUserByMiniInfoParams) (retVal interface{}, errCode string, err error) {
authInfo := &auth2.AuthInfo{} authInfo := &auth2.AuthInfo{}
// result := api.Cacher.Get(params.Token) result := api.Cacher.Get(params.Token)
// utils.Map2StructByJson(result.(map[string]interface{}), &authInfo, false) utils.Map2StructByJson(result.(map[string]interface{}), &authInfo, false)
// authInfo, err := api.Cacher.Get(params.Token)
jsCode := "" jsCode := ""
if params.AuthType == weixin.AuthTypeMini { if params.AuthType == weixin.AuthTypeMini {
jsCode = GetComposedCode(&c.Controller, params.JsCode) jsCode = GetComposedCode(&c.Controller, params.JsCode)