From fd35f223b7f40ee9ee4a9307384b54a96d7956a2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 十月 2024 09:35:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 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 2c79bee..e179dab 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
@@ -3,12 +3,15 @@
import java.time.LocalDateTime;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.account.api.feignClient.AppUserAddressClient;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUserAddress;
import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient;
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.ExchangeBackDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
@@ -25,6 +28,8 @@
import com.ruoyi.order.service.TShoppingOrderService;
import com.ruoyi.common.core.dto.ExchangeDto;
import com.ruoyi.common.core.utils.OrderCodeUtil;
+import com.ruoyi.other.api.domain.TCoupon;
+import com.ruoyi.other.api.domain.TGoods;
import com.ruoyi.other.api.feignClient.CouponClient;
import com.ruoyi.other.api.feignClient.GoodsClient;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
@@ -38,10 +43,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -96,7 +98,7 @@
}
@Resource
private SysUserClient sysUserClient;
- @PostMapping("/getShoppingOrderInfoById")
+ @GetMapping("/getShoppingOrderInfoById")
@ApiOperation(value = "根据订单id查看订单详情", tags = {"管理后台-兑换订单"})
public AjaxResult<TExchangeOrder> getShoppingOrderList(String id) {
TExchangeOrder byId = exchangeOrderService.getById(id);
@@ -118,6 +120,20 @@
byId.setReceivingName(data.getName()+"-"+data.getPhone());
byId.setReceivingAddress(data.getAddress());
}
+ }
+ switch (byId.getOrderType()){
+ case 1:
+ TGoods data = goodsClient.getGoodsById(byId.getGoodsId()).getData();
+ if (data!=null){
+ byId.setName(data.getName());
+ }
+ break;
+ case 2:
+ TCoupon data1 = couponClient.getCouponById1(byId.getCouponId()).getData();
+ if (data1!=null){
+ byId.setName(data1.getName());
+ }
+ break;
}
return AjaxResult.success(byId);
}
@@ -145,8 +161,10 @@
}
@GetMapping("/consignerShoppingOrder")
@ApiOperation(value = "发货", tags = {"管理后台-兑换订单"})
- public AjaxResult consignerShoppingOrder(String id) {
+ public AjaxResult consignerShoppingOrder(String id,String companyName,String code) {
TExchangeOrder byId = exchangeOrderService.getById(id);
+ byId.setExpressCompany(companyName);
+ byId.setExpressNumber(code);
Long userid = tokenService.getLoginUser().getUserid();
byId.setConsignerId(userid);
byId.setConsignerTime(LocalDateTime.now());
@@ -202,14 +220,16 @@
for (int i = 0; i < split1.length; i++) {
Integer reduce = tShoppingOrderService.list(new QueryWrapper<TShoppingOrder>()
.eq("order_type",1)
- .ne("refund_status", 2))
+ .eq("goods_id", split1[i])
+ .isNull("refund_status"))
.stream().map(TShoppingOrder::getPurchaseQuantity).reduce(0, Integer::sum);
res.add(reduce);
}
break;
case 2:
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]))
+ 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);
}
@@ -224,7 +244,7 @@
*/
@GetMapping("/getCodeByOrderId/{goodsIds}")
public R<List<String>> getCodeByOrderId(@PathVariable("goodsIds") String goodsIds){
- String[] split = goodsIds.split("-");
+ String[] split = goodsIds.split(",");
List<String> strings = new ArrayList<>();
for (String s : split) {
if (s.contains("-")){
@@ -264,9 +284,11 @@
return R.ok(exchangeOrderService.lambdaQuery().eq(TExchangeOrder::getCouponId,goodId).eq(TExchangeOrder::getAppUserId,userId).ne(TExchangeOrder::getStatus,4).count());
}
}
+ @Resource
+ private AppUserAddressClient appUserAddressClient;
@PostMapping("/create")
- public R<Long> exchangeCreate(@RequestBody ExchangeDto exchangeDto){
+ public R<ExchangeBackDto> exchangeCreate(@RequestBody ExchangeDto exchangeDto){
TExchangeOrder tExchangeOrder = new TExchangeOrder();
tExchangeOrder.setCode(OrderCodeUtil.getOrderCode("DH"));
tExchangeOrder.setAppUserId(exchangeDto.getUserId());
@@ -279,16 +301,24 @@
tExchangeOrder.setPurchaseQuantity(1);
tExchangeOrder.setAppUserAddressId(exchangeDto.getAddressId()==null?null:Long.valueOf(exchangeDto.getAddressId()));
tExchangeOrder.setPoints(exchangeDto.getPoint());
- tExchangeOrder.setRemark("");
+ tExchangeOrder.setRemark(exchangeDto.getRemark());
if (exchangeDto.getGoodType()==1){
- tExchangeOrder.setStatus(0);
+ tExchangeOrder.setStatus(1);
}else {
tExchangeOrder.setStatus(3);
}
tExchangeOrder.setCreateTime(LocalDateTime.now());
tExchangeOrder.setDelFlag(false);
+
+ TAppUserAddress data = appUserAddressClient.getAppUserAddressById(exchangeDto.getAddressId()).getData();
+ tExchangeOrder.setAddressJson(JSON.toJSONString(data));
+
exchangeOrderService.save(tExchangeOrder);
- return R.ok(tExchangeOrder.getId());
+ ExchangeBackDto exchangeBackDto = new ExchangeBackDto();
+ exchangeBackDto.setId(tExchangeOrder.getId());
+ exchangeBackDto.setCode(tExchangeOrder.getCode());
+
+ return R.ok(exchangeBackDto);
}
@@ -296,8 +326,8 @@
@GetMapping("/getMyExchangeOrder")
@ApiOperation(value = "获取兑换记录列表", tags = {"小程序-兑换记录"})
- public AjaxResult<List<MyExchangeOrderList>> getMyExchangeOrder(GetMyExchangeOrder query){
- List<MyExchangeOrderList> list = exchangeOrderService.getMyExchangeOrder(query);
+ public AjaxResult<Map<String, Object>> getMyExchangeOrder(GetMyExchangeOrder query){
+ Map<String, Object> list = exchangeOrderService.getMyExchangeOrder(query);
return AjaxResult.success(list);
}
@@ -307,6 +337,7 @@
@ApiOperation(value = "获取兑换订单详情", tags = {"小程序-兑换记录"})
public AjaxResult<ExchangeOrderGoodsInfo> getGoodsExchangeOrder(@PathVariable String id){
ExchangeOrderGoodsInfo goodsExchangeOrder = exchangeOrderService.getGoodsExchangeOrder(id);
+
return AjaxResult.success(goodsExchangeOrder);
}
--
Gitblit v1.7.1