jiaosong
2023-10-25 ebccdd6417f65ace22f1e0d7a5572589aa80698a
# 用户禁用
已修改5个文件
30 ■■■■■ 文件已修改
server/platform/src/main/java/com/doumee/task/ScheduleTool.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -53,7 +53,7 @@
     * 測試
     * @throws Exception
     */
    @Scheduled(cron = "0 0 21 * * ? ")
    @Scheduled(cron = "0 0/1 * * * ?  ")
    public void getYesterdayBill() throws Exception {
        log.info("=====================开始每天自动结算=======================");
        goodsorderService.autoCloseOrder();
server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java
@@ -31,11 +31,11 @@
    @ExcelColumn(name="状态 ", valueMapping = "0=请求开锁中;1=骑行中;2=已还车;3=开锁失败;" ,index = 4,width = 10,align = HorizontalAlignment.CENTER)
    private Integer status;
    @ApiModelProperty(value = "借出时间起始")
    private Date rentDateStart;
    @ApiModelProperty(value = "借出时间结束")
    private Date rentDateEnd;
//    @ApiModelProperty(value = "借出时间起始")
//    private Date rentDateStart;
//
//    @ApiModelProperty(value = "借出时间结束")
//    private Date rentDateEnd;
    @ApiModelProperty(value = "是否归还 [车辆取还记录(站点) 入参]")
    private Boolean hasBack;
@@ -44,4 +44,10 @@
    @ApiModelProperty(value = "还车类型 0正常还车 1强制还车")
    private Integer backType;
    @ApiModelProperty(value = "借出时间起始")
    private Date startDate;
    @ApiModelProperty(value = "借出时间结束")
    private Date endDate;
}
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -395,7 +395,7 @@
    @Override
    public void closeGoodsorder( Goodsorder goodsorder ,int type ) {
        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
//
        List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());
        //默认结算为押金金额
        BigDecimal closeMoney = new BigDecimal(0.00);
@@ -426,6 +426,8 @@
        if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
            //如果是强制结算
            update.setCloseType(Constants.ONE);
            LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
            update.setEditor(principal.getId());
        }else  if(Constants.REFUND_TYPE.NORMAL.getKey() == type){
            //如果是自行結算
            update.setCloseType(Constants.ZERO);
@@ -443,7 +445,7 @@
            refundDTO.setTotalAmount(goodsorder.getMoney());
            refundDTO.setMemberId(goodsorder.getMemberId());
            refundDTO.setReason(Constants.REFUND_TYPE.get(type).getName());
            refundDTO.setCreator(principal.getId());
            refundDTO.setCreator(update.getEditor());
            refundDTO.setType(type);
            Refund refund = wxMiniUtilService.wxRefund(refundDTO);
            update.setCloseId(refund.getId());
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -217,8 +217,8 @@
                .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
                .like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid())
                .like(StringUtils.isNotBlank(model.getBikeCode()),MemberRides::getBikeCode,model.getBikeCode());
        queryWrapper.ge(model.getRentDateStart()!=null, MemberRides::getRentDate,model.getRentDateStart());
        queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
        queryWrapper.ge(model.getStartDate()!=null, MemberRides::getRentDate,model.getStartDate());
        queryWrapper.le(model.getEndDate()!=null, MemberRides::getRentDate,model.getEndDate());
        queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
        queryWrapper.eq(model.getStatus()!=null,MemberRides::getStatus, model.getStatus());
        queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -120,7 +120,7 @@
            loginLog.setReason(e.getMessage().length() > 200 ? (e.getMessage().substring(0, 190) + "...") : e.getMessage());
            loginLog.setSuccess(Constants.ONE);
            systemLoginLogService.create(loginLog);
            throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(),e.getMessage());
            throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(),e.getCause().getMessage());
        }
    }