Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-24 75ec232b4f96ddb3bf59482adb7ad26e573cd9b6

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/controller/WxPayController.java

@@ -88,6 +88,16 @@
        try {
            Map<String, Object> params = wxV3Pay.verifyNotify(request, new TypeReference<Map<String, Object>>() {});
            log.info("支付回调：{}", params);
            String outRefundNo = (String) params.get("out_refund_no");
            String out_trade_no = params.get("out_trade_no").toString();
            String substring = outRefundNo.substring(0, 2);
            switch (substring){
                //购物订单
                case "GW":

                    break;
            }

            return R.ok(params);
        } catch (Exception e) {
            log.error("支付回调异常：{}", e, e);
@@ -151,10 +161,18 @@
     * @return
     */
    @PostMapping("query/queryOrderInfo")
    public R<NotifyV3PayDecodeRespBody> queryOrderInfo(String orderId){
        // todo 需要完善商户号
        NotifyV3PayDecodeRespBody query = wxV3Pay.query(orderId, "");
    public R<NotifyV3PayDecodeRespBody> queryOrderInfo(@RequestParam("orderId") String orderId){
        NotifyV3PayDecodeRespBody query = wxV3Pay.query(orderId);
        return R.ok(query);
    }
    
    
    /**
     * 关闭订单
     * @param outTradeNo
     */
    @PostMapping("pay/close")
    public void close(@RequestParam("outTradeNo") String outTradeNo){
        wxV3Pay.close(outTradeNo);
    }
}