From 4b26e3b108dff9a96873a66aa20e94096e68e4cb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 23 一月 2025 18:30:25 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java | 406 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 381 insertions(+), 25 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 446c350..354ef74 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
@@ -1,21 +1,52 @@
package com.ruoyi.order.controller;
+import java.text.SimpleDateFormat;
+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.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.model.TExchangeOrder;
import com.ruoyi.order.api.model.TShoppingOrder;
+import com.ruoyi.order.api.query.ShoppingOrderQuery;
+import com.ruoyi.order.api.query.TActivityStatisticsQuery;
+import com.ruoyi.order.api.vo.TActivityStatisticslVO;
+import com.ruoyi.order.api.vo.TActivityVO;
+import com.ruoyi.order.dto.ExchangeOrderGoodsInfo;
+import com.ruoyi.order.dto.GetMyExchangeOrder;
+import com.ruoyi.order.dto.MyExchangeOrderList;
import com.ruoyi.order.service.TExchangeOrderService;
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;
+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;
-import io.swagger.models.auth.In;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.List;
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -29,48 +60,373 @@
@RestController
@RequestMapping("/t-exchange-order")
public class TExchangeOrderController {
- @Autowired
+ @Resource
private TShoppingOrderService tShoppingOrderService;
- @Autowired
+ @Resource
private TExchangeOrderService exchangeOrderService;
+
+ @Resource
+ private AppUserClient appUserClient;
+ @Resource
+ private ChargingPileClient chargingPileClient;
+ @Resource
+ private GoodsClient goodsClient;
+ @Resource
+ private CouponClient couponClient;
+
+ @Resource
+ private SysUserClient sysUserClient;
+
+ @Resource
+ private TokenService tokenService;
+
+
+
+ @RequiresPermissions(value = {"/exchangeOrder"}, logical = Logical.OR)
+ @PostMapping("/getExchangeOrderList")
+ @ApiOperation(value = "列表查询", tags = {"管理后台-兑换订单"})
+ public AjaxResult<PageInfo<TExchangeOrder>> getExchangeOrderList(@RequestBody ShoppingOrderQuery query) {
+ if (StringUtils.hasLength(query.getPhone())) {
+ List<Long> data = appUserClient.getUserIdsByPhone(query.getPhone()).getData();
+ if (data.isEmpty()){
+ return AjaxResult.success(new PageInfo<TShoppingOrder>());
+ }
+ query.setUserIds(data);
+ }
+ if (StringUtils.hasLength(query.getName())) {
+ List<Integer> data = goodsClient.getGoodsIdsByName(query.getName()).getData();
+ query.setGoodsIds(data);
+ List<Integer> data1 = couponClient.getCouponIdsByName(query.getName()).getData();
+ query.setCouponIds(data1);
+ if (data.isEmpty() && data1.isEmpty()){
+ return AjaxResult.success(new PageInfo<TShoppingOrder>());
+ }
+ }
+
+ PageInfo<TExchangeOrder> res = exchangeOrderService.pageList(query);
+ return AjaxResult.success(res);
+ }
+
+
+
+ @RequiresPermissions(value = {"/exchangeOrder/deliver_goods"}, logical = Logical.OR)
+ @GetMapping("/getShoppingOrderInfoById")
+ @ApiOperation(value = "根据订单id查看订单详情", tags = {"管理后台-兑换订单"})
+ public AjaxResult<TExchangeOrder> getShoppingOrderList(String id) {
+ TExchangeOrder byId = exchangeOrderService.getById(id);
+ if (byId.getConsignerId()!=null){
+ SysUser data = sysUserClient.getSysUser(byId.getConsignerId()).getData();
+ if (data!=null){
+ byId.setConsignerName(data.getUserName());
+ }
+ }
+ if (byId.getCancellationId()!=null){
+ SysUser data = sysUserClient.getSysUser(byId.getCancellationId()).getData();
+ if (data!=null){
+ byId.setCancellationName(data.getUserName());
+ }
+ }
+ if (byId.getAppUserAddressId()!=null){
+ TAppUserAddress data = appUserClient.getAddressById(byId.getAppUserAddressId()).getData();
+ if (data!=null){
+ 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);
+ }
+
+
+
+ @RequiresPermissions(value = {"/exchangeOrder/del"}, logical = Logical.OR)
+ @GetMapping("/deleteShoppingOrder")
+ @ApiOperation(value = "批量删除订单", tags = {"管理后台-兑换订单"})
+ public AjaxResult<TExchangeOrder> deleteShoppingOrder(String ids) {
+ exchangeOrderService.removeBatchByIds(Arrays.asList(ids.split(",")));
+ return AjaxResult.success();
+ }
+
+
+ @RequiresPermissions(value = {"/exchangeOrder/cancel"}, logical = Logical.OR)
+ @GetMapping("/cancelShoppingOrder")
+ @ApiOperation(value = "取消订单", tags = {"管理后台-兑换订单"})
+ public AjaxResult cancelShoppingOrder(String id) {
+ TExchangeOrder byId = exchangeOrderService.getById(id);
+ Long userid = tokenService.getLoginUser().getUserid();
+ 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();
+ }
+
+
+
+ @RequiresPermissions(value = {"/exchangeOrder/deliver_goods"}, logical = Logical.OR)
+ @GetMapping("/consignerShoppingOrder")
+ @ApiOperation(value = "发货", tags = {"管理后台-兑换订单"})
+ 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());
+ byId.setStatus(2);
+ exchangeOrderService.updateById(byId);
+ return AjaxResult.success();
+ }
/**
- * 管理后台 根据商品ids 查询对应的销量
- * @param goodsIds
+ * 管理后台 活动费用统计
+ * @param
* @return
*/
- @PostMapping("/t-exchange-order/getSalesCountByGoodsIds")
- public R<List<Integer>> getSalesCountByGoodsId(String goodsIds){
+ @PostMapping(value = "/activityStatistics")
+ public R<TActivityVO> activityStatistics(@RequestBody TActivityStatisticsQuery dto) {
+ if (StringUtils.hasLength(dto.getPhone())){
+ // 远程调用查询出符合条件的用户ids
+ List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
+ if (data.isEmpty()){
+ TActivityVO res = new TActivityVO();
+ res.setList(new PageInfo<TActivityStatisticslVO>());
+ return R.ok(res);
+ }
+ dto.setUserIds(data);
+ }
+ if (dto.getSiteId()!=null){
+ // 远程调用查询出符合条件的充电桩ids
+ List<TChargingPile> data = chargingPileClient.getChargingPileBySiteId(dto.getSiteId()).getData();
+ dto.setChargingPileIds(data.stream().map(TChargingPile::getId).collect(Collectors.toList()));
+ }
+ return R.ok(tShoppingOrderService.activityStatistics(dto));
+ }
+
+ //订单详情
+ @PostMapping(value = "/detail")
+ public R<TExchangeOrder> detail(@RequestParam("orderId") Long orderId) {
+ return R.ok(exchangeOrderService.getById(orderId));
+ }
+
+ /**
+ * 管理后台 根据商品ids 查询对应的销量
+ * @param goodsIds 订单号-商品类型
+ * @return
+ */
+ @GetMapping("/getSalesCountByGoodsIds/{goodsIds}")
+ public R<List<Integer>> getSalesCountByGoodsId(@PathVariable("goodsIds")String goodsIds){
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("goods_id", split[i])
- .eq("payment_status", 2)
- .ne("refund_status", 2))
+ .eq("order_type",1)
+ .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 < split.length-1; i++) {
- Integer reduce = exchangeOrderService.list(new QueryWrapper<TExchangeOrder>()
- .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);
}
break;
}
-
-
return R.ok(res);
}
+
+ @GetMapping("/getCount")
+ public R<Integer> getCount(@RequestParam("goodId") Integer goodId,@RequestParam("goodeType")Integer goodeType,@RequestParam("buyType")Integer buyType){
+ if (buyType==1){
+ //现金
+ if (goodeType==1){
+ //商品
+ Integer reduce = tShoppingOrderService.list(new QueryWrapper<TShoppingOrder>()
+ .eq("order_type",1)
+ .eq("goods_id", goodId)
+ .isNull("refund_status"))
+ .stream().map(TShoppingOrder::getPurchaseQuantity).reduce(0, Integer::sum);
+ return R.ok(reduce);
+ }else {
+ //优惠券
+ Integer reduce = tShoppingOrderService.list(new QueryWrapper<TShoppingOrder>()
+ .eq("order_type",2)
+ .eq("coupon_id", goodId)
+ .isNull("refund_status"))
+ .stream().map(TShoppingOrder::getPurchaseQuantity).reduce(0, Integer::sum);
+ return R.ok(reduce);
+ }
+
+ }else {
+ //兑换
+ if (goodeType==1){
+ Integer reduce = exchangeOrderService.list(new QueryWrapper<TExchangeOrder>().eq("order_type",1)
+ .ne("status",4).eq("goods_id", goodId))
+ .stream().map(TExchangeOrder::getPurchaseQuantity).reduce(0, Integer::sum);
+ return R.ok(reduce);
+ }else {
+ Integer reduce = exchangeOrderService.list(new QueryWrapper<TExchangeOrder>().eq("order_type",2)
+ .ne("status",4).eq("coupon_id", goodId))
+ .stream().map(TExchangeOrder::getPurchaseQuantity).reduce(0, Integer::sum);
+ return R.ok(reduce);
+ }
+ }
+
+
+ }
+ /**
+ * 管理后台 根据t_app_coupon订单ids查询优惠券的订单编号
+ * @param goodsIds 订单号-商品类型
+ * @return
+ */
+ @GetMapping("/getCodeByOrderId/{goodsIds}")
+ public R<List<String>> getCodeByOrderId(@PathVariable("goodsIds") String goodsIds){
+ String[] split = goodsIds.split(",");
+ List<String> strings = new ArrayList<>();
+ for (String s : split) {
+ if (s.contains("-")){
+ // 带有负号的是积分兑换的订单
+ TExchangeOrder one = exchangeOrderService.getOne(new QueryWrapper<TExchangeOrder>()
+ .eq("order_type", 2)
+ .eq("id", s.replace("-","")));
+ if (one != null){
+ strings.add(one.getCode());
+ }else{
+ strings.add("");
+ }
+ }else{
+ TShoppingOrder one = tShoppingOrderService.getOne(new QueryWrapper<TShoppingOrder>()
+ .eq("order_type", 2)
+ .eq("id", s));
+ if (one != null){
+ strings.add(one.getCode());
+ }else{
+ strings.add("");
+ }
+ }
+
+ }
+
+ return R.ok(strings);
+ }
+
+
+
+
+ @PostMapping("/getById")
+ public R<Long> getById(@RequestParam("goodId") Integer goodId,@RequestParam("userId") Long userId,@RequestParam("goodType") Integer goodType){
+ if (goodType==1){
+ return R.ok(exchangeOrderService.lambdaQuery().eq(TExchangeOrder::getGoodsId,goodId).eq(TExchangeOrder::getAppUserId,userId).ne(TExchangeOrder::getStatus,4).count());
+ }else {
+ 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<ExchangeBackDto> exchangeCreate(@RequestBody ExchangeDto exchangeDto){
+ TExchangeOrder tExchangeOrder = new TExchangeOrder();
+ tExchangeOrder.setCode(OrderCodeUtil.getOrderCode("DH"));
+ tExchangeOrder.setAppUserId(exchangeDto.getUserId());
+ tExchangeOrder.setOrderType(exchangeDto.getGoodType());
+ if (exchangeDto.getGoodType()==1) {
+ tExchangeOrder.setGoodsId(exchangeDto.getGoodId());
+ }else {
+ tExchangeOrder.setCouponId(exchangeDto.getGoodId());
+ }
+ tExchangeOrder.setPurchaseQuantity(1);
+ tExchangeOrder.setAppUserAddressId(exchangeDto.getAddressId()==null?null:Long.valueOf(exchangeDto.getAddressId()));
+ tExchangeOrder.setPoints(exchangeDto.getPoint());
+ tExchangeOrder.setRemark(exchangeDto.getRemark());
+ if (exchangeDto.getGoodType()==1){
+ 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);
+ ExchangeBackDto exchangeBackDto = new ExchangeBackDto();
+ exchangeBackDto.setId(tExchangeOrder.getId());
+ exchangeBackDto.setCode(tExchangeOrder.getCode());
+
+ return R.ok(exchangeBackDto);
+
+ }
+
+
+
+ @GetMapping("/getMyExchangeOrder")
+ @ApiOperation(value = "获取兑换记录列表", tags = {"小程序-兑换记录"})
+ public AjaxResult<Map<String, Object>> getMyExchangeOrder(GetMyExchangeOrder query){
+ Map<String, Object> list = exchangeOrderService.getMyExchangeOrder(query);
+ return AjaxResult.success(list);
+ }
+
+
+
+ @GetMapping("/getGoodsExchangeOrder/{id}")
+ @ApiOperation(value = "获取兑换订单详情", tags = {"小程序-兑换记录"})
+ public AjaxResult<ExchangeOrderGoodsInfo> getGoodsExchangeOrder(@PathVariable String id){
+ ExchangeOrderGoodsInfo goodsExchangeOrder = exchangeOrderService.getGoodsExchangeOrder(id);
+ TExchangeOrder exchangeOrder = exchangeOrderService.getById(id);
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!exchangeOrder.getAppUserId().equals(userId)){
+ return AjaxResult.error("权限不足");
+ }
+ return AjaxResult.success(goodsExchangeOrder);
+ }
+
+
+ @PutMapping("/confirmReceipt/{id}")
+ @ApiOperation(value = "确认收货操作", tags = {"小程序-兑换记录"})
+ public AjaxResult confirmReceipt(@PathVariable String id){
+ TExchangeOrder tExchangeOrder = exchangeOrderService.getById(id);
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!tExchangeOrder.getAppUserId().equals(userId)){
+ return AjaxResult.error("权限不足");
+ }
+ if(tExchangeOrder.getStatus() == 3){
+ return AjaxResult.error("不能重复确认收货");
+ }
+ if(tExchangeOrder.getStatus() == 1){
+ return AjaxResult.error("订单还未发货呢");
+ }
+ if(tExchangeOrder.getStatus() == 4){
+ return AjaxResult.error("订单已取消，不允许操作。");
+ }
+ tExchangeOrder.setStatus(3);
+ exchangeOrderService.updateById(tExchangeOrder);
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.7.1