server/platform/pom.xml
@@ -53,4 +53,4 @@ </plugins> </build> </project> </project> server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
@@ -84,7 +84,11 @@ @Override public Ad findById(String id) { return adMapper.selectById(id); String path =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode()+ systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode(); Ad ad = adMapper.selectById(id); ad.setImgfullurl(path+ad.getImgurl()); return ad; } @Override @@ -147,7 +151,7 @@ } queryWrapper.lambda().orderByAsc(Ad::getSortnum); String path =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode()+ systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.AD).getCode(); systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode(); IPage<Ad> adIPage = adMapper.selectPage(page, queryWrapper); if (!CollectionUtils.isEmpty(adIPage.getRecords())){ server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -550,11 +550,11 @@ wrapper.select("sum(money) as money").last(" limit 1"); Refund total = refundMapper.selectOne(wrapper); GoodsorderCanBanlanceDTO goodsorderCanBanlanceDTO = new GoodsorderCanBanlanceDTO(); goodsorderCanBanlanceDTO.setGoodsorderMoney(goodsorder.getMoney()); goodsorderCanBanlanceDTO.setCloseMoney(goodsorder.getCloseMoney()); goodsorderCanBanlanceDTO.setGoodsorderMoney( Constants.translateMoney(goodsorder.getMoney())); goodsorderCanBanlanceDTO.setCloseMoney(Constants.translateMoney(goodsorder.getCloseMoney())); BigDecimal reduce = total!=null?Constants.formatDecimalNum(total.getMoney()):new BigDecimal(0); goodsorderCanBanlanceDTO.setHasRefundMoney(reduce); goodsorderCanBanlanceDTO.setCanBanlanceMoney(Constants.formatDecimalNum(goodsorder.getMoney()).subtract(goodsorderCanBanlanceDTO.getHasRefundMoney())); goodsorderCanBanlanceDTO.setHasRefundMoney(Constants.translateMoney(reduce)); goodsorderCanBanlanceDTO.setCanBanlanceMoney(Constants.translateMoney(goodsorder.getMoney()).subtract(goodsorderCanBanlanceDTO.getHasRefundMoney())); return goodsorderCanBanlanceDTO; }
@@ -338,7 +338,7 @@ } QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>(); wrapper.lambda() .in(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK)); .in(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK,Constants.FREE_RENT_TIME)); List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper); Map<String, SystemDictData> collect = systemDictData.stream().collect(Collectors.toMap(s -> s.getLabel(), s -> s)); @@ -354,8 +354,10 @@ update.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()); update.setBackSiteId(collect.get(Constants.FORCE_BACK_SITE).getCode()); update.setBackLockId(collect.get(Constants.FORCE_BACK_LOCK).getCode()); Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode()); Integer rideTime = DateUtil.betweenMin(model.getRentDate(), update.getBackDate()); //计算骑行计费时长 update.setDuration(DateUtil.betweenMin(model.getRentDate(), update.getBackDate())); update.setDuration( freeRentTime > 0 ? rideTime - freeRentTime : rideTime); memberRidesMapper.updateById(update); //修改前 String beforeContent = JSONObject.toJSONString(model);
