From 9ba5172bb23adc92938370316ab438cf94fbb68f Mon Sep 17 00:00:00 2001 From: pengsz Date: Thu, 4 Dec 2025 16:35:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=20=E5=BA=93?= =?UTF-8?q?=E5=90=8D=E8=A1=A8=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../model/acticitystyle/ActivityStyle.java | 2 +- .../com/yzt/common/model/article/Article.java | 4 +-- .../common/model/bargain/StoreBargain.java | 2 +- .../model/bargain/StoreBargainUser.java | 2 +- .../model/bargain/StoreBargainUserHelp.java | 2 +- .../com/yzt/common/model/cat/StoreCart.java | 2 +- .../yzt/common/model/category/Category.java | 4 +-- .../model/combination/StoreCombination.java | 2 +- .../common/model/combination/StorePink.java | 2 +- .../yzt/common/model/coupon/StoreCoupon.java | 2 +- .../common/model/coupon/StoreCouponUser.java | 2 +- .../common/model/exception/ExceptionLog.java | 2 +- .../com/yzt/common/model/express/Express.java | 4 +-- .../model/express/ShippingTemplates.java | 4 +-- .../model/express/ShippingTemplatesFree.java | 4 +-- .../express/ShippingTemplatesRegion.java | 4 +-- .../yzt/common/model/finance/UserExtract.java | 2 +- .../common/model/finance/UserRecharge.java | 2 +- .../yzt/common/model/log/StoreProductLog.java | 2 +- .../yzt/common/model/order/StoreOrder.java | 2 +- .../common/model/order/StoreOrderInfo.java | 2 +- .../common/model/order/StoreOrderInvoice.java | 2 +- .../common/model/order/StoreOrderStatus.java | 2 +- .../yzt/common/model/page/PageCategory.java | 2 +- .../com/yzt/common/model/page/PageDiy.java | 2 +- .../com/yzt/common/model/page/PageLink.java | 2 +- .../common/model/product/StoreProduct.java | 2 +- .../model/product/StoreProductAttr.java | 2 +- .../model/product/StoreProductAttrResult.java | 2 +- .../model/product/StoreProductAttrValue.java | 2 +- .../model/product/StoreProductCoupon.java | 2 +- .../product/StoreProductDescription.java | 2 +- .../model/product/StoreProductRelation.java | 2 +- .../model/product/StoreProductReply.java | 2 +- .../model/product/StoreProductRule.java | 2 +- .../common/model/record/UserVisitRecord.java | 2 +- .../common/model/seckill/StoreSeckill.java | 2 +- .../model/seckill/StoreSeckillManger.java | 2 +- .../com/yzt/common/model/sms/SmsRecord.java | 2 +- .../com/yzt/common/model/sms/SmsTemplate.java | 2 +- .../yzt/common/model/system/SystemAdmin.java | 2 +- .../common/model/system/SystemAttachment.java | 2 +- .../yzt/common/model/system/SystemBank.java | 2 +- .../yzt/common/model/system/SystemCity.java | 2 +- .../yzt/common/model/system/SystemConfig.java | 2 +- .../common/model/system/SystemFormTemp.java | 2 +- .../yzt/common/model/system/SystemGroup.java | 2 +- .../common/model/system/SystemGroupData.java | 2 +- .../yzt/common/model/system/SystemMenu.java | 2 +- .../model/system/SystemNotification.java | 2 +- .../model/system/SystemPermissions.java | 2 +- .../yzt/common/model/system/SystemRole.java | 2 +- .../common/model/system/SystemRoleMenu.java | 2 +- .../yzt/common/model/system/SystemStore.java | 2 +- .../common/model/system/SystemStoreStaff.java | 2 +- .../common/model/system/SystemUserLevel.java | 2 +- .../com/yzt/common/model/system/Tenant.java | 2 +- .../java/com/yzt/common/model/user/User.java | 2 +- .../yzt/common/model/user/UserAddress.java | 2 +- .../yzt/common/model/user/UserBankCard.java | 2 +- .../com/yzt/common/model/user/UserBill.java | 2 +- .../model/user/UserBrokerageRecord.java | 2 +- .../model/user/UserExperienceRecord.java | 2 +- .../com/yzt/common/model/user/UserGroup.java | 2 +- .../common/model/user/UserIntegralRecord.java | 2 +- .../com/yzt/common/model/user/UserLevel.java | 2 +- .../model/user/UserLevelUpgradeAudit.java | 2 +- .../model/user/UserRechargeApplication.java | 2 +- .../com/yzt/common/model/user/UserSign.java | 2 +- .../com/yzt/common/model/user/UserTag.java | 2 +- .../com/yzt/common/model/user/UserToken.java | 2 +- .../common/model/wechat/TemplateMessage.java | 2 +- .../common/model/wechat/WechatCallback.java | 2 +- .../common/model/wechat/WechatExceptions.java | 4 +-- .../model/wechat/WechatMerchantConfig.java | 2 +- .../common/model/wechat/WechatPayInfo.java | 4 +-- .../model/wechat/WechatProgramMyTemp.java | 2 +- .../model/wechat/WechatProgramPublicTemp.java | 2 +- .../yzt/common/model/wechat/WechatQrcode.java | 2 +- .../yzt/common/model/wechat/WechatReply.java | 2 +- .../yzt/common/request/UserCreateRequest.java | 26 +++++++++---------- .../com/yzt/common/response/UserResponse.java | 20 +++++++------- .../src/main/resources/application.yml | 2 +- .../service/service/impl/UserServiceImpl.java | 24 ++++++++--------- 85 files changed, 125 insertions(+), 125 deletions(-) diff --git a/fightwine-admin/src/main/resources/application.yml b/fightwine-admin/src/main/resources/application.yml index 2a8de4e..55bf290 100644 --- a/fightwine-admin/src/main/resources/application.yml +++ b/fightwine-admin/src/main/resources/application.yml @@ -59,7 +59,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://183.6.65.90:5001/fight_wine?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://183.6.65.90:5001/zp_fight_wine?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: Yizhitong@2024 # quartz diff --git a/fightwine-common/src/main/java/com/yzt/common/model/acticitystyle/ActivityStyle.java b/fightwine-common/src/main/java/com/yzt/common/model/acticitystyle/ActivityStyle.java index b7d6602..bb52553 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/acticitystyle/ActivityStyle.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/acticitystyle/ActivityStyle.java @@ -23,7 +23,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_activity_style") +@TableName("zp_activity_style") @ApiModel(value="ActivityStyle对象", description="") public class ActivityStyle implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/article/Article.java b/fightwine-common/src/main/java/com/yzt/common/model/article/Article.java index 678b9c9..f942795 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/article/Article.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/article/Article.java @@ -14,12 +14,12 @@ import java.util.Date; /** * 文章管理表 - * fw_ + * zp_ */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_article") +@TableName("zp_article") @ApiModel(value="Article对象", description="文章管理表") public class Article implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargain.java b/fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargain.java index d190845..2d310f7 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargain.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargain.java @@ -19,7 +19,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_bargain") +@TableName("zp_store_bargain") @ApiModel(value="StoreBargain对象", description="砍价表") public class StoreBargain implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargainUser.java b/fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargainUser.java index 87698f1..b7d34ba 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargainUser.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargainUser.java @@ -19,7 +19,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_bargain_user") +@TableName("zp_store_bargain_user") @ApiModel(value="StoreBargainUser对象", description="用户参与砍价表") public class StoreBargainUser implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargainUserHelp.java b/fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargainUserHelp.java index 13f9f87..15ccffc 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargainUserHelp.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargainUserHelp.java @@ -20,7 +20,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_bargain_user_help") +@TableName("zp_store_bargain_user_help") @ApiModel(value="StoreBargainUserHelp对象", description="砍价用户帮助表") public class StoreBargainUserHelp implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/cat/StoreCart.java b/fightwine-common/src/main/java/com/yzt/common/model/cat/StoreCart.java index 51e5958..afe3f06 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/cat/StoreCart.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/cat/StoreCart.java @@ -20,7 +20,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_cart") +@TableName("zp_store_cart") @ApiModel(value="StoreCart对象", description="购物车表") public class StoreCart implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/category/Category.java b/fightwine-common/src/main/java/com/yzt/common/model/category/Category.java index fe235a2..5943058 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/category/Category.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/category/Category.java @@ -14,12 +14,12 @@ import java.util.Date; /** * 分类表 - * fw_ + * zp_ */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_category") +@TableName("zp_category") @ApiModel(value="Category对象", description="分类表") public class Category implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/combination/StoreCombination.java b/fightwine-common/src/main/java/com/yzt/common/model/combination/StoreCombination.java index cc37ebb..cead770 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/combination/StoreCombination.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/combination/StoreCombination.java @@ -20,7 +20,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_combination") +@TableName("zp_store_combination") @ApiModel(value="StoreCombination对象", description="拼团商品表") public class StoreCombination implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/combination/StorePink.java b/fightwine-common/src/main/java/com/yzt/common/model/combination/StorePink.java index 507c46f..633a9ec 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/combination/StorePink.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/combination/StorePink.java @@ -19,7 +19,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_pink") +@TableName("zp_store_pink") @ApiModel(value="StorePink对象", description="拼团表") public class StorePink implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/coupon/StoreCoupon.java b/fightwine-common/src/main/java/com/yzt/common/model/coupon/StoreCoupon.java index 6a14d59..100ef8b 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/coupon/StoreCoupon.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/coupon/StoreCoupon.java @@ -21,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_coupon") +@TableName("zp_store_coupon") @ApiModel(value="StoreCoupon对象", description="优惠券表") public class StoreCoupon implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/coupon/StoreCouponUser.java b/fightwine-common/src/main/java/com/yzt/common/model/coupon/StoreCouponUser.java index c671ae7..ef2577e 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/coupon/StoreCouponUser.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/coupon/StoreCouponUser.java @@ -20,7 +20,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_coupon_user") +@TableName("zp_store_coupon_user") @ApiModel(value="StoreCouponUser对象", description="优惠券记录表") public class StoreCouponUser implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/exception/ExceptionLog.java b/fightwine-common/src/main/java/com/yzt/common/model/exception/ExceptionLog.java index 9501390..f2929c4 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/exception/ExceptionLog.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/exception/ExceptionLog.java @@ -22,7 +22,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_exception_log") +@TableName("zp_exception_log") @ApiModel(value = "ExceptionLog对象", description = "异常信息表") public class ExceptionLog implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/express/Express.java b/fightwine-common/src/main/java/com/yzt/common/model/express/Express.java index bdbd9b7..e8f052e 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/express/Express.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/express/Express.java @@ -13,12 +13,12 @@ import java.io.Serializable; /** * 快递公司表 - * fw_ + * zp_ */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_express") +@TableName("zp_express") @ApiModel(value="Express对象", description="快递公司表") public class Express implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplates.java b/fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplates.java index b2af45a..958deed 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplates.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplates.java @@ -14,12 +14,12 @@ import java.util.Date; /** * 运费模版对象 - * fw_ + * zp_ */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_shipping_templates") +@TableName("zp_shipping_templates") @ApiModel(value="ShippingTemplates对象", description="") public class ShippingTemplates implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplatesFree.java b/fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplatesFree.java index 8f81eec..07ab334 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplatesFree.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplatesFree.java @@ -15,12 +15,12 @@ import java.util.Date; /** * 免费运费模版 - * fw_ + * zp_ */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_shipping_templates_free") +@TableName("zp_shipping_templates_free") @ApiModel(value="ShippingTemplatesFree对象", description="") public class ShippingTemplatesFree implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplatesRegion.java b/fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplatesRegion.java index a0d99fa..8ef770a 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplatesRegion.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplatesRegion.java @@ -15,12 +15,12 @@ import java.util.Date; /** * 运费模版区域 - * fw_ + * zp_ */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_shipping_templates_region") +@TableName("zp_shipping_templates_region") @ApiModel(value="ShippingTemplatesRegion对象", description="") public class ShippingTemplatesRegion implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/finance/UserExtract.java b/fightwine-common/src/main/java/com/yzt/common/model/finance/UserExtract.java index d88b75a..3dd6423 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/finance/UserExtract.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/finance/UserExtract.java @@ -22,7 +22,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_extract") +@TableName("zp_user_extract") @ApiModel(value="UserExtract对象", description="用户提现表") public class UserExtract implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/finance/UserRecharge.java b/fightwine-common/src/main/java/com/yzt/common/model/finance/UserRecharge.java index c40b78b..5b9f068 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/finance/UserRecharge.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/finance/UserRecharge.java @@ -20,7 +20,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_recharge") +@TableName("zp_user_recharge") @ApiModel(value="UserRecharge对象", description="用户充值表") public class UserRecharge implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/log/StoreProductLog.java b/fightwine-common/src/main/java/com/yzt/common/model/log/StoreProductLog.java index 7fd201e..c49328b 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/log/StoreProductLog.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/log/StoreProductLog.java @@ -19,7 +19,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_product_log") +@TableName("zp_store_product_log") @ApiModel(value="StoreProductLog对象", description="商品统计") public class StoreProductLog implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrder.java b/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrder.java index 0abc27e..04c327e 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrder.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrder.java @@ -20,7 +20,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_order") +@TableName("zp_store_order") @ApiModel(value="StoreOrder对象", description="订单表") public class StoreOrder implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderInfo.java b/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderInfo.java index 0649cb3..b9235dd 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderInfo.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderInfo.java @@ -21,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_order_info") +@TableName("zp_store_order_info") @ApiModel(value="StoreOrderInfo对象", description="订单购物详情表") public class StoreOrderInfo implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderInvoice.java b/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderInvoice.java index 84d1942..0d8a553 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderInvoice.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderInvoice.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_order_invoice") +@TableName("zp_store_order_invoice") @ApiModel(value="StoreOrderInvoice对象", description="订单发票表") public class StoreOrderInvoice implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderStatus.java b/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderStatus.java index e73c78b..9f0d74f 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderStatus.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderStatus.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_order_status") +@TableName("zp_store_order_status") @ApiModel(value="StoreOrderStatus对象", description="订单操作记录表") public class StoreOrderStatus implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/page/PageCategory.java b/fightwine-common/src/main/java/com/yzt/common/model/page/PageCategory.java index 371a796..db52207 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/page/PageCategory.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/page/PageCategory.java @@ -21,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_page_category") +@TableName("zp_page_category") @ApiModel(value="PageCategory对象", description="页面链接分类") public class PageCategory implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/page/PageDiy.java b/fightwine-common/src/main/java/com/yzt/common/model/page/PageDiy.java index cd88343..79a41af 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/page/PageDiy.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/page/PageDiy.java @@ -21,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_page_diy") +@TableName("zp_page_diy") @ApiModel(value="PageDiy对象", description="DIY数据表") public class PageDiy implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/page/PageLink.java b/fightwine-common/src/main/java/com/yzt/common/model/page/PageLink.java index a52c167..e80061a 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/page/PageLink.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/page/PageLink.java @@ -21,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_page_link") +@TableName("zp_page_link") @ApiModel(value="PageLink对象", description="页面链接") public class PageLink implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProduct.java b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProduct.java index 076136e..7425f8b 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProduct.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProduct.java @@ -20,7 +20,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_product") +@TableName("zp_store_product") @ApiModel(value = "StoreProduct对象", description = "商品表") public class StoreProduct implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttr.java b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttr.java index ed36daa..d93645a 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttr.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttr.java @@ -18,7 +18,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_product_attr") +@TableName("zp_store_product_attr") @ApiModel(value="StoreProductAttr对象", description="商品属性表") public class StoreProductAttr implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttrResult.java b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttrResult.java index 383b64e..12ff271 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttrResult.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttrResult.java @@ -16,7 +16,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_product_attr_result") +@TableName("zp_store_product_attr_result") @ApiModel(value="StoreProductAttrResult对象", description="商品属性详情表") public class StoreProductAttrResult implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttrValue.java b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttrValue.java index adba753..bb25298 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttrValue.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttrValue.java @@ -20,7 +20,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_product_attr_value") +@TableName("zp_store_product_attr_value") @ApiModel(value="StoreProductAttrValue对象", description="商品属性值表") public class StoreProductAttrValue implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductCoupon.java b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductCoupon.java index 1b5fef4..650b9ea 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductCoupon.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductCoupon.java @@ -18,7 +18,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_product_coupon") +@TableName("zp_store_product_coupon") @ApiModel(value="StoreProductCoupon对象", description="") public class StoreProductCoupon implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductDescription.java b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductDescription.java index 6415137..3b5e6f0 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductDescription.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductDescription.java @@ -18,7 +18,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_product_description") +@TableName("zp_store_product_description") @ApiModel(value="StoreProductDescription对象", description="商品描述表") public class StoreProductDescription implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductRelation.java b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductRelation.java index 10e5da3..b1c6112 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductRelation.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductRelation.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_product_relation") +@TableName("zp_store_product_relation") @ApiModel(value="StoreProductRelation对象", description="商品点赞和收藏表") public class StoreProductRelation implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductReply.java b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductReply.java index 611312b..996c494 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductReply.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductReply.java @@ -20,7 +20,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_product_reply") +@TableName("zp_store_product_reply") @ApiModel(value="StoreProductReply对象", description="评论表") public class StoreProductReply implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductRule.java b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductRule.java index 118d7c1..d036b7d 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductRule.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductRule.java @@ -18,7 +18,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_product_rule") +@TableName("zp_store_product_rule") @ApiModel(value="StoreProductRule对象", description="商品规则值(规格)表") public class StoreProductRule implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/record/UserVisitRecord.java b/fightwine-common/src/main/java/com/yzt/common/model/record/UserVisitRecord.java index 3f8e250..e2422db 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/record/UserVisitRecord.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/record/UserVisitRecord.java @@ -18,7 +18,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_visit_record") +@TableName("zp_user_visit_record") @ApiModel(value="UserVisitRecord对象", description="用户访问记录表") public class UserVisitRecord implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/seckill/StoreSeckill.java b/fightwine-common/src/main/java/com/yzt/common/model/seckill/StoreSeckill.java index 20c22c2..fc2e23f 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/seckill/StoreSeckill.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/seckill/StoreSeckill.java @@ -20,7 +20,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_seckill") +@TableName("zp_store_seckill") @ApiModel(value="StoreSeckill对象", description="商品秒杀产品表") public class StoreSeckill implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/seckill/StoreSeckillManger.java b/fightwine-common/src/main/java/com/yzt/common/model/seckill/StoreSeckillManger.java index ad37b6e..2da208a 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/seckill/StoreSeckillManger.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/seckill/StoreSeckillManger.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_store_seckill_manger") +@TableName("zp_store_seckill_manger") @ApiModel(value="StoreSeckillManger对象", description="商品秒杀管理表") public class StoreSeckillManger implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/sms/SmsRecord.java b/fightwine-common/src/main/java/com/yzt/common/model/sms/SmsRecord.java index efa29ad..2345615 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/sms/SmsRecord.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/sms/SmsRecord.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_sms_record") +@TableName("zp_sms_record") @ApiModel(value="SmsRecord对象", description="短信发送记录表") public class SmsRecord implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/sms/SmsTemplate.java b/fightwine-common/src/main/java/com/yzt/common/model/sms/SmsTemplate.java index 39bf951..5da7654 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/sms/SmsTemplate.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/sms/SmsTemplate.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_sms_template") +@TableName("zp_sms_template") @ApiModel(value="SmsTemplate对象", description="短信模板表") public class SmsTemplate implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemAdmin.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemAdmin.java index 8d74458..e24587d 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemAdmin.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemAdmin.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_admin") +@TableName("zp_system_admin") @ApiModel(value="SystemAdmin对象", description="后台管理员表") public class SystemAdmin implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemAttachment.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemAttachment.java index 7b69de4..3577d78 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemAttachment.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemAttachment.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_attachment") +@TableName("zp_system_attachment") @ApiModel(value="SystemAttachment对象", description="附件管理表") public class SystemAttachment implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemBank.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemBank.java index c7f1c49..5a77c7e 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemBank.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemBank.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_bank") +@TableName("zp_system_bank") @ApiModel(value="SystemBank对象", description="银行表") public class SystemBank { @TableId(type = IdType.AUTO) diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemCity.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemCity.java index 18ef09c..03635a7 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemCity.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemCity.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_city") +@TableName("zp_system_city") @ApiModel(value="SystemCity对象", description="城市表") public class SystemCity implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemConfig.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemConfig.java index 72acc17..edc8ac9 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemConfig.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemConfig.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_config") +@TableName("zp_system_config") @ApiModel(value="SystemConfig对象", description="配置表") public class SystemConfig implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemFormTemp.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemFormTemp.java index 1d2033a..1113556 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemFormTemp.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemFormTemp.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_form_temp") +@TableName("zp_system_form_temp") @ApiModel(value="SystemFormTemp对象", description="表单模板") public class SystemFormTemp implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemGroup.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemGroup.java index b92dc9a..6a89be0 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemGroup.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemGroup.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_group") +@TableName("zp_system_group") @ApiModel(value="SystemGroup对象", description="组合数据表") public class SystemGroup implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemGroupData.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemGroupData.java index 4330b3a..cb68668 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemGroupData.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemGroupData.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_group_data") +@TableName("zp_system_group_data") @ApiModel(value="SystemGroupData对象", description="组合数据详情表") public class SystemGroupData implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemMenu.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemMenu.java index 1d86e9f..d2f3e96 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemMenu.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemMenu.java @@ -20,7 +20,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_menu") +@TableName("zp_system_menu") @ApiModel(value="SystemMenu对象", description="系统菜单表") public class SystemMenu implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemNotification.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemNotification.java index 345b50d..1eec77e 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemNotification.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemNotification.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_notification") +@TableName("zp_system_notification") @ApiModel(value="SystemNotification对象", description="通知设置表") public class SystemNotification implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemPermissions.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemPermissions.java index 835b3ff..dc7ffd1 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemPermissions.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemPermissions.java @@ -19,7 +19,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -//@TableName("fw_system_permissions") +//@TableName("zp_system_permissions") @ApiModel(value="SystemPermissions对象", description="系统权限表") public class SystemPermissions implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemRole.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemRole.java index 03a1711..809be61 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemRole.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemRole.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_role") +@TableName("zp_system_role") @ApiModel(value="SystemRole对象", description="身份管理表") public class SystemRole implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemRoleMenu.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemRoleMenu.java index c3af19a..35d7fbc 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemRoleMenu.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemRoleMenu.java @@ -16,7 +16,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_role_menu") +@TableName("zp_system_role_menu") @ApiModel(value="SystemRoleMenu对象", description="角色菜单关联表") public class SystemRoleMenu implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemStore.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemStore.java index c038d7a..2c155ac 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemStore.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemStore.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_store") +@TableName("zp_system_store") @ApiModel(value="SystemStore对象", description="门店自提") public class SystemStore implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemStoreStaff.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemStoreStaff.java index 89be47c..95d85cd 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemStoreStaff.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemStoreStaff.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_store_staff") +@TableName("zp_system_store_staff") @ApiModel(value="SystemStoreStaff对象", description="门店店员表") public class SystemStoreStaff implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemUserLevel.java b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemUserLevel.java index d367c42..79690c0 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/SystemUserLevel.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/SystemUserLevel.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_user_level") +@TableName("zp_system_user_level") @ApiModel(value="SystemUserLevel对象", description="用户等级表") public class SystemUserLevel implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/system/Tenant.java b/fightwine-common/src/main/java/com/yzt/common/model/system/Tenant.java index 3af2c77..0d00d29 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/system/Tenant.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/system/Tenant.java @@ -21,7 +21,7 @@ import java.util.Date; */ @Getter @Setter -@TableName("fw_tenant") +@TableName("zp_tenant") @ApiModel(value = "Tenant对象", description = "租户表") public class Tenant { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/user/User.java b/fightwine-common/src/main/java/com/yzt/common/model/user/User.java index 0bf6c6d..a11b10f 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/user/User.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/user/User.java @@ -21,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user") +@TableName("zp_user") @ApiModel(value="User对象", description="用户表") public class User implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/user/UserAddress.java b/fightwine-common/src/main/java/com/yzt/common/model/user/UserAddress.java index f88100e..8cd6214 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/user/UserAddress.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/user/UserAddress.java @@ -20,7 +20,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_address") +@TableName("zp_user_address") @ApiModel(value="UserAddress对象", description="用户地址表") public class UserAddress implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/user/UserBankCard.java b/fightwine-common/src/main/java/com/yzt/common/model/user/UserBankCard.java index 1823cff..dd388a1 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/user/UserBankCard.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/user/UserBankCard.java @@ -20,7 +20,7 @@ import java.util.Date; */ @Data @Accessors(chain = true) -@TableName("fw_user_bank_card") +@TableName("zp_user_bank_card") @ApiModel(value="UserBankCard对象", description="用户银行卡") public class UserBankCard { /** diff --git a/fightwine-common/src/main/java/com/yzt/common/model/user/UserBill.java b/fightwine-common/src/main/java/com/yzt/common/model/user/UserBill.java index 73a9975..d375031 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/user/UserBill.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/user/UserBill.java @@ -21,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_bill") +@TableName("zp_user_bill") @ApiModel(value="UserBill对象", description="用户账单表") public class UserBill implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/user/UserBrokerageRecord.java b/fightwine-common/src/main/java/com/yzt/common/model/user/UserBrokerageRecord.java index 153652e..c1fdaf2 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/user/UserBrokerageRecord.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/user/UserBrokerageRecord.java @@ -21,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_brokerage_record") +@TableName("zp_user_brokerage_record") @ApiModel(value="UserBrokerageRecord对象", description="用户佣金记录表") public class UserBrokerageRecord implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/user/UserExperienceRecord.java b/fightwine-common/src/main/java/com/yzt/common/model/user/UserExperienceRecord.java index a7a2d9d..93f2398 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/user/UserExperienceRecord.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/user/UserExperienceRecord.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_experience_record") +@TableName("zp_user_experience_record") @ApiModel(value="UserExperienceRecord对象", description="用户经验记录表") public class UserExperienceRecord implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/user/UserGroup.java b/fightwine-common/src/main/java/com/yzt/common/model/user/UserGroup.java index c8e3db5..bebfeb1 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/user/UserGroup.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/user/UserGroup.java @@ -18,7 +18,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_group") +@TableName("zp_user_group") @ApiModel(value="UserGroup对象", description="用户分组表") public class UserGroup implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/user/UserIntegralRecord.java b/fightwine-common/src/main/java/com/yzt/common/model/user/UserIntegralRecord.java index ba4a140..fb58d48 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/user/UserIntegralRecord.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/user/UserIntegralRecord.java @@ -20,7 +20,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_integral_record") +@TableName("zp_user_integral_record") @ApiModel(value="UserIntegralRecord对象", description="用户积分记录表") public class UserIntegralRecord implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/user/UserLevel.java b/fightwine-common/src/main/java/com/yzt/common/model/user/UserLevel.java index 0296d64..3a776cb 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/user/UserLevel.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/user/UserLevel.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_level") +@TableName("zp_user_level") @ApiModel(value="UserLevel对象", description="用户等级记录表") public class UserLevel implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/user/UserLevelUpgradeAudit.java b/fightwine-common/src/main/java/com/yzt/common/model/user/UserLevelUpgradeAudit.java index 1b84a6c..8367095 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/user/UserLevelUpgradeAudit.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/user/UserLevelUpgradeAudit.java @@ -15,7 +15,7 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName("fw_user_level_upgrade_audit") +@TableName("zp_user_level_upgrade_audit") @ApiModel(description = "用户晋升审核记录") public class UserLevelUpgradeAudit { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/user/UserRechargeApplication.java b/fightwine-common/src/main/java/com/yzt/common/model/user/UserRechargeApplication.java index 5f6537a..361694c 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/user/UserRechargeApplication.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/user/UserRechargeApplication.java @@ -16,7 +16,7 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName("fw_recharge_application") +@TableName("zp_recharge_application") @ApiModel(description = "用户充值兑换积分申请表") public class UserRechargeApplication { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/user/UserSign.java b/fightwine-common/src/main/java/com/yzt/common/model/user/UserSign.java index 61a3947..ee923b0 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/user/UserSign.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/user/UserSign.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_sign") +@TableName("zp_user_sign") @ApiModel(value="UserSign对象", description="签到记录表") public class UserSign implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/user/UserTag.java b/fightwine-common/src/main/java/com/yzt/common/model/user/UserTag.java index 88d2834..e4d1e12 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/user/UserTag.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/user/UserTag.java @@ -18,7 +18,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_tag") +@TableName("zp_user_tag") @ApiModel(value="UserTag对象", description="用户标签表") public class UserTag implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/user/UserToken.java b/fightwine-common/src/main/java/com/yzt/common/model/user/UserToken.java index abf0289..636e251 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/user/UserToken.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/user/UserToken.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_token") +@TableName("zp_user_token") @ApiModel(value="UserToken对象", description="") public class UserToken implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/wechat/TemplateMessage.java b/fightwine-common/src/main/java/com/yzt/common/model/wechat/TemplateMessage.java index 9b6a808..a115de9 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/wechat/TemplateMessage.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/wechat/TemplateMessage.java @@ -20,7 +20,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_template_message") +@TableName("zp_template_message") @ApiModel(value="TemplateMessage对象", description="微信模板") public class TemplateMessage implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatCallback.java b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatCallback.java index 6af315b..68272c5 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatCallback.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatCallback.java @@ -21,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_wechat_callback") +@TableName("zp_wechat_callback") @ApiModel(value="WechatCallback对象", description="微信回调表") public class WechatCallback implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatExceptions.java b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatExceptions.java index 8d3c2bb..34b592d 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatExceptions.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatExceptions.java @@ -14,12 +14,12 @@ import java.util.Date; /** * 微信异常表 - * fw_ + * zp_ */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_wechat_exceptions") +@TableName("zp_wechat_exceptions") @ApiModel(value="WechatExceptions对象", description="微信异常表") public class WechatExceptions implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatMerchantConfig.java b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatMerchantConfig.java index bcc6a33..9f5a51c 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatMerchantConfig.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatMerchantConfig.java @@ -16,7 +16,7 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName("fw_wechat_merchant_config") +@TableName("zp_wechat_merchant_config") @ApiModel(value = "微信商户配置") public class WechatMerchantConfig implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatPayInfo.java b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatPayInfo.java index f4a6d1f..287f051 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatPayInfo.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatPayInfo.java @@ -13,12 +13,12 @@ import java.io.Serializable; /** * 微信订单表 - * fw_ + * zp_ */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_wechat_pay_info") +@TableName("zp_wechat_pay_info") @ApiModel(value="WechatPayInfo对象", description="微信订单表") public class WechatPayInfo implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatProgramMyTemp.java b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatProgramMyTemp.java index ae7b1cc..3e88fac 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatProgramMyTemp.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatProgramMyTemp.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_wechat_program_my_temp") +@TableName("zp_wechat_program_my_temp") @ApiModel(value="WechatProgramMyTemp对象", description="小程序我的模板") public class WechatProgramMyTemp implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatProgramPublicTemp.java b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatProgramPublicTemp.java index 1569c14..93820d7 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatProgramPublicTemp.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatProgramPublicTemp.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_wechat_program_public_temp") +@TableName("zp_wechat_program_public_temp") @ApiModel(value="WechatProgramPublicTemp对象", description="") public class WechatProgramPublicTemp implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatQrcode.java b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatQrcode.java index 4694736..1419e5b 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatQrcode.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatQrcode.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_wechat_qrcode") +@TableName("zp_wechat_qrcode") @ApiModel(value="WechatQrcode对象", description="微信二维码管理表") public class WechatQrcode implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatReply.java b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatReply.java index ded3ee1..3b094fd 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatReply.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatReply.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_wechat_reply") +@TableName("zp_wechat_reply") @ApiModel(value="WechatReply对象", description="微信关键字回复表") public class WechatReply implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/request/UserCreateRequest.java b/fightwine-common/src/main/java/com/yzt/common/request/UserCreateRequest.java index bda2775..4fe30a7 100644 --- a/fightwine-common/src/main/java/com/yzt/common/request/UserCreateRequest.java +++ b/fightwine-common/src/main/java/com/yzt/common/request/UserCreateRequest.java @@ -40,26 +40,26 @@ public class UserCreateRequest implements Serializable { @ApiModelProperty(value = "登录密码") private String password; - @NotBlank(message = "交易密码不能为空") - @Size(min = 6, message = "交易密码至少6位") - @ApiModelProperty(value = "交易密码") - private String tradePassword; +// @NotBlank(message = "交易密码不能为空") +// @Size(min = 6, message = "交易密码至少6位") +// @ApiModelProperty(value = "交易密码") +// private String tradePassword; @NotBlank(message = "手机号不能为空") @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确") @ApiModelProperty(value = "手机号") private String phone; - @ApiModelProperty(value = "推广人id") - private Integer spreadUid; +// @ApiModelProperty(value = "推广人id") +// private Integer spreadUid; @ApiModelProperty(value = "租户(公司)id") private Long tenantId; // 公司ID /** * 机构名称（选填） */ - @ApiModelProperty(value = "机构名称") - private String orgName; +// @ApiModelProperty(value = "机构名称") +// private String orgName; @ApiModelProperty(value = "真实姓名") private String realName; @@ -80,8 +80,8 @@ public class UserCreateRequest implements Serializable { @ApiModelProperty(value = "详细地址") private String addres; - @ApiModelProperty(value = "等级") - private Integer level; +// @ApiModelProperty(value = "等级") +// private Integer level; @ApiModelProperty(value = "用户分组id") private String groupId; @@ -89,8 +89,8 @@ public class UserCreateRequest implements Serializable { @ApiModelProperty(value = "用户标签id") private String tagId; - @ApiModelProperty(value = "是否为推广员") -// @NotNull(message = "是否为推广员不能为空") - private Boolean isPromoter; +// @ApiModelProperty(value = "是否为推广员") +//// @NotNull(message = "是否为推广员不能为空") +// private Boolean isPromoter; } \ No newline at end of file diff --git a/fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java b/fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java index e22e850..43f46a3 100644 --- a/fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java +++ b/fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java @@ -91,8 +91,8 @@ public class UserResponse { @ApiModelProperty(value = "1为正常，0为禁止") private Boolean status; - @ApiModelProperty(value = "等级") - private Integer level; +// @ApiModelProperty(value = "等级") +// private Integer level; @ApiModelProperty(value = "推广人id") private Integer spreadUid; @@ -142,12 +142,12 @@ public class UserResponse { @ApiModelProperty(value = "公司名称") private String tenantName; - @ApiModelProperty(value = "累计收益") - private BigDecimal totalIncomes; - - @ApiModelProperty(value = "累计下单金额") - private BigDecimal TotalPaidAmount; - - @ApiModelProperty(value = "累计销售金额") - private BigDecimal totalSalesAmount; +// @ApiModelProperty(value = "累计收益") +// private BigDecimal totalIncomes; +// +// @ApiModelProperty(value = "累计下单金额") +// private BigDecimal TotalPaidAmount; +// +// @ApiModelProperty(value = "累计销售金额") +// private BigDecimal totalSalesAmount; } diff --git a/fightwine-front/src/main/resources/application.yml b/fightwine-front/src/main/resources/application.yml index 76b79cd..587387d 100644 --- a/fightwine-front/src/main/resources/application.yml +++ b/fightwine-front/src/main/resources/application.yml @@ -57,7 +57,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://183.6.65.90:5001/fight_wine?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://183.6.65.90:5001/zp_fight_wine?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: Yizhitong@2024 # quartz diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/UserServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/UserServiceImpl.java index 9a401a2..b2c6cbe 100644 --- a/fightwine-service/src/main/java/com/yzt/service/service/impl/UserServiceImpl.java +++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/UserServiceImpl.java @@ -252,9 +252,9 @@ public class UserServiceImpl extends ServiceImpl implements Us } userResponse.setPhone(YztUtil.maskMobile(userResponse.getPhone())); userResponse.setTenantName(tenantService.getInfo(tenantId).getTenantName()); - userResponse.setTotalIncomes(userBrokerageRecordService.getCurrentUserTotalSpreadPrice(user.getUid())); - userResponse.setTotalPaidAmount(storeOrderService.getTotalPaidAmountByUid(user.getUid())); - userResponse.setTotalSalesAmount(storeOrderService.getTotalPaidAmountByUids(userService.getSpreadIdList(userId))); +// userResponse.setTotalIncomes(userBrokerageRecordService.getCurrentUserTotalSpreadPrice(user.getUid())); +// userResponse.setTotalPaidAmount(storeOrderService.getTotalPaidAmountByUid(user.getUid())); +// userResponse.setTotalSalesAmount(storeOrderService.getTotalPaidAmountByUids(userService.getSpreadIdList(userId))); userResponses.add(userResponse); } return CommonPage.copyPageInfo(pageUser, userResponses); @@ -1613,20 +1613,20 @@ public class UserServiceImpl extends ServiceImpl implements Us if ( Objects.nonNull(user.getIsPromoter())) { user.setPromoterTime(DateUtil.date()); } - user.setTradePassword(YztUtil.encryptPassword(userRequest.getTradePassword(),userRequest.getPhone())); +// user.setTradePassword(YztUtil.encryptPassword(userRequest.getTradePassword(),userRequest.getPhone())); user.setPwd(YztUtil.encryptPassword(userRequest.getPassword(),userRequest.getPhone())); user.setUpdateTime(DateUtil.date()); - Boolean check = userService.checkBingSpread(user, userRequest.getSpreadUid(), "new"); - if (check) { - user.setSpreadUid(userRequest.getSpreadUid()); - user.setSpreadTime(DateUtil.date()); - } +// Boolean check = userService.checkBingSpread(user, userRequest.getSpreadUid(), "new"); +// if (check) { +// user.setSpreadUid(userRequest.getSpreadUid()); +// user.setSpreadTime(DateUtil.date()); +// } Boolean execute = transactionTemplate.execute(e -> { save(user); // 推广人处理 - if (check) { - updateSpreadCountByUid(userRequest.getSpreadUid(), "add"); - } +// if (check) { +// updateSpreadCountByUid(userRequest.getSpreadUid(), "add"); +// } return Boolean.TRUE; }); if (!execute) {