server/platform/src/main/java/com/doumee/api/business/PricingParamController.java
@@ -67,6 +67,14 @@ return ApiResponse.success(null); } @ApiOperation("根据ID修改状态") @PostMapping("/updateStatusById") @RequiresPermissions("business:pricingparam:update") public ApiResponse updateStatus(@RequestBody PricingParam pricingParam){ pricingParamService.updateStatus(pricingParam); return ApiResponse.success(null); } @ApiOperation("分页查询") @PostMapping("/page") @RequiresPermissions("business:pricingparam:query") server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java
@@ -35,6 +35,11 @@ @ExcelColumn(name="创建人",index = 7,width = 10,align = HorizontalAlignment.CENTER) private String creator; @ApiModelProperty(value = "创建人名称") @ExcelColumn(name="创建人名称",index = 7,width = 10,align = HorizontalAlignment.CENTER) private String creatorName; @ApiModelProperty(value = "编辑时间") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @@ -58,6 +63,7 @@ @ExcelColumn(name="类型 " ,valueMapping = "0=强制还车;1=骑行时长修改;",index = 5,width = 10,align = HorizontalAlignment.CENTER) private Integer type; @ApiModelProperty(value = "类型集合", example = "1") @TableField(exist = false) private List<Integer> typeList; @ApiModelProperty(value = "关联对象编码") server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -128,4 +128,8 @@ @TableField(exist = false) @ExcelColumn(name="退款结算时间",width = 10,align = HorizontalAlignment.CENTER) private Date refundDate; @ApiModelProperty(value = "最近骑行状态") @TableField(exist = false) private Integer memberRidesStatus; } server/services/src/main/java/com/doumee/dao/business/model/Member.java
@@ -46,7 +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/dao/business/model/MemberRides.java
@@ -37,7 +37,6 @@ private String editor; @ApiModelProperty(value = "是否已删除 0未删除 1已删除") @TableLogic private Integer isdeleted; @ApiModelProperty(value = "备注") server/services/src/main/java/com/doumee/service/business/PricingParamService.java
@@ -48,6 +48,8 @@ */ void update(PricingParam pricingParam); void updateStatus(PricingParam pricingParam); void updateById(PricingParam pricingParam); /** server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
@@ -136,10 +136,10 @@ queryWrapper.le(pageWrap.getModel().getEndDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getEndDate()); queryWrapper.eq(pageWrap.getModel().getCreator()!=null, ActionLog::getCreator,pageWrap.getModel().getCreator()); queryWrapper.in(pageWrap.getModel().getTypeList()!=null && pageWrap.getModel().getTypeList().size()>0, ActionLog::getType,pageWrap.getModel().getTypeList()); queryWrapper.selectAs(ActionLog::getCreateDate,ActionLog::getCreateDate) .selectAs(ActionLog::getActInfo,ActionLog::getActInfo) .selectAs(ActionLog::getActReason,ActionLog::getActReason) .selectAs(SystemUser::getNickname,ActionLog::getCreator) queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),ActionLog::getBeforeContent,"%"+pageWrap.getModel().getBikeCode()+"%"); queryWrapper .selectAll(ActionLog.class) .selectAs(SystemUser::getRealname,ActionLog::getCreatorName) .selectAs(Member::getOpenid,ActionLog::getOpenid) .selectAs(MemberRides::getBikeCode,ActionLog::getBikeCode) .selectAs(MemberRides::getRentSiteId,ActionLog::getRentSiteId) server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
@@ -34,6 +34,8 @@ @Override public String create(Ad ad) { ad.setIsdeleted(Constants.ZERO); ad.setStatus(Constants.ZERO); adMapper.insert(ad); return ad.getId(); } server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -227,6 +227,7 @@ public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) { IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel()); queryWrapper.select("(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date limit 1) as memberRidesStatus"); IPage<Goodsorder> goodsorderIPage = goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class, queryWrapper); if (!CollectionUtils.isEmpty(goodsorderIPage.getRecords())){ goodsorderIPage.getRecords().forEach(s->{ server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
@@ -93,7 +93,7 @@ public static String getRoleNameByParam(BigDecimal basePrice, Integer baseTime, BigDecimal unitPrice, Integer unitTime) { String title = "计费规则："; if(baseTime < 0){ title = Constants.translateMoney(basePrice).doubleValue()+"元畅骑一整天"; title = basePrice.doubleValue()+"元畅骑一整天"; }else { title = "起步"; int time = baseTime / 60; @@ -105,7 +105,7 @@ title += min+"分钟"; } title += Constants.translateMoney(unitPrice).doubleValue() +"元，超过后"+Constants.translateMoney(basePrice).doubleValue()+"元/" +"元，超过后"+basePrice.doubleValue()+"元/" +unitTime+"分钟"; } return title; server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
@@ -1,11 +1,15 @@ package com.doumee.service.business.impl; import com.doumee.core.constants.Constants; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Utils; import com.doumee.dao.business.PricingDetailMapper; import com.doumee.dao.business.PricingParamMapper; import com.doumee.dao.business.model.PricingDetail; import com.doumee.dao.business.model.PricingParam; import com.doumee.service.business.PricingParamService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,6 +23,7 @@ import java.util.Date; import java.util.List; import java.util.Objects; /** * 定价方案配置Service实现 @@ -30,6 +35,9 @@ @Autowired private PricingParamMapper pricingParamMapper; @Autowired private PricingDetailMapper pricingDetailMapper; @Override public String create(PricingParam pricingParam) { @@ -45,7 +53,7 @@ insert.setStartDate(pricingParam.getStartDate()); insert.setEndDate(pricingParam.getEndDate()); insert.setSortnum(pricingParam.getSortnum()); insert.setStatus(Constants.ZERO); insert.setStatus(Constants.ONE); insert.setInfo(pricingParam.getInfo()); pricingParamMapper.insert(insert); return insert.getId(); @@ -79,13 +87,46 @@ .eq(PricingParam::getId,pricingParam.getId()) .set(PricingParam::getEditor,principal.getId()) .set(PricingParam::getName,pricingParam.getName()) .set(PricingParam::getStatus,pricingParam.getStatus()) // .set(PricingParam::getStatus,pricingParam.getStatus()) .set(PricingParam::getStartDate,pricingParam.getStartDate()) .set(PricingParam::getEndDate,pricingParam.getEndDate()) .set(PricingParam::getSortnum,pricingParam.getSortnum()); pricingParamMapper.update(null,wrapper); } @Override public void updateStatus(PricingParam pricingParam) { if (Objects.nonNull(pricingParam.getStatus()) && pricingParam.getStatus().equals(Constants.ZERO)){ QueryWrapper<PricingDetail> wrapper = new QueryWrapper<>(); wrapper.lambda() .eq(PricingDetail::getIsdeleted,Constants.ZERO) .eq(PricingDetail::getPricePramId,pricingParam.getId()); Integer integer = pricingDetailMapper.selectCount(wrapper); if (integer < 0 ){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"该定价方案下没有配置价格"); } PricingParam pricingParam1 = new PricingParam(); pricingParam1.setId(pricingParam.getId()); pricingParam1.setStatus(pricingParam.getStatus()); pricingParamMapper.updateById(pricingParam1); }else if (Objects.nonNull(pricingParam.getStatus()) && pricingParam.getStatus().equals(Constants.ONE)){ QueryWrapper<PricingParam> wrapper = new QueryWrapper<>(); wrapper.lambda() .eq(PricingParam::getIsdeleted,Constants.ZERO) .eq(PricingParam::getStatus,Constants.ZERO); Integer integer = pricingParamMapper.selectCount(wrapper); if (integer <= 1 ){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"该定价方案必须配置"); } PricingParam pricingParam1 = new PricingParam(); pricingParam1.setId(pricingParam.getId()); pricingParam1.setStatus(pricingParam.getStatus()); pricingParamMapper.updateById(pricingParam1); } } @Override public void updateById(PricingParam pricingParam) { @@ -164,8 +205,8 @@ if (pageWrap.getModel().getInfo() != null) { queryWrapper.lambda().eq(PricingParam::getInfo, pageWrap.getModel().getInfo()); } queryWrapper.lambda().orderByAsc(PricingParam::getSortnum); queryWrapper.lambda().orderByAsc(PricingParam::getStatus); queryWrapper.lambda().orderByAsc(PricingParam::getSortnum); return PageData.from(pricingParamMapper.selectPage(page, queryWrapper)); }
@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -106,6 +107,7 @@ 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()); return PageData.from(refundJoinMapper.selectJoinPage(page, Refund.class,queryWrapper)); } @Override
