会员订单
This commit is contained in:
@@ -1,14 +1,18 @@
|
||||
package com.czg.service.market.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.czg.account.dto.shopuser.ShopUserAddDTO;
|
||||
import com.czg.account.entity.ShopUser;
|
||||
import com.czg.account.entity.table.ShopUserTableDef;
|
||||
import com.czg.account.entity.table.UserInfoTableDef;
|
||||
import com.czg.account.service.*;
|
||||
import com.czg.market.dto.MemberConfigDTO;
|
||||
import com.czg.account.entity.ShopInfo;
|
||||
import com.czg.account.entity.UserInfo;
|
||||
import com.czg.market.entity.table.MemberOrderTableDef;
|
||||
import com.czg.market.service.TbMemberConfigService;
|
||||
import com.czg.market.vo.MemberConfigVO;
|
||||
import com.czg.exception.CzgException;
|
||||
@@ -17,9 +21,13 @@ import com.czg.order.entity.OrderInfo;
|
||||
import com.czg.order.entity.OrderPayment;
|
||||
import com.czg.order.service.OrderInfoService;
|
||||
import com.czg.order.service.OrderPaymentService;
|
||||
import com.czg.sa.StpKit;
|
||||
import com.czg.service.market.enums.OrderStatusEnums;
|
||||
import com.czg.service.market.mapper.MemberOrderMapper;
|
||||
import com.czg.utils.AssertUtil;
|
||||
import com.czg.utils.PageUtil;
|
||||
import com.mybatisflex.core.paginate.Page;
|
||||
import com.mybatisflex.core.query.QueryCondition;
|
||||
import com.mybatisflex.core.query.QueryWrapper;
|
||||
import com.mybatisflex.spring.service.impl.ServiceImpl;
|
||||
import com.czg.market.entity.MemberOrder;
|
||||
@@ -30,6 +38,7 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 会员充值订单 服务层实现。
|
||||
@@ -54,6 +63,31 @@ public class MemberOrderServiceImpl extends ServiceImpl<MemberOrderMapper, Membe
|
||||
@DubboReference
|
||||
private OrderPaymentService paymentService;
|
||||
|
||||
@Override
|
||||
public Page<MemberOrder> pageInfo(String startTime, String endTime, String key) {
|
||||
LocalDateTime start = StrUtil.isBlank(startTime) ? null : DateUtil.parseLocalDateTime(startTime);
|
||||
LocalDateTime end = StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime);
|
||||
|
||||
return page(PageUtil.buildPage(), QueryWrapper.create()
|
||||
.leftJoin(UserInfoTableDef.USER_INFO).on(UserInfoTableDef.USER_INFO.ID.eq(MemberOrderTableDef.MEMBER_ORDER.USER_ID))
|
||||
.leftJoin(ShopUserTableDef.SHOP_USER).on(ShopUserTableDef.SHOP_USER.MAIN_SHOP_ID.eq(MemberOrderTableDef.MEMBER_ORDER.SHOP_ID)
|
||||
.and(ShopUserTableDef.SHOP_USER.USER_ID.eq(MemberOrderTableDef.MEMBER_ORDER.USER_ID)))
|
||||
.le(MemberOrder::getCreateTime, end)
|
||||
.ge(MemberOrder::getCreateTime, start)
|
||||
.and(a -> {
|
||||
a.or(r -> {
|
||||
r.like(ShopUser::getId, key);
|
||||
});
|
||||
|
||||
a.or(r -> {
|
||||
r.like(UserInfo::getNickName, key);
|
||||
});
|
||||
})
|
||||
.eq(MemberOrder::getShopId, StpKit.USER.getMainShopId())
|
||||
.orderBy(MemberOrder::getCreateTime, true)
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MemberOrder createMemberOrder(MemberOrderDTO orderDTO) {
|
||||
ShopInfo shopInfo = shopInfoService.getById(orderDTO.getShopId());
|
||||
|
||||
Reference in New Issue
Block a user