Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike int...

jiangping

2023-10-10 580cead2bc3a8502cd9bdd098df02345c0616b3b

 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -23,6 +23,7 @@
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
import com.doumee.dao.business.web.response.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
@@ -147,35 +148,56 @@
        QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
        return goodsorderMapper.selectList(wrapper);
    }
    @Override
    public   List<GoodsorderExportVO> findExportNotBikPage(Goodsorder model){
        List<GoodsorderExportVO> list = new ArrayList<>();
        MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);

        List<Goodsorder> goodsorderList = goodsorderJoinMapper.selectJoinList(Goodsorder.class,queryWrapper);
        if(goodsorderList!=null){
            for(Goodsorder order : goodsorderList){
                GoodsorderExportVO vo = new GoodsorderExportVO();
                vo.setId(order.getId());
                vo.setOpenid(order.getMemberName());
                vo.setPayDate(order.getPayDate());
                vo.setCloseDate(order.getCloseDate());
                vo.setCloseDate(order.getCloseDate());
                vo.setCloseMoney(Constants.formatDecimalNum(order.getCloseMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
                vo.setRefundDate(order.getRefundDate());
                vo.setRefundMoney(Constants.formatDecimalNum(order.getRefundMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
                list.add(vo);
            }
        }
        return list;
    }
    private MPJLambdaWrapper<Goodsorder> initQueryParamByModel(Goodsorder model) {
        MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(model);
        //只查询支付成功的
        model.setPayStatus(Constants.ONE);
        queryWrapper.selectAll(Goodsorder.class);
        queryWrapper.selectAs(Member::getOpenid, Goodsorder::getMemberOpenid);
        queryWrapper.leftJoin(Member.class, Member::getId  ,Goodsorder::getMemberId);
        queryWrapper.select("select max(r.done_date) from refund r where t1.obj_id=t.id  and r.status=2 ) as refund_date");
        queryWrapper.select("select sum(r.money) from refund r where t1.obj_id=t.id and r.status=2) as refund_money");
        //时间段筛选
        queryWrapper.ge(model.getStartDate()!=null, Goodsorder::getPayDate, model.getStartDate());
        queryWrapper.le(model.getEndDate()!=null, Goodsorder::getPayDate, model.getEndDate());
        queryWrapper.eq(model.getPayStatus() !=null,Goodsorder::getPayStatus,model.getPayStatus());
        queryWrapper.eq(model.getCode() !=null,Goodsorder::getCode,model.getCode());
        queryWrapper.eq(model.getStatus() !=null,Goodsorder::getStatus,model.getStatus());
        queryWrapper.eq(model.getOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getOnlineOrderid());
        queryWrapper.like(model.getMemberOpenid() !=null,Member::getOpenid,model.getMemberOpenid());
        queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
        queryWrapper.orderByDesc(Goodsorder::getPayDate);
        return  queryWrapper;
    }


    @Override
    public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
        IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());

        if (pageWrap.getModel().getCode() != null) {
            queryWrapper.like(Goodsorder::getCode, pageWrap.getModel().getCode());
        }

        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.eq(Goodsorder::getStatus, pageWrap.getModel().getStatus());
        }

        if (pageWrap.getModel().getOnlineOrderid() != null) {
            queryWrapper.eq(Goodsorder::getOnlineOrderid, pageWrap.getModel().getOnlineOrderid());
        }

        if (pageWrap.getModel().getPayDate() != null) {
            queryWrapper.ge(Goodsorder::getPayDate, Utils.Date.getStart(pageWrap.getModel().getPayDate()));
            queryWrapper.le(Goodsorder::getPayDate, Utils.Date.getEnd(pageWrap.getModel().getPayDate()));
        }

        queryWrapper.orderByDesc(Goodsorder::getCreateDate);
        queryWrapper.selectAll(Goodsorder.class)
                    .selectAs(Member::getName,Goodsorder::getMemberName)
                    .leftJoin(Member.class,Member::getId,Goodsorder::getMemberId)
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()),Member::getName,pageWrap.getModel().getMemberName());
        MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
        return PageData.from(goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class,queryWrapper));
    }