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

修改登录查询用湖,默认下吕店问题

Browse Source
This commit is contained in:
邹宗楠
2022-03-22 18:32:08 +08:00
parent 31e80b54bf
commit cf887fc458
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/auth2/auth2.go
View File

@@ -286,7 +286,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string
appID := strings.Split(authSecret, ",")[0] appID := strings.Split(authSecret, ",")[0]
if appID == "wx08a5c2a8581414ff" || appID == "wx2d6949f724b2541d" || appID == "wx18111a41fd17f24f" || appID == "wx4b5930c13f8b1170" { //菜市或者果园 if appID == "wx08a5c2a8581414ff" || appID == "wx2d6949f724b2541d" || appID == "wx18111a41fd17f24f" || appID == "wx4b5930c13f8b1170" { //菜市或者果园
if authInfo.AuthBindInfo.UserID != "" { if authInfo.AuthBindInfo.UserID != "" {
binds, err := dao.GetUserBindAuthInfo(dao.GetDB(), authInfo.AuthBindInfo.UserID, 0, nil, "", "", []string{"wx2bb99eb5d2c9b82c", "wx4b5930c13f8b1170"}) binds, err := dao.GetUserBindAuthInfo(dao.GetDB(), authInfo.AuthBindInfo.UserID, 0, nil, "", "", []string{appID})
if err != nil { if err != nil {
return authInfo, err return authInfo, err
} }

27
business/jxutils/smsmsg/smsmsg_test.go
View File

@@ -1,10 +1,13 @@
package smsmsg package smsmsg
import ( import (
"fmt"
"git.rosy.net.cn/baseapi/utils"
dyvmsapiclient "github.com/alibabacloud-go/dyvmsapi-20170525-2.0.2/client"
"github.com/alibabacloud-go/tea/tea"
"testing" "testing"
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/jx-callback/globals/testinit" "git.rosy.net.cn/jx-callback/globals/testinit"
) )
@@ -14,11 +17,23 @@ func init() {
} }
func TestSendSMSMsg(t *testing.T) { func TestSendSMSMsg(t *testing.T) {
err := SendSMSMsg([]string{"18180948107"}, "京西菜市", "SMS_175583150", map[string]interface{}{ err := SendVoiceMsg([]string{"18981810340"}, "tts_222871733", map[string]interface{}{
"daySeq": 9, "tel": "18981810340",
"consigneeName": "购买者",
"payMoney": jxutils.IntPrice2StandardString(1230),
}) })
aa := map[string]interface{}{"tel": "13957767601"}
request := &dyvmsapiclient.SingleCallByTtsRequest{
CalledNumber: tea.String("13957767601"),
TtsCode: tea.String("tts_222871733"),
TtsParam: tea.String(string(utils.MustMarshal(aa))),
}
cli, err := api.CreateClientVoice(tea.String("LTAI4FwZN7pp4dACQHoapkZQ"), tea.String("NTegceUFX0FdfMovqCDzqcIKmhcoOu"), "dyvmsapi.aliyuncs.com")
fmt.Println("err1==", err)
res, _err := cli.SingleCallByTts(request)
fmt.Println(_err)
if *res.Body.Code != "OK" {
fmt.Println("errr", err)
}
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

3
business/partner/delivery/mtps/store.go
View File

@@ -10,7 +10,6 @@ import (
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"time"
) )
const ( const (
@@ -121,7 +120,7 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt
//}) //})
//shopInfo.ShopLng = 121345878 //shopInfo.ShopLng = 121345878
//shopInfo.ShopLat = 3115628 //shopInfo.ShopLat = 3115628
_, err = api.MtpsAPI.CheckOrder(shopInfo.ShopID, shopInfo.ShopAddress, int64(shopInfo.ShopLng), int64(shopInfo.ShopLat), time.Now().Unix()) //_, err = api.MtpsAPI.CheckOrder(shopInfo.ShopID, shopInfo.ShopAddress, int64(shopInfo.ShopLng), int64(shopInfo.ShopLat), time.Now().Unix())
//result, err := api.MtpsAPI.GetStoreStatus(shopInfo.ShopName) //result, err := api.MtpsAPI.GetStoreStatus(shopInfo.ShopName)
//if err == nil { //if err == nil {
// storeDetail.AuditStatus = mtpsOpenTypeToJx(result.DataList[0].OpenType) // storeDetail.AuditStatus = mtpsOpenTypeToJx(result.DataList[0].OpenType)