server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -51,7 +51,6 @@ /** * @throws Exception */ // @Scheduled(cron = "0 0 11 * * ? ") public void getWxBill() throws Exception { //前一天的數據 Date ydate = DateUtil.addDaysToDate(new Date(), -1); @@ -75,10 +74,11 @@ * 30 秒刷新一次 * @throws Exception */ // @Scheduled(cron = "0/30 * * * * ? ") @Scheduled(cron = "0/30 * * * * ? ") public void autoRefreshLockStatus() throws Exception { log.info("=====================开始定时刷新骑行中的数充值未开锁失败======================="); memberRidesService.autoRefreshLockStatus(); log.info("=====================结束定时刷新骑行中的数充值未开锁失败======================="); }
@@ -174,6 +174,8 @@ public static final String RENT_DEPOSIT = "RENT_DEPOSIT"; //温馨提示 public static final String TIPS = "TIPS"; //温馨提示 public static final String RENT_NOTICE = "RENT_NOTICE"; //小程序停止服务提示 public static final String STOP_SERVE_TIPS = "STOP_SERVE_TIPS"; //小程序是否停止服务 0否 1是 server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -123,9 +123,13 @@ .selectAs(BaseParam::getName,BikeRepairDTO::getBikeTypeName); queryWrapper.like(StringUtils.isNotEmpty(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid()) .like(StringUtils.isNotEmpty(pageWrap.getModel().getBikeCode()),BikeRepair::getBinkeId,pageWrap.getModel().getBikeCode()) .eq( pageWrap.getModel().getStatus() !=null,BikeRepair::getStatus,pageWrap.getModel().getStatus()) .ge(Objects.nonNull(pageWrap.getModel().getStartDate()),BikeRepair::getCreateDate,pageWrap.getModel().getStartDate()) .le(Objects.nonNull(pageWrap.getModel().getEndDate()),BikeRepair::getCreateDate,pageWrap.getModel().getEndDate()); .eq( pageWrap.getModel().getStatus() !=null,BikeRepair::getStatus,pageWrap.getModel().getStatus()); if (Objects.nonNull(pageWrap.getModel().getStartDate())) { queryWrapper.ge(BikeRepair::getCreateDate,pageWrap.getModel().getStartDate()); } if (Objects.nonNull(pageWrap.getModel().getEndDate())) { queryWrapper.le(BikeRepair::getCreateDate, pageWrap.getModel().getEndDate()); } return PageData.from(bikeRepairJoinMapper.selectJoinPage(page, BikeRepairDTO.class,queryWrapper)); }
@@ -1,5 +1,6 @@ package com.doumee.service.business.impl; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.Constants; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; @@ -9,18 +10,25 @@ import com.doumee.dao.business.model.*; import com.doumee.dao.business.web.response.BikeLogDTO; import com.doumee.dao.business.web.response.MemberRidesDTO; import com.doumee.dao.business.web.response.MiniProgrammeDTO; import com.doumee.dao.system.SystemDictDataMapper; import com.doumee.dao.system.model.SystemDictData; import com.doumee.service.business.BikesService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.doumee.service.system.SystemDictDataService; 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; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; /** * 自行车信息表Service实现 @@ -34,6 +42,10 @@ private BikesMapper bikesMapper; @Autowired private BikesJoinMapper bikesJoinMapper; @Autowired SystemDictDataMapper systemDictDataMapper; @Override public String create(Bikes bikes) { @@ -94,6 +106,13 @@ @Override public PageData<Bikes> findJoinPage(PageWrap<Bikes> pageWrap) { QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>(); wrapper.lambda() .in(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK)); List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper); Map<String, SystemDictData> collect = systemDictData.stream().collect(Collectors.toMap(s -> s.getLabel(), s -> s)); IPage<Bikes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<Bikes> queryWrapper = new MPJLambdaWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); @@ -103,6 +122,8 @@ .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteId()),Bikes::getSiteId,pageWrap.getModel().getSiteId()) .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteName()), Sites::getName,pageWrap.getModel().getSiteName()) .like(StringUtils.isNotBlank(pageWrap.getModel().getLockId()),Bikes::getLockId,pageWrap.getModel().getLockId()) .ne(Bikes::getLockId,collect.get(Constants.FORCE_BACK_LOCK).getCode()) .ne(Bikes::getSiteId,collect.get(Constants.FORCE_BACK_SITE).getCode()) .isNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,Bikes::getCode) .isNotNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,Bikes::getCode); queryWrapper.selectAll(Bikes.class) server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -176,7 +176,7 @@ goodsorderExportVOIPage.getRecords().forEach(s->{ s.setMoney(Constants.translateMoney(s.getMoney())); s.setRefundMoney(Constants.translateMoney(s.getRefundMoney())); s.setCloseMoney(Constants.translateMoney(s.getCloseMoney())); s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()).compareTo(s.getMoney()) > 0 ? s.getMoney() : Constants.translateMoney(s.getCloseMoney())); }); } return PageData.from(goodsorderExportVOIPage); @@ -189,7 +189,7 @@ if (!CollectionUtils.isEmpty(goodsorderList)){ goodsorderList.forEach(s->{ s.setMoney(Constants.translateMoney(s.getMoney())); s.setCloseMoney(Constants.translateMoney(s.getCloseMoney())); s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()).compareTo(s.getMoney()) > 0 ? s.getMoney() : Constants.translateMoney(s.getCloseMoney())); s.setRefundMoney(Constants.translateMoney(s.getRefundMoney())); }); } @@ -244,7 +244,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"); queryWrapper.select("(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date desc limit 1) as memberRidesStatus"); if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ZERO)){ queryWrapper.ne(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey()); } @@ -281,7 +281,7 @@ homeResponse.setLeaseNoticeUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE_URL).getCode()); homeResponse.setLeaseNotice(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE).getCode()); homeResponse.setDeposit(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()).multiply(BigDecimal.valueOf(100))); homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.TIPS).getCode()); homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_NOTICE).getCode()); homeResponse.setLeaseVideoUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode()); homeResponse.setStopServeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode()); homeResponse.setIsStopServe(this.checkTemporaryStop()?1:0); @@ -751,7 +751,7 @@ try { Object response = null; WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest(); request.setBody("支付押金"); request.setBody("骑行押金"); request.setAttach("createGoodsOrder"); request.setOutTradeNo(goodsorder.getId()); request.setTotalFee(goodsorder.getMoney().intValue()); server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -620,6 +620,7 @@ // 大于阈值 if (between > 2){ s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey()); s.setEditDate(new Date()); memberRidesMapper.updateById(s); } }); server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -114,6 +114,16 @@ @Override public void update(Member member) { QueryWrapper<Member> wrapper = new QueryWrapper<>(); wrapper.lambda() .eq(Member::getIsdeleted,Constants.ZERO) .eq(Member::getType,Constants.ONE) .eq(Member::getCardNo,member.getCardNo()); Integer integer = memberMapper.selectCount(wrapper); if (integer > 0){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"卡号存在重复"); } LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); Member update = new Member(); update.setId(member.getId()); server/services/src/main/resources/mappers/WxBillDetailMapper.xml
@@ -5,8 +5,8 @@ <insert id="insertBatch"> insert into wx_bill_detail ( "id" , "pid", "bill_date", "pid", "appid" , "mch_id" , "sub_mchid" ,
