chuangte/share-space-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
邱贞招 2025-02-05 09:07:05 +08:00
parent 5db571124d
commit 726e8e3979
30 changed files with 323 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
share-space-admin/src/main/java/com/ruoyi/web/controller/system/StoreController.java
View File

@ -1,9 +1,12 @@
package com.ruoyi.web.controller.system;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.ss.store.service.IStoreAssembler;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -72,11 +75,11 @@ public class StoreController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('system:store:query')")
@GetMapping(value = "/{storeId}")
public AjaxResult getInfo(@PathVariable("storeId") Long storeId)
public AjaxResult getInfo(@PathVariable("storeId") Long storeId, StoreQuery query)
{
StoreVO vo = storeService.selectEStoreByStoreId(storeId);
// 拼接今日收入、本月收入、总设备数、总营收、房间总数、正在使用中的房间数、设施总数、正在使用中的设施数 统计数据
storeAssembler.assembleStatisticalData(vo);
storeAssembler.assembleStatisticalData(vo,query.getStartTime(),query.getEndTime());
return success(vo);
}

6
share-space-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
View File

@ -12,11 +12,13 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.ss.user.domain.UserQuery;
import com.ruoyi.ss.user.service.IUserAssembler;
import com.ruoyi.ss.user.service.IUserService;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.util.List;
/**
@ -80,14 +82,14 @@ public class UserController extends BaseController
* 根据用户编号获取详细信息
*/
@GetMapping(value = { "/", "/{userId}" })
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId,UserQuery query)
{
AjaxResult ajax = AjaxResult.success();
if (StringUtils.isNotNull(userId))
{
UserVO user = eUserService.selectUserById(userId);
// 拼接店铺数、房间数、设施数、设备数、总收入、总提现、总消费
userAssembler.assembleStatisticalData(user);
userAssembler.assembleStatisticalData(user, query.getStartDate(), query.getEndDate());
ajax.put(AjaxResult.DATA_TAG, user);
}
return ajax;

33
share-space-common/src/main/java/com/ruoyi/common/constant/ServiceConstants.java
View File

@ -1087,24 +1087,43 @@ public class ServiceConstants {
/**----------------------------设施类型end----------------------------*/
/**----------------------------退款申请状态start----------------------------*/
// /**----------------------------退款申请状态start----------------------------*/
//
// /**
// * 退款申请状态: 1-待处理
// */
// public static final String REFUND_STATUS_PENDING = "1";
//
// /**
// * 退款申请状态: 2-退款成功
// */
// public static final String REFUND_STATUS_SUCCESS = "2";
//
// /**
// * 退款申请状态: 3-驳回
// */
// public static final String REFUND_STATUS_REJECTED = "3";
//
// /**----------------------------退款申请状态end----------------------------*/
/**----------------------------退款订单状态start----------------------------*/
/**
* 退款申请状态: 1-待处理
* 退款订单状态: 1-退款中
*/
public static final String REFUND_STATUS_PENDING = "1";
public static final String REFUND_STATUS_PROCESSING = "1";
/**
* 退款申请状态: 2-退款成功
* 退款订单状态: 2-退款成功
*/
public static final String REFUND_STATUS_SUCCESS = "2";
/**
* 退款申请状态: 3-驳回
* 退款订单状态: 3-退款失败
*/
public static final String REFUND_STATUS_REJECTED = "3";
public static final String REFUND_STATUS_FAILED = "3";
/**----------------------------退款申请状态end----------------------------*/
/**----------------------------退款订单状态end----------------------------*/
/**----------------------------是否已退款start----------------------------*/

58
share-space-system/src/main/java/com/ruoyi/ss/callback/service/impl/CallbackServiceImpl.java
View File

@ -8,6 +8,7 @@ import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.pay.wx.domain.NotifyEventType;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.ss.callback.domain.CallbackLog;
import com.ruoyi.ss.callback.mapper.CallbackLogMapper;
@ -22,6 +23,7 @@ import com.ruoyi.ss.order.domain.Order;
import com.ruoyi.ss.order.domain.OrderVO;
import com.ruoyi.ss.orderOper.service.IOrderOperService;
import com.ruoyi.ss.payBill.domain.PayBill;
import com.ruoyi.ss.payBill.domain.PayBillQuery;
import com.ruoyi.ss.payBill.domain.PayBillVO;
import com.ruoyi.ss.payBill.domain.enums.PayBillStatus;
import com.ruoyi.ss.payBill.service.PayBillService;
@ -407,17 +409,59 @@ public class CallbackServiceImpl implements ICallbackService {
logger.info("【微信退款回调】转换成RefundNotification: {}", JSON.toJSONString(refundNotification));
etCallbackLog.setBody(JSON.toJSONString(refundNotification));
if (Status.SUCCESS.equals(refundNotification.getRefundStatus())) {
// 退款成功后 改变 etRefundService
// 如果outRefundNo没有值，说明是押金退款，直接新增退款记录， 还是在还车时新建退款记录？
/**
* 退款回调
* 1.更新分成表的退款金额、结算金额
* 2.更新订单中的退款金额
* 3.金额、退款金额、结算金额
* 4.更新退款表状态
* */
String outRefundNo = refundNotification.getOutRefundNo();
Refund refund = etRefundService.selectEtRefundByRefundNo(outRefundNo);
ServiceUtil.assertion(refund == null, "退款记录不存在");
Boolean execute = transactionTemplate.execute(e -> {
// 1.更新分成表的退款金额、结算金额
// 2.更新订单中的退款金额--金额、退款金额、结算金额
// 3.更新支付单中的退款金额
// 4.更新退款表状态为成功
return Boolean.TRUE;
});
if(Boolean.FALSE.equals(execute))throw new ServiceException("微信支付回调失败");
PayBill closeData = new PayBillVO();
closeData.setStatus(PayBillStatus.CANCEL.getStatus());
PayBillQuery updateQuery = new PayBillQuery();
updateQuery.setStatusList(PayBillStatus.getCanCancelList());
updateQuery.setPayId(refund.getPayId());
int update = paymentService.updateByQuery(closeData, updateQuery);
Order order = new Order();
// order.setOrderNo(refundNotification.getOutTradeNo());
// orderService.updateRlOrderByOrderNo();
// 更新退款表状态
Refund rlRefund = new Refund();
rlRefund.setRefundNo(outRefundNo);
rlRefund.setRefundResult(Constants.SUCCESS2);
rlRefund.setStatus(REFUND_STATUS_SUCCESS);//
int i = etRefundService.updateEtRefundByRefundNo(rlRefund);
if(i==0){
logger.error("【微信退款回调】更新退款单失败");
throw new ServiceException("【微信退款回调】更新退款单失败");
}
ServiceUtil.assertion(i == 0, "【微信退款回调】更新退款单失败");
logger.info("【微信退款回调】全部结束！！！！！");
}
}

5
share-space-system/src/main/java/com/ruoyi/ss/dividendDetail/domain/DividendDetailQuery.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.ss.dividendDetail.domain;
import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
@ -11,8 +12,8 @@ public class DividendDetailQuery extends DividendDetail{
private String agentName;
/** 开始时间 */
private LocalDateTime startTime;
private LocalDate startTime;
/** 结束时间 */
private LocalDateTime endTime;
private LocalDate endTime;
}

5
share-space-system/src/main/java/com/ruoyi/ss/dividendDetail/mapper/DividendDetailMapper.java
View File

@ -90,4 +90,9 @@ public interface DividendDetailMapper
* 查询收入
*/
BigDecimal getIncome(DividendDetailQuery query );
/**
* 根据时间查询收入
*/
List<InCome> selectIncome(DividendDetailQuery query);
}

13
share-space-system/src/main/java/com/ruoyi/ss/dividendDetail/mapper/DividendDetailMapper.xml
View File

@ -115,6 +115,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectIncome" resultType="com.ruoyi.system.domain.vo.InCome">
SELECT
DATE_FORMAT(dd.create_time, '%Y-%m-%d') as day,
COALESCE(SUM(dd.settlement_amount), 0) as orderIncome,
COALESCE(COUNT(DISTINCT dd.order_no), 0) as orderNum
FROM ss_dividend_detail dd
<where>
<include refid="searchCondition"/>
</where>
GROUP BY day
ORDER BY day ASC
</select>
<insert id="insertRlDividendDetail" parameterType="DividendDetail" useGeneratedKeys="true" keyProperty="id">
insert into ss_dividend_detail
<trim prefix="(" suffix=")" suffixOverrides=",">

8
share-space-system/src/main/java/com/ruoyi/ss/dividendDetail/service/IDividendDetailService.java
View File

@ -114,6 +114,14 @@ public interface IDividendDetailService
*/
List<InCome> select30DaysIncome(Long merchantId);
/**
* 根据时间查询收入
* @param query 查询条件
* @return 结果
*/
List<InCome> selectIncome(DividendDetailQuery query);
/**
* 获取指定时间范围的收入
* @return 收入金额

10
share-space-system/src/main/java/com/ruoyi/ss/dividendDetail/service/impl/DividendDetailServiceImpl.java
View File

@ -154,6 +154,16 @@ public class DividendDetailServiceImpl implements IDividendDetailService
return dividendDetailMapper.select30DaysIncome(merchantId);
}
/**
* 根据时间查询收入
* @param query 查询条件
* @return 结果
*/
@Override
public List<InCome> selectIncome(DividendDetailQuery query) {
return dividendDetailMapper.selectIncome(query);
}
/**
* 查询收入
* @return 结果

8
share-space-system/src/main/java/com/ruoyi/ss/order/domain/OrderQuery.java
View File

@ -3,6 +3,8 @@ package com.ruoyi.ss.order.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
@Data
public class OrderQuery extends Order {
@ -12,6 +14,12 @@ public class OrderQuery extends Order {
/** 结束时间*/
private String endTime;
/** 支付开始时间*/
private LocalDate payStartTime;
/** 支付结束时间*/
private LocalDate payEndTime;
/** 手机号*/
private String phone;

6
share-space-system/src/main/java/com/ruoyi/ss/order/mapper/OrderMapper.java
View File

@ -4,6 +4,7 @@ import com.ruoyi.ss.order.domain.Order;
import com.ruoyi.ss.order.domain.OrderQuery;
import com.ruoyi.ss.order.domain.OrderVO;
import com.ruoyi.ss.order.domain.vo.ReservedTimePeriod;
import com.ruoyi.system.domain.vo.InCome;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
@ -171,6 +172,11 @@ public interface OrderMapper
*/
BigDecimal getOrderFee(OrderQuery rlOrder);
/**
* 统计营收（根据日期返回）
*/
List<InCome> getInComeList(OrderQuery rlOrder);
// /**
// * 扫码绑定车辆
// */

18
share-space-system/src/main/java/com/ruoyi/ss/order/mapper/OrderMapper.xml
View File

@ -133,6 +133,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="endTime != null and endTime != ''">
and date_format(o.create_time,'%Y%m%d') &lt;= date_format(#{endTime},'%Y%m%d')
</if>
<if test="payStartTime != null "> and date(o.pay_time) >= #{payStartTime}</if>
<if test="payEndTime != null "> and date(o.pay_time) &lt;= #{payEndTime}</if>
<if test="keywords != null and keywords != ''">
AND (o.phone LIKE CONCAT('%', #{keywords}, '%') OR o.order_no LIKE CONCAT('%', #{keywords}, '%'))
</if>
@ -334,6 +336,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="getInComeList" parameterType="OrderQuery" resultType="com.ruoyi.system.domain.vo.InCome">
SELECT
DATE_FORMAT(o.pay_time, '%Y-%m-%d') as day,
COALESCE(SUM(pay_fee), 0) as orderIncome,
COALESCE(COUNT(DISTINCT o.order_no), 0) as orderNum
FROM
ss_order o
<where>
<include refid="searchCondition"/>
</where>
GROUP BY
DATE_FORMAT(o.pay_time, '%Y-%m-%d')
ORDER BY
day ASC
</select>
<insert id="insertRlOrder" parameterType="Order" useGeneratedKeys="true" keyProperty="orderId">
insert into ss_order
<trim prefix="(" suffix=")" suffixOverrides=",">

6
share-space-system/src/main/java/com/ruoyi/ss/order/service/IOrderService.java
View File

@ -11,6 +11,7 @@ import com.ruoyi.ss.order.domain.dto.ReOrderDTO;
import com.ruoyi.ss.order.domain.dto.TopUpOrderDTO;
import com.ruoyi.ss.order.domain.vo.ReservedTimePeriod;
import com.ruoyi.ss.refund.domain.Refund;
import com.ruoyi.system.domain.vo.InCome;
import com.ruoyi.system.domain.vo.IndexAdminVo;
import java.math.BigDecimal;
@ -267,5 +268,10 @@ public interface IOrderService
*/
BigDecimal getRevenueByTimeType(String timeType,OrderQuery query);
/**
* 统计营收（根据日期返回）
*/
List<InCome> getInComeList(OrderQuery rlOrder);
}

14
share-space-system/src/main/java/com/ruoyi/ss/order/service/impl/OrderAssemblerImpl.java
View File

@ -3,11 +3,15 @@ package com.ruoyi.ss.order.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.ss.order.domain.OrderVO;
import com.ruoyi.ss.order.service.IOrderAssembler;
import com.ruoyi.ss.orderOper.domain.OrderOper;
import com.ruoyi.ss.orderOper.service.IOrderOperService;
import com.ruoyi.ss.payBill.domain.PayBillVO;
import com.ruoyi.ss.payBill.service.PayBillService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 订单组装器
@ -20,6 +24,10 @@ public class OrderAssemblerImpl implements IOrderAssembler {
@Autowired
private PayBillService paymentService;
@Autowired
private IOrderOperService orderOperService;
/**
* 拼接后台需要的订单信息
* @param order 房间对象
@ -33,5 +41,11 @@ public class OrderAssemblerImpl implements IOrderAssembler {
order.setPayNo(payBillVO.getPayNo());
order.setPayBillVO(payBillVO);
}
// 操作履历
OrderOper orderOper = new OrderOper();
orderOper.setOrderNo(order.getOrderNo());
List<OrderOper> list = orderOperService.selectRlOrderOperList(orderOper);
order.setOrderOpers(list);
}
}

11
share-space-system/src/main/java/com/ruoyi/ss/order/service/impl/OrderServiceImpl.java
View File

@ -1276,8 +1276,8 @@ public class OrderServiceImpl implements IOrderService
DividendDetailQuery dividendDetailQuery = new DividendDetailQuery();
dividendDetailQuery.setStatus(DIVIDEND_STATUS_PAID);
dividendDetailQuery.setPartnerId(merchantId);
dividendDetailQuery.setStartTime(startTime);
dividendDetailQuery.setEndTime(now);
dividendDetailQuery.setStartTime(startTime.toLocalDate());
dividendDetailQuery.setEndTime(now.toLocalDate());
return dividendDetailService.getIncome(dividendDetailQuery);
}
@ -1388,5 +1388,12 @@ public class OrderServiceImpl implements IOrderService
return orderMapper.getOrderFee(order);
}
/**
* 统计营收（根据日期返回）
*/
public List<InCome> getInComeList(OrderQuery rlOrder){
return orderMapper.getInComeList(rlOrder);
}
}

2
share-space-system/src/main/java/com/ruoyi/ss/orderOper/mapper/OrderOperMapper.xml
View File

@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="operUserId != null "> and oper_user_id = #{operUserId}</if>
<if test="operPhone != null and operPhone != ''"> and oper_phone = #{operPhone}</if>
</where>
order by oper_id desc
order by create_time
</select>
<select id="selectRlOrderOperByOperId" parameterType="Long" resultMap="RlOrderOperResult">

5
share-space-system/src/main/java/com/ruoyi/ss/pay/service/impl/WxPayService.java
View File

@ -54,6 +54,8 @@ import java.math.BigDecimal;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import static com.ruoyi.common.constant.ServiceConstants.REFUND_STATUS_SUCCESS;
/**
* 微信支付服务
* @author qzz
@ -384,7 +386,8 @@ public class WxPayService implements IWxPayService {
private void handleRefundSuccess(String refundNo) {
Refund rlRefund = new Refund();
rlRefund.setRefundNo(refundNo);
rlRefund.setRefundResult(Constants.SUCCESS2);
rlRefund.setStatus(REFUND_STATUS_SUCCESS);
// rlRefund.setRefundResult(Constants.SUCCESS2);
int i = etRefundService.updateEtRefundByRefundNo(rlRefund);
if(i==0){
log.error("【通联退款】更新退款单失败");

6
share-space-system/src/main/java/com/ruoyi/ss/refund/domain/Refund.java
View File

@ -39,7 +39,11 @@ public class Refund extends BaseEntity
@ApiModelProperty("用户名")
private String userName;
@ApiModelProperty("状态：1-待处理；2-退款成功；3-驳回")
/** 用户类型 */
@ApiModelProperty("用户类型")
private String userType;
@ApiModelProperty("退款订单状态：1-退款中；2-退款成功；3-退款失败")
private String status;
/** 退款金额 */

6
share-space-system/src/main/java/com/ruoyi/ss/refund/service/impl/RefundServiceImpl.java
View File

@ -284,7 +284,7 @@ public class RefundServiceImpl implements IRefundService
public int passRefund(String refundNo) {
Refund refund = refundMapper.selectEtRefundByRefundNo(refundNo);
ServiceUtil.assertion(refund == null, "退款申请单不存在");
ServiceUtil.assertion(!ServiceConstants.REFUND_STATUS_PENDING.equals(refund.getStatus()), "退款申请单已处理,请勿操作！");
// ServiceUtil.assertion(!ServiceConstants.REFUND_STATUS_PENDING.equals(refund.getStatus()), "退款申请单已处理,请勿操作！");
// TODO 根据支付渠道 调用退款方法 2. 更新退款单状态为 REFUND_STATUS_SUCCESS
Refund refund1 = new Refund();
@ -303,10 +303,10 @@ public class RefundServiceImpl implements IRefundService
public int reject(String refundNo) {
Refund refund = refundMapper.selectEtRefundByRefundNo(refundNo);
ServiceUtil.assertion(refund == null, "退款申请单不存在");
ServiceUtil.assertion(!ServiceConstants.REFUND_STATUS_PENDING.equals(refund.getStatus()), "退款申请单已处理,请勿操作！");
// ServiceUtil.assertion(!ServiceConstants.REFUND_STATUS_PENDING.equals(refund.getStatus()), "退款申请单已处理,请勿操作！");
Refund update = new Refund();
update.setRefundNo(refundNo);
update.setStatus(ServiceConstants.REFUND_STATUS_REJECTED);
// update.setStatus(ServiceConstants.REFUND_STATUS_REJECTED);
int i = refundMapper.updateEtRefundByRefundNo(update);
ServiceUtil.assertion(i == 0, "退款申请单更新失败");
return i;

11
share-space-system/src/main/java/com/ruoyi/ss/store/domain/StoreQuery.java
View File

@ -2,6 +2,9 @@ package com.ruoyi.ss.store.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
@Data
public class StoreQuery extends Store {
@ -12,4 +15,12 @@ public class StoreQuery extends Store {
@ApiModelProperty("手机纬度")
private String phoneLat;
@ApiModelProperty("开始时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate startTime;
@ApiModelProperty("结束时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate endTime;
}

3
share-space-system/src/main/java/com/ruoyi/ss/store/domain/StoreVO.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.ss.store.domain;
import com.ruoyi.ss.carousel.domain.CarouselVO;
import com.ruoyi.ss.room.domain.RoomVO;
import com.ruoyi.ss.toilet.domain.ToiletVO;
import com.ruoyi.system.domain.vo.InCome;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -72,5 +73,7 @@ public class StoreVO extends Store {
@ApiModelProperty("二维码文本")
private String qrText;
@ApiModelProperty("营收列表")
private List<InCome> inComeList;
}

3
share-space-system/src/main/java/com/ruoyi/ss/store/service/IStoreAssembler.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.ss.store.service;
import com.ruoyi.ss.store.domain.StoreVO;
import java.time.LocalDate;
import java.util.List;
/**
@ -28,5 +29,5 @@ public interface IStoreAssembler {
* 拼接统计数据
* @param vo 店铺对象
*/
void assembleStatisticalData(StoreVO vo);
void assembleStatisticalData(StoreVO vo, LocalDate payStartTime, LocalDate payEndTime);
}

30
share-space-system/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java
View File

@ -1,5 +1,7 @@
package com.ruoyi.ss.store.service.impl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.common.utils.map.GeoUtils;
import com.ruoyi.common.utils.CommonUtil;
import com.ruoyi.ss.device.domain.DeviceQuery;
@ -10,10 +12,14 @@ import com.ruoyi.ss.room.domain.RoomQuery;
import com.ruoyi.ss.room.service.IRoomService;
import com.ruoyi.ss.store.domain.StoreVO;
import com.ruoyi.ss.store.service.IStoreAssembler;
import com.ruoyi.system.domain.vo.InCome;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Comparator;
import java.util.List;
@ -72,7 +78,7 @@ public class StoreAssemblerImpl implements IStoreAssembler {
*
*/
@Override
public void assembleStatisticalData(StoreVO vo) {
public void assembleStatisticalData(StoreVO vo,LocalDate payStartTime, LocalDate payEndTime) {
if (vo == null) {
return;
}
@ -86,6 +92,28 @@ public class StoreAssemblerImpl implements IStoreAssembler {
// 统计设备数量，设备表中的store_id，投放状态
deviceNum(vo);
// 近7天/30天的收入
getIncomeList(vo,payStartTime,payEndTime);
}
private void getIncomeList(StoreVO vo, LocalDate payStartTime, LocalDate payEndTime) {
OrderQuery orderQuery = new OrderQuery();
orderQuery.setStoreId(vo.getStoreId());
orderQuery.setPayStartTime(payStartTime);
orderQuery.setPayEndTime(payEndTime);
List<InCome> inComeList = orderService.getInComeList(orderQuery);
if (payStartTime != null && payEndTime!= null) {
inComeList = CollectionUtils.fillVoids(inComeList, InCome::getDay, (date) -> {
InCome co = new InCome();
co.setDay(date);
co.setOrderIncome(BigDecimal.ZERO);
co.setOrderNum(0);
return co;
}, payStartTime, payEndTime);
}
vo.setInComeList(inComeList);
}
private void setIncome(StoreVO vo) {

12
share-space-system/src/main/java/com/ruoyi/ss/user/domain/UserQuery.java
View File

@ -1,10 +1,12 @@
package com.ruoyi.ss.user.domain;
import com.ruoyi.common.core.domain.entity.User;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDate;
@Data
public class UserQuery extends User {
@ -27,4 +29,12 @@ public class UserQuery extends User {
/** 服务费 */
private BigDecimal withdrawHandlingCharge;
@ApiModelProperty("开始时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate startDate;
@ApiModelProperty("结束时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate endDate;
}

5
share-space-system/src/main/java/com/ruoyi/ss/user/domain/UserVO.java
View File

@ -1,9 +1,12 @@
package com.ruoyi.ss.user.domain;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.system.domain.vo.DailyVo;
import com.ruoyi.system.domain.vo.InCome;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* 用户对象 et_user
@ -47,4 +50,6 @@ public class UserVO extends User
/** 总消费 */
private BigDecimal totalConsume;
/** 日报表 */
private List<InCome> inComeList;
}

4
share-space-system/src/main/java/com/ruoyi/ss/user/service/IUserAssembler.java
View File

@ -2,6 +2,8 @@ package com.ruoyi.ss.user.service;
import com.ruoyi.ss.user.domain.UserVO;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
@ -20,5 +22,5 @@ public interface IUserAssembler
void assemblerStoreNum(List<UserVO> list);
void assembleStatisticalData(UserVO user);
void assembleStatisticalData(UserVO user, LocalDate startDate, LocalDate endDate);
}

30
share-space-system/src/main/java/com/ruoyi/ss/user/service/impl/UserAssemblerImpl.java
View File

@ -14,12 +14,15 @@ import com.ruoyi.ss.store.service.IStoreService;
import com.ruoyi.ss.user.domain.UserVO;
import com.ruoyi.ss.user.service.IUserAssembler;
import com.ruoyi.ss.withdraw.service.IWithdrawService;
import com.ruoyi.system.domain.vo.InCome;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import static com.ruoyi.common.constant.ServiceConstants.*;
@ -66,7 +69,7 @@ public class UserAssemblerImpl implements IUserAssembler {
}
@Override
public void assembleStatisticalData(UserVO user) {
public void assembleStatisticalData(UserVO user, LocalDate startDate, LocalDate endDate) {
Long userId = user.getUserId();
/** 店铺数*/
@ -106,6 +109,31 @@ public class UserAssemblerImpl implements IUserAssembler {
}
user.setTotalWithdrawAmount(totalWithdrawAmount);
// 日报表
getDailyVoList(user, startDate, endDate);
}
private void getDailyVoList(UserVO user, LocalDate startDate, LocalDate endDate) {
DividendDetailQuery query = new DividendDetailQuery();
query.setStatus(DIVIDEND_STATUS_PAID);
query.setPartnerId(user.getUserId());
query.setStartTime(startDate);
query.setEndTime(endDate);
List<InCome> inComes = dividendDetailService.selectIncome(query);
if (CollectionUtils.isEmptyElement(inComes)) {
return;
}
if (startDate != null && endDate!= null) {
inComes = CollectionUtils.fillVoids(inComes, InCome::getDay, (date) -> {
InCome co = new InCome();
co.setDay(date);
co.setOrderIncome(BigDecimal.ZERO);
co.setOrderNum(0);
return co;
}, startDate, endDate);
}
user.setInComeList(inComes);
}

21
share-space-system/src/main/java/com/ruoyi/ss/user/service/impl/UserServiceImpl.java
View File

@ -8,35 +8,31 @@ import com.ruoyi.common.core.domain.dto.BasicConfigDTO;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.core.redis.RedisLock;
import com.ruoyi.common.core.redis.enums.RedisLockKey;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.ss.transfer.domain.TransferVO;
import com.ruoyi.ss.user.domain.UserVO;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.common.utils.verify.VerifyIdentityUtil;
import com.ruoyi.ss.changeBalance.domain.ChangeBalance;
import com.ruoyi.ss.changeBalance.domain.ChangeBalanceQuery;
import com.ruoyi.ss.changeBalance.service.IChangeBalanceService;
import com.ruoyi.ss.channelWithdraw.service.ChannelWithdrawService;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawVO;
import com.ruoyi.ss.user.domain.UserQuery;
import com.ruoyi.ss.user.domain.UserVO;
import com.ruoyi.ss.user.mapper.UserMapper;
import com.ruoyi.ss.user.service.IUserService;
import com.ruoyi.ss.userWithdraw.domain.UserWithdraw;
import com.ruoyi.ss.userWithdraw.service.IUserWithdrawService;
import com.ruoyi.ss.withdraw.domain.Withdraw;
import com.ruoyi.ss.withdraw.domain.bo.WithdrawBO;
import com.ruoyi.ss.withdraw.domain.dto.MchWithdrawDTO;
import com.ruoyi.ss.withdraw.domain.dto.WithdrawApprovalDTO;
import com.ruoyi.ss.withdraw.service.IWithdrawService;
import com.ruoyi.ss.user.domain.UserQuery;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.ss.changeBalance.domain.ChangeBalance;
import com.ruoyi.ss.changeBalance.domain.ChangeBalanceQuery;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawVO;
import com.ruoyi.system.domain.enums.config.ConfigKey;
import com.ruoyi.system.domain.query.AuthenticationQuery;
import com.ruoyi.ss.withdraw.domain.Withdraw;
import com.ruoyi.ss.withdraw.domain.WithdrawQuery;
import com.ruoyi.ss.user.mapper.UserMapper;
import com.ruoyi.system.mapper.SysUserPostMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysConfigService;
@ -52,7 +48,6 @@ import javax.validation.Validator;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.concurrent.ScheduledExecutorService;

21
share-space-system/src/main/java/com/ruoyi/system/domain/vo/DailyVo.java Normal file
View File

@ -0,0 +1,21 @@
package com.ruoyi.system.domain.vo;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
* 经营概况，7天，30天
*/
@Data
public class DailyVo {
/** 日期 */
private LocalDate day;
/** 收入金额 */
private BigDecimal incomeAmount;
/** 订单数 */
private Integer orderNum;
}

3
share-space-system/src/main/java/com/ruoyi/system/domain/vo/InCome.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.system.domain.vo;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
* 经营概况，7天，30天
@ -10,7 +11,7 @@ import java.math.BigDecimal;
public class InCome {
/** 日期 */
private String day;
private LocalDate day;
/** 订单营收 */
private BigDecimal orderIncome;
/** 订单数 */