|
|
@@ -27,6 +27,7 @@ import com.goafanti.common.bo.EmailBo;
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.dao.AdminMapper;
|
|
|
+import com.goafanti.common.dao.NoticeMapper;
|
|
|
import com.goafanti.common.dao.OrganizationContactBookMapper;
|
|
|
import com.goafanti.common.dao.TDunLogMapper;
|
|
|
import com.goafanti.common.dao.TOrderBackMapper;
|
|
|
@@ -35,7 +36,9 @@ import com.goafanti.common.dao.TOrderNewMapper;
|
|
|
import com.goafanti.common.dao.TOrderRefundMapper;
|
|
|
import com.goafanti.common.dao.TOrderTaskMapper;
|
|
|
import com.goafanti.common.dao.UserLockReleaseMapper;
|
|
|
+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.TDunLog;
|
|
|
import com.goafanti.common.model.TOrderBack;
|
|
|
@@ -89,6 +92,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@Autowired
|
|
|
private AdminMapper adminMapper;
|
|
|
@Autowired
|
|
|
+ NoticeMapper noticeMapper;
|
|
|
+ @Autowired
|
|
|
private UserLockReleaseMapper userLockReleaseMapper;
|
|
|
@Value(value = "${mobileRemindCodeTemplate}")
|
|
|
private String mobileRemindCodeTemplate = null;
|
|
|
@@ -135,6 +140,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
checkOrder(order,t);
|
|
|
t.setTaskStatus(TaskState.WFP.getCode());
|
|
|
t.setProjectStatus(ProjectNewStage.DTJ.getCode());
|
|
|
+ if(t.getCommodityPrice()!=null)order.setTotalAmount(order.getTotalAmount());
|
|
|
return tOrderTaskMapper.insertSelective(t);
|
|
|
}
|
|
|
|
|
|
@@ -296,12 +302,34 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
ob.setBackStatus(0);//待处理
|
|
|
ob.setInitiate(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
|
|
|
ob.setAccept(tOrder.getSalesmanId());
|
|
|
- SendEmail(orderNo,null);
|
|
|
+ // 新增站内消息
|
|
|
+ addNotic(orderNo,NoticeStatus.ORDER_BACK.getCode());
|
|
|
+ // 发送邮件
|
|
|
+ try {
|
|
|
+ sendEmail(orderNo,null);
|
|
|
+ } catch (UnsupportedEncodingException | MessagingException e) {
|
|
|
+ LoggerUtils.error(getClass(), "发送邮件失败", e);
|
|
|
+ }
|
|
|
tOrderBackMapper.insertSelective(ob);
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+ public void addNotic(String orderNo,Integer type) {
|
|
|
+ String id=TokenManager.getAdminId()==null?"1":TokenManager.getAdminId();
|
|
|
+ AdminListBo a = adminMapper.getDeptNameByAid(id);
|
|
|
+ String str=NoticeStatus.getValueByCode(type)+": 订单编号 -"+orderNo+", 操作人:"+a.getDepartmentName()+"-"+a.getName()+"。";
|
|
|
+ Notice n =new Notice();
|
|
|
+ n.setId(UUID.randomUUID().toString());
|
|
|
+ n.setAid(id);
|
|
|
+ n.setNoticeType(type);
|
|
|
+ n.setContent(str);
|
|
|
+ n.setReaded(0);//未读
|
|
|
+ noticeMapper.insertSelective(n);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<TOrderNewBo> dunOrderNewList(String name, String orderNo, String starTime, String endTime,
|
|
|
@@ -433,10 +461,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
@Override
|
|
|
public int deleteOrderNew(String orderNo) {
|
|
|
- TOrderNew t=new TOrderNew();
|
|
|
- t.setOrderNo(orderNo);
|
|
|
- t.setDeleteSign(1);//作废
|
|
|
- return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
+ TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
+ if (t.getOrderStatus()==OrderNewState.YBH.getCode()||t.getOrderStatus()==OrderNewState.YTD.getCode()) {
|
|
|
+ t.setOrderNo(orderNo);
|
|
|
+ t.setDeleteSign(1);//作废
|
|
|
+ return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
+ }
|
|
|
+ return -1;
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -541,7 +572,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
return -1;
|
|
|
}
|
|
|
t.setOrderStatus(OrderNewState.YBH.getCode());
|
|
|
- SendEmail(orderNo,null);
|
|
|
+ //sendEmail
|
|
|
+ addNotic(orderNo,NoticeStatus.ORDER_BACK.getCode());
|
|
|
+ try {
|
|
|
+ sendEmail(orderNo,null);
|
|
|
+ } catch (UnsupportedEncodingException | MessagingException e) {
|
|
|
+ LoggerUtils.error(getClass(), "发送邮件失败", e);
|
|
|
+ }
|
|
|
return tOrderNewMapper.updateByPrimaryKey(t);
|
|
|
}
|
|
|
|
|
|
@@ -560,13 +597,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public void SendEmail(String orderNo,String dunId){
|
|
|
+ public void sendEmail(String orderNo,String dunId) throws UnsupportedEncodingException, MessagingException{
|
|
|
String id=TokenManager.getAdminId()==null?"1":TokenManager.getAdminId();
|
|
|
AdminListBo a = adminMapper.getDeptNameByAid(id);
|
|
|
TOrderNewBo b = tOrderNewMapper.getSaleIdByOno(orderNo);
|
|
|
String content = "<div>客户名称: "+ b.getUserName() +"</div><div>订单编号: " + orderNo + "</div>";
|
|
|
String tite="订单驳回";
|
|
|
- try {
|
|
|
if(StringUtils.isNotBlank(dunId)) {
|
|
|
TOrderDun tDun=tOrderDunMapper.selectByPrimaryKey(dunId);
|
|
|
content +="<div>催收时间: " + new SimpleDateFormat("yyyy-MM-dd").format(tDun.getCreateTime()) +
|
|
|
@@ -579,11 +615,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
LoggerUtils.debug(logger, "tite:"+tite+" Email:"+ b.getEmail()+" 收件人姓名:"+ b.getSalesmanName()+ " 部门:"+a.getDepartmentName()+ " 发件人姓名:"+a.getName()+" 内容:"+ content);
|
|
|
SendEmailUtil.getInstance().send(bo);
|
|
|
LoggerUtils.debug(logger, "=========================================发送邮件成功");
|
|
|
- } catch (UnsupportedEncodingException e) {
|
|
|
- LoggerUtils.error(getClass(), "发送邮件失败", e);
|
|
|
- } catch (MessagingException e) {
|
|
|
- LoggerUtils.error(getClass(), "发送邮件失败", e);
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
|