rk
7 天以前 08675d26d73c60e1c593e901e09588acf2c39233
server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java
@@ -7,7 +7,6 @@
import com.doumee.dao.business.MemberRevenueMapper;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRevenue;
import com.doumee.dao.business.model.Orders;
import com.doumee.service.business.MemberRevenueService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -98,9 +97,7 @@
                .selectAs(Member::getName,MemberRevenue::getMemberName)
                .selectAs(Member::getNickName,MemberRevenue::getMemberNickname)
                .selectAs(Member::getTelephone,MemberRevenue::getMemberPhone)
                .selectAs(Orders::getWorkType,MemberRevenue::getWorkType)
                .leftJoin(Member.class,Member::getId,MemberRevenue::getMemberId)
                .leftJoin(Orders.class,Orders::getId,MemberRevenue::getObjId);
                .leftJoin(Member.class,Member::getId,MemberRevenue::getMemberId);
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setDeleted(Constants.ZERO);
        queryWrapper.eq(pageWrap.getModel().getId() != null,MemberRevenue::getId, pageWrap.getModel().getId());
@@ -120,7 +117,7 @@
        PageData<MemberRevenue> result =  PageData.from(memberRevenueMapper.selectJoinPage(page,MemberRevenue.class,  queryWrapper));
        if(result!=null && result.getRecords()!=null){
            for(MemberRevenue model :result.getRecords()){
                model.setTypeName(Constants.RevenueType.getObjName(model.getType()));
                model.setTypeName(null);
                model.setAmountInfo(Constants.getFormatMoney(model.getAmount()));
            }
        }