Merge remote-tracking branch 'origin/master'

xuhy

2025-10-14 14f55cd77189bae10627277a2a3dab9cec5fcada

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java

@@ -447,6 +447,11 @@
            // 先退分账  在退订单
            // 查出采购单 算出价格  下单  算出应该分佣金额 应该分给谁
            TErpProcurement erpProcurement = erpProcurementService.getById(id);
            if(erpProcurement.getStatus()==2){
                erpProcurement.setStatus(6);
                erpProcurementService.updateById(erpProcurement);
                return R.ok("操作成功");
            }
            // 还未分账成功不能退款

        if(erpProcurement.getStatus()==null || erpProcurement.getStatus()!=1){