分销记录修改
This commit is contained in:
parent
4d81c79443
commit
118f0145be
|
|
@ -7,6 +7,7 @@ import com.czg.account.entity.UserInfo;
|
||||||
import com.czg.constant.TableValueConstant;
|
import com.czg.constant.TableValueConstant;
|
||||||
import com.czg.market.vo.MkDistributionAmountFlowVO;
|
import com.czg.market.vo.MkDistributionAmountFlowVO;
|
||||||
import com.czg.order.entity.OrderInfo;
|
import com.czg.order.entity.OrderInfo;
|
||||||
|
import com.czg.order.entity.OrderPayment;
|
||||||
import com.czg.utils.MyQueryWrapper;
|
import com.czg.utils.MyQueryWrapper;
|
||||||
import com.czg.utils.PageUtil;
|
import com.czg.utils.PageUtil;
|
||||||
import com.mybatisflex.core.paginate.Page;
|
import com.mybatisflex.core.paginate.Page;
|
||||||
|
|
@ -71,10 +72,10 @@ public class MkDistributionAmountFlowServiceImpl extends ServiceImpl<MkDistribut
|
||||||
public Map<String, Object> openPageInfo(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String key) {
|
public Map<String, Object> openPageInfo(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String key) {
|
||||||
QueryWrapper queryWrapper = new MyQueryWrapper()
|
QueryWrapper queryWrapper = new MyQueryWrapper()
|
||||||
.selectAll(MkDistributionAmountFlow.class)
|
.selectAll(MkDistributionAmountFlow.class)
|
||||||
.leftJoin(OrderInfo.class).on(OrderInfo::getId, MkDistributionAmountFlow::getSourceId)
|
.leftJoin(OrderPayment.class).on(OrderPayment::getId, MkDistributionAmountFlow::getSourceId)
|
||||||
.leftJoin(ShopUser.class).on(ShopUser::getId, OrderInfo::getUserId)
|
.leftJoin(ShopUser.class).on(ShopUser::getId, OrderPayment::getSourceId)
|
||||||
.eq(MkDistributionAmountFlow::getShopId, shopId)
|
.eq(MkDistributionAmountFlow::getShopId, shopId)
|
||||||
.select(OrderInfo::getOrderNo)
|
.select(OrderPayment::getOrderNo)
|
||||||
.eq(MkDistributionAmountFlow::getType, TableValueConstant.DistributionAmountFlow.Type.OPEN.getCode())
|
.eq(MkDistributionAmountFlow::getType, TableValueConstant.DistributionAmountFlow.Type.OPEN.getCode())
|
||||||
.select(ShopUser::getPhone, ShopUser::getNickName);
|
.select(ShopUser::getPhone, ShopUser::getNickName);
|
||||||
if (startTime != null) {
|
if (startTime != null) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue