productDev/parkBike.git

			@@ -26,6 +26,7 @@
			import com.doumee.dao.business.model.MemberRides;
			import com.doumee.dao.business.vo.GoodsorderExportVO;
			import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
			import com.doumee.dao.business.web.request.BikeRepairDTO;
			import com.doumee.dao.business.web.request.GoodsorderCanBanlanceDTO;
			import com.doumee.dao.business.web.request.MemberRidesQuery;
			import com.doumee.dao.business.web.request.RefundDTO;
			@@ -635,8 +636,12 @@
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}

			List<MemberRides> memberRides = memberRidesJoinMapper.selectList(new QueryWrapper<MemberRides>()
			.lambda().eq(MemberRides::getOrdreId,id).orderByDesc(MemberRides::getCreateDate));
			List<MemberRides> memberRides = memberRidesJoinMapper.selectJoinList(MemberRides.class,new MPJLambdaWrapper<MemberRides>()
			.selectAll(MemberRides.class)
			.selectAs(BaseParam::getName,MemberRides::getParamName)
			.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
			.eq(MemberRides::getOrdreId,id)
			.orderByDesc(MemberRides::getCreateDate));
			if (!CollectionUtils.isEmpty(memberRides)){
			//预计结算价格和计算时长
			int freeTime = 0;

			@@ -93,7 +93,7 @@
			public static String getRoleNameByParam(BigDecimal basePrice, Integer baseTime, BigDecimal unitPrice, Integer unitTime) {
			String title = "计费规则：";
			if(baseTime < 0){
			title = basePrice.doubleValue()+"元畅骑一整天";
			title = (basePrice.divide(new BigDecimal(100))).doubleValue()+"元畅骑一整天";
			}else {
			title = "起步";
			int time = baseTime / 60;

			@@ -67,7 +67,7 @@


			public static void main(String[] args) {
			JwtPayLoad payLoad = new JwtPayLoad("d0a92489d26d43e182a1b8b75e1d9836");
			JwtPayLoad payLoad = new JwtPayLoad("07a9f07178864e57bf1fb34e7a321f08");
			System.out.println(JwtTokenUtil.generateToken(payLoad));
			}

	server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/web/src/main/java/com/doumee/api/web/AccountApi.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史