getselfinfo

business/jxstore/cms/user2.go

@@ -222,6 +222,7 @@ func AddUserBill(user *model.User) (err error) {
 		BillID: jxutils.GenBillID(),
 		UserID: user.UserID,
 	}
+	dao.WrapAddIDCULDEntity(userBill, jxcontext.AdminCtx.GetUserName())
 	return dao.CreateEntity(db, userBill)
 }
 

business/model/dao/dao_user.go

@@ -19,6 +19,7 @@ type UserDeliveryAddressEx struct {
 
 type GetSelfInfoResult struct {
 	model.User
+	model.UserBill
 	UserMembers []*model.UserMember `json:"userMembers"`
 }
 
@@ -40,11 +41,13 @@ func GetUserByID(db *DaoDB, fieldName, fieldValue string) (user *model.User, err
 
 func GetUserByIDWithMembers(db *DaoDB, fieldName, fieldValue string) (getSelfInfoResult *GetSelfInfoResult, err error) {
 	sql := fmt.Sprintf(`
-	SELECT *
+	SELECT t1.*, t2.bill_id, t2.account_balance, t2.deposit_balance
 	FROM user t1
+	JOIN user_bill t2 ON t2.user_id = t1.user_id AND t2.deleted_at = ?
 	WHERE t1.deleted_at = ? AND t1.status = ? AND t1.%s = ?
 	`, fieldName)
 	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
 		utils.DefaultTimeValue,
 		model.UserStatusNormal,
 		fieldValue,