Explorar o código

订单Bug修改

Signed-off-by: anderx <312518615@qq.com>
anderx %!s(int64=6) %!d(string=hai) anos
pai
achega
8d4d50d89c

+ 2 - 4
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -828,11 +828,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public int updatetechnicianBackOrder(String orderNo,String reason) {
 		TOrderNew t = checkDeleteSign(orderNo);
-		if (t.getSettlementAmount().compareTo(new BigDecimal(0))!=0||
-				t.getProcessStatus()>ProcessStatus.YPZXSGLY.getCode()) {
+		if (t.getSettlementAmount().compareTo(new BigDecimal(0))!=0) {
 			return -1;
 		}
-		
 		t.setOrderStatus(OrderNewState.YBH.getCode());
 		t.setProcessStatus(ProcessStatus.YPYXY.getCode());
 		t.setFinanceId("");
@@ -934,7 +932,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
     @Async
 	public  void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,String OrderNo,String adminId) {
-		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
+		AdminListBo a = adminMapper.getDeptNameByAid(adminId);
 		String str=NoticeStatus.getValueByCode(type)+": 订单编号 -"+OrderNo+", 操作人:"+a.getDepartmentName()+"-"+a.getName()+"。";
 		String adminIds="";
 		List<Notice> nlist=new  ArrayList<>();