Merge remote-tracking branch 'origin/feature-201845-wangcz' into feature-201845-wangcz

# Conflicts:
#	src/main/webapp/resources/view/usercenter/b2b/fa/arCheck.html
#	src/main/webapp/resources/view/vendor/b2b/apCheck.html

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,14 +318,17 @@ 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 = user.getUserUU();
+            this.enName = user.getUserName();
         }
         this.createTime = new Date();
-        this.operaterUseruu = SystemSession.getUser().getUserUU();
-        this.operaterUserName = SystemSession.getUser().getUserName();
+        this.operaterUseruu = user.getUserUU();
+        this.operaterUserName = user.getUserName();
     }
 
 

src/main/webapp/resources/view/usercenter/forstore/product_upload.html

@@ -790,7 +790,7 @@
         top: 50%;
         left: 50%;
         margin-left: -50px;
-        margin-top: -60px;
+        margin-top: -180px;
     }
     #canvas {
         margin: 5% auto 0;

src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -1142,8 +1142,8 @@
                 </div>
                 <div class="content-line">
                     <div class="form-item form-left">
-                        <span><i>*</i>交期：</span>
-                        <input type="number" class="form-control" ng-change="onLeadtimeInput()" ng-blur="onLeadtimeBlur()" ng-model="inquiryItem.leadtime" placeholder="天数">
+                        <span><i>*</i>交期(天)：</span>
+                        <input type="number" class="form-control" ng-change="onLeadtimeInput()" ng-blur="onLeadtimeBlur()" ng-model="inquiryItem.leadtime" placeholder="最长交期">
                     </div>
                     <div class="form-item form-right">
                         <span><i>*</i>税率：</span>

src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -812,7 +812,7 @@
         top: 50%;
         left: 50%;
         margin-left: -50px;
-        margin-top: -60px;
+        margin-top: -180px;
     }
     #canvas {
         margin: 5% auto 0;

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");