将enterprisebaseInfo 调整问题enterprise分支

src/main/java/com/uas/platform/b2c/prod/commodity/model/ProductAttachSubmit.java

@@ -1,22 +1,14 @@
 package com.uas.platform.b2c.prod.commodity.model;
 
-import com.uas.platform.b2c.b2b.model.EnterpriseBaseInfo;
+import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.UserBaseInfo;
 import com.uas.platform.b2c.core.constant.Status;
 import com.uas.platform.b2c.prod.product.brand.modal.BrandInfo;
 import com.uas.platform.b2c.prod.product.kind.model.KindInfo;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * 物料规格书申请
@@ -89,7 +81,7 @@ public class ProductAttachSubmit implements Serializable{
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
     @JoinColumn(name = "as_submitenuu", insertable = false, updatable = false)
-    private EnterpriseBaseInfo submitEn;
+    private Enterprise submitEn;
 
     /**
      * 匹配标准器件的uuid
@@ -134,7 +126,7 @@ public class ProductAttachSubmit implements Serializable{
      * 审核企业信息
      */
     @Transient
-    private EnterpriseBaseInfo auditEn;
+    private Enterprise auditEn;
 
     /**
      * 商城类目id
@@ -250,14 +242,6 @@ public class ProductAttachSubmit implements Serializable{
         this.submiter = submiter;
     }
 
-    public EnterpriseBaseInfo getSubmitEn() {
-        return submitEn;
-    }
-
-    public void setSubmitEn(EnterpriseBaseInfo submitEn) {
-        this.submitEn = submitEn;
-    }
-
     public String getUuid() {
         return uuid;
     }
@@ -306,14 +290,6 @@ public class ProductAttachSubmit implements Serializable{
         this.auditer = auditer;
     }
 
-    public EnterpriseBaseInfo getAuditEn() {
-        return auditEn;
-    }
-
-    public void setAuditEn(EnterpriseBaseInfo auditEn) {
-        this.auditEn = auditEn;
-    }
-
     public Long getKindId() {
         return kindId;
     }
@@ -370,6 +346,24 @@ public class ProductAttachSubmit implements Serializable{
         this.reason = reason;
     }
 
+    public Enterprise getAuditEn() {
+        return auditEn;
+    }
+
+    public ProductAttachSubmit setAuditEn(Enterprise auditEn) {
+        this.auditEn = auditEn;
+        return this;
+    }
+
+    public Enterprise getSubmitEn() {
+        return submitEn;
+    }
+
+    public ProductAttachSubmit setSubmitEn(Enterprise submitEn) {
+        this.submitEn = submitEn;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "ProductAttachSubmit{" + "id=" + id + ", productId=" + productId

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductAttachServiceImpl.java

@@ -1,8 +1,8 @@
 package com.uas.platform.b2c.prod.commodity.service.impl;
 
-import com.uas.platform.b2c.b2b.dao.EnterpriseBaseInfoDao;
-import com.uas.platform.b2c.b2b.model.EnterpriseBaseInfo;
+import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserBaseInfoDao;
+import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.UserBaseInfo;
 import com.uas.platform.b2c.core.constant.Status;
 import com.uas.platform.b2c.core.support.SystemSession;
@@ -68,7 +68,7 @@ public class ProductAttachServiceImpl implements ProductAttachService {
 
     private final KindDao kindDao;
 
-    private final EnterpriseBaseInfoDao enterpriseBaseInfoDao;
+    private final EnterpriseDao enterpriseDao;
 
     private final UserBaseInfoDao userBaseInfoDao;
 
@@ -77,7 +77,7 @@ public class ProductAttachServiceImpl implements ProductAttachService {
 
     @Autowired
     public ProductAttachServiceImpl(ProductDao productDao, ProductAttachSubmitDao productAttachSubmitDao,
-        ComponentDao componentDao, BrandInfoDao brandInfoDao, KindInfoDao kindInfoDao, ComponentService componentService, KindDao kindDao, EnterpriseBaseInfoDao enterpriseBaseInfoDao, UserBaseInfoDao userBaseInfoDao) {
+                                    ComponentDao componentDao, BrandInfoDao brandInfoDao, KindInfoDao kindInfoDao, ComponentService componentService, KindDao kindDao, EnterpriseDao enterpriseDao, UserBaseInfoDao userBaseInfoDao) {
         this.productDao = productDao;
         this.productAttachSubmitDao = productAttachSubmitDao;
         this.componentDao = componentDao;
@@ -85,7 +85,7 @@ public class ProductAttachServiceImpl implements ProductAttachService {
         this.kindInfoDao = kindInfoDao;
         this.componentService = componentService;
         this.kindDao = kindDao;
-        this.enterpriseBaseInfoDao = enterpriseBaseInfoDao;
+        this.enterpriseDao = enterpriseDao;
         this.userBaseInfoDao = userBaseInfoDao;
     }
 
@@ -153,9 +153,9 @@ public class ProductAttachServiceImpl implements ProductAttachService {
      */
     private ProductAttachSubmit completeReturnSubmit(ProductAttachSubmit submit) {
         if (submit.getAuditEnuu() != null) {
-            EnterpriseBaseInfo enterpriseBaseInfo = enterpriseBaseInfoDao.findOne(submit.getAuditEnuu());
-            if (enterpriseBaseInfo != null) {
-                submit.setAuditEn(enterpriseBaseInfo);
+            Enterprise enterprise = enterpriseDao.findOne(submit.getAuditEnuu());
+            if (enterprise != null) {
+                submit.setAuditEn(enterprise);
             }
         }