接口整理

jiangping

2023-10-11 146442fe47b195f899e567eafc1d32f05c3bc13c

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

@@ -26,11 +26,13 @@
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.request.MemberRidesQuery;
import com.doumee.dao.business.web.request.RefundDTO;
import com.doumee.dao.business.web.response.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.MemberRidesService;
import com.doumee.service.business.PricingRuleService;
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
@@ -161,43 +163,51 @@
        return goodsorderMapper.selectList(wrapper);
    }
    @Override
    public   List<GoodsorderExportVO> findExportNotBikPage(Goodsorder model){
        List<GoodsorderExportVO> list = new ArrayList<>();
    public PageData<GoodsorderExportVO> findAccountDetailPage(PageWrap<Goodsorder> pageWrap) {
        IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        pageWrap.getModel().setPayStatus(Constants.ONE); //只查询支付成功的
        MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
        return PageData.from(goodsorderJoinMapper.selectJoinPage(page, GoodsorderExportVO.class,queryWrapper));
    }
    @Override
    public   List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model){
//        List<GoodsorderExportVO> list = new ArrayList<>();
        model.setPayStatus(Constants.ONE); //只查询支付成功的
        MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
        List<Goodsorder> goodsorderList = goodsorderJoinMapper.selectJoinList(Goodsorder.class,queryWrapper);
        if(goodsorderList!=null){
        List<GoodsorderExportVO> goodsorderList = goodsorderJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
       /* if(goodsorderList!=null){
            for(Goodsorder order : goodsorderList){
                GoodsorderExportVO vo = new GoodsorderExportVO();
                vo.setId(order.getId());
                vo.setCode(order.getCode());
                vo.setOpenid(order.getMemberOpenid());
                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.setMoney(Constants.translateMoney(order.getMoney()));
                vo.setCloseMoney(Constants.translateMoney(order.getCloseMoney()));
                vo.setRefundDate(order.getRefundDate());
                vo.setRefundMoney(Constants.formatDecimalNum(order.getRefundMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
                vo.setRefundMoney(Constants.translateMoney(order.getRefundMoney()));
                list.add(vo);
            }
        }
        return list;
        }*/
        return goodsorderList;
    }
    private MPJLambdaWrapper<Goodsorder> initQueryParamByModel(Goodsorder model) {
        MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(model);

        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.select("(select max(r.done_date) from refund r where r.obj_id=t.id  and r.status=2 ) as refund_date");
        queryWrapper.select("(select sum(r.money) from refund r where r.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.like(model.getCode() !=null,Goodsorder::getCode,model.getCode());
        queryWrapper.like(model.getId() !=null,Goodsorder::getId,model.getId());
        queryWrapper.eq(model.getStatus() !=null,Goodsorder::getStatus,model.getStatus());
        queryWrapper.eq(model.getOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getOnlineOrderid());
        queryWrapper.like(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);
@@ -211,6 +221,7 @@
        MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
        return PageData.from(goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class,queryWrapper));
    }


    @Override
    public long count(Goodsorder goodsorder) {
@@ -276,35 +287,42 @@

        List<PayOrderDTO> payOrderDTOList = new ArrayList<>();
        Goodsorder goodsorder = goodsorderMapper.selectById(id);
        if(goodsorder == null){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY );
        }
        QueryWrapper<Refund> refundQuery = new QueryWrapper<>();
        refundQuery.lambda()
                    .eq(Refund::getObjId,id);
                .eq(Refund::getObjId,id)
                .orderByAsc(Refund::getDoneDate);
        //查询所有有退款记录
        List<Refund> refunds = refundMapper.selectList(refundQuery);

        PayOrderDTO payOrderDTO = new PayOrderDTO();
        payOrderDTO.setId(goodsorder.getId());
        payOrderDTO.setOrderCode(goodsorder.getCode());
        payOrderDTO.setPayWay(goodsorder.getPayWay());
        payOrderDTO.setMoney(goodsorder.getMoney());
        payOrderDTO.setMoney(Constants.translateMoney(goodsorder.getMoney()));
        payOrderDTO.setPayDate(goodsorder.getPayDate());
        payOrderDTO.setOnlineorderId(goodsorder.getOnlineOrderid());
        payOrderDTOList.add(0,payOrderDTO);
        if (!CollectionUtils.isEmpty(refunds)){
            refunds.forEach(s->{
                PayOrderDTO refundOrderDTO = new PayOrderDTO();
                refundOrderDTO.setOrderCode(s.getCode());
                refundOrderDTO.setId(s.getId());
                refundOrderDTO.setPayWay(s.getPayWay());
                refundOrderDTO.setRefundType(s.getType());
                refundOrderDTO.setMoney(s.getMoney());
                refundOrderDTO.setMoney(Constants.translateMoney(s.getMoney()));
                refundOrderDTO.setPayDate(s.getDoneDate());
                payOrderDTOList.add(refundOrderDTO);
            });
        }
        MPJLambdaWrapper<MemberRides> wrapper = new MPJLambdaWrapper<>();
        wrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
                .eq(BaseParam::getType, Constants.THREE);
        List<MemberRides> memberRides = memberRidesJoinMapper.selectJoinList(MemberRides.class, wrapper);
        MemberRidesQuery query = new MemberRidesQuery();
        query.setGoodsorderId(goodsorder.getId());
        List<BikeLogDTO> memberRides = MemberRidesServiceImpl.findBikeLogList(memberRidesJoinMapper,query);
        GoodsorderDetailDTO goodsorderDetailDTO = new GoodsorderDetailDTO();
        goodsorderDetailDTO.setPayOrderDTOList(payOrderDTOList);
        goodsorderDetailDTO.setMemberRidesList(memberRides);
        goodsorderDetailDTO.setPayOrderDTOList(payOrderDTOList);//交易明细
        goodsorderDetailDTO.setMemberRidesList(memberRides);//骑行记录
        goodsorderDetailDTO.setModel(goodsorder);//订单对象
        return goodsorderDetailDTO;
    }