Merge branch 'refs/heads/master_feat_aftersale_not_refund_20250312'

fs-user-app/src/main/java/com/fs/app/controller/StoreOrderController.java

@@ -159,16 +159,20 @@ public class StoreOrderController extends  AppBaseController {
         //处理是否可以申请售后
         Integer isAfterSales=0;
         if(order.getStatus().equals(OrderInfoEnum.STATUS_3.getValue())) {
-            //已完成订单
-            isAfterSales=1;
-            if (order.getFinishTime() != null) {
-                if (config.getStoreAfterSalesDay() != null && config.getStoreAfterSalesDay() > 0) {
-                    //判断完成时间是否超过指定时间
-                    Calendar calendarAfterSales = new GregorianCalendar();
-                    calendarAfterSales.setTime(order.getFinishTime());
-                    calendarAfterSales.add(calendarAfterSales.DATE, config.getStoreAfterSalesDay()); //把日期往后增加一天,整数  往后推,负数往前移动
-                    if (calendarAfterSales.getTime().getTime() < new Date().getTime()) {
-                        isAfterSales = 0;
+            //已完成订单 如果是私域用户就不允许售后
+            if(ObjectUtil.isNotNull(order.getCompanyId())){
+                isAfterSales=0;
+            } else {
+                isAfterSales=1;
+                if (order.getFinishTime() != null) {
+                    if (config.getStoreAfterSalesDay() != null && config.getStoreAfterSalesDay() > 0) {
+                        //判断完成时间是否超过指定时间
+                        Calendar calendarAfterSales = new GregorianCalendar();
+                        calendarAfterSales.setTime(order.getFinishTime());
+                        calendarAfterSales.add(calendarAfterSales.DATE, config.getStoreAfterSalesDay()); //把日期往后增加一天,整数  往后推,负数往前移动
+                        if (calendarAfterSales.getTime().getTime() < new Date().getTime()) {
+                            isAfterSales = 0;
+                        }
                     }
                 }
             }