From 5cc3d8facdf1f169465dc7dcef4980c9fee23b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=97=AD?= <2795210596@qq.com> Date: Thu, 20 Mar 2025 23:47:40 +0800 Subject: [PATCH] =?UTF-8?q?user=E6=9C=8D=E5=8A=A1=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/api/coupon/vo/CouponDataVO.java | 5 ++--- .../api/payment/vo/ShopAccountDetailVO.java | 4 ++-- .../cloud/api/user/vo/UserManagerVO.java | 5 ++--- .../cloud/api/user/vo/UserPayInfoVO.java | 4 ++-- .../cloud/api/user/vo/UserTagApiVO.java | 4 ++-- .../tmerclub/cloud/user/UserApplication.java | 5 ++--- .../resources/mapper/ShopCustomerMapper.xml | 2 +- .../resources/mapper/UserLevelLogMapper.xml | 8 ++++---- .../src/main/resources/mapper/UserMapper.xml | 18 +++++++++--------- .../resources/mapper/UserRechargeMapper.xml | 2 +- .../main/resources/mapper/UserTagMapper.xml | 2 +- .../resources/mapper/UserTagUserMapper.xml | 4 ++-- 12 files changed, 30 insertions(+), 33 deletions(-) diff --git a/tmerclub-api/tmerclub-api-marketing/src/main/java/com/tmerclub/cloud/api/coupon/vo/CouponDataVO.java b/tmerclub-api/tmerclub-api-marketing/src/main/java/com/tmerclub/cloud/api/coupon/vo/CouponDataVO.java index 884e3ba..64c8b1e 100644 --- a/tmerclub-api/tmerclub-api-marketing/src/main/java/com/tmerclub/cloud/api/coupon/vo/CouponDataVO.java +++ b/tmerclub-api/tmerclub-api-marketing/src/main/java/com/tmerclub/cloud/api/coupon/vo/CouponDataVO.java @@ -1,4 +1,3 @@ - package com.tmerclub.cloud.api.coupon.vo; import com.tmerclub.cloud.common.vo.BaseVO; @@ -12,8 +11,8 @@ import java.util.List; /** * 优惠券VO * - * @author YXF - * @date 2020-12-08 17:22:56 + * @author tmerclub + * @date: 2022-04-14 */ public class CouponDataVO extends BaseVO implements Serializable { @Serial diff --git a/tmerclub-api/tmerclub-api-payment/src/main/java/com/tmerclub/cloud/api/payment/vo/ShopAccountDetailVO.java b/tmerclub-api/tmerclub-api-payment/src/main/java/com/tmerclub/cloud/api/payment/vo/ShopAccountDetailVO.java index 993d840..873a6ec 100644 --- a/tmerclub-api/tmerclub-api-payment/src/main/java/com/tmerclub/cloud/api/payment/vo/ShopAccountDetailVO.java +++ b/tmerclub-api/tmerclub-api-payment/src/main/java/com/tmerclub/cloud/api/payment/vo/ShopAccountDetailVO.java @@ -1,4 +1,3 @@ - package com.tmerclub.cloud.api.payment.vo; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,7 +6,8 @@ import java.io.Serial; import java.io.Serializable; /** - * @author TRACK + * @author tmerclub + * @date: 2022-04-14 */ public class ShopAccountDetailVO implements Serializable { @Serial diff --git a/tmerclub-api/tmerclub-api-user/src/main/java/com/tmerclub/cloud/api/user/vo/UserManagerVO.java b/tmerclub-api/tmerclub-api-user/src/main/java/com/tmerclub/cloud/api/user/vo/UserManagerVO.java index ec2b1fd..4e3ee0b 100644 --- a/tmerclub-api/tmerclub-api-user/src/main/java/com/tmerclub/cloud/api/user/vo/UserManagerVO.java +++ b/tmerclub-api/tmerclub-api-user/src/main/java/com/tmerclub/cloud/api/user/vo/UserManagerVO.java @@ -1,4 +1,3 @@ - package com.tmerclub.cloud.api.user.vo; import com.tmerclub.cloud.api.coupon.vo.CouponUserCountDataVO; @@ -13,8 +12,8 @@ import java.util.List; /** * 全部会员VO * - * @author cl - * @data 2020-04-09 16:16:53 + * @author tmerclub + * @date: 2022-04-14 */ public class UserManagerVO implements Serializable { @Serial diff --git a/tmerclub-api/tmerclub-api-user/src/main/java/com/tmerclub/cloud/api/user/vo/UserPayInfoVO.java b/tmerclub-api/tmerclub-api-user/src/main/java/com/tmerclub/cloud/api/user/vo/UserPayInfoVO.java index 4a0cb59..2f84f74 100644 --- a/tmerclub-api/tmerclub-api-user/src/main/java/com/tmerclub/cloud/api/user/vo/UserPayInfoVO.java +++ b/tmerclub-api/tmerclub-api-user/src/main/java/com/tmerclub/cloud/api/user/vo/UserPayInfoVO.java @@ -1,4 +1,3 @@ - package com.tmerclub.cloud.api.user.vo; import io.swagger.v3.oas.annotations.media.Schema; @@ -8,7 +7,8 @@ import java.io.Serializable; import java.util.Date; /** - * @author TRACK + * @author tmerclub + * @date: 2022-04-14 */ public class UserPayInfoVO implements Serializable { @Serial diff --git a/tmerclub-api/tmerclub-api-user/src/main/java/com/tmerclub/cloud/api/user/vo/UserTagApiVO.java b/tmerclub-api/tmerclub-api-user/src/main/java/com/tmerclub/cloud/api/user/vo/UserTagApiVO.java index 2c311d3..35b9d9d 100644 --- a/tmerclub-api/tmerclub-api-user/src/main/java/com/tmerclub/cloud/api/user/vo/UserTagApiVO.java +++ b/tmerclub-api/tmerclub-api-user/src/main/java/com/tmerclub/cloud/api/user/vo/UserTagApiVO.java @@ -1,4 +1,3 @@ - package com.tmerclub.cloud.api.user.vo; import io.swagger.v3.oas.annotations.media.Schema; @@ -9,7 +8,8 @@ import java.util.List; /** * 用户标签VO - * @author: cl + * + * @author: tmerclub * @date: 2021-04-12 15:56 */ public class UserTagApiVO implements Serializable { diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/UserApplication.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/UserApplication.java index 3c48c8c..ff0faad 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/UserApplication.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/UserApplication.java @@ -1,4 +1,3 @@ - package com.tmerclub.cloud.user; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; @@ -10,8 +9,8 @@ import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServic * @author tmerclub * @date 2020/11/19 */ -@SpringBootApplication(scanBasePackages = "com.moyuer.cloud", exclude = UserDetailsServiceAutoConfiguration.class) -@EnableDubbo(scanBasePackages = "com.moyuer.cloud.**.feign") +@SpringBootApplication(scanBasePackages = "com.tmerclub.cloud", exclude = UserDetailsServiceAutoConfiguration.class) +@EnableDubbo(scanBasePackages = "com.tmerclub.cloud.**.feign") public class UserApplication { public static void main(String[] args) { diff --git a/tmerclub-user/src/main/resources/mapper/ShopCustomerMapper.xml b/tmerclub-user/src/main/resources/mapper/ShopCustomerMapper.xml index e9e3ba5..17f3bbf 100644 --- a/tmerclub-user/src/main/resources/mapper/ShopCustomerMapper.xml +++ b/tmerclub-user/src/main/resources/mapper/ShopCustomerMapper.xml @@ -16,7 +16,7 @@ - select sc.shop_id, sc.user_id, u.nick_name, u.phone, u.pic from shop_customer sc join user u on sc.user_id = u.user_id diff --git a/tmerclub-user/src/main/resources/mapper/UserLevelLogMapper.xml b/tmerclub-user/src/main/resources/mapper/UserLevelLogMapper.xml index 88841b5..cf350c9 100644 --- a/tmerclub-user/src/main/resources/mapper/UserLevelLogMapper.xml +++ b/tmerclub-user/src/main/resources/mapper/UserLevelLogMapper.xml @@ -109,7 +109,7 @@ delete from `user_level_log` WHERE user_id = #{userId} - SELECT ul.after_level_type AS level_type, u.nick_name FROM `user` u LEFT JOIN user_level_log ul ON ul.user_id = u.user_id AND ul.create_time < #{createTime} WHERE u.user_id = #{userId} @@ -117,7 +117,7 @@ LIMIT 1 - SELECT tull.pay_type, tull.create_time AS trans_date, tull.create_time AS place_time,tull.level_log_id AS order_id, ul.level_name AS prod_name,tull.pay_amount AS trans_amount, 0 AS shop_id, tull.pay_id as pay_ids, 4 AS biz_type, tull.user_id, '官方店' as shop_name FROM `user_level_log` tull @@ -135,7 +135,7 @@ ORDER BY trans_date DESC - SELECT SUM(CASE WHEN pay_type IN (1,3,4,5,8) THEN pay_amount ELSE 0 END) AS wechat_amount, SUM(CASE WHEN pay_type IN (2,6,7) THEN pay_amount ELSE 0 END) AS alipay_amount, SUM(CASE WHEN pay_type IN (9) THEN pay_amount ELSE 0 END) AS balance_amount @@ -151,7 +151,7 @@ - SELECT level_log_id as orderIds, pay_id, 2 as pay_entry, pay_type,pay_amount, IF(pay_type IN (1,3,4,5,8), pay_amount, 0) AS wechat_amount, IF(pay_type IN (2,6,7), pay_amount, 0) AS alipay_amount, diff --git a/tmerclub-user/src/main/resources/mapper/UserMapper.xml b/tmerclub-user/src/main/resources/mapper/UserMapper.xml index 6ea4914..1dbcd8f 100644 --- a/tmerclub-user/src/main/resources/mapper/UserMapper.xml +++ b/tmerclub-user/src/main/resources/mapper/UserMapper.xml @@ -17,7 +17,7 @@ - + @@ -48,7 +48,7 @@ order by user_id desc - select from user where user_id = #{userId} @@ -126,7 +126,7 @@ #{userId} - select `user_id`,`nick_name`,`pic`,`create_time`, phone, status from user where user_id in @@ -187,7 +187,7 @@ ORDER BY u.create_time DESC - SELECT utemp.*, @consAmount := 0 AS consAmount, @@ -294,7 +294,7 @@ - SELECT count( DISTINCT u.user_id ) AS totalMember, count( DISTINCT CASE WHEN u.level_type = 1 THEN u.user_id ELSE NULL END ) AS paidMember, @@ -328,7 +328,7 @@ - select user_id, nick_name from user @@ -397,7 +397,7 @@ - SELECT COUNT(*) memberNum, ( SELECT COUNT(DISTINCT user_id) FROM user_level_log @@ -408,7 +408,7 @@ - SELECT COUNT(*) totalMember, ( SELECT COUNT(DISTINCT user_id) FROM user_level_log @@ -429,7 +429,7 @@ SELECT create_time FROM `user` ORDER BY create_time ASC LIMIT 0,1 - select user_id, status from `user` where phone = #{mobile} diff --git a/tmerclub-user/src/main/resources/mapper/UserRechargeMapper.xml b/tmerclub-user/src/main/resources/mapper/UserRechargeMapper.xml index adcf79f..3175b0e 100644 --- a/tmerclub-user/src/main/resources/mapper/UserRechargeMapper.xml +++ b/tmerclub-user/src/main/resources/mapper/UserRechargeMapper.xml @@ -16,7 +16,7 @@ - + diff --git a/tmerclub-user/src/main/resources/mapper/UserTagMapper.xml b/tmerclub-user/src/main/resources/mapper/UserTagMapper.xml index 432501c..bb6293e 100644 --- a/tmerclub-user/src/main/resources/mapper/UserTagMapper.xml +++ b/tmerclub-user/src/main/resources/mapper/UserTagMapper.xml @@ -66,7 +66,7 @@ - select from user_tag_user where user_tag_user_id = #{userTagUserId} - SELECT distinct ut.user_tag_id AS tagId,ut.tag_name, ut.tag_type FROM `user_tag` ut LEFT JOIN `user_tag_user` utg ON utg.user_tag_id = ut.user_tag_id @@ -31,7 +31,7 @@ #{userId} - SELECT u.`user_id`,u.`phone` as userMobile,u.`nick_name` FROM `user` u LEFT JOIN `user_tag_user` utu ON u.`user_id` = utu.`user_id` WHERE utu.user_tag_id IN