jiangping
2023-10-11 a1188a66f0549522068adde2fee430015077410c
接口整理
已修改38个文件
190 ■■■■■ 文件已修改
server/services/src/main/java/com/doumee/dao/business/model/Holidays.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/model/RentSite.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/HolidaysService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/AliBillDetailServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/AliBillServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/RentSiteServiceImpl.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemDepartmentServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemDepartmentUserServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemLoginLogServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemPositionUserServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/model/Holidays.java
@@ -19,14 +19,12 @@
@ApiModel("节假日配置表")
@TableName("\"holidays\"")
public class Holidays {
    @ApiModelProperty(value = "编码")
    @ExcelColumn(name="编码")
    private String id;
    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    //@JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;
    @ApiModelProperty(value = "创建人")
@@ -35,7 +33,6 @@
    @ApiModelProperty(value = "编辑时间")
    @ExcelColumn(name="编辑时间")
    //@JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;
    @ApiModelProperty(value = "编辑人")
@@ -50,9 +47,7 @@
    @ExcelColumn(name="备注")
    private String info;
    @ApiModelProperty(value = "日期")
    @ApiModelProperty(value = "日期,格式yyyy-MM-DD")
    @ExcelColumn(name="日期")
    //@JsonFormat(pattern = "yyyy-MM-dd")
    private Date holiday;
    private String holiday;
}
server/services/src/main/java/com/doumee/dao/business/model/RentSite.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -45,6 +46,7 @@
    @ApiModelProperty(value = "是否已删除 0未删除 1已删除", example = "1")
    @ExcelColumn(name="是否已删除 0未删除 1已删除")
    @TableLogic
    private Integer isdeleted;
    @ApiModelProperty(value = "名称")
server/services/src/main/java/com/doumee/service/business/HolidaysService.java
@@ -19,7 +19,7 @@
     * @return String
     */
    String create(Holidays holidays);
    Holidays isHolidayCreated(String date);
    /**
     * 主键删除
     *
server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
@@ -88,7 +88,7 @@
    @Override
    public ActionLog findOne(ActionLog actionLog) {
        QueryWrapper<ActionLog> wrapper = new QueryWrapper<>(actionLog);
        return actionLogMapper.selectOne(wrapper);
        return actionLogMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
@@ -75,7 +75,7 @@
    @Override
    public Ad findOne(Ad ad) {
        QueryWrapper<Ad> wrapper = new QueryWrapper<>(ad);
        return adMapper.selectOne(wrapper);
        return adMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/AliBillDetailServiceImpl.java
@@ -75,7 +75,7 @@
    @Override
    public AliBillDetail findOne(AliBillDetail aliBillDetail) {
        QueryWrapper<AliBillDetail> wrapper = new QueryWrapper<>(aliBillDetail);
        return aliBillDetailMapper.selectOne(wrapper);
        return aliBillDetailMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/AliBillServiceImpl.java
@@ -75,7 +75,7 @@
    @Override
    public AliBill findOne(AliBill aliBill) {
        QueryWrapper<AliBill> wrapper = new QueryWrapper<>(aliBill);
        return aliBillMapper.selectOne(wrapper);
        return aliBillMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
@@ -41,6 +41,7 @@
        QueryWrapper<BaseParam> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(BaseParam::getType,baseParam.getType())
                .eq(BaseParam::getIsdeleted,Constants.ZERO)
                .eq(BaseParam::getType,baseParam.getName());
        Integer count = baseParamMapper.selectCount(wrapper);
@@ -89,9 +90,10 @@
        QueryWrapper<BaseParam> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(BaseParam::getType,baseParam.getType())
                .eq(BaseParam::getIsdeleted,Constants.ZERO)
                .eq(BaseParam::getType,baseParam.getName());
        BaseParam baseParam1 = baseParamMapper.selectOne(wrapper);
        BaseParam baseParam1 = baseParamMapper.selectOne(wrapper.last(" limit 1"));
        if (Objects.nonNull(baseParam1) && !baseParam1.getId().equals(baseParam.getId())){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"车辆问题已存在");
        }
@@ -124,7 +126,7 @@
    @Override
    public BaseParam findOne(BaseParam baseParam) {
        QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(baseParam);
        return baseParamMapper.selectOne(wrapper);
        return baseParamMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
@@ -139,6 +141,7 @@
        IPage<BaseParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<BaseParam> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(BaseParam::getId, pageWrap.getModel().getId());
        }
@@ -160,7 +163,7 @@
            queryWrapper.lambda().eq(BaseParam::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(BaseParam::getName, pageWrap.getModel().getName());
            queryWrapper.lambda().like(BaseParam::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getSortnum() != null) {
            queryWrapper.lambda().eq(BaseParam::getSortnum, pageWrap.getModel().getSortnum());
@@ -172,18 +175,12 @@
            queryWrapper.lambda().eq(BaseParam::getStatus, pageWrap.getModel().getStatus());
        }
        if (pageWrap.getModel().getInfo() != null) {
            queryWrapper.lambda().eq(BaseParam::getInfo, pageWrap.getModel().getInfo());
            queryWrapper.lambda().like(BaseParam::getInfo, pageWrap.getModel().getInfo());
        }
        if (pageWrap.getModel().getRequired() != null) {
            queryWrapper.lambda().eq(BaseParam::getRequired, pageWrap.getModel().getRequired());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        queryWrapper.lambda().orderByAsc(BaseParam::getSortnum);
        return PageData.from(baseParamMapper.selectPage(page, queryWrapper));
    }
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -101,7 +101,7 @@
    @Override
    public BikeRepair findOne(BikeRepair bikeRepair) {
        QueryWrapper<BikeRepair> wrapper = new QueryWrapper<>(bikeRepair);
        return bikeRepairMapper.selectOne(wrapper);
        return bikeRepairMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -83,7 +83,7 @@
    @Override
    public Bikes findOne(Bikes bikes) {
        QueryWrapper<Bikes> wrapper = new QueryWrapper<>(bikes);
        return bikesMapper.selectOne(wrapper);
        return bikesMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -149,12 +149,12 @@
    @Override
    public Goodsorder findOne(Goodsorder goodsorder) {
        QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
        return goodsorderMapper.selectOne(wrapper);
        return goodsorderMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
    public Goodsorder findOneByWrapper(QueryWrapper<Goodsorder> wrapper) {
        return goodsorderMapper.selectOne(wrapper);
        return goodsorderMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
@@ -171,11 +171,11 @@
    }
    @Override
    public   List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model){
//        List<GoodsorderExportVO> list = new ArrayList<>();
        model.setPayStatus(Constants.ONE); //只查询支付成功的
        MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
        List<GoodsorderExportVO> goodsorderList = goodsorderJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
       /* if(goodsorderList!=null){
       /*   List<GoodsorderExportVO> list = new ArrayList<>();
        if(goodsorderList!=null){
            for(Goodsorder order : goodsorderList){
                GoodsorderExportVO vo = new GoodsorderExportVO();
                vo.setId(order.getId());
server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java
@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -10,11 +12,15 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.List;
import java.util.UUID;
/**
 * 节假日配置表Service实现
@@ -28,9 +34,27 @@
    private HolidaysMapper holidaysMapper;
    @Override
    public String create(Holidays holidays) {
        holidaysMapper.insert(holidays);
        return holidays.getId();
    public String create(Holidays model) {
        Holidays param = isHolidayCreated(model.getHoliday());
        if(param!=null){
            return  param.getId();
        }
        LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        model.setIsdeleted(Constants.ZERO);
        model.setId(UUID.randomUUID().toString());
        model.setCreateDate(new Date());
        model.setCreator(user.getId());
        holidaysMapper.insert(model);
        return model.getId();
    }
    @Override
    public Holidays isHolidayCreated(String date) {
        Holidays d = new Holidays();
        d.setIsdeleted(Constants.ZERO);
        d.setHoliday(date);
        return findOne(d) ;
    }
    @Override
@@ -54,6 +78,10 @@
    @Override
    public void updateById(Holidays holidays) {
        LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        holidays.setEditDate(new Date());
        holidays.setEditor(user.getId());
        holidaysMapper.updateById(holidays);
    }
@@ -75,11 +103,12 @@
    @Override
    public Holidays findOne(Holidays holidays) {
        QueryWrapper<Holidays> wrapper = new QueryWrapper<>(holidays);
        return holidaysMapper.selectOne(wrapper);
        return holidaysMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
    public List<Holidays> findList(Holidays holidays) {
        holidays.setIsdeleted(Constants.ZERO);
        QueryWrapper<Holidays> wrapper = new QueryWrapper<>(holidays);
        return holidaysMapper.selectList(wrapper);
    }
@@ -89,6 +118,7 @@
        IPage<Holidays> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<Holidays> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(Holidays::getId, pageWrap.getModel().getId());
        }
@@ -113,8 +143,7 @@
            queryWrapper.lambda().eq(Holidays::getInfo, pageWrap.getModel().getInfo());
        }
        if (pageWrap.getModel().getHoliday() != null) {
            queryWrapper.lambda().ge(Holidays::getHoliday, Utils.Date.getStart(pageWrap.getModel().getHoliday()));
            queryWrapper.lambda().le(Holidays::getHoliday, Utils.Date.getEnd(pageWrap.getModel().getHoliday()));
            queryWrapper.lambda().like(Holidays::getHoliday, pageWrap.getModel().getHoliday());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
@@ -75,7 +75,7 @@
    @Override
    public Locks findOne(Locks locks) {
        QueryWrapper<Locks> wrapper = new QueryWrapper<>(locks);
        return locksMapper.selectOne(wrapper);
        return locksMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -111,7 +111,7 @@
    @Override
    public MemberRides findOne(MemberRides memberRides) {
        QueryWrapper<MemberRides> wrapper = new QueryWrapper<>(memberRides);
        return memberRidesMapper.selectOne(wrapper);
        return memberRidesMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -143,7 +143,7 @@
    @Override
    public Member findOne(Member member) {
        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
        return memberMapper.selectOne(wrapper);
        return memberMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java
@@ -75,7 +75,7 @@
    @Override
    public Multifile findOne(Multifile multifile) {
        QueryWrapper<Multifile> wrapper = new QueryWrapper<>(multifile);
        return multifileMapper.selectOne(wrapper);
        return multifileMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
@@ -132,7 +132,7 @@
    @Override
    public PricingDetail findOne(PricingDetail pricingDetail) {
        QueryWrapper<PricingDetail> wrapper = new QueryWrapper<>(pricingDetail);
        return pricingDetailMapper.selectOne(wrapper);
        return pricingDetailMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
@@ -38,8 +38,8 @@
        PricingParam insert = new PricingParam();
        insert.setCreateDate(new Date());
        insert.setCreator(principal.getId());
        insert.setEditDate(new Date());
        insert.setEditor(principal.getId());
//        insert.setEditDate(new Date());
//        insert.setEditor(principal.getId());
        insert.setIsdeleted(Constants.ZERO);
        insert.setName(pricingParam.getName());
        insert.setStartDate(pricingParam.getStartDate());
@@ -71,9 +71,12 @@
    @Override
    public void update(PricingParam pricingParam) {
        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        UpdateWrapper<PricingParam> wrapper = new UpdateWrapper<>();
        wrapper.lambda()
                .eq(PricingParam::getId,pricingParam.getId())
                .set(PricingParam::getEditor,principal.getId())
                .set(PricingParam::getName,pricingParam.getName())
                .set(PricingParam::getStartDate,pricingParam.getStartDate())
                .set(PricingParam::getEndDate,pricingParam.getEndDate())
@@ -105,7 +108,7 @@
    @Override
    public PricingParam findOne(PricingParam pricingParam) {
        QueryWrapper<PricingParam> wrapper = new QueryWrapper<>(pricingParam);
        return pricingParamMapper.selectOne(wrapper);
        return pricingParamMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
@@ -140,7 +143,7 @@
            queryWrapper.lambda().eq(PricingParam::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(PricingParam::getName, pageWrap.getModel().getName());
            queryWrapper.lambda().like(PricingParam::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getStartDate() != null) {
            queryWrapper.lambda().ge(PricingParam::getStartDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
@@ -159,13 +162,7 @@
        if (pageWrap.getModel().getInfo() != null) {
            queryWrapper.lambda().eq(PricingParam::getInfo, pageWrap.getModel().getInfo());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        queryWrapper.lambda().orderByAsc(PricingParam::getSortnum);
        return PageData.from(pricingParamMapper.selectPage(page, queryWrapper));
    }
server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
@@ -88,7 +88,7 @@
    @Override
    public Refund findOne(Refund refund) {
        QueryWrapper<Refund> wrapper = new QueryWrapper<>(refund);
        return refundMapper.selectOne(wrapper);
        return refundMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/RentSiteServiceImpl.java
@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -10,11 +12,14 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.List;
import java.util.UUID;
/**
 * 租车点信息表Service实现
@@ -29,6 +34,12 @@
    @Override
    public String create(RentSite rentSite) {
        LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        rentSite.setId(UUID.randomUUID().toString());
        rentSite.setCreateDate(new Date());
        rentSite.setCreator(user.getId());
        rentSite.setStatus(Constants.ZERO);
        rentSite.setIsdeleted(Constants.ZERO);
        rentSiteMapper.insert(rentSite);
        return rentSite.getId();
    }
@@ -54,6 +65,9 @@
    @Override
    public void updateById(RentSite rentSite) {
        LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        rentSite.setEditDate(new Date());
        rentSite.setEditor(user.getId());
        rentSiteMapper.updateById(rentSite);
    }
@@ -75,11 +89,12 @@
    @Override
    public RentSite findOne(RentSite rentSite) {
        QueryWrapper<RentSite> wrapper = new QueryWrapper<>(rentSite);
        return rentSiteMapper.selectOne(wrapper);
        return rentSiteMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
    public List<RentSite> findList(RentSite rentSite) {
        rentSite.setIsdeleted(Constants.ZERO);
        QueryWrapper<RentSite> wrapper = new QueryWrapper<>(rentSite);
        return rentSiteMapper.selectList(wrapper);
    }
@@ -89,6 +104,7 @@
        IPage<RentSite> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<RentSite> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(RentSite::getId, pageWrap.getModel().getId());
        }
@@ -110,10 +126,10 @@
            queryWrapper.lambda().eq(RentSite::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(RentSite::getName, pageWrap.getModel().getName());
            queryWrapper.lambda().like(RentSite::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getCode() != null) {
            queryWrapper.lambda().eq(RentSite::getCode, pageWrap.getModel().getCode());
            queryWrapper.lambda().like(RentSite::getCode, pageWrap.getModel().getCode());
        }
        if (pageWrap.getModel().getLongitude() != null) {
            queryWrapper.lambda().eq(RentSite::getLongitude, pageWrap.getModel().getLongitude());
@@ -130,13 +146,7 @@
        if (pageWrap.getModel().getInfo() != null) {
            queryWrapper.lambda().eq(RentSite::getInfo, pageWrap.getModel().getInfo());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        queryWrapper.lambda().orderByAsc(RentSite::getCode);
        return PageData.from(rentSiteMapper.selectPage(page, queryWrapper));
    }
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
@@ -128,7 +128,7 @@
    @Override
    public Sites findOne(Sites sites) {
        QueryWrapper<Sites> wrapper = new QueryWrapper<>(sites);
        return sitesMapper.selectOne(wrapper);
        return sitesMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java
@@ -75,7 +75,7 @@
    @Override
    public Transactions findOne(Transactions transactions) {
        QueryWrapper<Transactions> wrapper = new QueryWrapper<>(transactions);
        return transactionsMapper.selectOne(wrapper);
        return transactionsMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java
@@ -78,7 +78,7 @@
    @Override
    public WxBillDetail findOne(WxBillDetail wxBillDetail) {
        QueryWrapper<WxBillDetail> wrapper = new QueryWrapper<>(wxBillDetail);
        return wxBillDetailMapper.selectOne(wrapper);
        return wxBillDetailMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
@@ -95,7 +95,7 @@
    @Override
    public WxBill findOne(WxBill wxBill) {
        QueryWrapper<WxBill> wrapper = new QueryWrapper<>(wxBill);
        return wxBillMapper.selectOne(wrapper);
        return wxBillMapper.selectOne(wrapper.last(" limit 1"));
    }
    @Override
server/services/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
@@ -85,7 +85,7 @@
    @Override
    public SystemDataPermission findOne(SystemDataPermission systemDataPermission) {
        Wrapper<SystemDataPermission> wrapper = new QueryWrapper<>(systemDataPermission);
        Wrapper<SystemDataPermission> wrapper = new QueryWrapper<>(systemDataPermission).last(" limit 1");
        return systemDataPermissionMapper.selectOne(wrapper );
    }
server/services/src/main/java/com/doumee/service/system/impl/SystemDepartmentServiceImpl.java
@@ -83,7 +83,7 @@
    @Override
    public SystemDepartment findOne(SystemDepartment systemDepartment) {
        Wrapper<SystemDepartment> wrapper = new QueryWrapper<>(systemDepartment);
        Wrapper<SystemDepartment> wrapper = new QueryWrapper<>(systemDepartment).last(" limit 1");
        return systemDepartmentMapper.selectOne(wrapper );
    }
server/services/src/main/java/com/doumee/service/system/impl/SystemDepartmentUserServiceImpl.java
@@ -76,7 +76,7 @@
    @Override
    public SystemDepartmentUser findOne(SystemDepartmentUser systemDepartmentUser) {
        Wrapper<SystemDepartmentUser> wrapper = new QueryWrapper<>(systemDepartmentUser);
        Wrapper<SystemDepartmentUser> wrapper = new QueryWrapper<>(systemDepartmentUser).last(" limit 1");
        return systemDepartmentUserMapper.selectOne(wrapper );
    }
server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
@@ -89,7 +89,7 @@
    @Override
    public SystemDictData findOne(SystemDictData systemDictData) {
        Wrapper<SystemDictData> wrapper = new QueryWrapper<>(systemDictData);
        Wrapper<SystemDictData> wrapper = new QueryWrapper<>(systemDictData).last(" limit 1");
        return systemDictDataMapper.selectOne(wrapper );
    }
server/services/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java
@@ -86,7 +86,7 @@
    @Override
    public SystemDict findOne(SystemDict systemDict) {
        Wrapper<SystemDict> wrapper = new QueryWrapper<>(systemDict);
        Wrapper<SystemDict> wrapper = new QueryWrapper<>(systemDict).last(" limit 1");
        return systemDictMapper.selectOne(wrapper );
    }
server/services/src/main/java/com/doumee/service/system/impl/SystemLoginLogServiceImpl.java
@@ -72,7 +72,7 @@
    @Override
    public SystemLoginLog findOne(SystemLoginLog systemLoginLog) {
        Wrapper<SystemLoginLog> wrapper = new QueryWrapper<>(systemLoginLog);
        Wrapper<SystemLoginLog> wrapper = new QueryWrapper<>(systemLoginLog).last(" limit 1");
        return systemLoginLogMapper.selectOne(wrapper);
    }
server/services/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java
@@ -72,7 +72,7 @@
    @Override
    public SystemMenu findOne(SystemMenu systemMenu) {
        Wrapper<SystemMenu> wrapper = new QueryWrapper<>(systemMenu);
        Wrapper<SystemMenu> wrapper = new QueryWrapper<>(systemMenu).last(" limit 1");
        return systemMenuMapper.selectOne(wrapper);
    }
server/services/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java
@@ -83,7 +83,7 @@
    @Override
    public SystemPermission findOne(SystemPermission systemPermission) {
        Wrapper<SystemPermission> wrapper = new QueryWrapper<>(systemPermission);
        Wrapper<SystemPermission> wrapper = new QueryWrapper<>(systemPermission).last(" limit 1");
        return systemPermissionMapper.selectOne(wrapper);
    }
server/services/src/main/java/com/doumee/service/system/impl/SystemPositionUserServiceImpl.java
@@ -76,7 +76,7 @@
    @Override
    public SystemPositionUser findOne(SystemPositionUser systemPositionUser) {
        Wrapper<SystemPositionUser> wrapper = new QueryWrapper<>(systemPositionUser);
        Wrapper<SystemPositionUser> wrapper = new QueryWrapper<>(systemPositionUser).last(" limit 1");
        return systemPositionUserMapper.selectOne(wrapper);
    }
server/services/src/main/java/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.java
@@ -81,7 +81,7 @@
    @Override
    public SystemRoleMenu findOne(SystemRoleMenu systemRoleMenu) {
        Wrapper<SystemRoleMenu> wrapper = new QueryWrapper<>(systemRoleMenu);
        Wrapper<SystemRoleMenu> wrapper = new QueryWrapper<>(systemRoleMenu).last(" limit 1");
        return systemRoleMenuMapper.selectOne(wrapper);
    }
server/services/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java
@@ -81,7 +81,7 @@
    @Override
    public SystemRolePermission findOne(SystemRolePermission systemRolePermission) {
        Wrapper<SystemRolePermission> wrapper = new QueryWrapper<>(systemRolePermission);
        Wrapper<SystemRolePermission> wrapper = new QueryWrapper<>(systemRolePermission).last(" limit 1");
        return systemRolePermissionMapper.selectOne(wrapper);
    }
server/services/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java
@@ -86,7 +86,7 @@
    @Override
    public SystemRole findOne(SystemRole systemRole) {
        Wrapper<SystemRole> wrapper = new QueryWrapper<>(systemRole);
        Wrapper<SystemRole> wrapper = new QueryWrapper<>(systemRole).last(" limit 1");
        return systemRoleMapper.selectOne(wrapper);
    }
server/services/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java
@@ -65,7 +65,7 @@
    @Override
    public SystemTraceLog findOne(SystemTraceLog systemTraceLog) {
        Wrapper<SystemTraceLog> wrapper = new QueryWrapper<>(systemTraceLog);
        Wrapper<SystemTraceLog> wrapper = new QueryWrapper<>(systemTraceLog).last(" limit 1");
        return systemTraceLogMapper.selectOne(wrapper);
    }
server/services/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java
@@ -81,7 +81,7 @@
    @Override
    public SystemUserRole findOne(SystemUserRole systemUserRole) {
        Wrapper<SystemUserRole> wrapper = new QueryWrapper<>(systemUserRole);
        Wrapper<SystemUserRole> wrapper = new QueryWrapper<>(systemUserRole).last(" limit 1");
        return systemUserRoleMapper.selectOne(wrapper);
    }