|
|
@@ -35,6 +35,7 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.goafanti.admin.bo.AdminListBo;
|
|
|
import com.goafanti.common.bo.EmailBo;
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
+import com.goafanti.common.bo.OrderOperator;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.dao.AdminMapper;
|
|
|
@@ -102,7 +103,6 @@ import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.customer.bo.LockingReleaseBo;
|
|
|
import com.goafanti.order.bo.InputArrearsDunListBo;
|
|
|
import com.goafanti.order.bo.OrderDunTaskBo;
|
|
|
-import com.goafanti.order.bo.OrderOutsourceDtails;
|
|
|
import com.goafanti.order.bo.OrderRefundDetailBo;
|
|
|
import com.goafanti.order.bo.OutArrearsDunListBo;
|
|
|
import com.goafanti.order.bo.OutNewOrderDunBo;
|
|
|
@@ -297,6 +297,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
log.setRemarks(str.toString());
|
|
|
log.setStatus(1);
|
|
|
+ OrderOperator oo=tOrderTaskMapper.selectAidByParam(t.getId());
|
|
|
+ if (oo!=null&&oo.getOrderNo()!=null&&oo.getSalesmanId()!=null) {
|
|
|
+ Notice n =new Notice();
|
|
|
+ String str2=String.format("[%s]完成了项目核对,订单编号[%s]项目编号[%s]。", oo.getSalesmanName(),oo.getOrderNo(),oo.getTid());
|
|
|
+ n.setId(UUID.randomUUID().toString());
|
|
|
+ n.setAid(oo.getTechId());
|
|
|
+ n.setNoticeType(NoticeStatus.ITEM_CHECK_END.getCode());
|
|
|
+ n.setContent(str2);
|
|
|
+ n.setReaded(0);//未读
|
|
|
+ asyncUtils.addNotice(n);
|
|
|
+ }
|
|
|
projcetCheckLogMapper.insertSelective(log);
|
|
|
}
|
|
|
return tOrderTaskMapper.updateByPrimaryKeySelective(t);
|
|
|
@@ -1336,6 +1347,16 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
for (OutThirdPartyCompany op : list) {
|
|
|
tCount=tCount.add(new BigDecimal(op.getTotalAmount()));
|
|
|
}
|
|
|
+ if(type==1) {
|
|
|
+ ProjectTypePuls tt=thirdPartyCompanyMapper.selectByTidGetDtails(tid);
|
|
|
+ if (tt.getOfficialCost()==1) {
|
|
|
+ if (tt.getCostReduction()==1) {
|
|
|
+ tCount=tCount.add(tt.getProportion85().multiply(new BigDecimal(tt.getQuantity())));
|
|
|
+ }else {
|
|
|
+ tCount=tCount.add(tt.getOfficialAmount().multiply(new BigDecimal(tt.getQuantity())));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
tTaskMidMapper.updateCostAmount(tid,tCount);
|
|
|
//计算订单成本
|
|
|
BigDecimal oCount=new BigDecimal(0);
|
|
|
@@ -1343,20 +1364,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
for (TTaskMid tm : tlist) {
|
|
|
if (tm!=null&&tm.getCostAmount()!=null)oCount=oCount.add(tm.getCostAmount()==null?new BigDecimal(0):tm.getCostAmount());
|
|
|
}
|
|
|
- //订单成本计算
|
|
|
- if (type==1) {
|
|
|
- List<ProjectTypePuls> list2=thirdPartyCompanyMapper.selectByTidGetListDtails(tid);
|
|
|
- for (ProjectTypePuls op : list2) {
|
|
|
- if (op.getOfficialCost()==1) {
|
|
|
- BigDecimal mCount=op.getOfficialAmount().multiply(new BigDecimal(op.getQuantity()));
|
|
|
- if (op.getCostReduction()==1) {
|
|
|
- mCount=op.getProportion85().multiply(new BigDecimal(op.getQuantity()));
|
|
|
- }
|
|
|
- oCount=oCount.add(mCount);
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
tOrderMidMapper.updateCostAmount(tid,oCount,null);
|
|
|
}
|
|
|
|