Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-31 aae527fa93d2720b56bd74acf53663d86f6150f6

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java

@@ -3,7 +3,9 @@
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;
@@ -26,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;
@@ -116,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);
    }
@@ -266,6 +284,8 @@
            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){
@@ -281,7 +301,7 @@
        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(1);
        }else {
@@ -289,10 +309,15 @@
        }
        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);

    }
@@ -312,6 +337,7 @@
    @ApiOperation(value = "获取兑换订单详情", tags = {"小程序-兑换记录"})
    public AjaxResult<ExchangeOrderGoodsInfo> getGoodsExchangeOrder(@PathVariable String id){
        ExchangeOrderGoodsInfo goodsExchangeOrder = exchangeOrderService.getGoodsExchangeOrder(id);

        return AjaxResult.success(goodsExchangeOrder);
    }