#调整记录修改单位

jiaosong

2023-10-23 3b48dbfe08bf2bcaeba2f8f9ff63f1599407fcdd

#调整记录修改单位

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

@@ -120,7 +120,7 @@
                    .leftJoin(BaseParam.class,BaseParam::getId,BikeRepair::getTypeId);
        queryWrapper.selectAll(BikeRepair.class)
                    .selectAs(Member::getOpenid,BikeRepairDTO::getOpenid)
                    .selectAs(Bikes::getCode,BikeRepairDTO::getBikeCode)
                    .selectAs(BikeRepair::getBinkeId,BikeRepairDTO::getBikeCode)
                    .selectAs(BaseParam::getName,BikeRepairDTO::getBikeTypeName);
        queryWrapper.like(StringUtils.isNotEmpty(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
                    .like(StringUtils.isNotEmpty(pageWrap.getModel().getBikeCode()),Bikes::getCode,pageWrap.getModel().getBikeCode())

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

@@ -6,9 +6,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.RefundMapper;
import com.doumee.dao.business.join.RefundJoinMapper;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Refund;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.RefundPlatExportVO;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.system.model.SystemUser;
@@ -27,6 +25,7 @@
import java.sql.Ref;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

/**
 * 退款信息表Service实现
@@ -107,7 +106,10 @@
        pageWrap.getModel().setStatus(Constants.TWO);
        IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Refund> queryWrapper = initQueryParamByModel(pageWrap.getModel());
        queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCreatorName()),SystemUser::getRealname,pageWrap.getModel().getCreatorName());
        queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCreatorName())
                ,SystemUser::getRealname
                ,pageWrap.getModel().getCreatorName());

        return PageData.from(refundJoinMapper.selectJoinPage(page, Refund.class,queryWrapper));
    }
    @Override
@@ -151,10 +153,18 @@
        queryWrapper.leftJoin(Member.class, Member::getId  ,Goodsorder::getMemberId);
        queryWrapper.leftJoin(SystemUser.class, SystemUser::getId  ,Refund::getCreator);
        //时间段筛选
        queryWrapper.ge(model.getStartDate()!=null, Refund::getDoneDate, model.getStartDate());
        queryWrapper.le(model.getEndDate()!=null, Refund::getDoneDate, model.getEndDate());
        if (Objects.nonNull(model.getStartDate())) {
            queryWrapper.ge(Refund::getDoneDate, Utils.Date.getStart(model.getStartDate()));
        }
        if (Objects.nonNull(model.getEndDate())) {
            queryWrapper.le(Refund::getDoneDate, Utils.Date.getEnd(model.getEndDate()));
        }
//        queryWrapper.ge(model.getStartDate()!=null, Refund::getDoneDate, model.getStartDate());
//        queryWrapper.le(model.getEndDate()!=null, Refund::getDoneDate, model.getEndDate());
        queryWrapper.eq(model.getCreator() !=null,Refund::getCreator,model.getCreator());
        queryWrapper.eq(model.getStatus() !=null,Refund::getStatus,model.getStatus());
        queryWrapper.in(model.getTypeList() !=null,Refund::getType,model.getTypeList());
        queryWrapper.eq(model.getType() !=null,Refund::getType,model.getType());
        queryWrapper.like(model.getPayOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getPayOnlineOrderid());
        queryWrapper.like(model.getOnlineOrderid() !=null,Refund::getOnlineOrderid,model.getOnlineOrderid());
        queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());