ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserListQueryDto.java
@@ -8,6 +8,8 @@ public class UserListQueryDto extends BasePage { @ApiModelProperty(value = "用户手机号") String userPhone; @ApiModelProperty(value = "所在省code") String provinceCode; @ApiModelProperty(value = "所在地code") String cityCode; @ApiModelProperty(value = "状态 1正常2冻结 3注销") ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java
@@ -56,6 +56,10 @@ @TableField("vip_id") private Integer vipId; @ApiModelProperty(value = "1月卡2季卡3年卡") @TableField("vip_type") private Integer vipType; @ApiModelProperty(value = "会员开始时间") @TableField("start_time") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java
@@ -12,6 +12,8 @@ public class SiteInfoVO { @ApiModelProperty(value = "电站名称") private String name; @ApiModelProperty(value = "桩id") private Integer chargingPileId; @ApiModelProperty(value = "桩编号") private String number; @ApiModelProperty(value = "充电枪id") ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -66,7 +66,6 @@ private String avatar; /** 密码 */ @NotBlank(message = "密码不能为空") private String password; /** 帐号状态（0正常 1停用） */ ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -219,6 +219,7 @@ Page<TAppUser> page = appUserService.lambdaQuery() .like(userListQueryDto.getUserPhone() != null && !"".equals(userListQueryDto.getUserPhone()), TAppUser::getPhone, userListQueryDto.getUserPhone()) .eq(userListQueryDto.getCompanyId() != null, TAppUser::getCompanyId, userListQueryDto.getCompanyId()) .like(userListQueryDto.getProvinceCode() != null && !"".equals(userListQueryDto.getProvinceCode()), TAppUser::getProvinceCode, userListQueryDto.getProvinceCode()) .eq(userListQueryDto.getCityCode() != null && !"".equals(userListQueryDto.getCityCode()), TAppUser::getCityCode, userListQueryDto.getCityCode()) .eq(userListQueryDto.getStatus() != null, TAppUser::getStatus, userListQueryDto.getStatus()) .eq(userListQueryDto.getVipTypeId() != null, TAppUser::getVipId, userListQueryDto.getVipTypeId()) @@ -648,7 +649,7 @@ plusDay = 12; } //增加vipDetail giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay); giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay,giveVipDto.getType()); appUserService.updateById(nowUser); } return R.ok(); @@ -952,10 +953,17 @@ pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+point,5,userId,appUserCar.getLicensePlate(),""); byId.setPoints(byId.getPoints()+point); byId.setFirstAdd(1); appUserService.updateById(byId); } CarNumDto carNumDto = CarUtil.carNum(appUserCar.getLicensePlate()); if (carNumDto==null){ return R.fail("请输入正确的车牌"); } byId.setCityCode(carNumDto.getAreaCode()); byId.setProvinceCode(carNumDto.getAreaCode().substring(0,2)+"0000"); appUserService.updateById(byId); // appUserCarService.saveOrUpdate(appUserCar); ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java
@@ -89,7 +89,7 @@ public AjaxResult editInvoiceInformation(@RequestBody TInvoiceInformation invoiceInformation){ Long userId = tokenService.getLoginUserApplet().getUserId(); //如果当前是默认抬头，则需要去除其他的默认配置 if(1 == invoiceInformation.getIsDefault()){ if(null != invoiceInformation.getIsDefault() && 1 == invoiceInformation.getIsDefault()){ TInvoiceInformation one = invoiceInformationService.getOne(new LambdaQueryWrapper<TInvoiceInformation>().eq(TInvoiceInformation::getDelFlag, 0) .eq(TInvoiceInformation::getIsDefault, 1).eq(TInvoiceInformation::getAppUserId, userId)); if(null != one && !one.getId().equals(invoiceInformation.getId())){ ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/task/TaskUtil.java
@@ -12,6 +12,7 @@ import javax.annotation.Resource; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; @@ -61,7 +62,7 @@ @Scheduled(fixedRate = 1000 * 60) public void changeVipId(){ LocalDate currentDate = LocalDate.now(); LocalDateTime currentDate = LocalDateTime.now(); List<TAppUserVipDetail> recentDetails = tAppUserVipDetailService.lambdaQuery() .le(TAppUserVipDetail::getStartTime, currentDate) .ge(TAppUserVipDetail::getEndTime, currentDate) ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarNumDto.java
@@ -8,5 +8,6 @@ private String pcode; private String province; private String city; private String code; private String Hp; private String AreaCode; } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java
Diff too large ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java
@@ -31,11 +31,11 @@ private OtherClient otherClient; @Resource private TAppCouponService appCouponService; public void sendVip(TAppUser nowUser,Integer vipId,Integer plusDay){ public void sendVip(TAppUser nowUser,Integer vipId,Integer plusDay,Integer type){ if (nowUser.getVipEndTime()==null||nowUser.getVipEndTime().isBefore(LocalDateTime.now())) { nowUser.setVipEndTime(LocalDateTime.now().plusMonths(plusDay)); nowUser.setVipEndTime(LocalDateTime.now().plusMonths(plusDay).minusDays(1)); nowUser.setVipId(vipId); //直接再detail里新增数据，因为不是续费 TAppUserVipDetail tAppUserVipDetail = new TAppUserVipDetail(); tAppUserVipDetail.setAppUserId(nowUser.getId()); @@ -56,6 +56,7 @@ tAppUserVipDetail.setDiscountMoney(vip.getMaximumDeduction()); tAppUserVipDetail.setSendMonth(1); tAppUserVipDetail.setVipJson(JSON.toJSONString(info.getData())); tAppUserVipDetail.setVipType(type); tAppUserVipDetailService.save(tAppUserVipDetail); //直接赠送优惠卷 for (SendCouponDto sendCouponDto : javaList) { @@ -83,20 +84,21 @@ }else { nowUser.setVipEndTime(nowUser.getVipEndTime().plusDays(plusDay).minusDays(1)); // nowUser.setVipEndTime(nowUser.getVipEndTime().plusDays(plusDay).minusDays(1)); //获取detail里结束时间大于当前时间的数据，并将enttime延长 TAppUserVipDetail tAppUserVipDetail = tAppUserVipDetailService.lambdaQuery().eq(TAppUserVipDetail::getVipId,vipId).eq(TAppUserVipDetail::getAppUserId, nowUser.getId()).orderByDesc(TAppUserVipDetail::getEndTime).last("limit 1").one(); if (tAppUserVipDetail!=null) { List<TAppUserVipDetail> list = tAppUserVipDetailService.lambdaQuery().eq(TAppUserVipDetail::getAppUserId, nowUser.getId()).ge(TAppUserVipDetail::getStartTime, tAppUserVipDetail.getEndTime()).list(); for (TAppUserVipDetail appUserVipDetail : list) { appUserVipDetail.setStartTime(appUserVipDetail.getStartTime().plusMonths(plusDay).minusDays(1)); appUserVipDetail.setEndTime(appUserVipDetail.getEndTime().plusMonths(plusDay).minusDays(1)); } tAppUserVipDetailService.updateBatchById(list); tAppUserVipDetail.setEndTime(tAppUserVipDetail.getEndTime().plusMonths(plusDay).minusDays(1)); tAppUserVipDetailService.updateById(tAppUserVipDetail); }else { // TAppUserVipDetail tAppUserVipDetail = tAppUserVipDetailService.lambdaQuery().eq(TAppUserVipDetail::getVipId,vipId).eq(TAppUserVipDetail::getAppUserId, nowUser.getId()).orderByDesc(TAppUserVipDetail::getEndTime).last("limit 1").one(); // if (tAppUserVipDetail!=null) { // List<TAppUserVipDetail> list = tAppUserVipDetailService.lambdaQuery().eq(TAppUserVipDetail::getAppUserId, nowUser.getId()).ge(TAppUserVipDetail::getStartTime, tAppUserVipDetail.getEndTime()).list(); // for (TAppUserVipDetail appUserVipDetail : list) { // appUserVipDetail.setStartTime(appUserVipDetail.getStartTime().plusMonths(plusDay).minusDays(1)); // appUserVipDetail.setEndTime(appUserVipDetail.getEndTime().plusMonths(plusDay).minusDays(1)); // } // tAppUserVipDetailService.updateBatchById(list); // tAppUserVipDetail.setEndTime(tAppUserVipDetail.getEndTime().plusMonths(plusDay).minusDays(1)); // // tAppUserVipDetailService.updateById(tAppUserVipDetail); // }else // { TAppUserVipDetail tAppUserVipDetail2 = tAppUserVipDetailService.lambdaQuery().eq(TAppUserVipDetail::getAppUserId, nowUser.getId()).orderByDesc(TAppUserVipDetail::getEndTime).last("limit 1").one(); TAppUserVipDetail tAppUserVipDetail1 = new TAppUserVipDetail(); @@ -107,20 +109,18 @@ R<TVip> info = vipClient.getInfo1(vipId); TVip vip = info.getData(); List<SendCouponDto> javaList = new ArrayList<>(); if (vip.getCoupon()!=null) { javaList = JSON.parseArray(vip.getCoupon()).toJavaList(SendCouponDto.class); } tAppUserVipDetail1.setCouponIds(vip.getCoupon()); tAppUserVipDetail1.setSendChargeNum(vip.getDiscountTimes()); tAppUserVipDetail1.setChargeNum(vip.getDiscountTimes()); tAppUserVipDetail1.setDiscountMoney(vip.getMaximumDeduction()); tAppUserVipDetail1.setSendMonth(1); tAppUserVipDetail.setVipJson(JSON.toJSONString(info.getData())); tAppUserVipDetail1.setVipType(type); tAppUserVipDetail1.setVipJson(JSON.toJSONString(info.getData())); tAppUserVipDetailService.save(tAppUserVipDetail1); } // } }
@@ -107,7 +107,7 @@ * @param number * @return */ @PostMapping("/getSiteInfoByNumber") @GetMapping("/getSiteInfoByNumber") @ApiOperation(value = "扫一扫后通过桩编号获取电站信息", tags = {"小程序-扫一扫"}) public R<SiteInfoVO> getSiteInfoByNumber(@RequestParam("number") String number){ SiteInfoVO siteInfoVO = new SiteInfoVO(); @@ -122,11 +122,13 @@ siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().multiply(byId1.getDiscount()).setScale(4, BigDecimal.ROUND_HALF_UP)); } } siteInfoVO.setChargingPileId(one.getId()); siteInfoVO.setName(byId.getName()); siteInfoVO.setNumber(one.getNumber().toString()); siteInfoVO.setSpaceChargeExplain(byId.getSpaceChargeExplain()); return R.ok(siteInfoVO); } @GetMapping("/getSiteList") @ApiOperation(value = "获取站点列表", tags = {"管理后台-站点管理"}) ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
@@ -1,10 +1,7 @@ package com.ruoyi.chargingPile.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.api.feignClient.AppUserClient; import com.ruoyi.chargingPile.api.dto.TAccountingStrategyDTO; import com.ruoyi.chargingPile.api.model.*; import com.ruoyi.chargingPile.api.query.TAccountingStrategyQuery; @@ -16,18 +13,13 @@ import com.ruoyi.chargingPile.service.TChargingPileService; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.dto.SteategyPassDto; import com.ruoyi.common.core.enums.AuditStateEnum; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.domain.BaseDelete; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.log.enums.OperatorType; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.feignClient.SysUserClient; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -64,10 +56,8 @@ private TChargingPileService chargingPileService; @Autowired private ISiteService siteService; @Autowired private SysUserClient sysUserClient; @Resource private TokenService tokenService; private SysUserClient sysUserClient; @Autowired public TAccountingStrategyController(TAccountingStrategyService accountingStrategyService, TAccountingStrategyDetailService accountingStrategyDetailService) { @@ -142,7 +132,7 @@ return AjaxResult.error("同阶段费率值需一致"); } // 判断修改的计费策略是否为已通过 if(dto.getAuditStatus() == 3 || dto.getAuditStatus() == 4){ if(null != dto.getAuditStatus() && (dto.getAuditStatus() == 3 || dto.getAuditStatus() == 4)){ // 查询是否有下级审核中的策略 TAccountingStrategy children = accountingStrategyService.getOne(Wrappers.lambdaQuery(TAccountingStrategy.class) .eq(TAccountingStrategy::getParentId, dto.getId()) @@ -343,6 +333,14 @@ } }else { if (byId.getAuditStatus()==1){ byId.setFirstRemark(steategyPassDto.getRemark()); }else if (byId.getAuditStatus()==2){ byId.setTwoRemark(steategyPassDto.getRemark()); } byId.setAuditStatus(4); } accountingStrategyService.updateById(byId); ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -130,7 +130,7 @@ @ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "列表") @PostMapping(value = "/page") public AjaxResult<Page<TApplyChargingPile>> page(ApplyChargingQuery applyChargingQuery) { public AjaxResult<Page<TApplyChargingPile>> page(@RequestBody ApplyChargingQuery applyChargingQuery) { Page<TApplyChargingPile> page = applyChargingPileService.lambdaQuery() .like(applyChargingQuery.getLandlordPhone() != null && !applyChargingQuery.getLandlordPhone().equals(""), TApplyChargingPile::getLandlordPhone, applyChargingQuery.getLandlordPhone()) .page(Page.of(applyChargingQuery.getPageCurr(), applyChargingQuery.getPageSize())); ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
@@ -1,6 +1,7 @@ package com.ruoyi.chargingPile.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.chargingPile.api.model.TChargingGun; import com.ruoyi.chargingPile.api.model.TChargingPile; @@ -10,8 +11,7 @@ import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring; import com.ruoyi.chargingPile.dto.ChargingGunMonitoring; import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring; import com.ruoyi.chargingPile.service.TChargingGunService; import com.ruoyi.chargingPile.service.TChargingPileService; import com.ruoyi.chargingPile.service.*; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.PageInfo; @@ -25,6 +25,7 @@ import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.log.enums.OperatorType; import com.ruoyi.other.api.domain.TVip; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -36,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.util.List; /** @@ -53,6 +55,12 @@ private final TChargingPileService chargingPileService; private final TChargingGunService chargingGunService; @Resource private TAccountingStrategyService accountingStrategyService; @Resource private TAccountingStrategyDetailService accountingStrategyDetailService; @Autowired @@ -197,5 +205,6 @@ TChargingPile chargingPile = chargingPileService.getById(id); return R.ok(chargingPile); } }
@@ -40,7 +40,7 @@ List<TAccountingStrategyVO> list = this.baseMapper.pageList(query,pageInfo); List<Integer> parentIds = list.stream().map(TAccountingStrategyVO::getId).collect(Collectors.toList()); List<TAccountingStrategy> list1 = this.list(Wrappers.lambdaQuery(TAccountingStrategy.class) .in(TAccountingStrategy::getParentId, parentIds) .in(!parentIds.isEmpty(),TAccountingStrategy::getParentId, parentIds) .in(TAccountingStrategy::getAuditStatus, Arrays.asList(1,2))); for (TAccountingStrategyVO tAccountingStrategyVO : list) { SysUser data = sysUserClient.getSysUser(tAccountingStrategyVO.getUserId()).getData(); ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
@@ -210,6 +210,13 @@ } List<Map<Integer, Integer>> modeStatistics = this.baseMapper.getModeStatistics(siteIds); if(CollectionUtils.isEmpty(modeStatistics)){ Map<Integer, Integer> modeStatistics1 = new HashMap<>(3,0); modeStatistics1.put(1, 0); modeStatistics1.put(2, 0); modeStatistics1.put(3, 0); modeStatistics.add(modeStatistics1); } gunStatusStatisticsVO.setModeStatistics(modeStatistics); List<Map<Integer, Integer>> statusStatistics = new ArrayList<>(); ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java
@@ -83,7 +83,8 @@ } } }else{ siteIds = new HashSet<>(siteId); siteIds = new HashSet<>(); siteIds.add(siteId); } PageInfo<TChargingPileNotification> pageInfo = new PageInfo<>(basePage.getPageCurr(), basePage.getPageSize()); List<TChargingPileNotification> list = this.baseMapper.chargingPileNotificationPageList(pageInfo, siteIds); ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/produce/IotMessageProduce.java
@@ -1,5 +1,6 @@ package com.ruoyi.integration.iotda.utils.produce; import com.alibaba.fastjson2.JSONObject; import com.huaweicloud.sdk.core.exception.ConnectionException; import com.huaweicloud.sdk.core.exception.RequestTimeoutException; import com.huaweicloud.sdk.core.exception.ServiceResponseException; @@ -34,7 +35,7 @@ * @return */ @PostMapping("/sendMessage") public String sendMessage(String deviceId,String name,String message){ public String sendMessage(String deviceId, String name, JSONObject message){ CreateMessageRequest request = new CreateMessageRequest(); request.withDeviceId(deviceId); DeviceMessageRequest body = new DeviceMessageRequest(); ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
@@ -61,7 +61,7 @@ * @param onlineReply 实体对象 * @return */ public String onlineReply(OnlineReply onlineReply){ public JSONObject onlineReply(OnlineReply onlineReply){ onlineReplyService.create(onlineReply); return getMessageJsonString(onlineReply, ServiceIdMenu.ONLINE_REPLY.getValue()); } @@ -71,7 +71,7 @@ * @param pong 实体对象 * @return */ public String pong(Pong pong){ public JSONObject pong(Pong pong){ pongService.create(pong); return getMessageJsonString(pong, ServiceIdMenu.PONG.getValue()); } @@ -81,7 +81,7 @@ * @param billingModeVerifyReply 实体对象 * @return */ public String billingModeVerifyReply(BillingModeVerifyReply billingModeVerifyReply){ public JSONObject billingModeVerifyReply(BillingModeVerifyReply billingModeVerifyReply){ billingModeVerifyReplyService.create(billingModeVerifyReply); return getMessageJsonString(billingModeVerifyReply, ServiceIdMenu.BILLING_MODE_VERIFY_REPLY.getValue()); } @@ -91,7 +91,7 @@ * @param acquisitionBillingModeReply 实体对象 * @return */ public String acquisitionBillingModeReply(AcquisitionBillingModeReply acquisitionBillingModeReply){ public JSONObject acquisitionBillingModeReply(AcquisitionBillingModeReply acquisitionBillingModeReply){ acquisitionBillingModeReplyService.create(acquisitionBillingModeReply); return getMessageJsonString(acquisitionBillingModeReply, ServiceIdMenu.ACQUISITION_BILLING_MODE_REPLY.getValue()); } @@ -101,7 +101,7 @@ * @param readRealTimeMonitoringData 实体对象 * @return */ public String readRealTimeMonitoringData(ReadRealTimeMonitoringData readRealTimeMonitoringData){ public JSONObject readRealTimeMonitoringData(ReadRealTimeMonitoringData readRealTimeMonitoringData){ readRealTimeMonitoringDataService.create(readRealTimeMonitoringData); return getMessageJsonString(readRealTimeMonitoringData, ServiceIdMenu.READ_REAL_TIME_MONITORING_DATA.getValue()); } @@ -121,7 +121,7 @@ * @param platformConfirmationCharging 实体对象 * @return */ public String platformConfirmationCharging(PlatformConfirmationCharging platformConfirmationCharging){ public JSONObject platformConfirmationCharging(PlatformConfirmationCharging platformConfirmationCharging){ platformConfirmationChargingService.create(platformConfirmationCharging); return getMessageJsonString(platformConfirmationCharging, ServiceIdMenu.PLATFORM_CONFIRMATION_CHARGING.getValue()); } @@ -131,7 +131,7 @@ * @param platformStartCharging 实体对象 * @return */ public String platformStartCharging(PlatformStartCharging platformStartCharging){ public JSONObject platformStartCharging(PlatformStartCharging platformStartCharging){ platformStartChargingService.create(platformStartCharging); return getMessageJsonString(platformStartCharging, ServiceIdMenu.PLATFORM_START_CHARGING.getValue()); } @@ -141,7 +141,7 @@ * @param platformStopCharging 实体对象 * @return */ public String platformStopCharging(PlatformStopCharging platformStopCharging){ public JSONObject platformStopCharging(PlatformStopCharging platformStopCharging){ platformStopChargingService.create(platformStopCharging); return getMessageJsonString(platformStopCharging, ServiceIdMenu.PLATFORM_STOP_CHARGING.getValue()); } @@ -151,7 +151,7 @@ * @param confirmTransactionRecord 实体对象 * @return */ public String confirmTransactionRecord(ConfirmTransactionRecord confirmTransactionRecord){ public JSONObject confirmTransactionRecord(ConfirmTransactionRecord confirmTransactionRecord){ confirmTransactionRecordService.create(confirmTransactionRecord); return getMessageJsonString(confirmTransactionRecord, ServiceIdMenu.CONFIRM_TRANSACTION_RECORD.getValue()); } @@ -161,7 +161,7 @@ * @param updateBalance 实体对象 * @return */ public String updateBalance(UpdateBalance updateBalance){ public JSONObject updateBalance(UpdateBalance updateBalance){ updateBalanceService.create(updateBalance); return getMessageJsonString(updateBalance, ServiceIdMenu.UPDATE_BALANCE.getValue()); } @@ -171,7 +171,7 @@ * @param synchronizeOfflineCard 实体对象 * @return */ public String synchronizeOfflineCard(SynchronizeOfflineCard synchronizeOfflineCard){ public JSONObject synchronizeOfflineCard(SynchronizeOfflineCard synchronizeOfflineCard){ synchronizeOfflineCardService.create(synchronizeOfflineCard); return getMessageJsonString(synchronizeOfflineCard, ServiceIdMenu.SYNCHRONIZE_OFFLINE_CARD.getValue()); } @@ -181,7 +181,7 @@ * @param clearOfflineCard 实体对象 * @return */ public String clearOfflineCard(ClearOfflineCard clearOfflineCard){ public JSONObject clearOfflineCard(ClearOfflineCard clearOfflineCard){ clearOfflineCardService.create(clearOfflineCard); return getMessageJsonString(clearOfflineCard, ServiceIdMenu.CLEAR_OFFLINE_CARD.getValue()); } @@ -191,7 +191,7 @@ * @param queryOfflineCard 实体对象 * @return */ public String queryOfflineCard(QueryOfflineCard queryOfflineCard){ public JSONObject queryOfflineCard(QueryOfflineCard queryOfflineCard){ queryOfflineCardService.create(queryOfflineCard); return getMessageJsonString(queryOfflineCard, ServiceIdMenu.QUERY_OFFLINE_CARD.getValue()); } @@ -201,7 +201,7 @@ * @param workingParameterSetting 实体对象 * @return */ public String workingParameterSetting(WorkingParameterSetting workingParameterSetting){ public JSONObject workingParameterSetting(WorkingParameterSetting workingParameterSetting){ workingParameterSettingService.create(workingParameterSetting); return getMessageJsonString(workingParameterSetting, ServiceIdMenu.WORKING_PARAMETER_SETTING.getValue()); } @@ -211,7 +211,7 @@ * @param timingSetting 实体对象 * @return */ public String timingSetting(TimingSetting timingSetting){ public JSONObject timingSetting(TimingSetting timingSetting){ timingSettingService.create(timingSetting); return getMessageJsonString(timingSetting, ServiceIdMenu.TIMING_SETTING.getValue()); } @@ -220,7 +220,7 @@ * @param timingSettingReply 实体对象 * @return */ public String timingSettingReply(TimingSettingReply timingSettingReply){ public JSONObject timingSettingReply(TimingSettingReply timingSettingReply){ timingSettingReplyService.create(timingSettingReply); return getMessageJsonString(timingSettingReply, ServiceIdMenu.TIMING_SETTING_REPLY.getValue()); } @@ -230,7 +230,7 @@ * @param setupBillingModel 实体对象 * @return */ public String setupBillingModel(SetupBillingModel setupBillingModel){ public JSONObject setupBillingModel(SetupBillingModel setupBillingModel){ setupBillingModelService.create(setupBillingModel); return getMessageJsonString(setupBillingModel, ServiceIdMenu.SETUP_BILLING_MODEL.getValue()); } @@ -240,7 +240,7 @@ * @param openOrCloseGroundLock 实体对象 * @return */ public String openOrCloseGroundLock(OpenOrCloseGroundLock openOrCloseGroundLock){ public JSONObject openOrCloseGroundLock(OpenOrCloseGroundLock openOrCloseGroundLock){ openOrCloseGroundLockService.create(openOrCloseGroundLock); return getMessageJsonString(openOrCloseGroundLock, ServiceIdMenu.OPEN_OR_CLOSE_GROUND_LOCK.getValue()); } @@ -249,7 +249,7 @@ * @param platformRestart 实体对象 * @return */ public String platformRestart(PlatformRestart platformRestart){ public JSONObject platformRestart(PlatformRestart platformRestart){ platformRestartService.create(platformRestart); return getMessageJsonString(platformRestart, ServiceIdMenu.PLATFORM_RESTART.getValue()); } @@ -258,7 +258,7 @@ * @param platformRemoteUpdate 实体对象 * @return */ public String platformRemoteUpdate(PlatformRemoteUpdate platformRemoteUpdate){ public JSONObject platformRemoteUpdate(PlatformRemoteUpdate platformRemoteUpdate){ platformRemoteUpdateService.create(platformRemoteUpdate); return getMessageJsonString(platformRemoteUpdate, ServiceIdMenu.PLATFORM_REMOTE_UPDATE.getValue()); } @@ -269,9 +269,9 @@ * @param serviceId 服务ID * @return */ public String getMessageJsonString(Object object, String serviceId){ public JSONObject getMessageJsonString(Object object, String serviceId){ JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(object)); jsonObject.put("service_id", serviceId); return jsonObject.toJSONString(); return jsonObject; } } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/TEnterpriseExport.java
@@ -27,8 +27,7 @@ private String phone; @Excel(name = "备注",width = 30) private String remark; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "申请时间",width = 30,exportFormat="yyyy-MM-dd HH:mm:ss") @Excel(name = "申请时间",width = 30) private String createTime;
@@ -96,12 +96,16 @@ String imgUrl = ""; if(tExchangeOrder.getOrderType() == 1){ TGoods goods = goodsClient.getGoodsById(tExchangeOrder.getGoodsId()).getData(); name = goods.getName(); imgUrl = goods.getCoverPicture(); if(null != goods){ name = goods.getName(); imgUrl = goods.getCoverPicture(); } }else{ TCoupon coupon = couponClient.getCouponById1(tExchangeOrder.getCouponId()).getData(); name = coupon.getName(); imgUrl = coupon.getCoverPicture(); if(null != coupon){ name = coupon.getName(); imgUrl = coupon.getCoverPicture(); } } exchangeOrderList.setName(name); exchangeOrderList.setImgUrl(imgUrl); @@ -137,15 +141,19 @@ String imgUrl = ""; if(exchangeOrder.getOrderType() == 1){ TGoods goods = goodsClient.getGoodsById(exchangeOrder.getGoodsId()).getData(); name = goods.getName(); imgUrl = goods.getCoverPicture(); if(null != goods){ name = goods.getName(); imgUrl = goods.getCoverPicture(); } }else{ TCoupon coupon = couponClient.getCouponById1(exchangeOrder.getCouponId()).getData(); info.setCouponType(coupon.getType()); info.setDays(coupon.getDays()); info.setEndTime(coupon.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); name = coupon.getName(); imgUrl = coupon.getCoverPicture(); if(null != coupon){ info.setCouponType(coupon.getType()); info.setDays(coupon.getDays()); info.setEndTime(coupon.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); name = coupon.getName(); imgUrl = coupon.getCoverPicture(); } } info.setName(name); info.setImgUrl(imgUrl); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
@@ -18,6 +18,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Objects; @@ -48,6 +49,9 @@ PageInfo<TOrderAppealVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize()); List<TOrderAppealVO> list = this.baseMapper.pageList(query,pageInfo); List<Long> orderIds = list.stream().map(TOrderAppealVO::getOrderId).collect(Collectors.toList()); if(CollectionUtils.isEmpty(orderIds)){ return new PageInfo<>(); } // 查询当前页的订单 List<TChargingOrder> chargingOrders = chargingOrderMapper.selectList(Wrappers.lambdaQuery(TChargingOrder.class) .in(TChargingOrder::getId, orderIds)); ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -1385,7 +1385,7 @@ </select> <select id="getchargingCapacity" resultType="java.util.Map"> SELECT DATE_FORMAT( create_time, '%Y-%m-%d %H' ) as time, DATE_FORMAT( create_time, '%Y-%m-%d' ) as time, SUM(charging_capacity) as chargingCapacity FROM t_charging_order ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
@@ -2,6 +2,7 @@ import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.account.api.dto.SendCouponDto; import com.ruoyi.common.core.domain.R; @@ -136,6 +137,7 @@ return R.ok(vipService.getOne(Wrappers.lambdaQuery(TVip.class) .eq(TVip::getReveal,1) .orderByDesc(TVip::getMaximumDeduction) .orderByDesc(TVip::getCreateTime) .last("LIMIT 1"))); case 2: return R.ok(vipService.getOne(Wrappers.lambdaQuery(TVip.class) @@ -146,6 +148,7 @@ return R.ok(vipService.getOne(Wrappers.lambdaQuery(TVip.class) .eq(TVip::getReveal,1) .orderByDesc(TVip::getMonthlyCardDiscount) .orderByDesc(TVip::getCreateTime) .last("LIMIT 1"))); } } @@ -259,6 +262,5 @@ return R.ok(vipService.vipInfoPay(byId,payMoney,payType,discountMoney,discount,buyType,userId)); } } Binary files differ
