From 375c1f7c569a5268fb300e00be08f5873876498e Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 11 Mar 2025 10:56:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4Builder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/account/dto/MqLogDTO.java | 3 +- .../com/czg/account/dto/OrderDetailDTO.java | 3 +- .../com/czg/account/dto/OrderInfoDTO.java | 3 +- .../com/czg/account/dto/PadLayoutDTO.java | 3 +- .../dto/PadProductCategoryDetailDTO.java | 3 +- .../com/czg/account/dto/PlatformDictDTO.java | 3 +- .../czg/account/dto/PlatformDictTypeDTO.java | 3 +- .../java/com/czg/account/dto/ProductDTO.java | 3 +- .../com/czg/account/dto/ShopActivateDTO.java | 3 +- .../com/czg/account/dto/ShopCouponDTO.java | 3 +- .../czg/account/dto/ShopCouponProductDTO.java | 3 +- .../com/czg/account/dto/ShopMsgStateDTO.java | 3 +- .../com/czg/account/dto/ShopPayTypeDTO.java | 8 +-- .../czg/account/dto/ShopPermissionDTO.java | 3 +- .../czg/account/dto/ShopProdCategoryDTO.java | 3 +- .../czg/account/dto/ShopProdStatisticDTO.java | 3 +- .../czg/account/dto/ShopPushOpenIdDTO.java | 3 +- .../com/czg/account/dto/ShopShareDTO.java | 3 +- .../czg/account/dto/ShopShareRecordDTO.java | 3 +- .../account/dto/ShopStaffPermissionDTO.java | 3 +- .../com/czg/account/dto/ShopStorageDTO.java | 3 +- .../com/czg/account/dto/ShopTableCodeDTO.java | 3 +- .../dto/ShopTableOrderStatisticDTO.java | 3 +- .../java/com/czg/account/dto/SysDictDTO.java | 3 +- .../com/czg/account/dto/ad/ShopAdDTO.java | 9 +-- .../czg/account/dto/area/ShopAreaEditDTO.java | 7 +-- .../czg/account/dto/extend/ShopExtendDTO.java | 7 --- .../czg/account/dto/flow/ShopUserFlowDTO.java | 3 +- .../czg/account/dto/pad/PadLayoutAddDTO.java | 7 +-- .../dto/paytype/ShopPayTypeAddDTO.java | 6 -- .../dto/shopuser/ShopUserMoneyEditDTO.java | 4 +- .../czg/account/dto/song/ShopSongAddDTO.java | 12 +--- .../czg/account/dto/song/ShopSongEditDTO.java | 7 ++- .../account/dto/table/ShopTableClearDTO.java | 3 - .../czg/account/dto/table/ShopTableDTO.java | 11 +--- .../com/czg/account/entity/CallConfig.java | 3 +- .../com/czg/account/entity/CallQueue.java | 3 +- .../com/czg/account/entity/CallTable.java | 3 +- .../czg/account/entity/FreeDineConfig.java | 9 ++- .../czg/account/entity/MerchantRegister.java | 3 +- .../com/czg/account/entity/PadLayout.java | 3 +- .../account/entity/PadProductCategory.java | 3 +- .../entity/PadProductCategoryDetail.java | 3 +- .../com/czg/account/entity/PlatformDict.java | 3 +- .../czg/account/entity/PlatformDictType.java | 3 +- .../account/entity/PointsBasicSetting.java | 3 +- .../com/czg/account/entity/PrintMachine.java | 3 +- .../com/czg/account/entity/ShopActivate.java | 3 +- .../entity/ShopActivateCouponRecord.java | 3 +- .../java/com/czg/account/entity/ShopAd.java | 3 +- .../com/czg/account/entity/ShopCoupon.java | 3 +- .../com/czg/account/entity/ShopExtend.java | 4 +- .../java/com/czg/account/entity/ShopInfo.java | 3 +- .../com/czg/account/entity/ShopMerchant.java | 3 +- .../com/czg/account/entity/ShopMsgState.java | 3 +- .../com/czg/account/entity/ShopPayType.java | 3 +- .../czg/account/entity/ShopPermission.java | 3 +- .../czg/account/entity/ShopProdCategory.java | 3 +- .../czg/account/entity/ShopProdStatistic.java | 3 +- .../czg/account/entity/ShopPushOpenId.java | 12 +--- .../com/czg/account/entity/ShopShare.java | 3 +- .../czg/account/entity/ShopShareRecord.java | 3 +- .../java/com/czg/account/entity/ShopSong.java | 3 +- .../com/czg/account/entity/ShopStaff.java | 3 +- .../account/entity/ShopStaffPermission.java | 3 +- .../com/czg/account/entity/ShopTable.java | 3 +- .../com/czg/account/entity/ShopTableArea.java | 3 +- .../com/czg/account/entity/ShopTableCode.java | 3 +- .../entity/ShopTableOrderStatistic.java | 14 ++--- .../java/com/czg/account/entity/ShopUser.java | 3 +- .../com/czg/account/entity/ShopUserFlow.java | 3 +- .../java/com/czg/account/entity/SysDict.java | 14 ++--- .../java/com/czg/account/entity/SysMenu.java | 3 +- .../java/com/czg/account/entity/SysRole.java | 3 +- .../com/czg/account/entity/SysRolesMenus.java | 3 +- .../java/com/czg/account/entity/SysUser.java | 3 +- .../com/czg/account/entity/SysUsersRoles.java | 3 +- .../java/com/czg/account/entity/UserInfo.java | 3 +- .../java/com/czg/order/dto/CheckOrderPay.java | 3 +- .../com/czg/order/dto/OrderInfoAddDTO.java | 3 +- .../java/com/czg/order/dto/OrderInfoDTO.java | 3 +- .../com/czg/order/dto/OrderInfoQueryDTO.java | 3 +- .../com/czg/order/dto/OrderInfoRefundDTO.java | 3 +- .../com/czg/order/dto/OrderInfoUpDTO.java | 3 +- .../czg/order/dto/ShopOrderStatisticDTO.java | 3 +- .../czg/order/dto/ShopProdStatisticDTO.java | 3 +- .../order/dto/ShopTableOrderStatisticDTO.java | 3 +- .../com/czg/order/entity/CashierCart.java | 3 +- .../main/java/com/czg/order/entity/MqLog.java | 3 +- .../com/czg/order/entity/OrderDetail.java | 3 +- .../java/com/czg/order/entity/OrderInfo.java | 3 +- .../czg/order/entity/ShopOrderStatistic.java | 3 +- .../czg/order/entity/ShopProdStatistic.java | 3 +- .../order/entity/ShopTableOrderStatistic.java | 3 +- .../com/czg/order/vo/OrderDetailSmallVO.java | 3 +- .../java/com/czg/order/vo/OrderInfoVo.java | 3 +- .../czg/product/dto/ShopStorageRecordDTO.java | 3 +- .../dto/storage/ShopStorageGoodDTO.java | 9 --- .../com/czg/product/entity/ShopStorage.java | 3 +- .../czg/product/entity/ShopStorageGood.java | 3 +- .../czg/product/entity/ShopStorageRecord.java | 3 +- .../com/czg/system/entity/MiniAppPages.java | 3 +- .../java/com/czg/system/entity/SysParams.java | 3 +- .../java/com/czg/system/entity/Version.java | 3 +- .../service/impl/ShopActivateServiceImpl.java | 19 +++--- .../main/resources/templates/entityDto.tpl | 2 - .../service/impl/OrderInfoServiceImpl.java | 12 ++-- .../order/service/impl/PayServiceImpl.java | 60 +++++++++---------- 108 files changed, 163 insertions(+), 334 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/MqLogDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/MqLogDTO.java index efe0483e..6e16e5a8 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/MqLogDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/MqLogDTO.java @@ -6,7 +6,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-21 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class MqLogDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/OrderDetailDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/OrderDetailDTO.java index 3611b033..3750140b 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/OrderDetailDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/OrderDetailDTO.java @@ -7,7 +7,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -18,7 +17,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-24 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class OrderDetailDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/OrderInfoDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/OrderInfoDTO.java index 3456ed3f..e2d784b7 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/OrderInfoDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/OrderInfoDTO.java @@ -8,7 +8,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -19,7 +18,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-24 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class OrderInfoDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PadLayoutDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PadLayoutDTO.java index a553272e..1b83806a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PadLayoutDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PadLayoutDTO.java @@ -6,7 +6,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class PadLayoutDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PadProductCategoryDetailDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PadProductCategoryDetailDTO.java index 8717fe89..a3194518 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PadProductCategoryDetailDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PadProductCategoryDetailDTO.java @@ -6,7 +6,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class PadProductCategoryDetailDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PlatformDictDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PlatformDictDTO.java index 4579c153..ced96e11 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PlatformDictDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PlatformDictDTO.java @@ -4,7 +4,6 @@ package com.czg.account.dto; import java.io.Serializable; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -15,7 +14,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-28 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class PlatformDictDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PlatformDictTypeDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PlatformDictTypeDTO.java index a5f17ee3..cefab3e8 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PlatformDictTypeDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/PlatformDictTypeDTO.java @@ -4,7 +4,6 @@ package com.czg.account.dto; import java.io.Serializable; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -15,7 +14,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-28 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class PlatformDictTypeDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ProductDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ProductDTO.java index 21eced9f..319c67f4 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ProductDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ProductDTO.java @@ -8,7 +8,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -19,7 +18,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ProductDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopActivateDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopActivateDTO.java index 2f2d43a1..65c86d6b 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopActivateDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopActivateDTO.java @@ -7,7 +7,6 @@ import com.czg.validator.group.InsertGroup; import com.czg.validator.group.UpdateGroup; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -25,7 +24,7 @@ import java.util.List; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopActivateDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopCouponDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopCouponDTO.java index 6254cdb5..8b68034b 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopCouponDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopCouponDTO.java @@ -3,7 +3,6 @@ package com.czg.account.dto; import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -19,7 +18,7 @@ import java.time.LocalDateTime; * @since 2025-02-17 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopCouponDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopCouponProductDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopCouponProductDTO.java index c163a498..c6325b02 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopCouponProductDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopCouponProductDTO.java @@ -3,7 +3,6 @@ package com.czg.account.dto; import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -18,7 +17,7 @@ import java.time.LocalDateTime; * @since 2025-02-18 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopCouponProductDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopMsgStateDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopMsgStateDTO.java index 54634572..eaca8263 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopMsgStateDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopMsgStateDTO.java @@ -6,7 +6,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-07 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopMsgStateDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPayTypeDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPayTypeDTO.java index 8c0bdbf5..d2942987 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPayTypeDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPayTypeDTO.java @@ -1,14 +1,11 @@ package com.czg.account.dto; -import java.io.Serializable; -import java.io.Serial; -import java.time.LocalDateTime; - import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; +import java.io.Serializable; /** * 店铺支付类型 实体类。 @@ -17,7 +14,6 @@ import lombok.NoArgsConstructor; * @since 2025-02-26 */ @Data -@Builder @NoArgsConstructor @AllArgsConstructor public class ShopPayTypeDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPermissionDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPermissionDTO.java index 14a2e860..08ddc93c 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPermissionDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPermissionDTO.java @@ -6,7 +6,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-18 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopPermissionDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopProdCategoryDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopProdCategoryDTO.java index 4422f302..7d6ec6f5 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopProdCategoryDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopProdCategoryDTO.java @@ -6,7 +6,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopProdCategoryDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopProdStatisticDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopProdStatisticDTO.java index 8cb2776e..51af6aaf 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopProdStatisticDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopProdStatisticDTO.java @@ -6,7 +6,6 @@ import java.math.BigDecimal; import java.sql.Date; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-06 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopProdStatisticDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPushOpenIdDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPushOpenIdDTO.java index 7db6f813..5f200eeb 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPushOpenIdDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPushOpenIdDTO.java @@ -6,7 +6,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-03 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopPushOpenIdDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareDTO.java index 6f98d971..e301b458 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareDTO.java @@ -9,7 +9,6 @@ import java.util.List; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,7 +19,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-05 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopShareDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareRecordDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareRecordDTO.java index 7502db7f..21036038 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareRecordDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareRecordDTO.java @@ -6,7 +6,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-05 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopShareRecordDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopStaffPermissionDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopStaffPermissionDTO.java index a9cf6e11..3a0e86e2 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopStaffPermissionDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopStaffPermissionDTO.java @@ -4,7 +4,6 @@ package com.czg.account.dto; import java.io.Serializable; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -15,7 +14,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-18 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopStaffPermissionDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopStorageDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopStorageDTO.java index 5d77ce3a..50f3a45e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopStorageDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopStorageDTO.java @@ -6,7 +6,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-27 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopStorageDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopTableCodeDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopTableCodeDTO.java index 9c6b2bfb..5cde6229 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopTableCodeDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopTableCodeDTO.java @@ -6,7 +6,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-19 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopTableCodeDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopTableOrderStatisticDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopTableOrderStatisticDTO.java index 08758357..26c9557f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopTableOrderStatisticDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopTableOrderStatisticDTO.java @@ -7,7 +7,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -18,7 +17,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-03 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopTableOrderStatisticDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/SysDictDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/SysDictDTO.java index 585e1eaf..bdcdecfe 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/SysDictDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/SysDictDTO.java @@ -6,7 +6,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-28 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class SysDictDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ad/ShopAdDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ad/ShopAdDTO.java index 1f8d5855..df020690 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ad/ShopAdDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ad/ShopAdDTO.java @@ -1,20 +1,16 @@ package com.czg.account.dto.ad; -import java.io.Serializable; -import java.time.LocalDateTime; -import com.alibaba.fastjson2.annotation.JSONField; -import java.io.Serial; - import com.czg.validator.group.InsertGroup; import com.czg.validator.group.UpdateGroup; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + /** * 店铺广告 实体类。 * @@ -22,7 +18,6 @@ import lombok.NoArgsConstructor; * @since 2025-02-26 */ @Data -@Builder @NoArgsConstructor @AllArgsConstructor public class ShopAdDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/area/ShopAreaEditDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/area/ShopAreaEditDTO.java index 6dc0520b..fb29883e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/area/ShopAreaEditDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/area/ShopAreaEditDTO.java @@ -1,15 +1,13 @@ package com.czg.account.dto.area; -import java.io.Serializable; -import java.io.Serial; - import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + /** * 店铺区域 实体类。 * @@ -17,7 +15,6 @@ import lombok.NoArgsConstructor; * @since 2025-02-18 */ @Data -@Builder @NoArgsConstructor @AllArgsConstructor public class ShopAreaEditDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/extend/ShopExtendDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/extend/ShopExtendDTO.java index 2a7fbecc..0dfc24d8 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/extend/ShopExtendDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/extend/ShopExtendDTO.java @@ -1,18 +1,12 @@ package com.czg.account.dto.extend; -import com.alibaba.fastjson2.annotation.JSONField; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - /** * 店铺扩展信息 实体类。 * @@ -20,7 +14,6 @@ import java.time.LocalDateTime; * @since 2025-02-19 */ @Data -@Builder @NoArgsConstructor @AllArgsConstructor public class ShopExtendDTO { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/flow/ShopUserFlowDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/flow/ShopUserFlowDTO.java index f524cc26..969508cf 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/flow/ShopUserFlowDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/flow/ShopUserFlowDTO.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson2.annotation.JSONField; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import java.time.LocalDateTime; * @since 2025-02-13 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopUserFlowDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/pad/PadLayoutAddDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/pad/PadLayoutAddDTO.java index 49a4ecb6..81c9f9de 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/pad/PadLayoutAddDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/pad/PadLayoutAddDTO.java @@ -1,15 +1,10 @@ package com.czg.account.dto.pad; -import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; - -import java.io.Serial; import java.io.Serializable; -import java.time.LocalDateTime; import java.util.List; /** @@ -19,7 +14,7 @@ import java.util.List; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class PadLayoutAddDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/paytype/ShopPayTypeAddDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/paytype/ShopPayTypeAddDTO.java index 1266cac5..d33c8f13 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/paytype/ShopPayTypeAddDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/paytype/ShopPayTypeAddDTO.java @@ -3,15 +3,10 @@ package com.czg.account.dto.paytype; import com.czg.validator.group.InsertGroup; import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.io.Serial; -import java.io.Serializable; - /** * 店铺支付类型 实体类。 * @@ -19,7 +14,6 @@ import java.io.Serializable; * @since 2025-02-26 */ @Data -@Builder @NoArgsConstructor @AllArgsConstructor public class ShopPayTypeAddDTO { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java index 008bf241..0ddcf985 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java @@ -4,8 +4,8 @@ import com.czg.enums.ShopUserFlowBizEnum; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.NotNull; -import lombok.Builder; import lombok.Data; +import lombok.experimental.Accessors; import java.io.Serializable; import java.math.BigDecimal; @@ -14,7 +14,7 @@ import java.math.BigDecimal; * @author Administrator */ @Data -@Builder +@Accessors(chain = true) public class ShopUserMoneyEditDTO implements Serializable { /** * 对应shopUserid diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/song/ShopSongAddDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/song/ShopSongAddDTO.java index 7010715a..9318aaa0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/song/ShopSongAddDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/song/ShopSongAddDTO.java @@ -1,22 +1,15 @@ package com.czg.account.dto.song; -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import com.alibaba.fastjson2.annotation.JSONField; -import java.io.Serial; - import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 点歌-歌曲表 实体类。 * @@ -24,7 +17,6 @@ import lombok.experimental.Accessors; * @since 2025-03-01 */ @Data -@Builder @Accessors(chain = true) public class ShopSongAddDTO{ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/song/ShopSongEditDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/song/ShopSongEditDTO.java index a3461b5e..c54fd4a3 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/song/ShopSongEditDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/song/ShopSongEditDTO.java @@ -1,8 +1,9 @@ package com.czg.account.dto.song; -import jakarta.validation.constraints.*; -import lombok.Builder; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -17,7 +18,7 @@ import java.math.BigDecimal; */ @EqualsAndHashCode(callSuper = true) @Data -@Builder + @Accessors(chain = true) public class ShopSongEditDTO extends BaseShopSongDTO { /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableClearDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableClearDTO.java index 139a3021..88f67dec 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableClearDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableClearDTO.java @@ -3,13 +3,11 @@ package com.czg.account.dto.table; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; -import java.math.BigDecimal; /** * 台桌配置 实体类。 @@ -18,7 +16,6 @@ import java.math.BigDecimal; * @since 2025-02-13 */ @Data -@Builder @NoArgsConstructor @AllArgsConstructor public class ShopTableClearDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableDTO.java index e79ae8a7..b8582565 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableDTO.java @@ -1,17 +1,13 @@ package com.czg.account.dto.table; -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import com.alibaba.fastjson2.annotation.JSONField; -import java.io.Serial; - import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; /** * 台桌配置 实体类。 @@ -20,7 +16,6 @@ import lombok.NoArgsConstructor; * @since 2025-02-13 */ @Data -@Builder @NoArgsConstructor @AllArgsConstructor public class ShopTableDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallConfig.java index 9b2b3e36..8d3fa7f6 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallConfig.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallConfig.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-21 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_call_config") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallQueue.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallQueue.java index 5349322d..765baf2a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallQueue.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallQueue.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-21 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_call_queue") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallTable.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallTable.java index 2c9a4fb0..afb53993 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallTable.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallTable.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-21 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_call_table") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java index 764c909f..041b4484 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java @@ -11,7 +11,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -22,7 +21,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-21 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_free_dine_config") @@ -64,9 +63,9 @@ public class FreeDineConfig implements Serializable { */ private String rechargeDesc; - /** - * 使用类型 dine-in店内 takeout 自取 post快递，takeaway外卖 - */ +// /** +// * 使用类型 dine-in店内 takeout 自取 post快递，takeaway外卖 +// */ // private String useType; /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/MerchantRegister.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/MerchantRegister.java index bf89ca66..f79cad3b 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/MerchantRegister.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/MerchantRegister.java @@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import java.time.LocalDateTime; * @since 2025-02-11 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_merchant_register") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadLayout.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadLayout.java index b2988fc7..923c2268 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadLayout.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadLayout.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_pad_layout") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadProductCategory.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadProductCategory.java index d50f0ab2..735666d9 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadProductCategory.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadProductCategory.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -22,7 +21,7 @@ import lombok.experimental.Accessors; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_pad_product_category") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadProductCategoryDetail.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadProductCategoryDetail.java index ba1f0443..571742d1 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadProductCategoryDetail.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadProductCategoryDetail.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -22,7 +21,7 @@ import lombok.experimental.Accessors; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_pad_product_category_detail") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PlatformDict.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PlatformDict.java index bfb23f5d..dd84249b 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PlatformDict.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PlatformDict.java @@ -8,7 +8,6 @@ import java.io.Serializable; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -19,7 +18,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-28 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_platform_dict") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PlatformDictType.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PlatformDictType.java index 6bb49284..b4ce5c69 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PlatformDictType.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PlatformDictType.java @@ -8,7 +8,6 @@ import java.io.Serializable; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -19,7 +18,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-28 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_platform_dict_type") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PointsBasicSetting.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PointsBasicSetting.java index e7464647..163d5d20 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PointsBasicSetting.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PointsBasicSetting.java @@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import java.time.LocalDateTime; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_points_basic_setting") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java index 6a4e3f5b..8b25e756 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java @@ -11,7 +11,6 @@ import java.io.Serial; import java.util.List; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -22,7 +21,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_print_machine") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopActivate.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopActivate.java index 887d94ec..c96bf50e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopActivate.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopActivate.java @@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import java.time.LocalDateTime; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_activate") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopActivateCouponRecord.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopActivateCouponRecord.java index 85c65ceb..7901c8a3 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopActivateCouponRecord.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopActivateCouponRecord.java @@ -12,7 +12,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -23,7 +22,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_activate_coupon_record") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopAd.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopAd.java index db61e743..96e141a0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopAd.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopAd.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-26 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_ad") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopCoupon.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopCoupon.java index 19abf2a0..95bc5b03 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopCoupon.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopCoupon.java @@ -12,7 +12,6 @@ import java.io.Serial; import java.time.LocalTime; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -23,7 +22,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_coupon") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopExtend.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopExtend.java index 0d8efebd..251d3c71 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopExtend.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopExtend.java @@ -11,7 +11,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -22,7 +21,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-19 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_extend") @@ -80,7 +79,6 @@ public class ShopExtend implements Serializable { * my_bg： 我的页面背景图 * member_bg：会员卡页面背景图 * shopinfo_bg：商品列表顶部背景图 - * @param autokey */ public void initAutoKey(String autokey,long shopId) { if (StrUtil.isBlank(name)) { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java index 68e5cab0..75f702ab 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java @@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import java.time.LocalDateTime; * @since 2025-02-10 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_info") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopMerchant.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopMerchant.java index fa7fc52f..25f37f90 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopMerchant.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopMerchant.java @@ -4,7 +4,6 @@ import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -19,7 +18,7 @@ import java.time.LocalDateTime; * @since 2025-02-11 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_merchant") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopMsgState.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopMsgState.java index 1b429dce..f7eb88af 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopMsgState.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopMsgState.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-07 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_msg_state") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPayType.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPayType.java index e652ed01..a19795b0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPayType.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPayType.java @@ -10,7 +10,6 @@ import java.io.Serial; import java.time.LocalDateTime; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -22,7 +21,7 @@ import lombok.experimental.Accessors; * @since 2025-02-26 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Accessors(chain = true) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPermission.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPermission.java index 081b7fc3..d857cebd 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPermission.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPermission.java @@ -11,7 +11,6 @@ import java.io.Serial; import java.util.List; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -22,7 +21,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-18 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_permission") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopProdCategory.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopProdCategory.java index aa683851..cfa4009c 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopProdCategory.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopProdCategory.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_prod_category") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopProdStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopProdStatistic.java index c6d39a8d..95799a51 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopProdStatistic.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopProdStatistic.java @@ -10,7 +10,6 @@ import java.sql.Date; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-06 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_prod_statistic") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPushOpenId.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPushOpenId.java index 3ff6b2c5..46df7a85 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPushOpenId.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPushOpenId.java @@ -1,20 +1,15 @@ package com.czg.account.entity; -import com.alibaba.fastjson2.annotation.JSONField; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import java.time.LocalDateTime; - -import java.io.Serial; -import java.util.List; - import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; /** * 用户推送信息表 实体类。 @@ -23,7 +18,6 @@ import lombok.NoArgsConstructor; * @since 2025-03-03 */ @Data -@Builder @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_push_open_id") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopShare.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopShare.java index 75bcf180..78e20b6c 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopShare.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopShare.java @@ -9,7 +9,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,7 +19,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-05 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_share") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopShareRecord.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopShareRecord.java index a4f13912..58209c11 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopShareRecord.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopShareRecord.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-05 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_share_record") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopSong.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopSong.java index d2a2f2cf..0f560c9d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopSong.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopSong.java @@ -11,7 +11,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -22,7 +21,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-01 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_song") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopStaff.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopStaff.java index a060b081..12596581 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopStaff.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopStaff.java @@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import java.time.LocalDateTime; * @since 2025-02-10 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_staff") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopStaffPermission.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopStaffPermission.java index be916d93..cd64d382 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopStaffPermission.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopStaffPermission.java @@ -8,7 +8,6 @@ import java.io.Serializable; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -19,7 +18,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-18 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_staff_permission") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java index aa9d8ac4..64f7b43d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java @@ -12,7 +12,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -23,7 +22,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-13 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_table") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableArea.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableArea.java index 8f436add..5f15d5ef 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableArea.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableArea.java @@ -10,7 +10,6 @@ import java.io.Serial; import java.time.LocalDateTime; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-18 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_table_area") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableCode.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableCode.java index ab3c4510..36018912 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableCode.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableCode.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -22,7 +21,7 @@ import lombok.experimental.Accessors; * @since 2025-02-19 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_table_code") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableOrderStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableOrderStatistic.java index 30b2cfcc..1c7dc935 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableOrderStatistic.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableOrderStatistic.java @@ -4,17 +4,14 @@ import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.sql.Date; -import java.time.LocalDateTime; - -import java.io.Serial; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; /** * 台桌订单统计表 实体类。 @@ -23,7 +20,6 @@ import lombok.NoArgsConstructor; * @since 2025-03-03 */ @Data -@Builder @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_table_order_statistic") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java index 2599c7e2..878dd3aa 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java @@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import java.time.LocalDateTime; * @since 2025-02-08 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_user") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUserFlow.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUserFlow.java index f3c3c0f5..fa9d9763 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUserFlow.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUserFlow.java @@ -12,7 +12,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -23,7 +22,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-13 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_user_flow") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysDict.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysDict.java index 88b7729e..865b6e4f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysDict.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysDict.java @@ -4,18 +4,15 @@ import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import java.time.LocalDateTime; - -import java.io.Serial; -import java.util.ArrayList; -import java.util.List; - import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + /** * 数据字典 实体类。 * @@ -23,7 +20,6 @@ import lombok.NoArgsConstructor; * @since 2025-02-28 */ @Data -@Builder @NoArgsConstructor @AllArgsConstructor @Table("sys_dict") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysMenu.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysMenu.java index ed4b2d49..b989f75b 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysMenu.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysMenu.java @@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,7 +19,7 @@ import java.time.LocalDateTime; * @since 2025-02-10 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("sys_menu") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysRole.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysRole.java index 387e0bfa..da1d905e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysRole.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysRole.java @@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,7 +19,7 @@ import java.time.LocalDateTime; * @since 2025-02-08 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("sys_role") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysRolesMenus.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysRolesMenus.java index e739ff09..a7e13249 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysRolesMenus.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysRolesMenus.java @@ -3,7 +3,6 @@ package com.czg.account.entity; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import java.io.Serializable; * @since 2025-02-10 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("sys_roles_menus") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysUser.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysUser.java index d31913d7..5552dde5 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysUser.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysUser.java @@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,7 +19,7 @@ import java.time.LocalDateTime; * @since 2025-02-08 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("sys_user") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysUsersRoles.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysUsersRoles.java index 96563d79..49bd9cc7 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysUsersRoles.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysUsersRoles.java @@ -3,7 +3,6 @@ package com.czg.account.entity; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import java.io.Serializable; * @since 2025-02-10 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("sys_users_roles") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/UserInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/UserInfo.java index 8eed4050..dd275ec6 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/UserInfo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/UserInfo.java @@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,7 +19,7 @@ import java.time.LocalDateTime; * @since 2025-02-11 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_user_info") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java index 0bf5c346..55a22ed4 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java @@ -3,7 +3,6 @@ package com.czg.order.dto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -19,7 +18,7 @@ import java.util.List; * @since 2025-02-13 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class CheckOrderPay implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoAddDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoAddDTO.java index f78eb35e..3c03a244 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoAddDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoAddDTO.java @@ -4,7 +4,6 @@ package com.czg.order.dto; import cn.hutool.core.util.StrUtil; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -18,7 +17,7 @@ import java.math.BigDecimal; * @since 2025-02-13 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class OrderInfoAddDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoDTO.java index 98c3a410..1c280e47 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoDTO.java @@ -10,7 +10,6 @@ import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-13 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class OrderInfoDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoQueryDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoQueryDTO.java index 20283c94..da9344dc 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoQueryDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoQueryDTO.java @@ -2,7 +2,6 @@ package com.czg.order.dto; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -15,7 +14,7 @@ import java.io.Serializable; * @since 2025-02-13 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class OrderInfoQueryDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoRefundDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoRefundDTO.java index 398cfcbb..ce44623e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoRefundDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoRefundDTO.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; import com.czg.order.entity.OrderDetail; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,7 +19,7 @@ import java.util.List; * @since 2025-02-13 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class OrderInfoRefundDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoUpDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoUpDTO.java index bf8e274a..e9767c59 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoUpDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoUpDTO.java @@ -4,7 +4,6 @@ package com.czg.order.dto; import com.czg.order.entity.OrderDetail; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -18,7 +17,7 @@ import java.util.List; * @since 2025-02-13 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class OrderInfoUpDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopOrderStatisticDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopOrderStatisticDTO.java index b1e56e56..34815c6c 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopOrderStatisticDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopOrderStatisticDTO.java @@ -6,7 +6,6 @@ import java.math.BigDecimal; import java.sql.Date; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-07 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopOrderStatisticDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopProdStatisticDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopProdStatisticDTO.java index 0d7ba3a1..2c02a3bd 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopProdStatisticDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopProdStatisticDTO.java @@ -6,7 +6,6 @@ import java.math.BigDecimal; import java.sql.Date; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-07 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopProdStatisticDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopTableOrderStatisticDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopTableOrderStatisticDTO.java index 87d90321..f26ec7b2 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopTableOrderStatisticDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopTableOrderStatisticDTO.java @@ -6,7 +6,6 @@ import java.math.BigDecimal; import java.sql.Date; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-07 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopTableOrderStatisticDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/CashierCart.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/CashierCart.java index 5807c484..5cca6558 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/CashierCart.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/CashierCart.java @@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import java.time.LocalDateTime; * @since 2025-02-20 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_cashier_cart") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/MqLog.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/MqLog.java index 9c163fd3..5853fe71 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/MqLog.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/MqLog.java @@ -4,7 +4,6 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -20,7 +19,7 @@ import java.time.LocalDateTime; * @since 2025-02-21 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_mq_log") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java index 26015c3e..16e73a39 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java @@ -6,7 +6,6 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -22,7 +21,7 @@ import java.time.LocalDateTime; * @since 2025-02-14 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_order_detail") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java index 388013a9..0a50427a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java @@ -13,7 +13,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -24,7 +23,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-13 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_order_info") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java index a8ca0cd8..a31cca85 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java @@ -10,7 +10,6 @@ import java.sql.Date; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-07 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_order_statistic") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopProdStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopProdStatistic.java index 0aa641de..6dc26364 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopProdStatistic.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopProdStatistic.java @@ -10,7 +10,6 @@ import java.sql.Date; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-07 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_prod_statistic") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopTableOrderStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopTableOrderStatistic.java index c398fb21..6d5312e9 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopTableOrderStatistic.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopTableOrderStatistic.java @@ -10,7 +10,6 @@ import java.sql.Date; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-03-07 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_table_order_statistic") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java index 50cc862f..5e558296 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java @@ -2,7 +2,6 @@ package com.czg.order.vo; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import java.math.BigDecimal; * @since 2025-02-13 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class OrderDetailSmallVO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderInfoVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderInfoVo.java index 3c472295..f5c1ccff 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderInfoVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderInfoVo.java @@ -2,7 +2,6 @@ package com.czg.order.vo; import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -19,7 +18,7 @@ import java.util.List; * @since 2025-02-13 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class OrderInfoVo implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopStorageRecordDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopStorageRecordDTO.java index dd4eee63..1f56982a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopStorageRecordDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopStorageRecordDTO.java @@ -6,7 +6,6 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-27 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor public class ShopStorageRecordDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/storage/ShopStorageGoodDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/storage/ShopStorageGoodDTO.java index ccc33ab4..b5fd607e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/storage/ShopStorageGoodDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/storage/ShopStorageGoodDTO.java @@ -1,17 +1,9 @@ package com.czg.product.dto.storage; -import java.io.Serializable; -import java.time.LocalDateTime; -import com.alibaba.fastjson2.annotation.JSONField; -import java.io.Serial; - -import com.czg.validator.group.InsertGroup; import com.czg.validator.group.UpdateGroup; -import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -22,7 +14,6 @@ import lombok.NoArgsConstructor; * @since 2025-02-26 */ @Data -@Builder @NoArgsConstructor @AllArgsConstructor public class ShopStorageGoodDTO { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopStorage.java b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopStorage.java index cfac19f2..b4f5ebea 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopStorage.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopStorage.java @@ -9,7 +9,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -21,7 +20,7 @@ import lombok.experimental.Accessors; * @since 2025-02-27 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_storage") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopStorageGood.java b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopStorageGood.java index f8ce496b..81bcfd0c 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopStorageGood.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopStorageGood.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-26 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_storage_good") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopStorageRecord.java b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopStorageRecord.java index 85efd24a..8767dde2 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopStorageRecord.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopStorageRecord.java @@ -9,7 +9,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,7 +19,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-27 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_storage_record") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/system/entity/MiniAppPages.java b/cash-common/cash-common-service/src/main/java/com/czg/system/entity/MiniAppPages.java index fc16ebb8..54f3f446 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/system/entity/MiniAppPages.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/system/entity/MiniAppPages.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-12 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_mini_app_pages") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysParams.java b/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysParams.java index f2314b85..5472a0b6 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysParams.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysParams.java @@ -4,7 +4,6 @@ import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -21,7 +20,7 @@ import java.time.LocalDateTime; */ @Data @Accessors(chain = true) -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("sys_params") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/system/entity/Version.java b/cash-common/cash-common-service/src/main/java/com/czg/system/entity/Version.java index 099e980d..c710a5eb 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/system/entity/Version.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/system/entity/Version.java @@ -10,7 +10,6 @@ import java.time.LocalDateTime; import java.io.Serial; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +20,7 @@ import lombok.NoArgsConstructor; * @since 2025-02-12 */ @Data -@Builder + @NoArgsConstructor @AllArgsConstructor @Table("tb_version") diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java index 62d37b75..cd9349e9 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java @@ -145,14 +145,13 @@ public class ShopActivateServiceImpl extends ServiceImpl 0) { - ShopUserMoneyEditDTO shopUserMoneyEditDTO = ShopUserMoneyEditDTO.builder() - .id(shopUser.getId()) - .money(activate.getGiftAmount()) - .type(1) - .remark("充值活动赠送") - .relationId(relationId) - .bizEnum(ShopUserFlowBizEnum.AWARD_IN) - .build(); + ShopUserMoneyEditDTO shopUserMoneyEditDTO = new ShopUserMoneyEditDTO() + .setId(shopUser.getId()) + .setMoney(activate.getGiftAmount()) + .setType(1) + .setRemark("充值活动赠送") + .setRelationId(relationId) + .setBizEnum(ShopUserFlowBizEnum.AWARD_IN); //更新会员余额 并生成流水 shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO); } @@ -168,9 +167,7 @@ public class ShopActivateServiceImpl extends ServiceImpl { - coupon.setNumber(couponMap.get(coupon.getId().toString())); - }); + list.forEach(coupon -> coupon.setNumber(couponMap.get(coupon.getId().toString()))); return list; } diff --git a/cash-service/code-generator/src/main/resources/templates/entityDto.tpl b/cash-service/code-generator/src/main/resources/templates/entityDto.tpl index dff3acdd..c194eda4 100644 --- a/cash-service/code-generator/src/main/resources/templates/entityDto.tpl +++ b/cash-service/code-generator/src/main/resources/templates/entityDto.tpl @@ -38,7 +38,6 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; #else import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; #if(entityConfig.getSuperClass(table)) @@ -60,7 +59,6 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) #else @Data -@Builder @NoArgsConstructor @AllArgsConstructor #if(entityConfig.getSuperClass(table)) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 68471160..d2285523 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -34,7 +34,6 @@ import com.czg.service.order.mapper.OrderInfoMapper; import com.czg.utils.AssertUtil; import com.czg.utils.CzgStrUtils; import com.czg.utils.PageUtil; -import com.mybatisflex.core.BaseMapper; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.update.UpdateChain; @@ -518,12 +517,11 @@ public class OrderInfoServiceImpl extends ServiceImpl map = JSONObject.parseObject(JSONObject.toJSONString(jsPayResp.getPayInfo())); - case CzgLtPayResp ltPayResp -> { - map = JSONObject.parseObject(JSONObject.toJSONString(ltPayResp.getPayInfo())); - } + case CzgLtPayResp ltPayResp -> map = JSONObject.parseObject(JSONObject.toJSONString(ltPayResp.getPayInfo())); case CzgScanPayResp scanPayResp -> map = JSONObject.parseObject(JSONObject.toJSONString(scanPayResp.getPayInfo())); default -> throw new IllegalStateException("Unexpected value: " + data);