ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/CallBackController.java
@@ -124,7 +124,7 @@ amountReq.setTotal(byId.getPaymentAmount().multiply(BigDecimal.valueOf(100)).longValue()); amountReq.setCurrency("CNY"); createRequest.setAmount(amountReq); createRequest.setNotifyUrl("http://vwpmxwbhv59i.guyubao.com/call-back/buy"); createRequest.setNotifyUrl("https://0ifzoxq2516g.guyubao.com/call-back/buy"); createRequest.setOutTradeNo(byId.getCode()); createRequest.setOutRefundNo("TK" + WeChatUtil.generateTradeNumber());
@@ -319,7 +319,7 @@ prepayRequest.setMchid(weChatConfig.merchantId); prepayRequest.setOutTradeNo(byId.getCode()); prepayRequest.setDescription("购买课程"); prepayRequest.setNotifyUrl("http://vwpmxwbhv59i.guyubao.com/call-back/buy"); prepayRequest.setNotifyUrl("https://0ifzoxq2516g.guyubao.com/call-back/buy"); com.wechat.pay.java.service.payments.nativepay.model.Amount amount = new com.wechat.pay.java.service.payments.nativepay.model.Amount(); amount.setTotal(byId.getPaymentAmount().multiply(new BigDecimal(100)).intValue()); prepayRequest.setAmount(amount); ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGeneratedRecordsController.java
@@ -164,7 +164,7 @@ prepayRequest.setMchid(weChatConfig.merchantId); prepayRequest.setOutTradeNo(byId1.getCode()); prepayRequest.setDescription("生成工作总结"); prepayRequest.setNotifyUrl("http://vwpmxwbhv59i.guyubao.com/call-back/buy"); prepayRequest.setNotifyUrl("https://0ifzoxq2516g.guyubao.com/call-back/buy"); com.wechat.pay.java.service.payments.nativepay.model.Amount amount = new com.wechat.pay.java.service.payments.nativepay.model.Amount(); amount.setTotal(payMoney.multiply(BigDecimal.valueOf(100)).intValue()); prepayRequest.setAmount(amount); ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIndexMenuController.java
@@ -127,7 +127,7 @@ @ApiOperation(value = "定制推荐-2政策3公示",tags = {"web-首页"}) @PostMapping(value = "/consultation/list") public R<List<TConsultation>> consultationlist(@RequestParam Integer type) { public R<List<TConsultation>> consultationlist(@RequestParam Integer type,@RequestParam(required = false) Integer regionId) { //获取当前登录人id Long userId = tokenService.getLoginUser().getUserId(); TUserChange one = changeService.lambdaQuery().eq(TUserChange::getUserId, userId).orderByDesc(TUserChange::getCreateTime).last("limit 1").one(); @@ -148,7 +148,16 @@ notices.sort(Comparator.comparing(TConsultation::getCreateTime).reversed()); }else { // 创建 LambdaQueryWrapper 并设置查询条件 TRegion region = regionService.getById(regionId); List<TRegion> regions = regionService.list(Wrappers.lambdaQuery(TRegion.class) .eq(TRegion::getProvinceName, region.getProvinceName())); List<Integer> regionIds = regions.stream().map(TRegion::getId).collect(Collectors.toList()); List<TConsultation> list1 = consultationService.lambdaQuery().eq(TConsultation::getClassificationId,type) .in(TConsultation::getRegionId,regionIds) .eq(TConsultation::getIsRecommend,1) .orderByDesc(TConsultation::getCreateTime,TConsultation::getClassificationSort).list(); notices.addAll(list1); notices.sort(Comparator.comparing(TConsultation::getCreateTime).reversed()); } List<TConsultation> list1 = consultationService.lambdaQuery().eq(TConsultation::getClassificationId,type).eq(TConsultation::getIsRecommend,1).last("ORDER BY RAND() LIMIT 16").list(); notices.addAll(list1); @@ -169,7 +178,15 @@ notices.sort(Comparator.comparing(TConsultation::getCreateTime).reversed()); }else { // 创建 LambdaQueryWrapper 并设置查询条件 TRegion region = regionService.getById(regionId); List<TRegion> regions = regionService.list(Wrappers.lambdaQuery(TRegion.class) .eq(TRegion::getProvinceName, region.getProvinceName())); List<Integer> regionIds = regions.stream().map(TRegion::getId).collect(Collectors.toList()); List<TConsultation> list1 = consultationService.lambdaQuery().eq(TConsultation::getClassificationId,type) .in(TConsultation::getRegionId,regionIds) .orderByDesc(TConsultation::getCreateTime,TConsultation::getClassificationSort).list(); notices.addAll(list1); notices.sort(Comparator.comparing(TConsultation::getCreateTime).reversed()); } List<TConsultation> list1 = consultationService.lambdaQuery().eq(TConsultation::getClassificationId,type).last("ORDER BY RAND() LIMIT 16").list(); notices.addAll(list1); ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java
@@ -274,7 +274,7 @@ prepayRequest.setMchid(weChatConfig.merchantId); prepayRequest.setOutTradeNo(byId1.getCode()); prepayRequest.setDescription("购买资料"); prepayRequest.setNotifyUrl("http://vwpmxwbhv59i.guyubao.com/call-back/buy"); prepayRequest.setNotifyUrl("https://0ifzoxq2516g.guyubao.com/call-back/buy"); com.wechat.pay.java.service.payments.nativepay.model.Amount amount = new com.wechat.pay.java.service.payments.nativepay.model.Amount(); amount.setTotal(i); prepayRequest.setAmount(amount); ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java
@@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.*; import java.util.stream.Collectors; /** * <p> @@ -183,21 +184,25 @@ failMsg.add(msg); continue; } else { String[] split = techImportExcel.getAddress().split(";"); regionIds = new ArrayList<>(); for (String s : split) { TRegion region = regionService.lambdaQuery().like(TRegion::getName, s).one(); if (region == null) { msg = "第" + techImportExcels.indexOf(techImportExcel) + "行,地区不存在"; failMsg.add(msg); } else { regionIds.add(region.getId()); if("全部".equals(techImportExcel.getAddress())){ List<TRegion> list = regionService.lambdaQuery().list(); regionIds = list.stream().map(TRegion::getId).collect(Collectors.toList()); }else { String[] split = techImportExcel.getAddress().split(";"); regionIds = new ArrayList<>(); for (String s : split) { TRegion region = regionService.lambdaQuery().like(TRegion::getName, s).one(); if (region == null) { msg = "第" + techImportExcels.indexOf(techImportExcel) + "行,地区不存在"; failMsg.add(msg); } else { regionIds.add(region.getId()); } } if (regionIds.size() != split.length) { continue; } } if (regionIds.size() != split.length) { continue; } } TTechnicalTitle tTechnicalTitle = new TTechnicalTitle(); tTechnicalTitle.setTitileName(techImportExcel.getTitileName()); @@ -215,7 +220,7 @@ e.printStackTrace(); // logger.error("批量购入导入失败:{}",e.getMessage()); // importRecordService.removeById(tImportRecord.getId()); return R.fail("批量购入导入失败!"); return R.fail("批量导入失败!"); }finally { try { inputStream.close();
