删除一些model和dao文件

business/jxstore/cms/cms.go

@@ -60,13 +60,8 @@ func InitServiceInfo(version string, buildTime time.Time, gitCommit string) {
 			"purchaseVendorInfo":     model.PurchaseVendorInfo,
 			"afsReasonTypeName":      model.AfsReasonTypeName,
 			"afsAppealTypeName":      model.AfsAppealTypeName,
-			"actTypeName":            model.ActTypeName,
-			"actStatusName":          model.ActStatusName,
-			"actCreateTypeName":      model.ActCreateTypeName,
 			"configTypeName":         model.ConfigTypeName,
 			"userTypeName":           model.UserTypeName,
-			"payStatusName":          model.PayStatusName,
-			"refundStatusName":       model.RefundStatusName,
 			"complaintReasons":       model.ComplaintReasons,
 			"supplementType":         model.SupplementTypeName,
 			"operateType":            model.OperateTypeName,

business/jxstore/cms/user2.go

@@ -8,8 +8,6 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/jxstore/event"
 
-	"git.rosy.net.cn/jx-callback/business/jxstore/financial"
-
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/auth2"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -356,26 +354,6 @@ func LoadUserCart(ctx *jxcontext.Context, userID string, storeIDs []int) (cartIt
 	return cartItems, err
 }
 
-func GetSelfInfo(ctx *jxcontext.Context) (getSelfInfoResult *dao.GetSelfInfoResult, err error) {
-	tokenInfo, err := auth2.GetTokenInfo(ctx.GetToken())
-	if err == nil {
-		if getSelfInfoResult, err = dao.GetUserByIDWithMembers(dao.GetDB(), "user_id", tokenInfo.GetID()); err == nil {
-			if userMembers, err3 := dao.GetUserMember(dao.GetDB(), getSelfInfoResult.User.UserID, 0); err3 == nil {
-				getSelfInfoResult.UserMembers = userMembers
-			} else {
-				err = err3
-			}
-			if price, err := dao.GetUserAllWaitCashPrice(dao.GetDB(), getSelfInfoResult.User.UserID); err == nil {
-				getSelfInfoResult.WaitCashPrice = price
-			}
-			if price, err := dao.GetUserAllWaitRealCashPrice(dao.GetDB(), getSelfInfoResult.User.UserID); err == nil {
-				getSelfInfoResult.WaitRealCashPrice = price
-			}
-		}
-	}
-	return getSelfInfoResult, err
-}
-
 func RefreshUserMemberStatus(ctx *jxcontext.Context) (err error) {
 	var (
 		db = dao.GetDB()
@@ -390,90 +368,6 @@ func RefreshUserMemberStatus(ctx *jxcontext.Context) (err error) {
 	return err
 }
 
-func InvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree bool) (errCode string, err error) {
-	var (
-		db          = dao.GetDB()
-		memberCards []*model.MemberCard
-		memberCard  *model.MemberCard
-		userIDReal  string
-	)
-	if !isFree {
-		userIDReal = ctx.GetUserID()
-	} else {
-		userIDReal = userID
-	}
-	userMembers, err := dao.GetUserMember(db, userIDReal, model.MemberTypeNormal)
-	configList, err := dao.QueryConfigs(db, model.ConfigTypeName[model.ConfigTypeMemberCard], model.ConfigTypeMemberCard, "")
-	userBill, err := dao.GetUserBill(db, userIDReal, "")
-	if len(configList) <= 0 {
-		return "", fmt.Errorf("未找到会员卡配置！")
-	}
-	config := configList[0]
-	err = jxutils.Strings2Objs(config.Value, &memberCards)
-	if err != nil {
-		return "", err
-	}
-	for _, v := range memberCards {
-		if v.ID == memberID {
-			memberCard = v
-		}
-	}
-	if !isFree {
-		//验证微信绑定
-		if err = auth2.CheckWeixinminiAuthBind(userIDReal); err != nil {
-			return "", err
-		}
-		if userBill.AccountBalance < memberCard.Price {
-			return model.ErrCodeAccountBalanceNotEnough, fmt.Errorf("用户余额不足，请充值！")
-		}
-	}
-	txDB, _ := dao.Begin(db)
-	defer func() {
-		if r := recover(); r != nil {
-			dao.Rollback(db, txDB)
-			panic(r)
-		}
-	}()
-	//证明已经开了会员了，相当于续费
-	if len(userMembers) > 0 {
-		userMember := userMembers[0]
-		if memberID == model.MemberCardTypeMonth {
-			userMember.EndAt = userMember.EndAt.AddDate(0, 1, 0)
-		} else {
-			userMember.EndAt = userMember.EndAt.AddDate(1, 0, 0)
-		}
-		if _, err = dao.UpdateEntity(db, userMember, "EndAt"); err != nil {
-			dao.Rollback(db, txDB)
-			return
-		}
-	} else {
-		userMember2 := &model.UserMember{
-			UserID:       userIDReal,
-			MemberType:   model.MemberTypeNormal,
-			MemberTypeID: memberID,
-		}
-		if memberID == model.MemberCardTypeMonth {
-			userMember2.EndAt = time.Now().AddDate(0, 1, 0)
-		} else {
-			userMember2.EndAt = time.Now().AddDate(1, 0, 0)
-		}
-		dao.WrapAddIDCULDEntity(userMember2, ctx.GetUserName())
-		if err = dao.CreateEntity(db, userMember2); err != nil {
-			dao.Rollback(db, txDB)
-			return
-		}
-	}
-	if !isFree {
-		//支出明细
-		if err = financial.AddExpendUpdateAccount(txDB, userBill, model.BillTypeMember, memberCard.Price, 0); err != nil {
-			dao.Rollback(db, txDB)
-			return
-		}
-	}
-	dao.Commit(db, txDB)
-	return errCode, err
-}
-
 func UpdateUser(ctx *jxcontext.Context, payload map[string]interface{}) (err error) {
 	var (
 		db     = dao.GetDB()