attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
dzl 2025-05-21 15:10:56 +08:00
commit 796081cf7b
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ebike-feign/pom.xml
View File

@ -65,4 +65,18 @@
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs>
<arg>-implicit:class</arg> <!-- 可选值：none、class -->
</compilerArgs>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

4
ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
View File

@ -318,7 +318,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
public void refund(Long orderId) { public void refund(Long orderId) {
QueryWrapper queryWrapper = QueryWrapper.create() QueryWrapper queryWrapper = QueryWrapper.create()
.where(EBIKE_USER_ORDERS.ORDER_ID.eq(orderId)) .where(EBIKE_USER_ORDERS.ORDER_ID.eq(orderId))
.where(EBIKE_USER_ORDERS.STATUS.eq(OrderStatus.PAID)); .where(EBIKE_USER_ORDERS.STATUS.eq(OrderStatus.REFUND_APPLYING));
EbikeUserOrders userOrders = this.mapper.selectOneByQuery(queryWrapper); EbikeUserOrders userOrders = this.mapper.selectOneByQuery(queryWrapper);
userOrders.setStatus(OrderStatus.REFUNDING); userOrders.setStatus(OrderStatus.REFUNDING);
this.mapper.update(userOrders); this.mapper.update(userOrders);
@ -338,7 +338,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
public void rejectRefund(Long orderId) { public void rejectRefund(Long orderId) {
QueryWrapper queryWrapper = QueryWrapper.create() QueryWrapper queryWrapper = QueryWrapper.create()
.where(EBIKE_USER_ORDERS.ORDER_ID.eq(orderId)) .where(EBIKE_USER_ORDERS.ORDER_ID.eq(orderId))
.where(EBIKE_USER_ORDERS.STATUS.eq(OrderStatus.REFUNDING)); .where(EBIKE_USER_ORDERS.STATUS.eq(OrderStatus.REFUND_APPLYING));
EbikeUserOrders userOrders = this.mapper.selectOneByQuery(queryWrapper); EbikeUserOrders userOrders = this.mapper.selectOneByQuery(queryWrapper);
userOrders.setStatus(OrderStatus.REFUND_REJECTED); userOrders.setStatus(OrderStatus.REFUND_REJECTED);
this.mapper.update(userOrders); this.mapper.update(userOrders);