|
|
@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import com.goafanti.common.dao.*;
|
|
|
import com.goafanti.common.model.*;
|
|
|
import com.goafanti.order.bo.*;
|
|
|
+import com.goafanti.order.enums.*;
|
|
|
import com.goafanti.organization.bo.*;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import groovy.transform.Synchronized;
|
|
|
@@ -57,16 +58,6 @@ import com.goafanti.core.mybatis.JDBCIdGenerator;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.customer.bo.LockingReleaseBo;
|
|
|
-import com.goafanti.order.enums.ActiveState;
|
|
|
-import com.goafanti.order.enums.ApprovalNewState;
|
|
|
-import com.goafanti.order.enums.LiquidationNewState;
|
|
|
-import com.goafanti.order.enums.NewOrderDunType;
|
|
|
-import com.goafanti.order.enums.NewProjectStatus;
|
|
|
-import com.goafanti.order.enums.OrderDunSubject;
|
|
|
-import com.goafanti.order.enums.OrderNewState;
|
|
|
-import com.goafanti.order.enums.ProcessStatus;
|
|
|
-import com.goafanti.order.enums.TaskState;
|
|
|
-import com.goafanti.order.enums.refundState;
|
|
|
import com.goafanti.order.service.OrderNewService;
|
|
|
import com.goafanti.order.service.OrderService;
|
|
|
import com.goafanti.patent.service.PatentNewService;
|
|
|
@@ -137,6 +128,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
private PushOrderService pushOrderService;
|
|
|
@Autowired
|
|
|
private BusinessProjectMapper businessProjectMapper;
|
|
|
+ @Autowired
|
|
|
+ private BusinessCategoryMapper businessCategoryMapper;
|
|
|
|
|
|
Logger logger = LoggerFactory.getLogger(OrderNewServiceImpl.class);
|
|
|
|
|
|
@@ -194,6 +187,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (b.getType()==5){
|
|
|
int i=tOrderTaskMapper.getHighNewRetrial(order.getOrderNo());
|
|
|
if (i>0) highNewRetrial =1;
|
|
|
+ BusinessCategory bc =businessCategoryMapper.selectByPrimaryKey(b.getCid());
|
|
|
+ if (bc !=null && bc.getSort().equals(6)){
|
|
|
+ TOrderMid tom=new TOrderMid();
|
|
|
+ tom.setOrderNo(t.getOrderNo());
|
|
|
+ tom.setProjectType(1);
|
|
|
+ tOrderMidMapper.updateByOrderNo(tom);
|
|
|
+ }
|
|
|
}
|
|
|
tm.setHighNewRetrial(highNewRetrial);
|
|
|
tTaskMidMapper.insertSelective(tm);
|
|
|
@@ -388,6 +388,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
Admin admin=adminMapper.selectFinanceAdminByOrderDep(t.getOrderDep());
|
|
|
Admin a=adminMapper.selectAllByid(TokenManager.getAdminId());
|
|
|
User u=userMapper.selectByPrimaryKey(t.getBuyerId());
|
|
|
+
|
|
|
if (tm==null) tm=new TOrderMid();
|
|
|
tm.setOrderNo(t.getOrderNo());
|
|
|
if (u!=null&&u.getNickname()!=null) {
|
|
|
@@ -401,6 +402,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
tm.setSalesmanId(a.getId());
|
|
|
tm.setSalesmanName(a.getName());
|
|
|
}
|
|
|
+ //判断订单是否为会员订单
|
|
|
+ int i =tOrderMidMapper.judgeProjectType(t.getOrderNo());
|
|
|
+ if (i>0){
|
|
|
+ tm.setProjectType(1);
|
|
|
+ }
|
|
|
tm.setDepName(tOrderMidMapper.selectDepNameByDepid(t.getOrderDep()));
|
|
|
if (tm.getId()!=null) {
|
|
|
tOrderMidMapper.updateByPrimaryKeySelective(tm);
|
|
|
@@ -535,7 +541,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@Override
|
|
|
public Pagination<TOrderNewBo> orderNewList(String aid,String name, String orderNo, String starTime, String endTime,Integer specially,Integer approval,
|
|
|
Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer amountStatus,
|
|
|
- String contractStart, String contractEnd,String uid, Integer pageNo, Integer pageSize) {
|
|
|
+ String contractStart, String contractEnd,String uid,Integer projectType,Integer processStatus, Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
|
@@ -569,6 +575,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
|
|
|
if (StringUtils.isNotBlank(contractStart)) params.put("contractStart", contractStart);
|
|
|
if (StringUtils.isNotBlank(contractEnd)) params.put("contractEnd", contractEnd+" 23:59:59");
|
|
|
+ if(null != projectType)params.put("projectType",projectType);
|
|
|
+ if(null != processStatus)params.put("processStatus",processStatus);
|
|
|
params.put("outsource", outsource);
|
|
|
Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, pageNo, pageSize);
|
|
|
return p;
|
|
|
@@ -1137,34 +1145,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
return t;
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
- public List<OrderDunTaskBo> selectAllOrderDun() {
|
|
|
- return tOrderDunMapper.getTaskAllOrderDun();
|
|
|
- }
|
|
|
|
|
|
- @Override
|
|
|
- public void updateOrderDun(TOrderDun tDun) {
|
|
|
- tOrderDunMapper.updateByPrimaryKeySelective(tDun);
|
|
|
- }
|
|
|
|
|
|
@Override
|
|
|
- public void addNoticAndSendEmail(String orderNo,OrderDunTaskBo t,Integer type)
|
|
|
- throws UnsupportedEncodingException, MessagingException {
|
|
|
- TOrderNewBo b = tOrderNewMapper.getSaleIdByOno(type==NoticeStatus.ORDER_DUN.getCode()?t.getOrderNo():orderNo);
|
|
|
- String id="1";
|
|
|
- if (type==NoticeStatus.ORDER_DUN.getCode()) id=b.getSalesmanId();
|
|
|
- if (type==NoticeStatus.ORDER_BACK.getCode()) id=TokenManager.getAdminId()==null?"1":TokenManager.getAdminId();
|
|
|
- if (type==NoticeStatus.ORDER_APPROVA_NO.getCode()) id=TokenManager.getAdminId()==null?"1":TokenManager.getAdminId();
|
|
|
- AdminListBo a = adminMapper.getDeptNameByAid(id);
|
|
|
- sendEmail( t==null?null:t.getId(), a, b);
|
|
|
-
|
|
|
- addNotic(type,a, b);
|
|
|
- }
|
|
|
-
|
|
|
- public void addNotic(Integer type,AdminListBo a,TOrderNewBo b) {
|
|
|
+ public void addNotic(Integer type, AdminListBo a, TOrderNewBo b) {
|
|
|
StringBuffer sb=new StringBuffer();
|
|
|
- sb=sb.append("客户名称[").append(b.getUserName()).append("], 合同编号[").append(b.getContractNo())
|
|
|
- .append("] 订单编号[").append(b.getOrderNo()).append("] 操作人: ").append(a.getDepartmentName()).append("-").append(a.getName()).append("。");
|
|
|
+ sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
|
|
|
Notice n =new Notice();
|
|
|
n.setId(UUID.randomUUID().toString());
|
|
|
n.setAid(b.getSalesmanId());
|