jiaosong
2023-10-13 947f4fc58f3a7f4c4cb12062afcf851b439a53f1
#获取可退款信息
已添加1个文件
已修改6个文件
97 ■■■■ 文件已修改
server/platform/src/main/java/com/doumee/api/business/BikesController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/platform/src/main/java/com/doumee/api/business/LocksController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/join/LocksJoinMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/model/Locks.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/platform/src/main/java/com/doumee/api/business/BikesController.java
@@ -73,7 +73,7 @@
    public ApiResponse<PageData<Bikes>> findPage (@RequestBody PageWrap<Bikes> pageWrap) {
        return ApiResponse.success(bikesService.findPage(pageWrap));
    }
    @ApiOperation("实时车位信息-分页查询")
    @ApiOperation("实时车位信息-分页查询-弃用")
    @PostMapping("/pageCurrent")
    @RequiresPermissions("business:bikes:query")
    public ApiResponse<PageData<Bikes>> pageCurrent (@RequestBody PageWrap<Bikes> pageWrap) {
server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
@@ -127,8 +127,8 @@
    @ApiOperation("强制结算订单")
    @PostMapping("/closerGoodsorder")
    @RequiresPermissions("business:goodsorder:query")
    public ApiResponse closerGoodsorder(@RequestParam String id){
        goodsorderService.forceCloseGoodsorder(id);
    public ApiResponse closerGoodsorder(@RequestBody Goodsorder goodsorder){
        goodsorderService.forceCloseGoodsorder(goodsorder.getId());
        return ApiResponse.success(null);
    }
@@ -142,7 +142,7 @@
    }
    @ApiOperation("获取可退款信息")
    @PostMapping("/getGoodsorderCanBanlanceDTO")
    @GetMapping("/getGoodsorderCanBanlanceDTO")
    @RequiresPermissions("business:goodsorder:query")
    public ApiResponse<GoodsorderCanBanlanceDTO> getGoodsorderCanBanlanceDTO(@RequestParam String orderId){
        return ApiResponse.success(goodsorderService.getGoodsorderCanBanlanceDTO(orderId));
server/platform/src/main/java/com/doumee/api/business/LocksController.java
@@ -70,7 +70,7 @@
        return ApiResponse.success(null);
    }
    @ApiOperation("分页查询")
    @ApiOperation("实时车位信息-分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:locks:query")
    public ApiResponse<PageData<Locks>> findPage(@RequestBody PageWrap<Locks> pageWrap) {
server/services/src/main/java/com/doumee/dao/business/join/LocksJoinMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.dao.business.join;
import com.doumee.dao.business.model.Locks;
import com.github.yulichang.base.mapper.MPJJoinMapper;
import org.springframework.stereotype.Repository;
/**
 * @author T14
 */
@Repository
public interface LocksJoinMapper extends MPJJoinMapper<Locks> {
}
server/services/src/main/java/com/doumee/dao/business/model/Locks.java
@@ -67,9 +67,20 @@
    @ExcelColumn(name="站点编码(关联sites)")
    private String siteId;
    @ApiModelProperty(value = "站点编码(关联sites)")
    @ExcelColumn(name="站点编码(关联sites)")
    @TableField(select = false)
    private String siteName;
    @ApiModelProperty(value = "当前锁定自行车编号")
    @ExcelColumn(name="当前锁定自行车编号")
    private String bikeCode;
    @ApiModelProperty(value = "当前锁定自行车编号")
    @ExcelColumn(name="当前锁定自行车类型")
    @TableField(select = false)
    private String bikeType;
    @ApiModelProperty(value = "当前锁定自行车编号")
    @TableField(select = false)
    private Sites sites;
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
@@ -4,13 +4,18 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.LocksMapper;
import com.doumee.dao.business.join.LocksJoinMapper;
import com.doumee.dao.business.model.BaseParam;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Locks;
import com.doumee.dao.business.model.Sites;
import com.doumee.service.business.LocksService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.SitesService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -27,6 +32,9 @@
    @Autowired
    private LocksMapper locksMapper;
    @Autowired
    private LocksJoinMapper locksJoinMapper;
    @Override
    public String create(Locks locks) {
@@ -88,54 +96,26 @@
    @Override
    public PageData<Locks> findPage(PageWrap<Locks> pageWrap) {
        IPage<Locks> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<Locks> queryWrapper = new QueryWrapper<>();
        MPJLambdaWrapper<Locks> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(Locks::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
            queryWrapper.lambda().ge(Locks::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.lambda().le(Locks::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.lambda().eq(Locks::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getEditDate() != null) {
            queryWrapper.lambda().ge(Locks::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.lambda().le(Locks::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
            queryWrapper.lambda().eq(Locks::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.lambda().eq(Locks::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getInfo() != null) {
            queryWrapper.lambda().eq(Locks::getInfo, pageWrap.getModel().getInfo());
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(Locks::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getCode() != null) {
            queryWrapper.lambda().eq(Locks::getCode, pageWrap.getModel().getCode());
        }
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(Locks::getStatus, pageWrap.getModel().getStatus());
            queryWrapper.like(Locks::getCode, pageWrap.getModel().getCode());
        }
        if (pageWrap.getModel().getSiteId() != null) {
            queryWrapper.lambda().eq(Locks::getSiteId, pageWrap.getModel().getSiteId());
            queryWrapper.like(Locks::getSiteId, pageWrap.getModel().getSiteId());
        }
        if (pageWrap.getModel().getBikeCode() != null) {
            queryWrapper.lambda().eq(Locks::getBikeCode, pageWrap.getModel().getBikeCode());
        if (pageWrap.getModel().getSiteName() != null) {
            queryWrapper.like(Sites::getName, pageWrap.getModel().getSiteName());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(locksMapper.selectPage(page, queryWrapper));
        queryWrapper.leftJoin(Bikes.class,Bikes::getCode,Locks::getBikeCode)
                    .leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId)
                    .leftJoin(Sites.class,Sites::getCode,Locks::getSiteId);
        queryWrapper.orderByDesc(Locks::getBikeCode);
        queryWrapper.selectAll(Locks.class)
                    .selectAs(Sites::getName,Locks::getSiteName)
                    .selectAs(BaseParam::getName,Locks::getBikeType);
        return PageData.from(locksJoinMapper.selectJoinPage(page, Locks.class,queryWrapper));
    }
    @Override