|
|
@@ -42,6 +42,7 @@ import com.goafanti.common.enums.NoticeStatus;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
import com.goafanti.common.model.Notice;
|
|
|
import com.goafanti.common.model.OrganizationContactBook;
|
|
|
+import com.goafanti.common.model.OrganizationManagement;
|
|
|
import com.goafanti.common.model.TDunLog;
|
|
|
import com.goafanti.common.model.TOrderBack;
|
|
|
import com.goafanti.common.model.TOrderDun;
|
|
|
@@ -73,6 +74,7 @@ import com.goafanti.order.enums.ProjectNewStage;
|
|
|
import com.goafanti.order.enums.TaskState;
|
|
|
import com.goafanti.order.enums.refundState;
|
|
|
import com.goafanti.order.service.OrderNewService;
|
|
|
+import com.goafanti.order.service.OrderService;
|
|
|
|
|
|
@Service
|
|
|
public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> implements OrderNewService {
|
|
|
@@ -97,6 +99,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@Autowired
|
|
|
NoticeMapper noticeMapper;
|
|
|
@Autowired
|
|
|
+ OrderService orderService;
|
|
|
+ @Autowired
|
|
|
private UserLockReleaseMapper userLockReleaseMapper;
|
|
|
@Value(value = "${mobileRemindCodeTemplate}")
|
|
|
private String mobileRemindCodeTemplate = null;
|
|
|
@@ -275,13 +279,16 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
|
if (specially!=null&&(specially==0||specially==1||specially==2||specially==5)) {
|
|
|
- params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
|
|
|
- }else if(specially!=null&&specially==4){
|
|
|
- params.put("distribution",distribution);
|
|
|
- }
|
|
|
//0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询
|
|
|
+ if (specially!=3&&specially!=4) {
|
|
|
+ params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
|
|
|
+ }
|
|
|
+ //(咨询师管理列表 0 未分配 1部分 2全部)
|
|
|
+ if(specially==4) params.put("distribution",distribution);
|
|
|
+ // 计算出所有本部门及所属部门的ID
|
|
|
+ if(specially==1||specially==5) params.put("deps", orderService.selectMyDeps());
|
|
|
+ }
|
|
|
params.put("specially",specially);
|
|
|
-
|
|
|
if (StringUtils.isNotBlank(name)) params.put("name", name);
|
|
|
if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
|
|
|
if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
|
|
|
@@ -290,7 +297,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
return p;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public int updateOrderNew(String orderNo, Integer orderStatus,String reason) {
|