Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-09-27 d153ca8d05991566bed18eed1ae25f0af3c1cc70

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java

@@ -1,10 +1,13 @@
package com.ruoyi.order.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.dto.GiveVipDto;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.api.model.TVipOrder;
import com.ruoyi.order.api.query.VipShoppingOrderQuery;
import com.ruoyi.order.dto.SixVipDto;
import com.ruoyi.order.mapper.TVipOrderMapper;
import com.ruoyi.order.service.TVipOrderService;
import com.ruoyi.other.api.domain.TVip;
@@ -12,6 +15,8 @@
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import java.math.BigDecimal;
import java.time.LocalDate;
import javax.annotation.Resource;
import java.util.List;

@@ -52,4 +57,28 @@
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public List<SixVipDto> sixBefore(LocalDate sixBefore) {
        return this.baseMapper.sixBefore(sixBefore);
    }

    @Override
    public BigDecimal getSumAmout(LocalDate sixBefore) {
        return this.baseMapper.getSumAmout(sixBefore);
    }

    @Override
    public void payBack(String outTradeNo) {
        //将vip订单改为已完成
        TVipOrder tVipOrder = this.baseMapper.selectOne(Wrappers.lambdaQuery(TVipOrder.class).eq(TVipOrder::getCode, outTradeNo));
        tVipOrder.setPaymentStatus(2);
        this.baseMapper.updateById(tVipOrder);
        //赠送会员
        GiveVipDto giveVipDto = new GiveVipDto();
        giveVipDto.setUserIds(tVipOrder.getAppUserId().toString());
        giveVipDto.setVipId(tVipOrder.getVipId());
        giveVipDto.setType(tVipOrder.getVipType());
        vipClient.giveVip(giveVipDto);
    }
}