Forráskód Böngészése

新增合同变更撤销、完成日志

anderx 3 éve%!(EXTRA string=óta)
szülő
commit
d820461360

+ 14 - 14
src/main/java/com/goafanti/common/model/OrganizationContactBook.java

@@ -47,7 +47,7 @@ public class OrganizationContactBook {
 	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	private String department;
-	/**
+	/**			   depatrment
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.position
 	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
@@ -347,22 +347,22 @@ public class OrganizationContactBook {
 	public void setAname(String aname) {
 		this.aname = aname;
 	}
-	
+
 	private String provinceName;
 	private String cityName;
 	private String areaName;
 	private String createTimes;
 
-	@Override  
-    public boolean equals(Object arg0) {  
-    	OrganizationContactBook p = (OrganizationContactBook) arg0;  
-        return name.equals(p.name) && name.equals(p.name);  
-    }  
-      
-    @Override  
-    public int hashCode() {  
-        String str = name + mobile;  
-        return str.hashCode();  
+	@Override
+    public boolean equals(Object arg0) {
+    	OrganizationContactBook p = (OrganizationContactBook) arg0;
+        return name.equals(p.name) && name.equals(p.name);
+    }
+
+    @Override
+    public int hashCode() {
+        String str = name + mobile;
+        return str.hashCode();
     }
 
 	public String getProvinceName() {
@@ -395,5 +395,5 @@ public class OrganizationContactBook {
 
 	public void setCreateTimes(String createTimes) {
 		this.createTimes = createTimes;
-	}  
-}
+	}
+}

+ 14 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -620,6 +620,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		newOrderChangeMapper.updateByPrimaryKeySelective(nb);
 		TOrderNewBo order=tOrderNewMapper.getSaleIdByOno(nb.getOrderNo());
 		List<String> alist = getAllAid(nb.getId());
+		OrderChangeLog ocl=new OrderChangeLog();
+		ocl.setAuditor(TokenManager.getAdminId());
+		ocl.setOrderNo(nb.getOrderNo());
+		ocl.setRemarks("变更完成。");
+		ocl.setChangeId(nb.getId());
+		ocl.setStatus(4);
+		orderChangeLogMapper.insertSelective(ocl);
 		orderNewService.pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), order, TokenManager.getAdminId(),0);
 		return 1;
 	}
@@ -1086,6 +1093,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				TOrderNew t=new TOrderNew();
 				t.setOrderNo(nb.getOrderNo());
 				t.setDeleteSign(0);
+				OrderChangeLog ocl=new OrderChangeLog();
+				ocl.setAuditor(TokenManager.getAdminId());
+				ocl.setOrderNo(nb.getOrderNo());
+				ocl.setRemarks("变更撤销成功");
+				ocl.setChangeId(nb.getId());
+				ocl.setStatus(5);
+				orderChangeLogMapper.insertSelective(ocl);
 				tOrderNewMapper.updateByPrimaryKeySelective(t);
 				return 1;
 			}