From 4fe0ca21f984b38e24df69be4443c30341ee8efb Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 24 八月 2024 16:38:26 +0800
Subject: [PATCH] 8.24.2
---
ruoyi-service/ruoyi-account/pom.xml | 6 ++++++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java | 2 ++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 14 ++++++++++++++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java | 9 ++++++++-
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java | 5 +++++
5 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java
index be1274f..84d6c27 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java
@@ -31,6 +31,8 @@
@ApiModelProperty(value = "主键")
@TableId("id")
private Long id;
+ @TableField(exist = false)
+ private String uid;
@ApiModelProperty(value = "流水号")
@TableField("code")
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
index 7c4b753..ada6228 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
@@ -55,6 +55,11 @@
return R.fail("订单创建" + cause.getMessage());
}
+ @Override
+ public R callBack(String code, String outTradeNo) {
+ return R.fail("支付回调:" + cause.getMessage());
+ }
+
@Override
public R<TActivityVO> activityStatistics(TActivityStatisticsQuery dto) {
diff --git a/ruoyi-service/ruoyi-account/pom.xml b/ruoyi-service/ruoyi-account/pom.xml
index e109f2e..6e7481f 100644
--- a/ruoyi-service/ruoyi-account/pom.xml
+++ b/ruoyi-service/ruoyi-account/pom.xml
@@ -139,6 +139,12 @@
<artifactId>alipay-sdk-java</artifactId>
<version>4.38.10.ALL</version>
</dependency>
+ <dependency>
+ <groupId>org.openeuler</groupId>
+ <artifactId>bgmprovider</artifactId>
+ <version>1.1.2</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index 9526914..1a701f0 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -420,6 +420,7 @@
.in(!types.isEmpty(), TAppUserIntegralChange::getChangeType, types).page(Page.of(pointsQueryDto.getPageCurr(), pointsQueryDto.getPageSize()));
for (TAppUserIntegralChange record : page.getRecords()) {
+ record.setUid(record.getId().toString());
if (record.getChangeType()==2){
R<TChargingOrder> tChargingOrderR = chargingOrderClient.orderDetail(Long.valueOf(record.getExtension()));
if (tChargingOrderR.getData()!=null) {
@@ -436,6 +437,13 @@
return R.ok(page);
+ }
+
+ @ApiOperation(value = "积分详情", tags = {"小程序-个人中心"})
+ @GetMapping(value = "/user/points/detail")
+ public R<TAppUserIntegralChange> pointsDetail(String id) {
+ TAppUserIntegralChange byId = integralChangeService.getById(id);
+ return R.ok(byId);
}
@ApiOperation(value = "冻结解冻用户", tags = {"后台-用户管理-用户列表"})
@@ -802,6 +810,12 @@
return R.ok();
}
+ @ApiOperation(value = "添加编辑车辆", tags = {"小程序-个人中心-车辆"})
+ @DeleteMapping(value = "/user/car/delete")
+ public R carDelete(String id) {
+ boolean b = appUserCarService.removeById(id);
+ return R.ok();
+ }
@ApiOperation(value = "获取车辆品牌", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/getBrands")
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java
index 35e15af..e36b5d6 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.other.api.domain.THtml;
import com.ruoyi.other.api.domain.TNotice;
@@ -29,7 +30,13 @@
@ApiOperation(tags = {"后台-内容设置-协议服务"},value = "新增修改")
@PostMapping(value = "/saveOrUpdate")
public AjaxResult saveOrUpdate(@RequestBody THtml tHtml) {
- htmlService.saveOrUpdate(tHtml);
+ THtml one = htmlService.lambdaQuery().eq(THtml::getType, tHtml.getType()).one();
+ if(one!=null){
+ one.setContent(tHtml.getContent());
+ htmlService.updateById(one);
+ }else {
+ htmlService.save(tHtml);
+ }
return AjaxResult.success();
}
--
Gitblit v1.7.1