From 7d797c3f197371bb66c8ed3e60327817e9f0364c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 28 八月 2024 13:57:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
index e2a563a..2c79bee 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
@@ -27,6 +27,8 @@
import com.ruoyi.common.core.utils.OrderCodeUtil;
import com.ruoyi.other.api.feignClient.CouponClient;
import com.ruoyi.other.api.feignClient.GoodsClient;
+import com.ruoyi.payment.api.feignClient.AliPaymentClient;
+import com.ruoyi.payment.api.feignClient.WxPaymentClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.Api;
@@ -67,6 +69,7 @@
private GoodsClient goodsClient;
@Resource
private CouponClient couponClient;
+
@PostMapping("/getExchangeOrderList")
@ApiOperation(value = "列表查询", tags = {"管理后台-兑换订单"})
@@ -131,11 +134,13 @@
public AjaxResult cancelShoppingOrder(String id) {
TExchangeOrder byId = exchangeOrderService.getById(id);
Long userid = tokenService.getLoginUser().getUserid();
- // todo 根据支付方式 取消订单
byId.setCancellationId(userid);
byId.setCancellationTime(LocalDateTime.now());
byId.setStatus(4);
exchangeOrderService.updateById(byId);
+ // 回退积分
+ Integer points = byId.getPoints();
+ appUserClient.refundPoints(byId.getAppUserId()+"-"+points);
return AjaxResult.success();
}
@GetMapping("/consignerShoppingOrder")
@@ -190,26 +195,21 @@
String[] split = goodsIds.split("-");
// 取出最后一位字符 类型1查询现金购买 类型2查询积分兑换
String s = split[split.length - 1];
+ String[] split1 = split[0].split(",");
List<Integer> res = new ArrayList<>();
switch (Integer.parseInt(s)){
case 1:
- for (int i = 0; i < split.length-1; i++) {
+ for (int i = 0; i < split1.length; i++) {
Integer reduce = tShoppingOrderService.list(new QueryWrapper<TShoppingOrder>()
.eq("order_type",1)
- .eq("goods_id", split[i])
- .eq("payment_status", 2)
.ne("refund_status", 2))
.stream().map(TShoppingOrder::getPurchaseQuantity).reduce(0, Integer::sum);
res.add(reduce);
}
break;
case 2:
- for (int i = 0; i < split.length-1; i++) {
- Integer reduce = exchangeOrderService.list(new QueryWrapper<TExchangeOrder>()
- .eq("order_type",1)
- .ne("status",4)
- .eq("goods_id", split[i])
- )
+ for (int i = 0; i < split1.length; i++) {
+ Integer reduce = exchangeOrderService.list(new QueryWrapper<TExchangeOrder>().eq("order_type",1).ne("status",4).eq("goods_id", split1[i]))
.stream().map(TExchangeOrder::getPurchaseQuantity).reduce(0, Integer::sum);
res.add(reduce);
}
@@ -277,7 +277,7 @@
tExchangeOrder.setCouponId(exchangeDto.getGoodId());
}
tExchangeOrder.setPurchaseQuantity(1);
- tExchangeOrder.setAppUserAddressId(Long.valueOf(exchangeDto.getAddressId()));
+ tExchangeOrder.setAppUserAddressId(exchangeDto.getAddressId()==null?null:Long.valueOf(exchangeDto.getAddressId()));
tExchangeOrder.setPoints(exchangeDto.getPoint());
tExchangeOrder.setRemark("");
if (exchangeDto.getGoodType()==1){
--
Gitblit v1.7.1