Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

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

@@ -1,47 +1,78 @@
 package com.uas.platform.b2c.prod.commodity.model;
 
-import com.uas.platform.b2c.common.account.model.UserBaseInfo;
-
 import javax.persistence.*;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 个人物料库
- * @author wangdy
+ * 用户个人产品库
  *
+ * Created by hejq on 2017-11-08.
  */
+@Table(name = "product$users")
 @Entity
-@Table(name = "products_person")
-public class ProductPerson {
+public class ProductPerson implements Serializable {
 
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
     @Id
-    @GeneratedValue
-    @Column(name = "pp_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "pu_id")
     private Long id;
 
-    @Column(name = "user_uu")
+    /**
+     * 用户uu
+     */
+    @Column(name = "pu_useruu")
     private Long userUU;
 
-    @Column(name = "pr_id")
-    private Long productId;
-
-    @Column(name = "up_time")
-    private Date time;
+    /**
+     * 企业uu，方便统计处理
+     */
+    @Column(name = "pu_enuu")
+    private Long enuu;
 
     /**
-     * 物料拥有者
+     * 物料id
      */
-    @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "user_uu", insertable = false, updatable = false)
-    private UserBaseInfo user;
+    @Column(name = "pu_prid")
+    private Long productId;
 
     /**
-     * 物料明细
+     * 产品
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "pr_id", insertable = false, updatable = false)
+    @JoinColumn(name = "pu_prid", insertable = false, updatable = false)
     private Product product;
 
+    /**
+     * 日期
+     */
+    @Column(name = "pu_date")
+    private Date time;
+
+    /**
+     * 存在ERP同步过来数据的情况，记录id
+     */
+    @Column(name = "pu_erpid")
+    private Long erpid;
+
+    public ProductPerson() {
+
+    }
+
+    public ProductPerson(Long enUU, Long userUU, Long productId) {
+        this.setEnuu(enUU);
+        this.setUserUU(userUU);
+        this.setProductId(productId);
+    }
+
     public Long getId() {
         return id;
     }
@@ -58,20 +89,20 @@ public class ProductPerson {
         this.userUU = userUU;
     }
 
-    public Long getProductId() {
-        return productId;
+    public Long getEnuu() {
+        return enuu;
     }
 
-    public void setProductId(Long productId) {
-        this.productId = productId;
+    public void setEnuu(Long enuu) {
+        this.enuu = enuu;
     }
 
-    public UserBaseInfo getUser() {
-        return user;
+    public Long getProductId() {
+        return productId;
     }
 
-    public void setUser(UserBaseInfo user) {
-        this.user = user;
+    public void setProductId(Long productId) {
+        this.productId = productId;
     }
 
     public Product getProduct() {
@@ -89,4 +120,12 @@ public class ProductPerson {
     public void setTime(Date time) {
         this.time = time;
     }
+
+    public Long getErpid() {
+        return erpid;
+    }
+
+    public void setErpid(Long erpid) {
+        this.erpid = erpid;
+    }
 }

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

@@ -1160,10 +1160,8 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
             // TODO 什么接口
 			String result = restTemplate.postForEntity(productServiceIp + "/product/update", products, String.class).getBody();
             List<Long> productIds = JSON.parseArray(result, Long.class);
-            Map<String,Object> requestMap = new HashMap<>();
-            requestMap.put("userUU",SystemSession.getUser().getUserUU());
             //添加个人关系
-            String res  = restTemplate.postForEntity(productServiceIp + "/product/assign/batch", productIds, String.class, requestMap).getBody();
+            String res  = restTemplate.postForEntity(productServiceIp + "/product/assign/batch?userUU=" + SystemSession.getUser().getUserUU(), productIds, String.class).getBody();
             // 默认为b2c Enable开启
             List<ProductPrivate> productPrivates = new ArrayList<>();
             for (Long prId : productIds) {

src/main/webapp/resources/css/common.css

@@ -953,7 +953,9 @@ textarea{resize:none}
 
 .modal-content {
 	overflow-y: auto;
-	max-height: 500px;
+	max-height: 520px;
+	overflow-x: hidden;
+	height: auto !important;
 }
 .form-control:focus {
 	border: 1px solid #4272d3;

src/main/webapp/resources/css/commonComponent.css

@@ -13,7 +13,7 @@
     </div>
 </div>
 */
-.com-del-box{
+.com-mall-del-box{
     position: fixed;
     z-index: 10;
     height: 152px;
@@ -26,14 +26,14 @@
     top: 55%;
     left: 50%;
 }
-.com-del-box .title{
+.com-mall-del-box .title{
     height: 30px;
     background-color: #5078cb;
     text-align: right;
     padding-right: 15px;
     line-height: 30px;
 }
-.com-del-box .title i{
+.com-mall-del-box .title i{
     background: url(../img/icon/close.png) no-repeat;
     display: inline-block;
     width: 9px;
@@ -41,27 +41,27 @@
     cursor: pointer;
     margin: 0;
 }
-.com-del-box .content{
+.com-mall-del-box .content{
     width: 100%;
     text-align: center;
     margin: 0 auto;
 }
-.com-del-box .content p{
+.com-mall-del-box .content p{
     line-height: 50px;
     font-size: 14px;
     padding-top: 10px;
 }
-.com-del-box .content p i{
+.com-mall-del-box .content p i{
     color: #5078cb;
     font-size: 16px;
     margin-right: 10px;
 }
-.com-del-box .content div{
+.com-mall-del-box .content div{
     width: 100%;
     text-align: center;
     margin: 0 auto;
 }
-.com-del-box .content div a{
+.com-mall-del-box .content div a{
     width: 55px;
     height: 26px;
     line-height: 26px;
@@ -70,16 +70,16 @@
     font-size: 14px;
     cursor: pointer;
 }
-.com-del-box .content div a:first-child{
+.com-mall-del-box .content div a:first-child{
     background: #b4b5b9;
     color: #333;
     margin-right: 10px;
 }
-.com-del-box .content div a:last-child{
+.com-mall-del-box .content div a:last-child{
     background: #5078cb;
     color: #fff;
 }
-.com-del-box .content div a:hover{
+.com-mall-del-box .content div a:hover{
     background: #3f7ae3;
     color: #fff;
 }

src/main/webapp/resources/css/pay.css

@@ -315,8 +315,7 @@
     margin-top: 0;
 }
 .down-payment .pay-price div.stage .content{
-    width: 250px;
-    float: right;
+    text-align: right;
     border: none;
     margin-top: 0;
     padding-bottom: 0;

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_invoice_ctrl.js

@@ -91,8 +91,9 @@ define(['app/app'], function(app) {
         //上传发票许可证
         $scope.onUploadPermission = function () {
             $scope.isDoUpload = true;
-            if (event.target.files[0].size < 3*1024*1024) {
-                $scope.bill.attachUrl = event.target.files[0].name;
+            // console.log($scope.bill.billInfo);
+            if ($scope.bill.billInfo[0].size < 3*1024*1024) {
+                $scope.bill.attachUrl = $scope.bill.billInfo[0].name;
             } else {
                 $scope.bill.attachUrl = '';
             }

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

@@ -432,7 +432,7 @@
 				<div style="text-align: right;margin-right:25px;margin-top:-30px;">
 					<span class="count-tip">显示 {{$$bankInfo.start}}-{{$$bankInfo.end}} 条,共 <em ng-bind="$$bankInfo.totalElements" style="color: #5078cb">2506</em> 条</span>
 				</div>
-				<div class="com-del-box" ng-if="showDelete">
+				<div class="com-mall-del-box" ng-if="showDelete">
 					<div class="title">
 						<i ng-click="cancelDelete()"></i>
 					</div>