From c6aba2caa98c58b847ad21f8b7ea467206519a38 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Thu, 31 Oct 2024 14:42:54 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=AD=9B=E9=80=89bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ysk/cashier/repository/order/TbOrderDetailRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java index fe3ab82f..62cd4b5d 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java @@ -206,7 +206,7 @@ public interface TbOrderDetailRepository extends JpaRepository :startTime AND info.createTime < :endTime " + - "AND (info.status = 'closed' OR info.status = 'refund') " + + "AND (orders.status = 'closed' OR orders.orderType = 'return') " + "GROUP BY info.productId, info.productSkuId, orders.tableId " + "ORDER BY salesNum DESC") List queryTbOrderSalesCountByTable(@Param("shopId") Integer shopId, @Param("startTime") Date startTime, @Param("endTime") Date endTime); From 362c737c4b815e8708695d832adda97009a58bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Thu, 31 Oct 2024 14:47:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/entity/TbMemberPoints.java | 2 + .../mybatis/entity/TbMemberPointsLog.java | 2 + .../mybatis/entity/TbPointsBasicSetting.java | 2 + .../entity/TbPointsExchangeRecord.java | 153 +++++++++--------- .../mybatis/entity/TbPointsGoodsSetting.java | 3 + ...LogDao.xml => TbMemberPointsLogMapper.xml} | 0 ...PointsDao.xml => TbMemberPointsMapper.xml} | 0 ...Dao.xml => TbPointsBasicSettingMapper.xml} | 0 ...o.xml => TbPointsExchangeRecordMapper.xml} | 0 ...Dao.xml => TbPointsGoodsSettingMapper.xml} | 0 10 files changed, 87 insertions(+), 75 deletions(-) rename eladmin-system/src/main/resources/mapper/plus/{TbMemberPointsLogDao.xml => TbMemberPointsLogMapper.xml} (100%) rename eladmin-system/src/main/resources/mapper/plus/{TbMemberPointsDao.xml => TbMemberPointsMapper.xml} (100%) rename eladmin-system/src/main/resources/mapper/plus/{TbPointsBasicSettingDao.xml => TbPointsBasicSettingMapper.xml} (100%) rename eladmin-system/src/main/resources/mapper/plus/{TbPointsExchangeRecordDao.xml => TbPointsExchangeRecordMapper.xml} (100%) rename eladmin-system/src/main/resources/mapper/plus/{TbPointsGoodsSettingDao.xml => TbPointsGoodsSettingMapper.xml} (100%) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMemberPoints.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMemberPoints.java index e274d687..08072dae 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMemberPoints.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMemberPoints.java @@ -1,6 +1,7 @@ package cn.ysk.cashier.mybatis.entity; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -56,6 +57,7 @@ public class TbMemberPoints { * 最近一次积分变动时间 */ @TableField("last_points_change_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date lastPointsChangeTime; /** * 最近一次浮动积分 diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMemberPointsLog.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMemberPointsLog.java index ac430835..c86808ed 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMemberPointsLog.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMemberPointsLog.java @@ -3,6 +3,7 @@ package cn.ysk.cashier.mybatis.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -64,5 +65,6 @@ public class TbMemberPointsLog { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsBasicSetting.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsBasicSetting.java index b9b5432a..daa71be3 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsBasicSetting.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsBasicSetting.java @@ -3,6 +3,7 @@ package cn.ysk.cashier.mybatis.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -65,5 +66,6 @@ public class TbPointsBasicSetting { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsExchangeRecord.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsExchangeRecord.java index dfd5fc3a..07c18390 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsExchangeRecord.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsExchangeRecord.java @@ -1,6 +1,7 @@ package cn.ysk.cashier.mybatis.entity; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,84 +15,86 @@ import java.util.Date; * @since 2.0 2024-10-25 */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("tb_points_exchange_record") public class TbPointsExchangeRecord { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * id - */ - @TableId(type = IdType.AUTO) - private Long id; - /** - * 订单编号 - */ - private String orderNo; - /** - * 店铺id - */ - private Long shopId; - /** - * 积分商品id - */ - private Long pointsGoodsId; - /** - * 积分商品名称 - */ - private String pointsGoodsName; - /** - * 商品图片URL - */ - private String goodsImageUrl; - /** - * 领取方式 self-自取 post-邮寄 - */ - private String pickupMethod; - /** - * 会员id - */ - private Long memberId; - /** - * 会员名称 - */ - private String memberName; - /** - * 手机号码 - */ - private String mobile; - /** - * 会员头像 - */ - private String avatarUrl; - /** - * 消耗积分 - */ - private Integer spendPoints; - /** - * 额外支付 - */ - private BigDecimal extraPaymentAmount; - /** - * 兑换券券码 - */ - private String couponCode; - /** - * 状态 waiting-待自取 done-已完成 - */ - private String status; - /** - * 创建时间（下单时间） - */ - private Date createTime; - /** - * 更新时间（核销时间） - */ - private Date updateTime; + /** + * id + */ + @TableId(type = IdType.AUTO) + private Long id; + /** + * 订单编号 + */ + private String orderNo; + /** + * 店铺id + */ + private Long shopId; + /** + * 积分商品id + */ + private Long pointsGoodsId; + /** + * 积分商品名称 + */ + private String pointsGoodsName; + /** + * 商品图片URL + */ + private String goodsImageUrl; + /** + * 领取方式 self-自取 post-邮寄 + */ + private String pickupMethod; + /** + * 会员id + */ + private Long memberId; + /** + * 会员名称 + */ + private String memberName; + /** + * 手机号码 + */ + private String mobile; + /** + * 会员头像 + */ + private String avatarUrl; + /** + * 消耗积分 + */ + private Integer spendPoints; + /** + * 额外支付 + */ + private BigDecimal extraPaymentAmount; + /** + * 兑换券券码 + */ + private String couponCode; + /** + * 状态 waiting-待自取 done-已完成 + */ + private String status; + /** + * 创建时间（下单时间） + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + /** + * 更新时间（核销时间） + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - @TableField(value = "count(*)", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER) - private Long count; + @TableField(value = "count(*)", select = false, insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER) + private Long count; - @TableField(value = "sum(extra_payment_amount)", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER) - private BigDecimal totalAmount; + @TableField(value = "sum(extra_payment_amount)", select = false, insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER) + private BigDecimal totalAmount; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsGoodsSetting.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsGoodsSetting.java index ba123948..666dbc69 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsGoodsSetting.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsGoodsSetting.java @@ -2,6 +2,7 @@ package cn.ysk.cashier.mybatis.entity; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -74,10 +75,12 @@ public class TbPointsGoodsSetting { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** * 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; /** * 逻辑删除标志 1-是 0-否 diff --git a/eladmin-system/src/main/resources/mapper/plus/TbMemberPointsLogDao.xml b/eladmin-system/src/main/resources/mapper/plus/TbMemberPointsLogMapper.xml similarity index 100% rename from eladmin-system/src/main/resources/mapper/plus/TbMemberPointsLogDao.xml rename to eladmin-system/src/main/resources/mapper/plus/TbMemberPointsLogMapper.xml diff --git a/eladmin-system/src/main/resources/mapper/plus/TbMemberPointsDao.xml b/eladmin-system/src/main/resources/mapper/plus/TbMemberPointsMapper.xml similarity index 100% rename from eladmin-system/src/main/resources/mapper/plus/TbMemberPointsDao.xml rename to eladmin-system/src/main/resources/mapper/plus/TbMemberPointsMapper.xml diff --git a/eladmin-system/src/main/resources/mapper/plus/TbPointsBasicSettingDao.xml b/eladmin-system/src/main/resources/mapper/plus/TbPointsBasicSettingMapper.xml similarity index 100% rename from eladmin-system/src/main/resources/mapper/plus/TbPointsBasicSettingDao.xml rename to eladmin-system/src/main/resources/mapper/plus/TbPointsBasicSettingMapper.xml diff --git a/eladmin-system/src/main/resources/mapper/plus/TbPointsExchangeRecordDao.xml b/eladmin-system/src/main/resources/mapper/plus/TbPointsExchangeRecordMapper.xml similarity index 100% rename from eladmin-system/src/main/resources/mapper/plus/TbPointsExchangeRecordDao.xml rename to eladmin-system/src/main/resources/mapper/plus/TbPointsExchangeRecordMapper.xml diff --git a/eladmin-system/src/main/resources/mapper/plus/TbPointsGoodsSettingDao.xml b/eladmin-system/src/main/resources/mapper/plus/TbPointsGoodsSettingMapper.xml similarity index 100% rename from eladmin-system/src/main/resources/mapper/plus/TbPointsGoodsSettingDao.xml rename to eladmin-system/src/main/resources/mapper/plus/TbPointsGoodsSettingMapper.xml From 5eab49b8448c492677bea05330bf723c3ab2f1a1 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 31 Oct 2024 15:10:56 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java index e32e43c6..d4358b77 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java @@ -75,7 +75,7 @@ public class TbConCheckServiceImpl implements TbConCheckService { } TbConsInfoFlow flow=new TbConsInfoFlow(); - if(consInfo.getStockNumber().compareTo(resources.getStockNumber())>=0){ + if((consInfo.getStockNumber().subtract(consInfo.getStockConsume())).compareTo(resources.getStockNumber())>=0){ flow.setBizCode("checkStockOut"); flow.setBizName("盘点出库"); flow.setBizType("-"); From 2e9c25d8a8f80f1799b3634af9458d03ffa92c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Thu, 31 Oct 2024 15:24:33 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/service/impl/TbMemberPointsLogServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbMemberPointsLogServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbMemberPointsLogServiceImpl.java index 0c9009d9..3070f8b3 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbMemberPointsLogServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbMemberPointsLogServiceImpl.java @@ -33,6 +33,7 @@ public class TbMemberPointsLogServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaQuery(); wrapper.eq(TbMemberPointsLog::getShopId, param.getShopId()); + wrapper.eq(param.getMemberId() != null, TbMemberPointsLog::getMemberId, param.getMemberId()); wrapper.like(StrUtil.isNotEmpty(param.getMemberName()), TbMemberPointsLog::getMemberName, param.getMemberName()); wrapper.like(StrUtil.isNotEmpty(param.getMobile()), TbMemberPointsLog::getMobile, param.getMobile()); wrapper.like(StrUtil.isNotEmpty(param.getContent()), TbMemberPointsLog::getContent, param.getContent()); From 97a8a5472dba7456cbce8e3b394de82ac9953d0e Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 1 Nov 2024 09:40:03 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eladmin-system/pom.xml | 10 ++- .../ysk/cashier/dto/BotButtonConfigDto.java | 37 -------- .../dto/BotButtonConfigQueryCriteria.java | 32 ------- .../java/cn/ysk/cashier/dto/BotConfigDto.java | 40 --------- .../cashier/dto/BotConfigQueryCriteria.java | 36 -------- .../java/cn/ysk/cashier/dto/BotUserDto.java | 87 ------------------- .../cn/ysk/cashier/dto/BotUserFlowDto.java | 54 ------------ .../cashier/dto/BotUserFlowQueryCriteria.java | 40 --------- .../ysk/cashier/dto/BotUserQueryCriteria.java | 48 ---------- 9 files changed, 8 insertions(+), 376 deletions(-) delete mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigDto.java delete mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigQueryCriteria.java delete mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigDto.java delete mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigQueryCriteria.java delete mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserDto.java delete mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowDto.java delete mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowQueryCriteria.java delete mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserQueryCriteria.java diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml index 2b543b9e..cb0749ce 100644 --- a/eladmin-system/pom.xml +++ b/eladmin-system/pom.xml @@ -167,9 +167,15 @@ - pro + pre - pro + pre + + + + prod + + prod diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigDto.java deleted file mode 100644 index b555cae6..00000000 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigDto.java +++ /dev/null @@ -1,37 +0,0 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package cn.ysk.cashier.dto; - -import lombok.Data; -import java.io.Serializable; - -/** -* @website https://eladmin.vip -* @description / -* @author admin -* @date 2023-10-31 -**/ -@Data -public class BotButtonConfigDto implements Serializable { - - private Integer id; - - /** 按钮名称 */ - private String buttonName; - - /** 按钮值 */ - private String buttonValue; -} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigQueryCriteria.java deleted file mode 100644 index d789fd09..00000000 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigQueryCriteria.java +++ /dev/null @@ -1,32 +0,0 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package cn.ysk.cashier.dto; - -import lombok.Data; -import cn.ysk.cashier.annotation.Query; - -/** -* @website https://eladmin.vip -* @author admin -* @date 2023-10-31 -**/ -@Data -public class BotButtonConfigQueryCriteria{ - - /** 精确 */ - @Query - private String buttonName; -} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigDto.java deleted file mode 100644 index 1426d65d..00000000 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigDto.java +++ /dev/null @@ -1,40 +0,0 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package cn.ysk.cashier.dto; - -import lombok.Data; -import java.io.Serializable; - -/** -* @website https://eladmin.vip -* @description / -* @author admin -* @date 2023-10-31 -**/ -@Data -public class BotConfigDto implements Serializable { - - private Integer id; - - /** 元素键值 */ - private String configKey; - - /** 元素值 */ - private String configValue; - - /** 描述 */ - private String remark; -} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigQueryCriteria.java deleted file mode 100644 index ce14acb3..00000000 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigQueryCriteria.java +++ /dev/null @@ -1,36 +0,0 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package cn.ysk.cashier.dto; - -import lombok.Data; -import cn.ysk.cashier.annotation.Query; - -/** -* @website https://eladmin.vip -* @author admin -* @date 2023-10-31 -**/ -@Data -public class BotConfigQueryCriteria{ - - /** 精确 */ - @Query - private String configKey; - - /** 精确 */ - @Query - private String configValue; -} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserDto.java deleted file mode 100644 index 93ee777f..00000000 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserDto.java +++ /dev/null @@ -1,87 +0,0 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package cn.ysk.cashier.dto; - -import lombok.Data; -import java.sql.Timestamp; -import java.math.BigDecimal; -import java.io.Serializable; - -/** -* @website https://eladmin.vip -* @description / -* @author admin -* @date 2023-10-30 -**/ -@Data -public class BotUserDto implements Serializable { - - private Integer id; - - private Integer fatherId; - - /** 父级电报号 */ - private String fatherTelegramId; - - /** 电报号 */ - private String userTelegramId; - - /** 用户名称 */ - private String userName; - - /** 组电报号 */ - private String groupTelegramId; - - /** 用户代码 */ - private String userCode; - - private String userPayPass; - - private String bombStatus; - - /** 用户状态 */ - private String botStatus; - - /** 总充值 */ - private BigDecimal usdtRechargeTotal; - - /** 总提现 */ - private BigDecimal usdtWithdrawTotal; - - /** 总资金 */ - private BigDecimal balance; - - /** 冻结资金 */ - private BigDecimal freezeBalance; - - /** 版本号 */ - private Integer version; - - /** 创建时间 */ - private Timestamp createTime; - - /** 更新时间 */ - private Timestamp updateTime; - - /** 语言 */ - private String userLanguage; - - /** 质押资金 */ - private BigDecimal chipBalance; - - /** 绑定时间 */ - private Timestamp fatherBindTime; -} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowDto.java deleted file mode 100644 index cc5a0e83..00000000 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowDto.java +++ /dev/null @@ -1,54 +0,0 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package cn.ysk.cashier.dto; - -import lombok.Data; -import java.sql.Timestamp; -import java.math.BigDecimal; -import java.io.Serializable; - -/** -* @website https://eladmin.vip -* @description / -* @author admin -* @date 2023-10-30 -**/ -@Data -public class BotUserFlowDto implements Serializable { - - private Integer id; - - /** 电报号 */ - private String userTelegramId; - - /** 用户名称 */ - private String userName; - - /** 业务代码 */ - private String bizCode; - - /** 变动金额 */ - private BigDecimal amount; - - /** 变动前金额 */ - private BigDecimal oldBalance; - - /** 变动后金额 */ - private BigDecimal newBalance; - - /** 创建时间 */ - private Timestamp createTime; -} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowQueryCriteria.java deleted file mode 100644 index d629ccf6..00000000 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowQueryCriteria.java +++ /dev/null @@ -1,40 +0,0 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package cn.ysk.cashier.dto; - -import lombok.Data; -import cn.ysk.cashier.annotation.Query; - -/** -* @website https://eladmin.vip -* @author admin -* @date 2023-10-30 -**/ -@Data -public class BotUserFlowQueryCriteria{ - - /** 精确 */ - @Query - private String userTelegramId; - - /** 精确 */ - @Query - private String userName; - - /** 精确 */ - @Query - private String bizCode; -} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserQueryCriteria.java deleted file mode 100644 index e174c66c..00000000 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserQueryCriteria.java +++ /dev/null @@ -1,48 +0,0 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package cn.ysk.cashier.dto; - -import lombok.Data; -import cn.ysk.cashier.annotation.Query; - -/** -* @website https://eladmin.vip -* @author admin -* @date 2023-10-30 -**/ -@Data -public class BotUserQueryCriteria{ - - /** 精确 */ - @Query - private String fatherTelegramId; - - /** 精确 */ - @Query - private String userTelegramId; - - /** 精确 */ - @Query - private String userName; - - /** 精确 */ - @Query - private String userCode; - - /** 精确 */ - @Query - private String botStatus; -} \ No newline at end of file From cdeb5e003c60589fd2da0883338330cbb359c007 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 1 Nov 2024 13:46:10 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/controller/shop/SummaryController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryController.java index efd3df02..7b814e1e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryController.java @@ -26,7 +26,6 @@ public class SummaryController { //营业板块 上 @PostMapping("/trade") - @AnonymousPostMapping private Object shopSummaryDate(@RequestBody BaseQueryDto param) { return summaryService.trade(param); }