irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

排行fix

Browse Source
This commit is contained in:
admin
2024-06-12 20:51:49 +08:00
parent 58d411b227
commit 8bbd74c5f1
7 changed files with 114 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkRankingInfoService.java
View File

@@ -45,12 +45,22 @@ public interface IPlayClerkRankingInfoService extends IService<PlayClerkRankingI
IPage<PlayClerkRankingInfoEntity> selectPlayClerkRankingInfoByPage(PlayClerkRankingInfoEntity playClerkRankingInfo);
/**
* 根据统计批次更新排名数据
*
* @param weeklyRanking 日排名还是周排名（0:每日排名;1:每周排名）
* @param serialNumber 统计批次
* @author admin
* @since 2024/6/12 15:47
**/
void updateClerkRankingInfo(String weeklyRanking, Integer serialNumber);
/**
* 查询当前排行榜最后一个批次值
*
* @param weeklyRanking 日排名还是周排名（0:每日排名;1:每周排名）
* @return Integer 当前排行榜最后一个批次值
* @author 杭州世平信息科技有限公司-xuhq
* @author admin
* @since 2024/6/7 11:53
**/
Integer selectSerialNumber(String weeklyRanking);
@@ -61,7 +71,7 @@ public interface IPlayClerkRankingInfoService extends IService<PlayClerkRankingI
*
* @param weeklyRanking 日排名还是周排名（0:每日排名;1:每周排名）
* @return List<com.starry.admin.modules.clerk.module.entity.PlayClerkRankingInfoEntity>
* @author 杭州世平信息科技有限公司-xuhq
* @author admin
* @since 2024/6/7 11:55
**/
List<PlayClerkRankingInfoEntity> selectMaxSerialNumber(String weeklyRanking);

13
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkRankingInfoServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.starry.admin.modules.clerk.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -37,7 +38,7 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl<PlayClerkRankin
MPJLambdaWrapper<PlayClerkRankingInfoEntity> lambdaQueryWrapper = new MPJLambdaWrapper<>();
lambdaQueryWrapper.selectAll(PlayClerkRankingInfoEntity.class);
// 拼接店员表
lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getSex,"clerkSex");
lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex");
lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkRankingInfoEntity::getClerkId);
if (StrUtil.isNotBlank(vo.getClerkId())) {
lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getClerkId, vo.getClerkId());
@@ -110,6 +111,16 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl<PlayClerkRankin
return this.baseMapper.selectList(lambdaQueryWrapper);
}
@Override
public void updateClerkRankingInfo(String weeklyRanking, Integer serialNumber) {
LambdaUpdateWrapper<PlayClerkRankingInfoEntity> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.eq(PlayClerkRankingInfoEntity::getWeeklyRanking, weeklyRanking);
lambdaUpdateWrapper.eq(PlayClerkRankingInfoEntity::getSerialNumber, serialNumber);
lambdaUpdateWrapper.set(PlayClerkRankingInfoEntity::getHistoricalStatistics, "1");
this.baseMapper.update(null, lambdaUpdateWrapper);
}
/**
* 获取当前期排名序号
*

71
play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderInfoService.java
View File

@@ -8,7 +8,6 @@ import com.starry.admin.modules.weichat.entity.order.*;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -87,74 +86,6 @@ public interface IPlayOrderInfoService extends IService<PlayOrderInfoEntity> {
* @since 2024/6/3 11:12
**/
Integer getEstimatedRevenueRatio(String clerkId, String placeType, String firstOrder);
/**
* 新增打赏单
*
* @param orderId 订单ID
* @param orderMoney 订单金额
* @param finalAmount 订单最终金额（支付金额）
* @param purchaserBy 下单人ID
* @param acceptBy 接单人ID
* @param remark 订单备注
* @param weiChatCode 微信号码
*/
void createRewardOrder(String orderId, BigDecimal orderMoney, BigDecimal finalAmount, String purchaserBy, String acceptBy, String remark, String weiChatCode);
/**
* 新增赠送礼物订单
*
* @param orderId 订单ID
* @param commodityId 商品ID（礼物ID）
* @param commodityPrice 商品单价（礼物单价）
* @param commodityNumber 商品数量（礼物数量）
* @param orderMoney 订单金额
* @param finalAmount 订单最终金额（支付金额）
* @param purchaserBy 下单人ID
* @param acceptBy 接单人ID
* @param remark 订单备注
* @param weiChatCode 微信号码
*/
void createGiftOrder(String orderId, String commodityId, BigDecimal commodityPrice, String commodityNumber, BigDecimal orderMoney, BigDecimal finalAmount, String purchaserBy, String acceptBy, String remark, String weiChatCode);
/**
* 新增指定订单
*
* @param orderId 订单ID
* @param commodityId 商品ID
* @param commodityPrice 商品单价
* @param commodityNumber 商品数量
* @param serviceDuration 服务时长
* @param commodityName 商品名称
* @param orderMoney 订单金额
* @param finalAmount 订单最终金额（支付金额）
* @param purchaserBy 下单人ID
* @param acceptBy 接单人ID
* @param remark 订单备注
* @param weiChatCode 微信号码
*/
void createOrdinaryOrder(String orderId, String commodityId, BigDecimal commodityPrice, String commodityNumber, String serviceDuration, String commodityName, BigDecimal orderMoney, BigDecimal finalAmount, String purchaserBy, String acceptBy, String remark, String weiChatCode);
/**
* 新增指定订单
*
* @param orderId 订单ID
* @param commodityId 商品ID
* @param commodityPrice 商品单价
* @param commodityNumber 商品数量
* @param serviceDuration 服务时长
* @param commodityName 商品名称
* @param orderMoney 订单金额
* @param finalAmount 订单最终金额（支付金额）
* @param purchaserBy 下单人ID
* @param remark 订单备注
* @param weiChatCode 微信号码
*/
void createRandomOrder(String orderId, String commodityId, BigDecimal commodityPrice, String commodityNumber, String serviceDuration, String commodityName, BigDecimal orderMoney, BigDecimal finalAmount, String purchaserBy, String remark, String weiChatCode);
/**
* 根据订单结算状态查询订单
*
@@ -182,7 +113,7 @@ public interface IPlayOrderInfoService extends IService<PlayOrderInfoEntity> {
* @param endTime 结束时间
* @return List<PlayOrderInfoEntity>
*/
List<PlayOrderInfoEntity> listByTime(String clerkId, LocalDate startTime, LocalDate endTime);
List<PlayOrderInfoEntity> listByTime(String clerkId, String startTime, String endTime);
/**
* 分页查询打赏订单

113
play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
View File

@@ -35,7 +35,6 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
@@ -202,119 +201,11 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
}
}
/**
* 新增打赏单
* 打赏订单直接完成
*
* @param orderMoney 订单金额
* @param finalAmount 订单最终金额（支付金额）
* @param purchaserBy 下单人ID
*/
@Override
public void createRewardOrder(String orderId, BigDecimal orderMoney, BigDecimal finalAmount, String purchaserBy, String acceptBy, String remark, String weiChatCode) {
PlayOrderInfoEntity entity = new PlayOrderInfoEntity(orderId, ORDER_STATUS_3, "2", "2");
entity.setOrderMoney(orderMoney);
entity.setRefundType("0");
entity.setFinalAmount(finalAmount);
entity.setPurchaserBy(purchaserBy);
entity.setPurchaserTime(LocalDateTime.now());
entity.setAcceptBy(acceptBy);
entity.setAcceptTime(LocalDateTime.now());
entity.setRemark(remark);
entity.setWeiChatCode(weiChatCode);
this.baseMapper.insert(entity);
}
/**
* 新增赠送礼物订单
*
* @param commodityId 商品ID（礼物ID）
* @param commodityPrice 商品单价（礼物单价）
* @param commodityNumber 商品数量（礼物数量）
* @param orderMoney 订单金额
* @param finalAmount 订单最终金额（支付金额）
* @param purchaserBy 下单人ID
* @param acceptBy 接单人ID
*/
@Override
public void createGiftOrder(String orderId, String commodityId, BigDecimal commodityPrice, String commodityNumber, BigDecimal orderMoney, BigDecimal finalAmount, String purchaserBy, String acceptBy, String remark, String weiChatCode) {
PlayOrderInfoEntity entity = new PlayOrderInfoEntity(orderId, ORDER_STATUS_3, "2", "2");
entity.setOrderNo(this.getOrderNo());
entity.setRefundType("1");
entity.setCommodityId(commodityId);
entity.setCommodityPrice(commodityPrice);
entity.setCommodityNumber(commodityNumber);
entity.setCommodityType("0");
entity.setOrderMoney(orderMoney);
entity.setFinalAmount(finalAmount);
entity.setPurchaserBy(purchaserBy);
entity.setPurchaserTime(LocalDateTime.now());
entity.setAcceptBy(acceptBy);
entity.setAcceptTime(LocalDateTime.now());
entity.setRemark(remark);
entity.setWeiChatCode(weiChatCode);
this.baseMapper.insert(entity);
}
/**
* 新增指定订单
*
* @param commodityId 商品ID
* @param commodityPrice 商品单价
* @param commodityNumber 商品数量
* @param orderMoney 订单金额
* @param finalAmount 订单最终金额（支付金额）
* @param purchaserBy 下单人ID
* @param acceptBy 接单人ID
*/
@Override
public void createOrdinaryOrder(String orderId, String commodityId, BigDecimal commodityPrice, String commodityNumber, String serviceDuration, String commodityName, BigDecimal orderMoney, BigDecimal finalAmount, String purchaserBy, String acceptBy, String remark, String weiChatCode) {
PlayOrderInfoEntity entity = new PlayOrderInfoEntity(orderId, OrderConstant.ORDER_STATUS_0, "2", "0");
entity.setOrderNo(this.getOrderNo());
entity.setCommodityId(commodityId);
entity.setCommodityPrice(commodityPrice);
entity.setCommodityNumber(commodityNumber);
entity.setCommodityName(commodityName);
entity.setServiceDuration(serviceDuration);
entity.setCommodityType("1");
entity.setOrderMoney(orderMoney);
entity.setFinalAmount(finalAmount);
entity.setPurchaserBy(purchaserBy);
entity.setPurchaserTime(LocalDateTime.now());
entity.setAcceptBy(acceptBy);
entity.setAcceptTime(LocalDateTime.now());
entity.setRemark(remark);
entity.setWeiChatCode(weiChatCode);
this.baseMapper.insert(entity);
}
@Override
public void createRandomOrder(String orderId, String commodityId, BigDecimal commodityPrice, String commodityNumber, String serviceDuration, String commodityName, BigDecimal orderMoney, BigDecimal finalAmount, String purchaserBy, String remark, String weiChatCode) {
PlayOrderInfoEntity entity = new PlayOrderInfoEntity(orderId, OrderConstant.ORDER_STATUS_0, "2", "1");
entity.setOrderNo(this.getOrderNo());
entity.setCommodityId(commodityId);
entity.setCommodityPrice(commodityPrice);
entity.setCommodityNumber(commodityNumber);
entity.setCommodityName(commodityName);
entity.setServiceDuration(serviceDuration);
entity.setCommodityType("1");
entity.setOrderMoney(orderMoney);
entity.setFinalAmount(finalAmount);
entity.setPurchaserBy(purchaserBy);
entity.setPurchaserTime(LocalDateTime.now());
entity.setAcceptTime(LocalDateTime.now());
entity.setRemark(remark);
entity.setWeiChatCode(weiChatCode);
this.baseMapper.insert(entity);
}
/**
* 新增充值订单
*
* @param orderOn 订单编号
* @param orderId 订单编号
* @param orderMoney 订单金额
* @param finalAmount 订单最终金额（支付金额）
* @param purchaserBy 下单人ID
@@ -369,7 +260,7 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
}
@Override
public List<PlayOrderInfoEntity> listByTime(String clerkId, LocalDate startTime, LocalDate endTime) {
public List<PlayOrderInfoEntity> listByTime(String clerkId, String startTime, String endTime) {
MPJLambdaWrapper<PlayOrderInfoEntity> lambdaQueryWrapper = new MPJLambdaWrapper<>();
lambdaQueryWrapper.eq(PlayOrderInfoEntity::getAcceptBy, clerkId);
lambdaQueryWrapper.between(PlayOrderInfoEntity::getAcceptTime, startTime, endTime);