From 8ba382e33f2142ae668e33fab87cdd42377be471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 15 May 2023 10:26:01 +0800
Subject: [PATCH] 1

---
 business/jxstore/cms/user2.go | 2 +-
 business/model/dao/store.go   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index 7cf8b5e65..f51492527 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -412,7 +412,7 @@ func CreateUser(user *model.User, creatorName string) (err error) {
 	}
 	//支付宝注册电话需要解密
 	if user.GetMobile() != "" && user.GetName() != "" && user.GetID2() != "" {
-		if user.LastLoginType != "" && user.LastLoginType == alipay.AuthType {
+		if user.LastLoginType == alipay.AuthType {
 			mobile := &alipayapi.KeyMobile{}
 			data, _ := base64.StdEncoding.DecodeString(user.GetMobile())
 			key, _ := base64.StdEncoding.DecodeString(alipay.AuthKey)
diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index c60404c91..0022599b9 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -3,7 +3,6 @@ package dao
 import (
 	"errors"
 	"fmt"
-	"git.rosy.net.cn/jx-callback/business/partner"
 	"sort"
 	"strings"
 	"time"
@@ -1181,7 +1180,7 @@ func GetStoreAcctExpendLastCreateWayBillFee(db *DaoDB, vendorOrderID string) (ex
 		   AND a.type = ?
 	`
 	sqlParams := []interface{}{
-		partner.StoreAcctTypeExpendCreateWaybillEx,
+		20, // partner.StoreAcctTypeExpendCreateWaybillEx 零食运费
 	}
 	if vendorOrderID != "" {
 		sql += " AND a.vendor_order_id = ?"