ZP/zp-fightwine
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 更改 库名表名

Browse Source
This commit is contained in:
pengsz 2025-12-04 16:35:08 +08:00
parent f2cbf3f282
commit 9ba5172bb2
85 changed files with 125 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fightwine-admin/src/main/resources/application.yml
View File

@ -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

2
fightwine-common/src/main/java/com/yzt/common/model/acticitystyle/ActivityStyle.java
View File

@ -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 {

4
fightwine-common/src/main/java/com/yzt/common/model/article/Article.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargain.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargainUser.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/bargain/StoreBargainUserHelp.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/cat/StoreCart.java
View File

@ -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 {

4
fightwine-common/src/main/java/com/yzt/common/model/category/Category.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/combination/StoreCombination.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/combination/StorePink.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/coupon/StoreCoupon.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/coupon/StoreCouponUser.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/exception/ExceptionLog.java
View File

@ -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 {

4
fightwine-common/src/main/java/com/yzt/common/model/express/Express.java
View File

@ -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 {

4
fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplates.java
View File

@ -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 {

4
fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplatesFree.java
View File

@ -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 {

4
fightwine-common/src/main/java/com/yzt/common/model/express/ShippingTemplatesRegion.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/finance/UserExtract.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/finance/UserRecharge.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/log/StoreProductLog.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrder.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderInfo.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderInvoice.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrderStatus.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/page/PageCategory.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/page/PageDiy.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/page/PageLink.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/product/StoreProduct.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttr.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttrResult.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductAttrValue.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductCoupon.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductDescription.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductRelation.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductReply.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/product/StoreProductRule.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/record/UserVisitRecord.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/seckill/StoreSeckill.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/seckill/StoreSeckillManger.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/sms/SmsRecord.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/sms/SmsTemplate.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemAdmin.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemAttachment.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemBank.java
View File

@ -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)

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemCity.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemConfig.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemFormTemp.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemGroup.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemGroupData.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemMenu.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemNotification.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemPermissions.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemRole.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemRoleMenu.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemStore.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemStoreStaff.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/SystemUserLevel.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/system/Tenant.java
View File

@ -21,7 +21,7 @@ import java.util.Date;
*/
@Getter
@Setter
@TableName("fw_tenant")
@TableName("zp_tenant")
@ApiModel(value = "Tenant对象", description = "租户表")
public class Tenant {

2
fightwine-common/src/main/java/com/yzt/common/model/user/User.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/user/UserAddress.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/user/UserBankCard.java
View File

@ -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 {
/**

2
fightwine-common/src/main/java/com/yzt/common/model/user/UserBill.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/user/UserBrokerageRecord.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/user/UserExperienceRecord.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/user/UserGroup.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/user/UserIntegralRecord.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/user/UserLevel.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/user/UserLevelUpgradeAudit.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/user/UserRechargeApplication.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/user/UserSign.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/user/UserTag.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/user/UserToken.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/wechat/TemplateMessage.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatCallback.java
View File

@ -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 {

4
fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatExceptions.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatMerchantConfig.java
View File

@ -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 {

4
fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatPayInfo.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatProgramMyTemp.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatProgramPublicTemp.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatQrcode.java
View File

@ -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 {

2
fightwine-common/src/main/java/com/yzt/common/model/wechat/WechatReply.java
View File

@ -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 {

26
fightwine-common/src/main/java/com/yzt/common/request/UserCreateRequest.java
View File

@ -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;
}

20
fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java
View File

@ -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;
}

2
fightwine-front/src/main/resources/application.yml
View File

@ -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

24
fightwine-service/src/main/java/com/yzt/service/service/impl/UserServiceImpl.java
View File

@ -252,9 +252,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> 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<UserMapper, User> 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) {