Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

zhibing.pu

2024-08-10 c3363d35b8dd42a862681d505360cd2c72d070a1

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

@@ -2,23 +2,32 @@


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.account.api.feignClient.AppUserClient;
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.web.page.PageInfo;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TExchangeOrder;
import com.ruoyi.order.api.model.TShoppingOrder;
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.service.TChargingOrderService;
import com.ruoyi.order.service.TExchangeOrderService;
import com.ruoyi.order.service.TShoppingOrderService;
import com.ruoyi.order.service.TVipOrderService;
import com.ruoyi.order.service.impl.TChargingOrderServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.models.auth.In;
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.RequestParam;
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.Arrays;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -36,6 +45,33 @@
    private TShoppingOrderService tShoppingOrderService;
    @Autowired
    private TExchangeOrderService exchangeOrderService;
    @Autowired
    private TChargingOrderService chargingOrderService;
    @Autowired
    private TVipOrderService vipOrderService;
    @Autowired
    private AppUserClient appUserClient;
    @Autowired
    private ChargingPileClient chargingPileClient;
    /**
     * 管理后台 活动费用统计
     * @param
     * @return
     */
    @PostMapping(value = "/activityStatistics")
    public R<TActivityVO> activityStatistics(@RequestBody TActivityStatisticsQuery dto) {
        if (StringUtils.hasLength(dto.getPhone())){
            // 远程调用查询出符合条件的用户ids
            List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
            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")
@@ -78,49 +114,45 @@
        return R.ok(res);
    }
    /**
     * 管理后台 根据t_app_coupon流水号查询现金优惠券的订单编号
     * 管理后台 根据t_app_coupon订单ids查询优惠券的订单编号
     * @param goodsIds  订单号-商品类型
     * @return
     */
    @PostMapping("/getCodeBySerialNumber")
    public R<List<String>> getCodeBySerialNumber(String goodsIds){
    @PostMapping("/getCodeByOrderId")
    public R<List<String>> getCodeByOrderId(String goodsIds){
        String[] split = goodsIds.split("-");
        List<String> strings = new ArrayList<>();
        for (String s : split) {
            TShoppingOrder one = tShoppingOrderService.getOne(new QueryWrapper<TShoppingOrder>()
                    .eq("order_type", 2)
                    .eq("serial_number", s));
            if (one != null){
                strings.add(one.getCode());
            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{
                strings.add("");
                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);
    }
    /**
     * 管理后台 根据t_app_coupon流水号查询积分兑换优惠券的订单编号
     * 管理后台 根据t_app_coupon订单ids查询积分兑换优惠券的订单编号
     * @param goodsIds  订单号-商品类型
     * @return
     */
    @PostMapping("/getCodeBySerialNumberIntegral")
    public R<List<String>> getCodeBySerialNumberIntegral(String goodsIds){
        String[] split = goodsIds.split("-");
        List<String> strings = new ArrayList<>();
        for (String s : split) {
            TExchangeOrder one = exchangeOrderService.getOne(new QueryWrapper<TExchangeOrder
                    >()
                    .eq("order_type", 2)
                    .eq("serial_number", s));
            if (one != null){
                strings.add(one.getCode());
            }else{
                strings.add("");
            }
        }

        return R.ok(strings);
    }
}