feat(mall): 为订单支付流程添加订单号生成和更新功能

Administrator

6 days ago b51f6f0d5564b843aeb11f088873faa5aa2116ce

 src/main/java/cc/mrbird/febs/mall/controller/dependentStation/ApiMallOrderController.java

@@ -3,11 +3,20 @@
import cc.mrbird.febs.common.annotation.Limit;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.LimitType;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.common.utils.ValidateEntityUtils;
import cc.mrbird.febs.mall.controller.dependentStation.constant.OrderConstants;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
import cc.mrbird.febs.mall.service.IMallCountryDeliveryService;
import cc.mrbird.febs.mall.vo.ApiOrderPayVo;
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.pay.service.LwPayService;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -17,6 +26,8 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;

@@ -34,6 +45,8 @@

    private final IApiMallOrderInfoService mallOrderInfoService;
    private final IXcxPayService iXcxPayService;
    private final LwPayService lwPayService;
    private final IMallCountryDeliveryService countryDeliveryService;

    @ApiOperation(value = "创建订单--验证是否允许创建", notes = "创建订单--验证是否允许创建")
    @PostMapping(value = "/createOrderVerify")
@@ -43,12 +56,17 @@
    }

    @ApiOperation(value = "创建订单", notes = "创建订单")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = ApiOrderPayVo.class)
    })
    @PostMapping(value = "/createOrder")
    @Limit(key = "createOrder", period = 1, count = 1, name = "注册", prefix = "limit",limitType = LimitType.IP)
    public FebsResponse createOrder(@RequestBody @Validated AddOrderDto addOrderDto) {
        Long orderId = mallOrderInfoService.createOrder(addOrderDto);

        return new FebsResponse().success().data(orderId).message("Order successfully created");
        ApiOrderPayDto apiOrderPayDto = new ApiOrderPayDto();
        apiOrderPayDto.setOrderId(orderId);
        apiOrderPayDto.setPayType(3);
        return mallOrderInfoService.payOrderByCoin(apiOrderPayDto);
    }

    @ApiOperation(value = "取消订单", notes = "取消订单")
@@ -68,6 +86,17 @@
        map.put("order", result);
        map.put("type", payOrderDto.getType());
        return new FebsResponse().success().data(map).message("支付成功");
    }


    @ApiOperation(value = "USDT支付订单", notes = "USDT支付订单")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = ApiOrderPayVo.class)
    })
    @PostMapping(value = "/payOrderByCoin", produces = "application/json")
    public FebsResponse payOrder(@RequestBody @Validated ApiOrderPayDto payDto) {

        return mallOrderInfoService.payOrderByCoin(payDto);
    }

    @ApiOperation(value = "订单列表", notes = "订单列表")
@@ -147,4 +176,147 @@
        return new FebsResponse().success().data(iXcxPayService.getTemplateId());
    }

    // ==================== LWPAY 支付 ====================

    /**
     * 创建订单并通过 LWPAY 支付
     * <p>
     * 流程：创建订单 → 调 LWPAY 代收接口 → 返回支付 URL
     * <p>
     * 参数说明：
     * - bankCode: 银行编码，968=USDT-TRC20
     * - network:  网络链，TRX/ETH/MATIC/BSC/SOL/ARBEVM（bankCode=968 时必填）
     */
    @ApiOperation(value = "创建订单-LWPAY支付", notes = "创建订单并返回LWPAY支付URL")
    @PostMapping(value = "/createOrderByLwPay")
    @Limit(key = "createOrderByLwPay", period = 1, count = 1, name = "LWPAY下单", prefix = "limit", limitType = LimitType.IP)
    public FebsResponse createOrderByLwPay(@RequestBody @Validated LwPayCreateOrderDto lwPayDto) {
        // 1. 创建订单
        AddOrderDto addOrderDto = lwPayDto.getOrder();
        Long orderId = mallOrderInfoService.createOrder(addOrderDto);

        // 2. 获取订单详情
        MallOrderInfo order = mallOrderInfoService.getById(orderId);
        if (order != null
                && OrderStatusEnum.WAIT_PAY.getValue() == order.getStatus()
        ){

            // 3. 调用 LWPAY 代收接口
            try {
                String payUrl = lwPayService.createPayment(
                        order,
                        lwPayDto.getBankCode(),
                        lwPayDto.getNetwork()
                );

                Map<String, Object> result = new HashMap<>();
                result.put("orderNo", order.getOrderNo());
                result.put("amount", order.getAmount());
                result.put("payUrl", payUrl);
                return new FebsResponse().success().data(result);
            } catch (Exception e) {
                log.error("LWPAY 代收下单失败: orderId={}", orderId, e);
                return new FebsResponse().fail().message("Payment channel exception: " + e.getMessage());
            }
        }
        return new FebsResponse().fail().message("Payment channel exception");
    }




    @ApiOperation(value = "LWPAY支付", notes = "LWPAY支付")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = ApiOrderPayVo.class)
    })
    @PostMapping(value = "/payOrderByLwPay", produces = "application/json")
    public FebsResponse payOrderByLwPay(@RequestBody @Validated ApiOrderPayDto payDto) {

        Long orderId = payDto.getOrderId();
        Integer payType = payDto.getPayType();
        // 2. 获取订单详情
        MallOrderInfo order = mallOrderInfoService.getById(orderId);
        if (order != null
                && OrderConstants.PAY_TYPE_SYSTEM == payType
                && OrderStatusEnum.WAIT_PAY.getValue() == order.getStatus()
        ){
            String orderNo = MallUtils.getOrderNum();
            order.setOrderNo(orderNo);
            mallOrderInfoService.getBaseMapper().update(
                    null,
                    Wrappers.lambdaUpdate(MallOrderInfo.class)
                    .set(MallOrderInfo::getOrderNo, orderNo)
                    .eq(MallOrderInfo::getId, orderId)
            );
            // 3. 调用 LWPAY 代收接口
            try {
                String payUrl = lwPayService.createPayment(
                        order,
                        "967",
                        null
                );

                Map<String, Object> result = new HashMap<>();
                result.put("orderNo", order.getOrderNo());
                result.put("amount", order.getAmount());
                result.put("payUrl", payUrl);
                return new FebsResponse().success().data(result).message("下单成功");
            } catch (Exception e) {
                log.error("LWPAY 代收下单失败: orderId={}", orderId, e);
                return new FebsResponse().fail().message("Payment channel exception: " + e.getMessage());
            }
        }
        return new FebsResponse().fail().message("Payment channel exception");
    }

    /**
     * LWPAY 支付结果通知（服务端回调）
     * <p>
     * LWPAY 在支付完成后会 POST 通知到此地址。
     * 需在 LWPAY 商户后台配置 pay_notifyurl 为此地址。
     * <p>
     * 注意：收到后必须响应 "OK"，LWPAY 才会停止重试。
     */
    @ApiOperation(value = "LWPAY 支付回调", notes = "接收LWPAY异步通知")
    @PostMapping(value = "/lwPayNotify")
    public String lwPayNotify(HttpServletRequest request) {
        // 解析 form 参数
        Map<String, String> params = new HashMap<>();
        Enumeration<String> paramNames = request.getParameterNames();
        while (paramNames.hasMoreElements()) {
            String name = paramNames.nextElement();
            params.put(name, request.getParameter(name));
        }

        log.info("LWPAY 回调参数: {}", params);

        boolean success = lwPayService.handleCallback(params);
        return success ? "OK" : "FAIL";
    }

    /**
     * LWPAY 支付结果页面跳转
     * <p>
     * 用户在 LWPAY 支付页面完成后跳回此地址。
     * 需在 LWPAY 商户后台配置 pay_callbackurl 为此地址。
     */
    @ApiOperation(value = "LWPAY 支付跳转", notes = "LWPAY支付完成后的页面跳转")
    @GetMapping(value = "/lwPayReturn")
    public String lwPayReturn(HttpServletRequest request) {
        // 简单跳转到前端结果页
        String orderId = request.getParameter("orderid");
        String returncode = request.getParameter("returncode");
        log.info("LWPAY 页面跳转: orderNo={}, returncode={}", orderId, returncode);
        return "redirect:/pages/payResult?orderNo=" + orderId + "&code=" + returncode;
    }

    @ApiOperation(value = "根据国家编码查询运费", notes = "根据国家编码查询对应运费")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success")
    })
    @GetMapping(value = "/getShippingFee")
    public FebsResponse getShippingFee(@RequestParam String countryCode) {
        return countryDeliveryService.getShippingFeeByCountryCode(countryCode);
    }

}