server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
@@ -34,14 +34,14 @@ private String rentLockId; @ApiModelProperty(value = "骑行时长") @ExcelColumn(name="骑行时长",index = 8,width = 10,align = HorizontalAlignment.CENTER) @ExcelColumn(name="借出时长",index = 8,width = 10,align = HorizontalAlignment.CENTER) private Integer rideTime; @ApiModelProperty(value = "计费时长") // @ExcelColumn(name="计费时长",index = 8,width = 10,align = HorizontalAlignment.CENTER) private Integer duration; @ApiModelProperty(value = "借出时间") @ExcelColumn(name="借出时间",index = 9,width = 10,align = HorizontalAlignment.CENTER) @ExcelColumn(name="借出时间",index = 9,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss") private Date rentDate; @ApiModelProperty(value = "还车站点") @@ -53,6 +53,6 @@ private String backLockId; @ApiModelProperty(value = "还车时间") @ExcelColumn(name="还车时间",index = 14,width = 10,align = HorizontalAlignment.CENTER) @ExcelColumn(name="归还时间",index = 14,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss") private Date backDate; } server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -116,7 +116,6 @@ MPJLambdaWrapper<BikeRepair> queryWrapper = new MPJLambdaWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); queryWrapper.leftJoin(Member.class,Member::getId,BikeRepair::getMemberId) .leftJoin(Bikes.class,Bikes::getCode,BikeRepair::getBinkeId) .leftJoin(BaseParam.class,BaseParam::getId,BikeRepair::getTypeId); queryWrapper.selectAll(BikeRepair.class) .selectAs(Member::getOpenid,BikeRepairDTO::getOpenid) server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
@@ -104,8 +104,8 @@ if(min >0){ title += min+"分钟"; } title += Constants.translateMoney(unitPrice).doubleValue() +"元，超过后"+basePrice.doubleValue()+"元/" title += basePrice.doubleValue() +"元，超过后"+unitPrice.doubleValue()+"元/" +unitTime+"分钟"; } return title; server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
@@ -7,8 +7,10 @@ import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Utils; import com.doumee.dao.business.BaseParamMapper; import com.doumee.dao.business.PricingDetailMapper; import com.doumee.dao.business.PricingParamMapper; import com.doumee.dao.business.model.BaseParam; import com.doumee.dao.business.model.PricingDetail; import com.doumee.dao.business.model.PricingParam; import com.doumee.service.business.PricingParamService; @@ -24,6 +26,7 @@ import java.util.Date; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; /** * 定价方案配置Service实现 @@ -38,6 +41,9 @@ @Autowired private PricingDetailMapper pricingDetailMapper; @Autowired private BaseParamMapper baseParamMapper; @Override public String create(PricingParam pricingParam) { @@ -102,10 +108,21 @@ wrapper.lambda() .eq(PricingDetail::getIsdeleted,Constants.ZERO) .eq(PricingDetail::getPricePramId,pricingParam.getId()); Integer integer = pricingDetailMapper.selectCount(wrapper); if (integer == 0 ){ List<PricingDetail> pricingDetails = pricingDetailMapper.selectList(wrapper); QueryWrapper<BaseParam> baseParamQuery = new QueryWrapper<>(); baseParamQuery.lambda() .eq(BaseParam::getIsdeleted,Constants.ZERO) .eq(BaseParam::getType,Constants.THREE); List<BaseParam> baseParams = baseParamMapper.selectList(baseParamQuery); if (CollectionUtils.isEmpty(pricingDetails)){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"该定价方案下没有配置价格"); } List<String> collect = pricingDetails.stream().map(s -> s.getBikeTypeId()).collect(Collectors.toList()); boolean b = baseParams.stream().map(s -> s.getId()).anyMatch(s -> collect.contains(s)); if (b){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"该定价方案下没有配置完整"); } PricingParam pricingParam1 = new PricingParam(); pricingParam1.setId(pricingParam.getId()); pricingParam1.setStatus(pricingParam.getStatus());
