czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
SongZhang
2024-11-01 16:54:37 +08:00
parent 086eb3523b cdeb5e003c
commit 00e7b35926
23 changed files with 98 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eladmin-system/pom.xml
View File

@@ -167,9 +167,15 @@
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>pro</id> <id>pre</id>
<properties> <properties>
<env>pro</env> <env>pre</env>
</properties>
</profile>
<profile>
<id>prod</id>
<properties>
<env>prod</env>
</properties> </properties>
</profile> </profile>
</profiles> </profiles>

2
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java
View File

@@ -75,7 +75,7 @@ public class TbConCheckServiceImpl implements TbConCheckService {
} }
TbConsInfoFlow flow=new TbConsInfoFlow(); 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.setBizCode("checkStockOut");
flow.setBizName("盘点出库"); flow.setBizName("盘点出库");
flow.setBizType("-"); flow.setBizType("-");

1
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryController.java
View File

@@ -26,7 +26,6 @@ public class SummaryController {
//营业板块 上 //营业板块 上
@PostMapping("/trade") @PostMapping("/trade")
@AnonymousPostMapping
private Object shopSummaryDate(@RequestBody BaseQueryDto param) { private Object shopSummaryDate(@RequestBody BaseQueryDto param) {
return summaryService.trade(param); return summaryService.trade(param);
} }

37
eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigDto.java
View File

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

32
eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigQueryCriteria.java
View File

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

40
eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigDto.java
View File

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

36
eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigQueryCriteria.java
View File

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

87
eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserDto.java
View File

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

54
eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowDto.java
View File

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

40
eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowQueryCriteria.java
View File

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

48
eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserQueryCriteria.java
View File

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

2
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMemberPoints.java
View File

@@ -1,6 +1,7 @@
package cn.ysk.cashier.mybatis.entity; package cn.ysk.cashier.mybatis.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -56,6 +57,7 @@ public class TbMemberPoints {
* 最近一次积分变动时间 * 最近一次积分变动时间
*/ */
@TableField("last_points_change_time") @TableField("last_points_change_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date lastPointsChangeTime; private Date lastPointsChangeTime;
/** /**
* 最近一次浮动积分 * 最近一次浮动积分

2
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMemberPointsLog.java
View File

@@ -3,6 +3,7 @@ package cn.ysk.cashier.mybatis.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -64,5 +65,6 @@ public class TbMemberPointsLog {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
} }

2
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsBasicSetting.java
View File

@@ -3,6 +3,7 @@ package cn.ysk.cashier.mybatis.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -65,5 +66,6 @@ public class TbPointsBasicSetting {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
} }

153
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsExchangeRecord.java
View File

@@ -1,6 +1,7 @@
package cn.ysk.cashier.mybatis.entity; package cn.ysk.cashier.mybatis.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -14,84 +15,86 @@ import java.util.Date;
* @since 2.0 2024-10-25 * @since 2.0 2024-10-25
*/ */
@Data @Data
@EqualsAndHashCode(callSuper=false) @EqualsAndHashCode(callSuper = false)
@TableName("tb_points_exchange_record") @TableName("tb_points_exchange_record")
public class TbPointsExchangeRecord { public class TbPointsExchangeRecord {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* id * id
*/ */
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO)
private Long id; private Long id;
/** /**
* 订单编号 * 订单编号
*/ */
private String orderNo; private String orderNo;
/** /**
* 店铺id * 店铺id
*/ */
private Long shopId; private Long shopId;
/** /**
* 积分商品id * 积分商品id
*/ */
private Long pointsGoodsId; private Long pointsGoodsId;
/** /**
* 积分商品名称 * 积分商品名称
*/ */
private String pointsGoodsName; private String pointsGoodsName;
/** /**
* 商品图片URL * 商品图片URL
*/ */
private String goodsImageUrl; private String goodsImageUrl;
/** /**
* 领取方式 self-自取 post-邮寄 * 领取方式 self-自取 post-邮寄
*/ */
private String pickupMethod; private String pickupMethod;
/** /**
* 会员id * 会员id
*/ */
private Long memberId; private Long memberId;
/** /**
* 会员名称 * 会员名称
*/ */
private String memberName; private String memberName;
/** /**
* 手机号码 * 手机号码
*/ */
private String mobile; private String mobile;
/** /**
* 会员头像 * 会员头像
*/ */
private String avatarUrl; private String avatarUrl;
/** /**
* 消耗积分 * 消耗积分
*/ */
private Integer spendPoints; private Integer spendPoints;
/** /**
* 额外支付 * 额外支付
*/ */
private BigDecimal extraPaymentAmount; private BigDecimal extraPaymentAmount;
/** /**
* 兑换券券码 * 兑换券券码
*/ */
private String couponCode; private String couponCode;
/** /**
* 状态 waiting-待自取 done-已完成 * 状态 waiting-待自取 done-已完成
*/ */
private String status; private String status;
/** /**
* 创建时间（下单时间） * 创建时间（下单时间）
*/ */
private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
/** private Date createTime;
* 更新时间（核销时间） /**
*/ * 更新时间（核销时间）
private Date updateTime; */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@TableField(value = "count(*)", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER) @TableField(value = "count(*)", select = false, insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
private Long count; private Long count;
@TableField(value = "sum(extra_payment_amount)", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER) @TableField(value = "sum(extra_payment_amount)", select = false, insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
private BigDecimal totalAmount; private BigDecimal totalAmount;
} }

3
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsGoodsSetting.java
View File

@@ -2,6 +2,7 @@ package cn.ysk.cashier.mybatis.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -74,10 +75,12 @@ public class TbPointsGoodsSetting {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime; private Date updateTime;
/** /**
* 逻辑删除标志 1-是 0-否 * 逻辑删除标志 1-是 0-否

1
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbMemberPointsLogServiceImpl.java
View File

@@ -33,6 +33,7 @@ public class TbMemberPointsLogServiceImpl extends ServiceImpl<TbMemberPointsLogM
LambdaQueryWrapper<TbMemberPointsLog> wrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<TbMemberPointsLog> wrapper = Wrappers.lambdaQuery();
wrapper.eq(TbMemberPointsLog::getShopId, param.getShopId()); 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.getMemberName()), TbMemberPointsLog::getMemberName, param.getMemberName());
wrapper.like(StrUtil.isNotEmpty(param.getMobile()), TbMemberPointsLog::getMobile, param.getMobile()); wrapper.like(StrUtil.isNotEmpty(param.getMobile()), TbMemberPointsLog::getMobile, param.getMobile());
wrapper.like(StrUtil.isNotEmpty(param.getContent()), TbMemberPointsLog::getContent, param.getContent()); wrapper.like(StrUtil.isNotEmpty(param.getContent()), TbMemberPointsLog::getContent, param.getContent());

2
eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
View File

@@ -207,7 +207,7 @@ public interface TbOrderDetailRepository extends JpaRepository<TbOrderDetail, In
"LEFT JOIN TbShopCategory cate ON cate.id = pro.categoryId " + "LEFT JOIN TbShopCategory cate ON cate.id = pro.categoryId " +
"WHERE info.shopId = :shopId " + "WHERE info.shopId = :shopId " +
"AND info.createTime > :startTime AND info.createTime < :endTime " + "AND info.createTime > :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 " + "GROUP BY info.productId, info.productSkuId, orders.tableId " +
"ORDER BY salesNum DESC") "ORDER BY salesNum DESC")
List<TbOrderSalesCountByTable> queryTbOrderSalesCountByTable(@Param("shopId") Integer shopId, @Param("startTime") Date startTime, @Param("endTime") Date endTime); List<TbOrderSalesCountByTable> queryTbOrderSalesCountByTable(@Param("shopId") Integer shopId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);

0
eladmin-system/src/main/resources/mapper/plus/TbMemberPointsLogDao.xml → eladmin-system/src/main/resources/mapper/plus/TbMemberPointsLogMapper.xml
View File

0
eladmin-system/src/main/resources/mapper/plus/TbMemberPointsDao.xml → eladmin-system/src/main/resources/mapper/plus/TbMemberPointsMapper.xml
View File

0
eladmin-system/src/main/resources/mapper/plus/TbPointsBasicSettingDao.xml → eladmin-system/src/main/resources/mapper/plus/TbPointsBasicSettingMapper.xml
View File

0
eladmin-system/src/main/resources/mapper/plus/TbPointsExchangeRecordDao.xml → eladmin-system/src/main/resources/mapper/plus/TbPointsExchangeRecordMapper.xml
View File

0
eladmin-system/src/main/resources/mapper/plus/TbPointsGoodsSettingDao.xml → eladmin-system/src/main/resources/mapper/plus/TbPointsGoodsSettingMapper.xml
View File