Merge remote-tracking branch 'origin/master'

wzp

2025-05-08 435f6e023163ccee35dda99e9c07c187c8f0b9c6

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java

@@ -115,7 +115,14 @@
            tbOrders.setAppId(appId);
            tbOrders.setCreateTime(new Date());

            tbOrdersService.insertTbOrders(tbOrders);
            try
            {
                tbOrdersService.insertTbOrders(tbOrders);
            }
            catch (Exception ex)
            {
                return AjaxResult.error("订单号不能重复");
            }


            SysClientApp scApp = clientAppService.selectSysClientAppByAppKey(tbOrders.getAppId());