Browse Source

修改订单作废金额收入问题

anderx 10 months ago
parent
commit
033ad4be99

+ 1 - 0
src/main/java/com/goafanti/common/enums/NoticeStatus.java

@@ -93,6 +93,7 @@ public enum NoticeStatus {
 	PUBLIC_MAX_DURATION_YES(83,"公出时长审核通过"),
 	PUBLIC_MAX_DURATION_NO(84,"公出时长审核驳回"),
 	CLUE_USER_RELEASE(85,"线索客户丢失"),
+	ORDER_CANCELLATION_AMOUNT_RETURN(86,"订单取消金额返回"),
 	OTHER(0, "其他");
 
 	private NoticeStatus(Integer code, String desc) {

+ 15 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1920,7 +1920,20 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			if(t.getSettlementAmount().compareTo(BigDecimal.ZERO) > 0){
 				TemporaryReceivables tr=new TemporaryReceivables();
 				tr.setOrderNo(orderNo);
-				tr.setAid(t.getFinanceId());
+				String financeId=null;
+				if(t.getFinanceId()!=null){
+					financeId=t.getFinanceId();
+
+				}else{
+					OrganizationListOut out = departmentMapper.selectAllById(t.getOrderDep());
+					if (out.getFinanceId()!=null){
+						financeId=out.getFinanceId();
+					}
+				}
+				if(financeId==null){
+					throw new BusinessException(new Error("订单部门财务负责人为空,请修改正确在操作","订单部门财务负责人为空,请修改正确在操作"));
+				}
+				tr.setAid(financeId);
 				tr.setAmount(t.getSettlementAmount());
 				User user = userMapper.queryById(t.getBuyerId());
 				tr.setCorporateName(user.getNickname());
@@ -1931,6 +1944,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				tr.setReceivablesTime(date);
 				tr.setMergeStatus(0);
 				temporaryReceivablesMapper.insertSelective(tr);
+				asyncUtils.addNoticAndEmail(new Notice(financeId,NoticeStatus.ORDER_CANCELLATION_AMOUNT_RETURN.getCode(),"订单作废,金额返回订单财务负责人" ));
 			}
 			t.setContractNo("");
 			return tOrderNewMapper.update(t);