Merge branch 'feature' into master

app/api/api_serve.go

@@ -124,7 +124,7 @@ func serviceMiddleware(s api.Server, prefix string, debug bool, rl *util.Request
 			)
 			if rsp.Code == api.RAccessDenied.Code {
 				data, _ := url.QueryUnescape(ctx.Request().Form.Encode())
-				sortData := api.ParamsToBytes(ctx.Request().Form, form.GetString("$user_secret"))
+				sortData := api.ParamsToBytes(ctx.Request().Form, form.GetString("$user_secret"), true)
 				log.Println(prefix, "request data = [", data, "]")
 				log.Println(" sign not match ! key =", form.Get("key"),
 					"\r\n   server_sign=", form.GetString("$server_sign"),

app/api/passport_api.go

@@ -175,7 +175,7 @@ func (h PassportApi) sendCode(ctx api.Context) interface{} {
 			r, _ := cli.SendCode(context.TODO(), &proto.SendCodeRequest{
 				MemberId:  memberId.Value,
 				Operation: operationArr[operation],
-				MsgType:   msgChan.String(),
+				MsgType:   int32(msgChan),
 			})
 			code := r.Data["code"]
 			if r.ErrCode == 0 {
@@ -284,9 +284,9 @@ func (h PassportApi) resetPwd(ctx api.Context) interface{} {
 	if err == nil {
 		defer trans.Close()
 		r, _ := cli.ModifyPwd(context.TODO(), &proto.ModifyPwdRequest{
-			MemberId: memberId,
-			Old:      "",
-			Pwd:      pwd,
+			MemberId:  memberId,
+			OriginPwd: "",
+			NewPwd:    pwd,
 		})
 		if r.ErrCode != 0 {
 			return api.ResponseWithCode(int(r.ErrCode), r.ErrMsg)
@@ -335,9 +335,9 @@ func (h PassportApi) modifyPwd(ctx api.Context) interface{} {
 	if err == nil {
 		defer trans.Close()
 		r, _ := cli.ModifyPwd(context.TODO(), &proto.ModifyPwdRequest{
-			MemberId: memberId,
-			Old:      oldPwd,
-			Pwd:      pwd,
+			MemberId:  memberId,
+			OriginPwd: oldPwd,
+			NewPwd:    pwd,
 		})
 		if r.ErrCode != 0 {
 			return api.ResponseWithCode(int(r.ErrCode), r.ErrMsg)
@@ -386,9 +386,9 @@ func (h PassportApi) tradePwd(ctx api.Context) interface{} {
 	if err == nil {
 		defer trans.Close()
 		r, _ := cli.ModifyTradePwd(context.TODO(), &proto.ModifyPwdRequest{
-			MemberId: memberId,
-			Old:      oldPwd,
-			Pwd:      pwd,
+			MemberId:  memberId,
+			OriginPwd: oldPwd,
+			NewPwd:    pwd,
 		})
 		if r.ErrCode != 0 {
 			return api.ResponseWithCode(int(r.ErrCode), r.ErrMsg)
@@ -435,9 +435,9 @@ func (h PassportApi) resetTradePwd(ctx api.Context) interface{} {
 	if err == nil {
 		defer trans.Close()
 		r, _ := cli.ModifyTradePwd(context.TODO(), &proto.ModifyPwdRequest{
-			MemberId: memberId,
-			Old:      "",
-			Pwd:      pwd,
+			MemberId:  memberId,
+			OriginPwd: "",
+			NewPwd:    pwd,
 		})
 		if r.ErrCode != 0 {
 			return api.ResponseWithCode(int(r.ErrCode), r.ErrMsg)

app/api/register_api.go

@@ -75,20 +75,16 @@ func (m RegisterApi) submit(ctx api.Context) interface{} {
 	trans, cli, err := service.MemberServiceClient()
 	if err == nil {
 		defer trans.Close()
-		mp := map[string]string{
-			"reg_ip":      regIp,
-			"reg_from":    regFrom,
-			"invite_code": inviteCode,
-		}
 		r, _ := cli.RegisterMemberV2(context.TODO(), &proto.RegisterMemberRequest{
-			User:   user,
-			Pwd:    pwd,
-			Flag:   0,
-			Name:   "",
-			Phone:  phone,
-			Email:  "",
-			Avatar: "",
-			Extend: mp,
+			User:        user,
+			Pwd:         pwd,
+			Flag:        0,
+			Name:        "",
+			Phone:       phone,
+			Email:       "",
+			RegFrom:     regFrom,
+			RegIp:       regIp,
+			InviterCode: inviteCode,
 		})
 		if r.ErrCode == 0 {
 			//todo: 未生效

core/domain/express/express.go

@@ -283,7 +283,7 @@ type ExpressRepBase struct {
 }
 
 // 将默认的快递服务商保存
-func (e *ExpressRepBase) SaveDefaultExpressProviders(rep express.IExpressRepo) []*express.ExpressProvider {
+func (e *ExpressRepBase) SaveDefaultExpressProviders(rep express.IExpressRepo) []*express.Provider {
 	var err error
 	for _, v := range express.SupportedExpressProvider {
 		if v.Id, err = rep.SaveExpressProvider(v); err != nil {

core/domain/interface/express/express.go

@@ -47,7 +47,7 @@ const (
 var (
 	//todo: 选择一些主流的快递
 	// 系统支持的快递服务商
-	SupportedExpressProvider = []*ExpressProvider{
+	SupportedExpressProvider = []*Provider{
 		NewExpressProvider("安能快递", "A-E", "ANE66", "ANE66"),
 		NewExpressProvider("百世汇通", "常用,A-E", "HTKY", "HTKY"),
 		NewExpressProvider("CCES", "A-E", "CCES", "CCES"),
@@ -154,13 +154,13 @@ type (
 
 	IExpressRepo interface {
 		// 获取所有快递公司
-		GetExpressProviders() []*ExpressProvider
+		GetExpressProviders() []*Provider
 
 		// 获取快递公司
-		GetExpressProvider(id int32) *ExpressProvider
+		GetExpressProvider(id int32) *Provider
 
 		// 保存快递公司
-		SaveExpressProvider(v *ExpressProvider) (int32, error)
+		SaveExpressProvider(v *Provider) (int32, error)
 
 		// 获取用户的快递
 		GetUserExpress(userId int) IUserExpress
@@ -185,13 +185,13 @@ type (
 	}
 
 	// 快递服务商
-	ExpressProvider struct {
+	Provider struct {
 		// 快递公司编号
 		Id int32 `db:"id" pk:"yes" auto:"yes"`
 		// 快递名称
 		Name string `db:"name"`
 		// 首字母，用于索引分组
-		FirstLetter string `db:"letter"`
+		FirstLetter string `db:"-"` //`db:"letter"`
 		// 分组,多个组,用","隔开
 		GroupFlag string `db:"group_flag"`
 		// 快递公司编码
@@ -247,8 +247,8 @@ type (
 	}
 )
 
-func NewExpressProvider(name, group, code, apiCode string) *ExpressProvider {
-	return &ExpressProvider{
+func NewExpressProvider(name, group, code, apiCode string) *Provider {
+	return &Provider{
 		Name:      name,
 		GroupFlag: group,
 		Code:      code,

core/domain/interface/member/account.go

@@ -8,6 +8,8 @@
  */
 package member
 
+import "go2o/core/domain/interface/wallet"
+
 const (
 	// 余额账户
 	AccountBalance = 1
@@ -99,6 +101,9 @@ type (
 		// 保存
 		Save() (int64, error)
 
+		// 电子钱包
+		Wallet() wallet.IWallet
+
 		// 设置优先(默认)支付方式, account 为账户类型
 		SetPriorityPay(account int, enabled bool) error
 
@@ -152,13 +157,14 @@ type (
 		GetWalletLog(id int32) *WalletAccountLog
 
 		// 申请提现,applyType：提现方式,返回info_id,交易号 及错误
-		RequestTakeOut(takeKind int, title string, amount int, tradeFee int) (int32, string, error)
+		RequestWithdrawal(takeKind int, title string, amount int,
+			tradeFee int, bankAccountNo string) (int64, string, error)
 
 		// 确认提现
-		ReviewWithdrawal(id int32, pass bool, remark string) error
+		ReviewWithdrawal(id int64, pass bool, remark string) error
 
 		// 完成提现
-		FinishWithdrawal(id int32, tradeNo string) error
+		FinishWithdrawal(id int64, tradeNo string) error
 
 		// 将冻结金额标记为失效
 		FreezeExpired(accountKind int, amount float32, remark string) error
@@ -198,6 +204,8 @@ type (
 		FreezeBalance float32 `db:"freeze_balance"`
 		// 失效的账户余额
 		ExpiredBalance float32 `db:"expired_balance"`
+		// 钱包代码
+		WalletCode string `db:"wallet_code"`
 		//奖金账户余额
 		WalletBalance float32 `db:"wallet_balance"`
 		//冻结赠送金额

core/domain/interface/member/errors.go

@@ -105,8 +105,8 @@ var (
 	ErrNotSetArea = domain.NewError(
 		"err_not_set_area", "地址不正确")
 
-	ErrNoSuchBankInfo = domain.NewError(
-		"err_no_such_bank_info", "请完善银行卡信息")
+	ErrBankCardIsExists = domain.NewError(
+		"err_member_bank_card_is_exists", "银行卡已绑定")
 
 	ErrBankInfo = domain.NewError(
 		"err_member_bank_info", "银行卡信息不正确")
@@ -123,11 +123,8 @@ var (
 	ErrBankNetwork = domain.NewError(
 		"err_member_bank_network", "开户银行支行不正确")
 
-	ErrBankInfoLocked = domain.NewError(
-		"err_bank_info_locked", "银行卡信息已锁定,无法更改")
-
-	ErrBankInfoNoYetSet = domain.NewError(
-		"err_bank_info_no_yet_set", "银行卡信息尚未设置")
+	ErrBankNoSuchCard = domain.NewError(
+		"err_bank_no_such_card", "银行卡未绑定")
 
 	ErrIncorrectAmount = domain.NewError(
 		"err_balance_amount", "金额错误")

core/domain/interface/member/member.go

@@ -140,11 +140,13 @@ type (
 		// 修改交易密码，旧密码可为空; 传入原始密码。密码均为密文
 		ModifyTradePassword(newPwd, oldPwd string) error
 		// 获取提现银行信息
-		GetBank() BankInfo
-		// 保存提现银行信息,保存后将锁定
-		SaveBank(*BankInfo) error
+		GetBankCards() []BankCard
+		// 获取绑定的银行卡
+		GetBankCard(cardNo string) *BankCard
+		// 添加银行卡
+		AddBankCard(*BankCard) error
 		// 移除银行卡
-		RemoveBankCard(backCardId int64) error
+		RemoveBankCard(cardNo string) error
 		// 获取收款码
 		ReceiptsCodes() []ReceiptsCode
 		// 保存收款码
@@ -156,7 +158,7 @@ type (
 		// 审核实名认证,若重复审核将返回错误
 		ReviewTrustedInfo(pass bool, remark string) error
 		// 创建配送地址
-		CreateDeliver(*Address) IDeliverAddress
+		CreateDeliver(*ConsigneeAddress) IDeliverAddress
 		// 获取配送地址
 		GetDeliverAddress() []IDeliverAddress
 		// 获取配送地址
@@ -359,7 +361,7 @@ type (
 
 	// 银行卡信息,因为重要且非频繁更新的数据
 	// 所以需要用IsLocked来标记是否锁定
-	BankInfo struct {
+	BankInfo_ struct {
 		//会员编号
 		MemberId int64 `db:"member_id" pk:"yes"`
 		//名称
@@ -377,6 +379,33 @@ type (
 		//更新时间
 		UpdateTime int64 `db:"update_time"`
 	}
+
+	// 银行卡
+	BankCard struct {
+		// 编号
+		Id int64 `db:"id" pk:"yes" auto:"yes"`
+		// 会员编号
+		MemberId int64 `db:"member_id"`
+		// 银行账号
+		BankAccount string `db:"bank_account"`
+		// 户名
+		AccountName string `db:"account_name"`
+		// 银行编号
+		BankId int `db:"bank_id"`
+		// 银行名称
+		BankName string `db:"bank_name"`
+		// 银行卡代码
+		BankCode string `db:"bank_code"`
+		// 网点
+		Network string `db:"network"`
+		// 快捷支付授权码
+		AuthCode string `db:"auth_code"`
+		// 状态
+		State int16 `db:"state"`
+		// 添加时间
+		CreateTime int64 `db:"create_time"`
+	}
+
 	// 收款码
 	ReceiptsCode struct {
 		// 编号
@@ -411,13 +440,13 @@ type (
 	// 收货地址
 	IDeliverAddress interface {
 		GetDomainId() int64
-		GetValue() Address
-		SetValue(*Address) error
+		GetValue() ConsigneeAddress
+		SetValue(*ConsigneeAddress) error
 		Save() (int64, error)
 	}
 
 	// 收货地址
-	Address struct {
+	ConsigneeAddress struct {
 		//编号
 		Id int64 `db:"id" pk:"yes" auto:"yes"`
 		//会员编号
@@ -490,11 +519,12 @@ type (
 	}
 )
 
-func (b BankInfo) Right() bool {
-	return len(b.BankName) > 0 && len(b.Account) > 0 &&
+func (b BankCard) Right() bool {
+	return len(b.BankName) > 0 && len(b.BankAccount) > 0 &&
 		len(b.AccountName) > 0
 }
 
-func (b BankInfo) Locked() bool {
-	return b.IsLocked == BankLocked
+func (b BankCard) Locked() bool {
+	panic("remove")
+	//return b.IsLocked == BankLocked
 }

core/domain/interface/member/member_repo.go

@@ -89,11 +89,11 @@ type IMemberRepo interface {
 	// 保存账户，传入会员编号
 	SaveAccount(*Account) (int64, error)
 	// 获取银行卡
-	BankCards(memberId int64) *BankInfo
+	BankCards(memberId int64) []BankCard
 	// 保存银行卡信息
-	SaveBankCard(*BankInfo) error
+	SaveBankCard(card *BankCard) error
 	// 移除银行卡
-	RemoveBankCard(id int64) error
+	RemoveBankCard(id int64, no string) error
 	// 获取收款码
 	ReceiptsCodes(memberId int64) []ReceiptsCode
 	// 保存收款码
@@ -129,13 +129,13 @@ type IMemberRepo interface {
 	SaveLevelUpLog(l *LevelUpLog) (int32, error)
 
 	// 保存地址
-	SaveDeliver(*Address) (int64, error)
+	SaveDeliver(*ConsigneeAddress) (int64, error)
 
 	// 获取全部配送地址
-	GetDeliverAddress(memberId int64) []*Address
+	GetDeliverAddress(memberId int64) []*ConsigneeAddress
 
 	// 获取配送地址
-	GetSingleDeliverAddress(memberId, addressId int64) *Address
+	GetSingleDeliverAddress(memberId, addressId int64) *ConsigneeAddress
 
 	// 删除配送地址
 	DeleteAddress(memberId, addressId int64) error

core/domain/interface/mss/notify/notify.go

@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	TypeSiteMessage = 1 + iota
+	TypeSiteMessage = iota
 	TypeEmailMessage
 	TypePhoneMessage
 )