xuhy
2025-08-07 14658ead2516e801092c84c69834dc3966404305
订单导入
5个文件已修改
2个文件已添加
304 ■■■■ 已修改文件
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/ChargeOrderExport.java 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/OrderExport.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageList.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java
@@ -1,19 +1,29 @@
package com.ruoyi.order.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.utils.WebUtils;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.dto.GetImportOrderDTO;
import com.ruoyi.order.export.ChargeOrderExport;
import com.ruoyi.order.model.ChargeOrder;
import com.ruoyi.order.service.ChargeOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
@Api(tags = "充电订单")
@@ -32,6 +42,7 @@
     * 导入充电信息
     */
    @PostMapping("/importExpress")
    @ApiOperation(value = "导入充电信息", tags = "后台-充电订单-导入充电信息")
    public R importExpress(@RequestParam("file") MultipartFile file) {
       /* JSONObject jsonObject = JSONObject.parseObject(url);
        String url2 = jsonObject.getString("url");*/
@@ -54,4 +65,32 @@
        return R.ok(pageInfo);
    }
    @ApiOperation(value = "充电订单导入模板下载", tags = "后台-充电订单")
    @GetMapping("/importChargeOrder")
    public void importChargeOrder() {
        List<ChargeOrderExport> chargeOrderExports = new ArrayList<>();
        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), ChargeOrderExport.class, chargeOrderExports);
        HttpServletResponse response = WebUtils.response();
        ServletOutputStream outputStream = null;
        try {
            String fileName = URLEncoder.encode("充电订单导入模板.xls", "utf-8");
            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
            response.setHeader("content-Type", "application/vnd.ms-excel");
            response.setHeader("Pragma", "no-cache");
            response.setHeader("Cache-Control", "no-cache");
            outputStream = response.getOutputStream();
            workbook.write(outputStream);
        } catch (IOException e) {
            e.printStackTrace();
            System.out.println("充电订单导入模板下载失败!");
        } finally {
            try {
                outputStream.close();
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
    }
}
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -1,35 +1,33 @@
package com.ruoyi.order.controller;
import com.alibaba.fastjson2.JSON;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.constant.ExpressCompanyMap;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.WebUtils;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.dto.ConfirmOrderDTO;
import com.ruoyi.order.enums.OrderStatus;
import com.ruoyi.order.export.ChargeOrderExport;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.model.ChargeOrder;
import com.ruoyi.order.model.Order;
import com.ruoyi.order.service.ChargeOrderService;
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
import com.ruoyi.order.util.payment.model.UniPayCallbackResult;
import com.ruoyi.order.util.payment.wechat.PayMoneyUtil;
import com.ruoyi.order.util.payment.wx.WechatPayService;
import com.ruoyi.order.util.payment.wx.vo.PayResult;
import com.ruoyi.order.util.vo.MapTrackKD100Vo;
import com.ruoyi.order.util.vo.ShopAnalysisVO;
import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.BaseSetting;
@@ -37,29 +35,28 @@
import com.ruoyi.other.api.dto.ShopAnalysisDTO;
import com.ruoyi.other.api.feignClient.BaseSettingClient;
import com.ruoyi.other.api.feignClient.ShopClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.*;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Duration;
import java.net.URLEncoder;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -100,7 +97,7 @@
    @ResponseBody
    @PostMapping("/confirmOrder")
    @ApiOperation(value = "确定订单", tags = {"商城-订单-小程序"})
    @ApiOperation(value = "确定订单", tags = {"商城-订单-小程序-确定订单"})
    public R<ConfirmOrderVo> confirmOrder(@RequestBody ConfirmOrderDTO confirmOrderDTO) {
        ConfirmOrderVo confirmOrderVo = orderService.confirmOrder(confirmOrderDTO.getGoodId(),confirmOrderDTO.getType());
        return R.ok(confirmOrderVo);
@@ -108,7 +105,7 @@
    @ResponseBody
    @PostMapping("/orderPayment")
    @ApiOperation(value = "订单支付", tags = {"商城-订单支付-小程序"})
    @ApiOperation(value = "订单支付", tags = {"商城-订单支付-小程序-订单支付"})
    public R orderPayment(@RequestBody OrderPayment orderPayment){
        return orderService.orderPayment(orderPayment);
    }
@@ -147,12 +144,12 @@
    /**
     * 我的订单列表
     */
    @ApiOperation(value = "我的订单列表", tags = {"小程序-个人中心-我的订单"})
    @ApiOperation(value = "我的订单列表", tags = {"小程序-个人中心-我的订单-我的订单列表"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
    })
    @GetMapping("/getMyOrderList")
    public TableDataInfo<OrderVO> getMyOrderList(@RequestParam("订单状态") Integer status) {
    public TableDataInfo<OrderVO> getMyOrderList(@RequestParam("status") Integer status) {
        startPage();
        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
        return getDataTable(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
@@ -181,7 +178,7 @@
    /**
     * 扫码校验
     */
    @ApiOperation(value = "扫码校验", tags = {"小程序-个人中心-门店管理"})
    @ApiOperation(value = "扫码校验", tags = {"小程序-个人中心-门店管理-扫码校验"})
    @GetMapping("/check/{orderNumber}/{shopId}")
    public R<Boolean> check(@PathVariable("orderNumber") String orderNumber, @PathVariable("shopId") Integer shopId) {
        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
@@ -193,7 +190,7 @@
    /**
     * 订单核销
     */
    @ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理"})
    @ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理-订单核销"})
    @GetMapping("/writeOff")
    public R<Void> writeOff(@RequestParam("id") String id, @RequestParam("shopId") Integer shopId) {
        orderService.writeOff(id, shopId);
@@ -201,7 +198,7 @@
    }
    @GetMapping("/getShopOrderList")
    @ApiOperation(value = "获取订单列表", tags = {"门店后台-订单管理", })
    @ApiOperation(value = "获取订单列表", tags = {"门店后台-订单管理-获取订单列表"})
    public R<IPage<OrderPageListVo>> getShopOrderList(@RequestParam("content") String content ,
                                                      @RequestParam("status") Integer status,
                                                      @RequestParam("shopId") Integer shopId,
@@ -210,7 +207,7 @@
        return R.ok(orderService.getShopOrderList(content,status,shopId,pageNum,pageSize));
    }
    @PostMapping("/importExpress")
    @ApiOperation(value = "2.0新增导入订单", tags = {"门店后台-订单管理"})
    @ApiOperation(value = "2.0新增导入订单", tags = {"门店后台-订单管理-2.0新增导入订单"})
    public R importExpress(@RequestParam("file") MultipartFile file) {
       /* JSONObject jsonObject = JSONObject.parseObject(url);
        String url2 = jsonObject.getString("url");*/
@@ -221,8 +218,35 @@
        return orderService.importExpress(file);
    }
    @ApiOperation(value = "2.0订单导入模板下载", tags = {"门店后台-订单管理-2.0订单导入模板下载"})
    @GetMapping("/importOrder")
    public void importOrder() {
        List<OrderExport> orderExports = new ArrayList<>();
        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), OrderExport.class, orderExports);
        HttpServletResponse response = WebUtils.response();
        ServletOutputStream outputStream = null;
        try {
            String fileName = URLEncoder.encode("订单导入模板.xls", "utf-8");
            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
            response.setHeader("content-Type", "application/vnd.ms-excel");
            response.setHeader("Pragma", "no-cache");
            response.setHeader("Cache-Control", "no-cache");
            outputStream = response.getOutputStream();
            workbook.write(outputStream);
        } catch (IOException e) {
            e.printStackTrace();
            System.out.println("订单导入模板下载失败!");
        } finally {
            try {
                outputStream.close();
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
    }
    @PutMapping("/shopCancelOrder/{orderId}")
    @ApiOperation(value = "取消订单", tags = {"门店后台-订单管理"})
    @ApiOperation(value = "取消订单", tags = {"门店后台-订单管理-取消订单"})
    public R shopCancelOrder(@PathVariable("orderId") Long orderId) {
        return orderService.shopCancelOrder(orderId);
    }
@@ -232,7 +256,7 @@
    /**
     * 取消订单
     */
    @ApiOperation(value = "取消订单", tags = {"小程序-个人中心-我的订单"})
    @ApiOperation(value = "取消订单小程序", tags = {"小程序-个人中心-我的订单-取消订单小程序"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
    })
@@ -244,7 +268,7 @@
    /**
     * 确认收货
     */
    @ApiOperation(value = "确认收货", tags = {"小程序-个人中心-我的订单"})
    @ApiOperation(value = "确认收货", tags = {"小程序-个人中心-我的订单-确认收货"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
    })
@@ -272,7 +296,7 @@
    /**
     * 更新订单状态
     */
    @ApiOperation(value = "更新订单状态", tags = {"后台-订单管理"})
    @ApiOperation(value = "更新订单状态", tags = {"后台-订单管理-更新订单状态"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单对象", name = "order", required = true, dataType = "Order"),
    })
@@ -327,20 +351,20 @@
    @PutMapping("/cancelOrder/{orderId}")
    @ApiOperation(value = "取消订单操作", tags = {"后台-订单管理"})
    @ApiOperation(value = "取消订单操作", tags = {"后台-订单管理-取消订单操作"})
    public R cancelOrder(@PathVariable("orderId") Long orderId) {
        return orderService.cancelOrder(orderId);
    }
    @PutMapping("/receivingOperation/{orderId}")
    @ApiOperation(value = "收货操作", tags = {"管理后台-订单管理"})
    @ApiOperation(value = "收货操作", tags = {"管理后台-订单管理-收货操作"})
    public R receivingOperation(@PathVariable("orderId") Long orderId) {
        return orderService.receivingOperation(orderId);
    }
    @GetMapping("/getOrderInfo/{orderId}")
    @ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理"})
    @ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理-查询订单详情"})
    public R<OrderInfoVo> getOrderInfo(@PathVariable("orderId") Long orderId) {
        OrderInfoVo orderInfo = orderService.getOrderInfo(orderId);
        return R.ok(orderInfo);
@@ -348,8 +372,14 @@
    @GetMapping("/getOrderPageList")
    @ApiOperation(value = "获取订单列表", tags = {"后台-订单管理", })
//    @ApiOperation(value = "获取订单列表后台", tags = {"管理后台-订单管理-获取订单列表后台"})
    public R<PageInfo<OrderManagePageListVO>> getOrderPageList(OrderPageList orderPageList) {
        return R.ok(orderService.getOrderPageList(orderPageList));
    }
    @PostMapping("/queryOrderPageList")
    @ApiOperation(value = "获取订单列表后台", tags = {"管理后台-订单管理-获取订单列表后台"})
    public R<PageInfo<OrderManagePageListVO>> queryOrderPageList(@RequestBody OrderPageList orderPageList) {
        return R.ok(orderService.getOrderPageList(orderPageList));
    }
@@ -357,7 +387,7 @@
     * 订单统计
     */
 /*   @GetMapping("/getOrderStatistics")
    @ApiOperation(value = "订单统计", tags = {"管理后台-首页统计"})
    //@ApiOperation(value = "订单统计", tags = {"管理后台-首页统计"})
    public R<OrderStatistics> getOrderStatistics(@RequestParam("startTime") String startTime,
                                                 @RequestParam("endTime") String endTime) {
@@ -454,7 +484,6 @@
    /**
     * 获取商品销售数量
     *
     * @param goodsId
     * @return
     */
    @PostMapping(value = "/getList")
@@ -527,7 +556,7 @@
     * @return
     *//*
    @GetMapping("/getOrderExpress/{id}")
    @ApiOperation(value = "获取订单快递明细", tags = {"小程序-订单管理"})
    //@ApiOperation(value = "获取订单快递明细", tags = {"小程序-订单管理"})
    public R<MapTrackKD100Vo> getOrderExpress(@PathVariable("id") Long id) {
        Order order = orderService.getById(id);
        String expressResult = order.getExpressResult();
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/ChargeOrderExport.java
New file
@@ -0,0 +1,68 @@
package com.ruoyi.order.export;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@ApiModel(value="充电订单Order导出对象")
public class ChargeOrderExport {
    // 订单编号
    @Excel(name = "订单编号", width = 20)
    private String orderNumber;
    // 订单类型
    @Excel(name = "订单类型", width = 20)
    private String orderType;
    // 充电方式
    @Excel(name = "充电方式", width = 20)
    private String chargeType;
    // 充电用户
    @Excel(name = "充电用户", width = 20)
    private String phone;
    // 开始时间
    @Excel(name = "开始时间", width = 20)
    private LocalDateTime beginTime;
    // 结束时间
    @Excel(name = "结束时间", width = 20)
    private LocalDateTime endTime;
    // 充电时长
    @Excel(name = "充电时长", width = 20)
    private String chargingDuration;
    // 充电电量
    @Excel(name = "充电电量", width = 20)
    private BigDecimal chargingCapacity;
    // 电站运营商
    @Excel(name = "电站运营商", width = 20)
    private String powerStationOperator;
    // 城市名称
    @Excel(name = "城市名称", width = 20)
    private String city;
    // 充电场站
    @Excel(name = "充电场站", width = 20)
    private String chargingStation;
    // 电站id
    @Excel(name = "电站id", width = 20)
    private Integer powerStationId;
    // 终端编码
    @Excel(name = "终端编码", width = 20)
    private String terminalCode;
    // 车牌号
    @Excel(name = "车牌号", width = 20)
    private String plateNumber;
    // 电站价电费金额
    @Excel(name = "电站价电费金额", width = 20)
    private BigDecimal electricityAmount;
    // 电站价服务费金额
    @Excel(name = "电站价服务费金额", width = 20)
    private BigDecimal serviceAmount;
    // 电站价总金额
    @Excel(name = "电站价总金额", width = 20)
    private BigDecimal totalAmount;
    //获得积分
    @Excel(name = "获得积分", width = 20)
    private Integer point;
}
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/OrderExport.java
New file
@@ -0,0 +1,50 @@
package com.ruoyi.order.export;
import cn.afterturn.easypoi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@ApiModel(value="订单Order导出对象")
public class OrderExport {
    // 订单状态
    @Excel(name = "订单状态", width = 20)
    private Integer orderStatus;
    // 订单编号
    @Excel(name = "订单编号", width = 20)
    private String orderNumber;
    // 订单类型
    @Excel(name = "订单类型", width = 20)
    private Integer orderType;
    // 下单时间
    @Excel(name = "下单时间", width = 20)
    private String beginTime;
    // 下单用户
    @Excel(name = "下单用户", width = 20)
    private String userName;
    // 联系方式
    @Excel(name = "联系方式", width = 20)
    private String phone;
    // 商品名称
    @Excel(name = "商品名称", width = 20)
    private String goodsName;
    // 店铺名称
    @Excel(name = "店铺名称", width = 20)
    private String shopName;
    // 商品售价
    @Excel(name = "商品售价", width = 20)
    private BigDecimal sellingPrice;
    // 支付方式
    @Excel(name = "支付方式", width = 20)
    private Integer payType;
    // 支付金额
    @Excel(name = "支付积分", width = 20)
    private BigDecimal pointPayment;
    // 支付金额
    @Excel(name = "支付金额", width = 20)
    private BigDecimal cashPayment;
}
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java
@@ -217,39 +217,45 @@
                String powerStationId = row.getCell(18).getStringCellValue();
                // 终端编码
                if (row.getCell(20 )== null){
                    throw new ServiceException("第" + i + "行电站id为空", 500);
                if (row.getCell(19 )== null){
                    throw new ServiceException("第" + i + "行终端编码为空", 500);
                }
                row.getCell(20).setCellType(CellType.STRING);
                String terminalCode = row.getCell(20).getStringCellValue();
                row.getCell(19).setCellType(CellType.STRING);
                String terminalCode = row.getCell(19).getStringCellValue();
                // 车牌号
                if (row.getCell(26 )== null){
                if (row.getCell(20 )== null){
                    throw new ServiceException("第" + i + "行车牌号为空", 500);
                }
                row.getCell(26).setCellType(CellType.STRING);
                row.getCell(20).setCellType(CellType.STRING);
                String plateNumber = row.getCell(26).getStringCellValue();
                // 电站价电费金额
                if (row.getCell(73 )== null){
                if (row.getCell(21 )== null){
                    throw new ServiceException("第" + i + "行电站价电费金额为空", 500);
                }
                row.getCell(73).setCellType(CellType.STRING);
                String electricityAmount = row.getCell(73).getStringCellValue();
                row.getCell(21).setCellType(CellType.STRING);
                String electricityAmount = row.getCell(21).getStringCellValue();
                // 电站价服务费金额
                if (row.getCell(74 )== null){
                if (row.getCell(22 )== null){
                    throw new ServiceException("第" + i + "行电站价服务费金额为空", 500);
                }
                row.getCell(74).setCellType(CellType.STRING);
                String serviceAmount = row.getCell(74).getStringCellValue();
                row.getCell(22).setCellType(CellType.STRING);
                String serviceAmount = row.getCell(22).getStringCellValue();
                // 电站价总金额
                if (row.getCell(75 )== null){
                    throw new ServiceException("第" + i + "行电站价服务费金额为空", 500);
                if (row.getCell(23 )== null){
                    throw new ServiceException("第" + i + "行电站价总金额为空", 500);
                }
                row.getCell(75).setCellType(CellType.STRING);
                String totalAmount = row.getCell(75).getStringCellValue();
                row.getCell(23).setCellType(CellType.STRING);
                String totalAmount = row.getCell(23).getStringCellValue();
                // 绿电分
                if (row.getCell(24 )== null){
                    throw new ServiceException("第" + i + "行绿电分为空", 500);
                }
                row.getCell(24).setCellType(CellType.STRING);
                String point = row.getCell(24).getStringCellValue();
                //检查订单号是否重复
@@ -288,6 +294,7 @@
                chargeOrder.setElectricityAmount(new BigDecimal(electricityAmount));
                chargeOrder.setServiceAmount(new BigDecimal(serviceAmount));
                chargeOrder.setTotalAmount(new BigDecimal(totalAmount));
                chargeOrder.setPoint(Integer.valueOf(point));
                R r = importData(chargeOrder);
                if (R.isError(r)) {
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -1491,6 +1491,17 @@
                    if (shop!=null){
                        order1.setShopId(shop.getId());
                    }
                    switch (payType){
                        case "微信支付":
                            order1.setPayMethod(1);
                            break;
                        case "积分支付":
                            order1.setPayMethod(3);
                            break;
                        case "组合支付":
                            order1.setPayMethod(4);
                            break;
                    }
                    order1.setDelFlag(0);
                    order1.setCreateTime(LocalDateTime.now());
                    orderList.add(order1);//添加到订单集合中
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageList.java
@@ -15,7 +15,7 @@
 * @Date 2024/12/12 17:29
 */
@Data
@ApiModel
@ApiModel(value = "订单列表查询query")
public class OrderPageList extends BasePage {
    @ApiModelProperty("订单编号")
    public String orderNumber;