|
|
@@ -2,6 +2,7 @@ package com.goafanti.order.service.impl;
|
|
|
|
|
|
import java.io.UnsupportedEncodingException;
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
@@ -10,7 +11,6 @@ import java.util.UUID;
|
|
|
|
|
|
import javax.mail.MessagingException;
|
|
|
|
|
|
-import org.apache.commons.io.input.BOMInputStream;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -20,6 +20,7 @@ import com.goafanti.common.dao.AdminMapper;
|
|
|
import com.goafanti.common.dao.TOrderBackMapper;
|
|
|
import com.goafanti.common.dao.TOrderBillNewMapper;
|
|
|
import com.goafanti.common.dao.TOrderBonusMapper;
|
|
|
+import com.goafanti.common.dao.TOrderMonthReportMapper;
|
|
|
import com.goafanti.common.dao.TOrderNewMapper;
|
|
|
import com.goafanti.common.dao.TOrderRefundMapper;
|
|
|
import com.goafanti.common.model.TOrderBack;
|
|
|
@@ -54,6 +55,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
@Autowired
|
|
|
private TOrderBonusMapper bonusMapper;
|
|
|
@Autowired
|
|
|
+ private TOrderMonthReportMapper monthReportMapper;
|
|
|
+ @Autowired
|
|
|
JDBCIdGenerator idGenerator;
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@@ -182,14 +185,23 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
lstaus = 2;
|
|
|
bonus.setBonusSubject(12);
|
|
|
//发放给技术员
|
|
|
- bonus.setGrantTarget(o.getTechnicianId());
|
|
|
- bonus.setGrantType(1);
|
|
|
- bonusMapper.insertSelective(bonus);
|
|
|
+ if(null != o.getTechnicianId()){
|
|
|
+ bonus.setGrantTarget(o.getTechnicianId());
|
|
|
+ bonus.setGrantType(1);
|
|
|
+ bonusMapper.insertSelective(bonus);
|
|
|
+ }
|
|
|
|
|
|
}else if(bd.compareTo(o.getTotalAmount()) == -1){//如果订单流水小于总金额
|
|
|
- if(bd.compareTo(o.getFirstAmount()) == 0){//首付完成
|
|
|
- bonus.setBonusSubject(11);
|
|
|
- }else if(bd.compareTo(o.getFirstAmount()) == 1){//大于首付 lstaus 1
|
|
|
+ if(bd.compareTo(o.getFirstAmount()) == 0 || bd.compareTo(o.getFirstAmount()) == 1){//首付完成
|
|
|
+ //查看首付奖是否存在
|
|
|
+ TOrderBonus b = new TOrderBonus();
|
|
|
+ b.setOrderNo(billNew.getOrderNo());
|
|
|
+ b.setBonusSubject(11);
|
|
|
+ int c = bonusMapper.checkByOnoAndSub(b);
|
|
|
+ //不存在就设置
|
|
|
+ if(c==0){
|
|
|
+ bonus.setBonusSubject(11);
|
|
|
+ }
|
|
|
lstaus = 1;
|
|
|
}
|
|
|
}
|
|
|
@@ -248,7 +260,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
String content = "<div>退单编号: "+ refund.getId() +"</div><div>客户名称: " + o.getUserName() + "</div>";
|
|
|
content += "<div>订单编号: "+ o.getOrderNo() +"</div><div>订单状态: " + OrderNewState.getValueByCode(o.getOrderStatus()) + "</div>";
|
|
|
|
|
|
- EmailBo emailBo = new EmailBo("同意退单", o.getEmail(), o.getSalesmanName(), a.getDepartmentId(), a.getName(), content);
|
|
|
+ EmailBo emailBo = new EmailBo("同意退单", o.getEmail(), o.getSalesmanName(), a.getDepartmentName(), a.getName(), content);
|
|
|
try {
|
|
|
SendEmailUtil.send(emailBo);
|
|
|
} catch (UnsupportedEncodingException e) {
|
|
|
@@ -325,8 +337,21 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
TOrderNew new1 = tOrderNewMapper.selectByPrimaryKey(orderNew.getOrderNo());
|
|
|
//new simpl
|
|
|
//如果签单的月份小于校对的月份需要重新校对
|
|
|
-
|
|
|
-
|
|
|
+ Calendar cal = Calendar.getInstance();
|
|
|
+ cal.setTime(new1.getSignTime());
|
|
|
+ int sy = cal.get(Calendar.YEAR);
|
|
|
+ int sm = cal.get(Calendar.MONTH);
|
|
|
+ cal.setTime(new1.getProofTime());
|
|
|
+ int py = cal.get(Calendar.YEAR);
|
|
|
+ int pm = cal.get(Calendar.MONTH);
|
|
|
+ if(py>sy || (py==sy && pm>sm)){
|
|
|
+ //重新校对信息
|
|
|
+ TOrderNew orderNew2 = new TOrderNew();
|
|
|
+ orderNew2.setSignTime(new1.getSignTime());
|
|
|
+ orderNew2.setOrderType(new1.getOrderType());
|
|
|
+ orderNew2.setSalesmanId(new1.getSalesmanId());
|
|
|
+ monthReportMapper.proofDataBySomeBody(orderNew2);
|
|
|
+ }
|
|
|
|
|
|
return 0;
|
|
|
}
|