Merge remote-tracking branch 'origin/master'

mitao

2025-11-26 11ade824e0abb0c42d6346c9b808666aaff99c9a

 DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java

@@ -96,7 +96,7 @@
                    out.flush();
                    out.close();
                    String[] split = out_trade_no.split("_");
                    reassignService.payReassign(split[0], order_id, 1);
                    reassignService.payReassign(out_trade_no, order_id, 1);
                }
            }
        }catch (Exception e){
@@ -139,7 +139,7 @@
                    out.flush();
                    out.close();
                    String[] split = out_trade_no.split("_");
                    reassignService.payReassign(split[0], order_id, 2);
                    reassignService.payReassign(out_trade_no, order_id, 2);
                }
            }
        }catch (Exception e){