|
|
@@ -370,7 +370,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
|
|
|
flag = false;
|
|
|
if(!flag) throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"申请退款"));
|
|
|
- int boundary = tOrder.getActuallyTotalAmount().add(changeAmount).compareTo(tOrder.getSignTotalAmount());
|
|
|
+ tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
|
|
|
+ int boundary = tOrder.getActuallyTotalAmount().compareTo(tOrder.getSignTotalAmount());
|
|
|
if(boundary == 0) {
|
|
|
tOrder.setLiquidationStatus(LiquidationState.COMPLETE_REFUND.getCode()); //完成退款
|
|
|
}else if(boundary == 1){
|
|
|
@@ -1700,8 +1701,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
@Override
|
|
|
@Transactional
|
|
|
public int addOrderChange(String orderNo, String changeComment) {
|
|
|
- TOrder tOrder = new TOrder();
|
|
|
- tOrder.setOrderNo(orderNo);
|
|
|
+ TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
tOrder.setChangeStatus(ChangeState.CHANGING.getCode());
|
|
|
TOrderChange change = new TOrderChange();
|
|
|
change.setCreaterId(TokenManager.getAdminId());
|
|
|
@@ -1757,7 +1757,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
change.setChangeStatus(changeStatus);
|
|
|
tOrderChangeMapper.updateByPrimaryKeySelective(change);
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(change.getOrderNo());
|
|
|
- generatorNoticeData(NoticeStatus.ORDER_CHANGE_ADD,changeComment,tOrder);
|
|
|
+ generatorNoticeData(NoticeStatus.ORDER_CHANGE_UDPATE,changeComment,tOrder);
|
|
|
return updateOrderSatusByChange(change.getOrderNo());
|
|
|
}
|
|
|
|
|
|
@@ -1784,11 +1784,11 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
Calendar now = Calendar.getInstance();
|
|
|
now.set(Calendar.MILLISECOND, 0);
|
|
|
List<String> targetIds = new ArrayList<String>();
|
|
|
- if(!tOrder.getSalesmanId().equals("") && !targetIds.contains(tOrder.getSalesmanId()))
|
|
|
+ if(StringUtils.isNotBlank(tOrder.getSalesmanId()) && !targetIds.contains(tOrder.getSalesmanId()))
|
|
|
targetIds.add(tOrder.getSalesmanId());
|
|
|
- if(!tOrder.getFinanceId().endsWith("") && !targetIds.contains(tOrder.getFinanceId()))
|
|
|
+ if(StringUtils.isNotBlank(tOrder.getFinanceId()) && !targetIds.contains(tOrder.getFinanceId()))
|
|
|
targetIds.add(tOrder.getFinanceId());
|
|
|
- if(!tOrder.getTechnicianId().equals("") && !targetIds.contains(tOrder.getTechnicianId()))
|
|
|
+ if(StringUtils.isNotBlank(tOrder.getTechnicianId()) && !targetIds.contains(tOrder.getTechnicianId()))
|
|
|
targetIds.add(tOrder.getTechnicianId());
|
|
|
Admin admin = adminMapper.selectAdminByRoleId(AFTConstants.TECH_ADMIN);
|
|
|
if(admin!= null && !targetIds.contains(admin.getId())) targetIds.add(admin.getId());
|
|
|
@@ -1801,6 +1801,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
notice.setRid(tOrder.getOrderNo());
|
|
|
notice.setNoticeType(noticeType.getCode());
|
|
|
notice.setContent(noticeType.getDesc() + ": 订单编号-" + tOrder.getOrderNo() + ",操作人-" + TokenManager.getAdminToken().getName());
|
|
|
+ notice.setAid(id);
|
|
|
noticeList.add(notice);
|
|
|
}
|
|
|
noticeMapper.insertBatch(noticeList);
|