购物车索引更新

search-console-b2b/src/main/java/com/uas/search/console/b2b/model/CartSimpleInfo.java

@@ -1,10 +1,17 @@
 package com.uas.search.console.b2b.model;
 
-import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
 /**
  * 购物车
  *
@@ -46,7 +53,7 @@ public class CartSimpleInfo {
 
     public static final String USERUU_FIELD = "ca_useruu";
 
-    public static final String VENDUU_FIELD = "ca_venduu";
+	public static final String ENTERPRISE_FIELD = "ca_venduu";
 
     public static final String VENDUSERUU_FIELD = "ca_venduseruu";
 
@@ -142,11 +149,12 @@ public class CartSimpleInfo {
     @JoinColumn(name = USERUU_FIELD, insertable = false, updatable = false)
     private UserSimpleInfo user;
 
-    /**
-     * 供应商UU
-     */
-    @Column(name = VENDUU_FIELD)
-    private Long vendUU;
+	/**
+	 * 供应商企业UU
+	 */
+	@OneToOne
+	@JoinColumn(name = ENTERPRISE_FIELD, insertable = false, updatable = false)
+	private EnterpriseSimpleInfo enterprise;
 
     /**
      * 供应商联系人UU
@@ -284,15 +292,16 @@ public class CartSimpleInfo {
         this.user = user;
     }
 
-    public Long getVendUU() {
-        return vendUU;
-    }
 
-    public void setVendUU(Long vendUU) {
-        this.vendUU = vendUU;
-    }
+	public EnterpriseSimpleInfo getEnterprise() {
+		return enterprise;
+	}
+
+	public void setEnterprise(EnterpriseSimpleInfo enterprise) {
+		this.enterprise = enterprise;
+	}
 
-    public Long getVendUserUU() {
+	public Long getVendUserUU() {
         return vendUserUU;
     }
 
@@ -324,42 +333,28 @@ public class CartSimpleInfo {
         this.vendusertel = vendusertel;
     }
 
-    @Override
-    public String toString() {
-        return "CartSimpleInfo{" +
-                "id=" + id +
-                ", auditor='" + auditor + '\'' +
-                ", code='" + code + '\'' +
-                ", currency='" + currency + '\'' +
-                ", date=" + date +
-                ", enUU=" + enUU +
-                ", payments='" + payments + '\'' +
-                ", rate=" + rate +
-                ", receiveCode='" + receiveCode + '\'' +
-                ", receiveName='" + receiveName + '\'' +
-                ", recorder='" + recorder + '\'' +
-                ", remark='" + remark + '\'' +
-                ", shipAddress='" + shipAddress + '\'' +
-                ", user=" + user +
-                ", vendUU=" + vendUU +
-                ", vendUserUU=" + vendUserUU +
-                ", status=" + status +
-                ", venduser='" + venduser + '\'' +
-                ", vendusertel='" + vendusertel + '\'' +
-                '}';
-    }
 
-    /**
-     * 获取所有可以搜索的字段列名（索引的field名）
-     *
-     * @return 可以搜索的字段列名
-     */
+    @Override
+	public String toString() {
+		return "CartSimpleInfo [id=" + id + ", auditor=" + auditor + ", code=" + code + ", currency=" + currency
+				+ ", date=" + date + ", enUU=" + enUU + ", payments=" + payments + ", rate=" + rate + ", receiveCode="
+				+ receiveCode + ", receiveName=" + receiveName + ", recorder=" + recorder + ", remark=" + remark
+				+ ", shipAddress=" + shipAddress + ", user=" + user + ", enterprise=" + enterprise + ", vendUserUU="
+				+ vendUserUU + ", status=" + status + ", venduser=" + venduser + ", vendusertel=" + vendusertel + "]";
+	}
+
+	/**
+	 * 获取所有可以搜索的字段列名（索引的field名）
+	 *
+	 * @return 可以搜索的字段列名
+	 */
     public static List<String> getKeywordFields() {
         List<String> fields = new ArrayList<>();
         fields.add(CODE_FIELD);
         fields.add(ENUU_FIELD);
         fields.add(VENDUSERUU_FIELD);
         fields.add(VENDUSER_FIELD);
+		fields.add(ENTERPRISE_FIELD);
         return fields;
     }
 }

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/DocumentToObjectUtils.java

@@ -2380,9 +2380,10 @@ public class DocumentToObjectUtils {
 			cartSimpleInfo.setVendUserUU(Long.valueOf(document
 					.get(ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.VENDUSERUU_FIELD))));
 		}
-		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.VENDUU_FIELD))){
-			cartSimpleInfo.setVendUU(Long.valueOf(document
-					.get(ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.VENDUU_FIELD))));
+		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.ENTERPRISE_FIELD))) {
+			cartSimpleInfo.setEnterprise(JSONObject.parseObject(
+					document.get(ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.ENTERPRISE_FIELD)),
+					EnterpriseSimpleInfo.class));
 		}
 		return cartSimpleInfo;
 	}

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/ObjectToDocumentUtils.java

@@ -2721,9 +2721,8 @@ public class ObjectToDocumentUtils {
 					Long.valueOf(cartSimpleInfo.getEnUU())));
 		}
 		if (null != cartSimpleInfo.getId()) {
-			document.add(new NumericDocValuesField(
-					ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.ID_FIELD),
-					Long.valueOf(cartSimpleInfo.getId())));
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.ID_FIELD),
+					String.valueOf(cartSimpleInfo.getId()), Store.YES));
 		}
 		if (null != cartSimpleInfo.getPayments()) {
 			document.add(new TextField(
@@ -2780,10 +2779,10 @@ public class ObjectToDocumentUtils {
 					ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.VENDUSERUU_FIELD),
 					Long.valueOf(cartSimpleInfo.getVendUserUU())));
 		}
-		if (null != cartSimpleInfo.getVendUU()) {
-			document.add(new NumericDocValuesField(
-					ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.VENDUU_FIELD),
-					Long.valueOf(cartSimpleInfo.getVendUU())));
+		if (null != cartSimpleInfo.getEnterprise()) {
+			document.add(
+					new StringField(ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.ENTERPRISE_FIELD),
+							JSONObject.toJSONString(cartSimpleInfo.getEnterprise()), Store.YES));
 		}
 		// 排序字段
 		document.add(new NumericDocValuesField(ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.ID_FIELD),