|
|
@@ -2,6 +2,7 @@ package com.goafanti.order.service.impl;
|
|
|
|
|
|
import java.io.UnsupportedEncodingException;
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
@@ -34,6 +35,7 @@ import com.goafanti.common.dao.TOrderTaskMapper;
|
|
|
import com.goafanti.common.enums.NoticeStatus;
|
|
|
import com.goafanti.common.enums.OrderLogProcess;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
+import com.goafanti.common.model.Admin;
|
|
|
import com.goafanti.common.model.Notice;
|
|
|
import com.goafanti.common.model.TOrderBack;
|
|
|
import com.goafanti.common.model.TOrderBillNew;
|
|
|
@@ -58,6 +60,7 @@ import com.goafanti.order.enums.OrderNewState;
|
|
|
import com.goafanti.order.enums.ProcessStatus;
|
|
|
import com.goafanti.order.enums.refundState;
|
|
|
import com.goafanti.order.service.FundManageOrderService;
|
|
|
+import com.goafanti.order.service.OrderNewService;
|
|
|
import com.goafanti.organization.bo.OrganizationListOut;
|
|
|
|
|
|
@Service
|
|
|
@@ -82,9 +85,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
@Autowired
|
|
|
private TOrderLogMapper tOrderLogMapper;
|
|
|
@Autowired
|
|
|
- JDBCIdGenerator idGenerator;
|
|
|
- @Autowired
|
|
|
- NoticeMapper noticeMapper;
|
|
|
+ private OrderNewService orderNewService;
|
|
|
@Autowired
|
|
|
private OrganizationManagementMapper organizationManagementMapper;
|
|
|
Logger logger = LoggerFactory.getLogger(FundManagerOrderServiceImpl.class);
|
|
|
@@ -169,7 +170,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
@Override
|
|
|
public Integer updateReject(TOrderBack back) {
|
|
|
// 是否已经收款
|
|
|
- checkDeleteSign(back.getOrderNo());
|
|
|
+ TOrderNew t=checkDeleteSign(back.getOrderNo());
|
|
|
BigDecimal bd = billNewMapper.getAmountByOid(back.getOrderNo());
|
|
|
if(bd.compareTo(new BigDecimal(0.0)) == 1){
|
|
|
return 0;//已经收款不能驳回
|
|
|
@@ -195,22 +196,9 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
back.setAccept(b.getSalesmanId()); //查看该订单的负责人
|
|
|
addOrderLog(back.getOrderNo(), OrderLogProcess.BH.getCode());
|
|
|
c = backMapper.insertSelective(back);
|
|
|
-
|
|
|
- //发送站内消息
|
|
|
- addNotic(back.getOrderNo(),NoticeStatus.ORDER_BACK.getCode(),b.getSalesmanId());
|
|
|
- if(StringUtils.isNotBlank(b.getEmail())){ //邮箱不为空发送邮件
|
|
|
- AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
- //发送驳回邮件
|
|
|
- String content = "<div>客户名称: "+ b.getUserName() +"</div><div>订单编号: " + back.getOrderNo() + "</div>";
|
|
|
- EmailBo bo = new EmailBo("订单驳回", b.getEmail(), b.getSalesmanName(), a.getDepartmentName(), a.getName(), content);
|
|
|
- try {
|
|
|
- SendEmailUtil.getInstance().send(bo);
|
|
|
- } catch (UnsupportedEncodingException e) {
|
|
|
- e.printStackTrace();
|
|
|
- } catch (MessagingException e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
- }
|
|
|
+ List<String> aids = new ArrayList<>();
|
|
|
+ aids.add(t.getSalesmanId());;
|
|
|
+ orderNewService.generalSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),t.getOrderNo(), TokenManager.getAdminId());
|
|
|
}
|
|
|
return c;
|
|
|
}
|
|
|
@@ -355,12 +343,12 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
}
|
|
|
}
|
|
|
//发送站内消息
|
|
|
- addNotic(o.getOrderNo(),NoticeStatus.ORDER_REFUND.getCode(),o.getSalesmanId());//给营销员
|
|
|
+ //addNotic(o.getOrderNo(),NoticeStatus.ORDER_REFUND.getCode(),o.getSalesmanId());//给营销员
|
|
|
//根据订单编号获得所有的技术员
|
|
|
List<TOrderTask> l = taskMapper.getReceiverByOid(o.getOrderNo());
|
|
|
for (TOrderTask tOrderTask : l) {
|
|
|
if(null != tOrderTask && null != tOrderTask.getTaskReceiver()){
|
|
|
- addNotic(o.getOrderNo(),NoticeStatus.ORDER_REFUND.getCode(),tOrderTask.getTaskReceiver());//给技术员
|
|
|
+ //addNotic(o.getOrderNo(),NoticeStatus.ORDER_REFUND.getCode(),tOrderTask.getTaskReceiver());//给技术员
|
|
|
//发邮件给技术员
|
|
|
if(StringUtils.isNotBlank(tOrderTask.getEmail())){
|
|
|
EmailBo emailBo = new EmailBo("同意退单", tOrderTask.getEmail(), tOrderTask.getName(), a.getDepartmentName(), a.getName(), content);
|
|
|
@@ -378,7 +366,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
}else{//审核拒绝
|
|
|
//给营销员发通知和邮件
|
|
|
TOrderNewBo o = tOrderNewMapper.agreeEmailData(refund.getId());
|
|
|
- addNotic(o.getOrderNo(),NoticeStatus.ORDER_REFUND_REFUSE.getCode(),o.getSalesmanId());//给营销员
|
|
|
+ //addNotic(o.getOrderNo(),NoticeStatus.ORDER_REFUND_REFUSE.getCode(),o.getSalesmanId());//给营销员
|
|
|
AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
|
|
|
String content = "<div>退单编号: "+ refund.getId() +"</div><div>客户名称: " + o.getUserName() + "</div>";
|
|
|
@@ -470,18 +458,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
- public void addNotic(String orderNo,Integer type,String aid) {
|
|
|
- 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(aid);//通知人
|
|
|
- n.setNoticeType(type);
|
|
|
- n.setContent(str);
|
|
|
- n.setReaded(0);//未读
|
|
|
- noticeMapper.insertSelective(n);
|
|
|
- }
|
|
|
|
|
|
private void updateCount(String orderNo){
|
|
|
//获得订单数据
|
|
|
@@ -511,6 +487,11 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
OrganizationListOut oo=organizationManagementMapper.selectAllById(new1.getOrderDep());
|
|
|
t.setFinanceId(oo.getFinanceId());
|
|
|
+ List<String> aids = new ArrayList<>();
|
|
|
+ for (Admin admin : adminMapper.getAdminRoleList("咨询师管理员")) {
|
|
|
+ aids.add(admin.getId());
|
|
|
+ }
|
|
|
+ orderNewService.generalSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),t.getOrderNo(), TokenManager.getAdminId());
|
|
|
return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
}
|
|
|
|