Browse Source

fix(入库): 如果为个人采购入库时,保存个人的信息

yuj 7 years ago
parent
commit
62aa1d6efe

+ 10 - 4
src/main/java/com/uas/platform/b2c/prod/commodity/model/CommodityInOutbound.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2c.prod.commodity.model;
 
 import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.logistics.model.Logistics;
 import com.uas.platform.b2c.prod.commodity.type.InOutBoundType;
@@ -38,12 +39,14 @@ public class CommodityInOutbound implements Serializable {
 
     /**
      * 所属企业
+     * 如果是个人,就保存个人uu
      */
     @Column(name = "cio_enuu")
     private Long enuu;
 
     /**
      * 所属企业的名称
+     * 如果是个人,就保存个人的名称
      */
     @Column(name = "cio_enname")
     private String enName;
@@ -315,10 +318,13 @@ public class CommodityInOutbound implements Serializable {
                 this.type = InOutBoundType.OUTBOUND;
             }
         }
-        Enterprise enterprise = SystemSession.getUser().getEnterprise();
-        if (enterprise != null) {
-            this.enuu = enterprise.getUu();
-            this.enName = enterprise.getEnName();
+        User user = SystemSession.getUser();
+        if (user.getEnterprise() != null) {
+            this.enuu = user.getEnterprise().getUu();
+            this.enName = user.getEnterprise().getEnName();
+        } else {
+            this.enuu = SystemSession.getUser().getUserUU();
+            this.enName = SystemSession.getUser().getUserName();
         }
         this.createTime = new Date();
         this.operaterUseruu = SystemSession.getUser().getUserUU();

+ 1 - 1
src/test/java/com/uas/platform/b2c/DesTest.java

@@ -11,7 +11,7 @@ import java.util.Set;
 
 public class DesTest {
     @Test
-    public void test(){
+    public void test() {
         // 测试
         System.out.println("text & dev: ");
         prindHexString("jdbc:mysql://192.168.100.3:3306/mall_test_dev?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&useUnicode=true");