Kaynağa Gözat

门店/订单结构完善

Veronique 2 yıl önce
ebeveyn
işleme
3eccae8da6
58 değiştirilmiş dosya ile 1497 ekleme ve 4368 silme
  1. 76 0
      conf/esTemplate/businessorder.json
  2. 0 137
      conf/esTemplate/clientinfo.json
  3. 0 135
      conf/esTemplate/deliveryFeedBackInfo.json
  4. 0 92
      conf/esTemplate/machineBreedTask.json
  5. 0 134
      conf/esTemplate/materialinfo.json
  6. 0 21
      conf/esTemplate/materialtype.json
  7. 0 207
      conf/esTemplate/orderChargeData.json
  8. 0 114
      conf/esTemplate/orderCostItem.json
  9. 0 160
      conf/esTemplate/orderDeliverInform.json
  10. 0 79
      conf/esTemplate/orderImageDispatchItem.json
  11. 0 118
      conf/esTemplate/orderLifeCycle.json
  12. 0 81
      conf/esTemplate/orderLifeCycleCount.json
  13. 0 137
      conf/esTemplate/orderMaterialItem.json
  14. 0 285
      conf/esTemplate/orderPart.json
  15. 0 33
      conf/esTemplate/orderPartParamValue.json
  16. 0 173
      conf/esTemplate/orderPartProcess.json
  17. 0 140
      conf/esTemplate/orderPrePay.json
  18. 0 196
      conf/esTemplate/orderReceivable.json
  19. 0 101
      conf/esTemplate/orderSendAddress.json
  20. 0 219
      conf/esTemplate/orderStockItem.json
  21. 0 114
      conf/esTemplate/orderStockLabel.json
  22. 17 23
      conf/esTemplate/clientreceiveaddress.json
  23. 40 0
      conf/esTemplate/orderdetailitem.json
  24. 48 0
      conf/esTemplate/orderfinances.json
  25. 0 63
      conf/esTemplate/paperbaseinfo.json
  26. 0 74
      conf/esTemplate/paperinfo.json
  27. 0 64
      conf/esTemplate/paperquoteinfo.json
  28. 0 22
      conf/esTemplate/papertype.json
  29. 31 0
      conf/esTemplate/platforminfo.json
  30. 7 10
      conf/esTemplate/clientindustryinfo.json
  31. 0 182
      conf/esTemplate/printBill.json
  32. 0 276
      conf/esTemplate/printBillBreed.json
  33. 0 70
      conf/esTemplate/printBillLifeCycle.json
  34. 0 126
      conf/esTemplate/printBreedPart.json
  35. 0 377
      conf/esTemplate/printOrder.json
  36. 0 90
      conf/esTemplate/product.json
  37. 0 33
      conf/esTemplate/productImage.json
  38. 22 16
      conf/esTemplate/printBillStep.json
  39. 25 67
      conf/esTemplate/outassistinfo.json
  40. 46 0
      conf/esTemplate/storeinvoiceinfo.json
  41. 11 11
      conf/esTemplate/clientlevel.json
  42. 45 0
      conf/esTemplate/storeplatformrequire.json
  43. 0 143
      conf/esTemplate/workPart.json
  44. 0 44
      conf/esTemplate/workprocess.json
  45. 285 0
      conf/初始化业务表.sql
  46. 25 0
      ddCommon/src/main/java/com/dderp/common/api/BusinessDocService.java
  47. 195 0
      ddCommon/src/main/java/com/dderp/common/entity/order/BusinessOrder.java
  48. 117 0
      ddCommon/src/main/java/com/dderp/common/entity/order/OrderDeliveryInfo.java
  49. 55 0
      ddCommon/src/main/java/com/dderp/common/entity/order/OrderDetailItem.java
  50. 81 0
      ddCommon/src/main/java/com/dderp/common/entity/order/OrderFinances.java
  51. 60 0
      ddCommon/src/main/java/com/dderp/common/entity/platform/PlatformInfo.java
  52. 50 1
      ddCommon/src/main/java/com/dderp/common/entity/platform/PlatformRequire.java
  53. 67 0
      ddCommon/src/main/java/com/dderp/common/entity/store/StoreBrand.java
  54. 30 0
      ddCommon/src/main/java/com/dderp/common/entity/store/StoreInfo.java
  55. 67 0
      ddCommon/src/main/java/com/dderp/common/entity/store/StoreInvoiceInfo.java
  56. 7 0
      ddCommon/src/main/java/com/dderp/common/entity/store/StorePlatform.java
  57. 63 0
      ddCommon/src/main/java/com/dderp/common/entity/store/StorePlatformRequire.java
  58. 27 0
      ddCommon/src/main/java/com/dderp/common/entity/store/ViewStoreInfo.java

+ 76 - 0
conf/esTemplate/businessorder.json

@@ -0,0 +1,76 @@
+{
+  "info": {
+    "properties": {
+      "id": {
+        "type": "long"
+      },
+      "orderName": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "orderCode": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "orderStatus": {
+        "type": "integer"
+      },
+      "incomePlatformId": {
+        "type": "long"
+      },
+      "incomePlatformName": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "incomePlatformOrderCode": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "incomePlatformOrderTimeLong": {
+        "type": "long"
+      },
+      "suggestDeliverTimeLong": {
+        "type": "long"
+      },
+      "idStore": {
+        "type": "long"
+      },
+      "storeName": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "deliverFee": {
+        "type": "double"
+      },
+      "deliverDistance": {
+        "type": "double"
+      },
+      "deliverAddressAll": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "outGoingPlatformId": {
+        "type": "long"
+      },
+      "outGoingPlatformName": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "voidFlag": {
+        "type": "integer"
+      },
+      "createBy": {
+        "type": "long"
+      },
+      "createTimeLong": {
+        "type": "long"
+      },
+      "updateBy": {
+        "type": "long"
+      },
+      "updateTimeLong": {
+        "type": "long"
+      }
+    }
+  }
+}

+ 0 - 137
conf/esTemplate/clientinfo.json

@@ -1,137 +0,0 @@
-{
-  "info": {
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idIndustry": {
-        "type": "long"
-      },
-      "industryName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "clientName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          },
-          "raw2": {
-            "type":  "text",
-            "index": "analyzed",
-            "analyzer": "keywordignorespace_analyzer"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "contactMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "contactPhone": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "clientCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "province": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "city": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "area": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "address": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "clientFrom": {
-        "type": "long"
-      },
-      "overdraftQuota": {
-        "type": "long"
-      },
-      "idLevel": {
-        "type": "long"
-      },
-      "levelName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idSalesManBelong": {
-        "type": "long"
-      },
-      "salesManNameBelong": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "enable": {
-        "type": "long"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTime": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTime": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      },
-      "signKey": {
-        "type": "keyword"
-      },
-      "dutyMan": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "againstFlag": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 135
conf/esTemplate/deliveryFeedBackInfo.json

@@ -1,135 +0,0 @@
-{
-  "deliveryfeedbackinfo": {
-    "_parent": {
-      "type": "info"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idSendBillItem": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "orderYear": {
-        "type": "integer"
-      },
-      "idLogisticsInfo": {
-        "type": "long"
-      },
-      "logisticsCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "logisticsName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "chargeKind": {
-        "type": "integer"
-      },
-      "logisticsRecMoney": {
-        "type": "double"
-      },
-      "idGuarantor": {
-        "type": "long"
-      },
-      "guarantorName": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "guarantorMoney": {
-        "type": "double"
-      },
-      "chargeMemo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "voidFlag": {
-        "type": "integer"
-      },
-      "feedBackKind": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "sendMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "reviewMemo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "sendDateLong": {
-        "type": "long"
-      },
-      "itemState": {
-        "type": "long"
-      },
-      "guarantorCheckFlag": {
-        "type": "integer"
-      },
-      "driverName": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "expressName": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 92
conf/esTemplate/machineBreedTask.json

@@ -1,92 +0,0 @@
-{
-  "machinebreedtask": {
-    "_parent": {
-      "type": "breed"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "billYear": {
-        "type": "integer"
-      },
-      "idMachineInfo": {
-        "type": "long"
-      },
-      "idProcess": {
-        "type": "long"
-      },
-      "idPrintBreed": {
-        "type": "long"
-      },
-      "idPrintBill": {
-        "type": "long"
-      },
-      "expectedWorkTime": {
-        "type": "double"
-      },
-      "beginAtLong": {
-        "type": "long"
-      },
-      "completeAtLong": {
-        "type": "long"
-      },
-      "scheduleStatus": {
-        "type": "long"
-      },
-      "pauseStatus": {
-        "type": "long"
-      },
-      "taskStatus": {
-        "type": "long"
-      },
-      "sortIndex": {
-        "type": "long"
-      },
-      "lastOperateManId": {
-        "type": "long"
-      },
-      "lastOperateManName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "taskMemo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "voidFlag": {
-        "type": "integer"
-      },
-      "assembleBreedId": {
-        "type": "long"
-      },
-      "madeBreedId": {
-        "type": "long"
-      },
-      "cutPaperId": {
-        "type": "long"
-      },
-      "printId": {
-        "type": "long"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTime": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTime": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 134
conf/esTemplate/materialinfo.json

@@ -1,134 +0,0 @@
-{
-  "info": {
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idMaterialType": {
-        "type": "long"
-      },
-      "materialTypeName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "materialName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "mtModel": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj"
-      },
-      "mtRule": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj"
-      },
-      "mtUnit": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "byUnit": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "seUnit": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "convertUnitByToMt": {
-        "type": "double"
-      },
-      "convertUnitMtToSe": {
-        "type": "double"
-      },
-      "newestPrice": {
-        "type": "double"
-      },
-      "voidFlag": {
-        "type": "integer"
-      },
-      "remark": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "materialCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "barCode": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "stockPrecision": {
-        "type": "integer"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      },
-      "priceType": {
-        "type": "long"
-      },
-      "machineRequestFlag": {
-        "type": "integer"
-      }
-    }
-  }
-}

+ 0 - 21
conf/esTemplate/materialtype.json

@@ -1,21 +0,0 @@
-{
-  "info": {
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "materialTypeName": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "voidFlag": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 207
conf/esTemplate/orderChargeData.json

@@ -1,207 +0,0 @@
-{
-  "orderchargedata": {
-    "_parent": {
-      "type": "orderreceivable"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idReceivable": {
-        "type": "long"
-      },
-      "idPaymentOrderGroup": {
-        "type": "long"
-      },
-      "chargeCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "lockFlag": {
-        "type": "integer"
-      },
-      "lockMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "financeCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "idClient": {
-        "type": "long"
-      },
-      "clientName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "orderName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "receivableMoney": {
-        "type": "double"
-      },
-      "agioMoney": {
-        "type": "double"
-      },
-      "agioMemo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idAccount": {
-        "type": "long"
-      },
-      "accountName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "voucherCode": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "payMan": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "dataKind": {
-        "type": "integer"
-      },
-      "chargeKind": {
-        "type": "integer"
-      },
-      "chargeMan": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "orderCreateTimeLong": {
-        "type": "long"
-      },
-      "orderCreateMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "voidFlag": {
-        "type": "integer"
-      },
-      "billYear": {
-        "type": "integer"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "receiveCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "chargeDateLong": {
-        "type": "long"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      },
-      "orderCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "chargeMemo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "redState": {
-        "type": "integer"
-      }
-    }
-  }
-}

+ 0 - 114
conf/esTemplate/orderCostItem.json

@@ -1,114 +0,0 @@
-{
-  "ordercostitem": {
-    "_parent": {
-      "type": "info"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "costItemValue": {
-        "type": "integer"
-      },
-      "costItemName": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "direction": {
-        "type": "integer"
-      },
-      "machineUseMoney": {
-        "type": "double"
-      },
-      "referenceId": {
-        "type": "integer"
-      },
-      "referenceName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "mtRule": {
-        "type": "keyword",
-        "index": "not_analyzed",
-        "fields": {
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          }
-        }
-      },
-      "useQty": {
-        "type": "double"
-      },
-      "price": {
-        "type": "double"
-      },
-      "money": {
-        "type": "double"
-      },
-      "idTeam": {
-        "type": "long"
-      },
-      "teamName": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "memo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "createMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "checkState": {
-        "type": "integer"
-      },
-      "sortIndex": {
-        "type": "integer"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 160
conf/esTemplate/orderDeliverInform.json

@@ -1,160 +0,0 @@
-{
-  "orderdeliverinform": {
-    "_parent": {
-      "type": "info"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "idOrderSendAddress": {
-        "type": "long"
-      },
-      "linkMan": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "linkPhone": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "sendProvince": {
-        "type": "keyword",
-        "index": "not_analyzed"
-      },
-      "sendCity": {
-        "type": "keyword",
-        "index": "not_analyzed"
-      },
-      "sendDistrict": {
-        "type": "keyword",
-        "index": "not_analyzed"
-      },
-      "sendAddress": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "needDeliverQty": {
-        "type": "double"
-      },
-      "deliveredQty": {
-        "type": "double"
-      },
-      "sendKind": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "searchSendKind": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "idLogistics": {
-        "type": "long"
-      },
-      "logisticsName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "longitude": {
-        "type": "double"
-      },
-      "latitude": {
-        "type": "double"
-      },
-      "orderYear": {
-        "type": "integer"
-      },
-      "orderMoneyTotal": {
-        "type": "double"
-      },
-      "orderMoneyPay": {
-        "type": "double"
-      },
-      "sendState": {
-        "type": "integer"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      },
-      "idClient": {
-        "type": "long"
-      },
-      "sendRegion": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "voidFlag": {
-        "type": "integer"
-      },
-      "acDeliverDateLong": {
-        "type": "long"
-      },
-      "deliverMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "createMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "packDetail": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "packageCount": {
-        "type": "integer"
-      }
-    }
-  }
-}

+ 0 - 79
conf/esTemplate/orderImageDispatchItem.json

@@ -1,79 +0,0 @@
-{
-  "orderimagedispatchitem": {
-    "_parent": {
-      "type": "info"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "itemKind": {
-        "type": "long"
-      },
-      "workStatus": {
-        "type": "long"
-      },
-      "pCount": {
-        "type": "integer"
-      },
-      "idUser": {
-        "type": "long"
-      },
-      "userName": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          }
-        }
-      },
-      "dispatchTimeLong": {
-        "type": "long"
-      },
-      "dispatchTimeYear": {
-        "type": "long"
-      },
-      "dispatchTimeMonth": {
-        "type": "long"
-      },
-      "dispatchTimeDay": {
-        "type": "long"
-      },
-      "processTimeLong": {
-        "type": "long"
-      },
-      "processTimeYear": {
-        "type": "long"
-      },
-      "processTimeMonth": {
-        "type": "long"
-      },
-      "processTimeDay": {
-        "type": "long"
-      },
-      "processMemo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "editCountP": {
-        "type": "integer"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 118
conf/esTemplate/orderLifeCycle.json

@@ -1,118 +0,0 @@
-{
-  "orderlifecycle": {
-    "_parent": {
-      "type": "info"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "idOrderPart": {
-        "type": "long"
-      },
-      "lifeNodeId": {
-        "type": "long"
-      },
-      "lifeNodeName": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          }
-        }
-      },
-      "lifeNodeState": {
-        "type": "integer"
-      },
-      "orderYear": {
-        "type": "integer"
-      },
-      "referenceMasterId": {
-        "type": "long"
-      },
-      "referenceMasterCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          }
-        }
-      },
-      "referenceSlaveId": {
-        "type": "long"
-      },
-      "referenceSlaveCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          }
-        }
-      },
-      "referenceMasterContent": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          },
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "createManName": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "updateManName": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "voidMasterFlag": {
-        "type": "integer"
-      },
-      "voidSlaveFlag": {
-        "type": "integer"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 81
conf/esTemplate/orderLifeCycleCount.json

@@ -1,81 +0,0 @@
-{
-  "orderlifecyclecount": {
-    "_parent": {
-      "type": "info"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "idOrderPart": {
-        "type": "long"
-      },
-      "a0Count": {
-        "type": "long"
-      },
-      "a1Count": {
-        "type": "long"
-      },
-      "a2Count": {
-        "type": "long"
-      },
-      "a3Count": {
-        "type": "long"
-      },
-      "a4Count": {
-        "type": "long"
-      },
-      "a5Count": {
-        "type": "long"
-      },
-      "a6Count": {
-        "type": "long"
-      },
-      "a7Count": {
-        "type": "long"
-      },
-      "a8Count": {
-        "type": "long"
-      },
-      "a9Count": {
-        "type": "long"
-      },
-      "a10Count": {
-        "type": "long"
-      },
-      "a11Count": {
-        "type": "long"
-      },
-      "a12Count": {
-        "type": "long"
-      },
-      "a13Count": {
-        "type": "long"
-      },
-      "a14Count": {
-        "type": "long"
-      },
-      "a15Count": {
-        "type": "long"
-      },
-      "a16Count": {
-        "type": "long"
-      },
-      "a17Count": {
-        "type": "long"
-      },
-      "a18Count": {
-        "type": "long"
-      },
-      "a19Count": {
-        "type": "long"
-      },
-      "a20Count": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 137
conf/esTemplate/orderMaterialItem.json

@@ -1,137 +0,0 @@
-{
-  "ordermaterial": {
-    "_parent": {
-      "type": "info"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "idMaterial": {
-        "type": "long"
-      },
-      "mtName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "idActualMaterial": {
-        "type": "long"
-      },
-      "actualMtName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "materialQty": {
-        "type": "double"
-      },
-      "actualMaterialQty": {
-        "type": "double"
-      },
-      "processedQty": {
-        "type": "double"
-      },
-      "materialMemo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "materialState": {
-        "type": "integer"
-      },
-      "orderYear": {
-        "type": "integer"
-      },
-      "materialFlag": {
-        "type": "integer"
-      },
-      "idStockRoom": {
-        "type": "long"
-      },
-      "stockRoomName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "preOutMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idCompany": {
-        "type": "long"
-      },
-      "orderPreRequestFlag": {
-        "type": "integer"
-      },
-      "orderStockInFlag": {
-        "type": "integer"
-      },
-      "orderPickingFlag": {
-        "type": "integer"
-      },
-      "orderStockOutFlag": {
-        "type": "integer"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 285
conf/esTemplate/orderPart.json

@@ -1,285 +0,0 @@
-{
-  "orderpart": {
-    "_parent": {
-      "type": "info"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "idPart": {
-        "type": "long"
-      },
-      "partName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "partSize": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "partSizeDesc": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "partSizeWidth": {
-        "type": "double"
-      },
-      "partSizeHeight": {
-        "type": "double"
-      },
-      "partSizeLength": {
-        "type": "double"
-      },
-      "bloodValue": {
-        "type": "double"
-      },
-      "idPaperType": {
-        "type": "long"
-      },
-      "paperTypeName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "idPaperQuoteInfo": {
-        "type": "long"
-      },
-      "quotePaperName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "faceCount": {
-        "type": "integer"
-      },
-      "pageQty": {
-        "type": "integer"
-      },
-      "partQty": {
-        "type": "double"
-      },
-      "paperSuttle": {
-        "type": "integer"
-      },
-      "originFile": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "finalFile": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "pDFFileObverse": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "pDFFileObversePageIndex": {
-        "type": "integer"
-      },
-      "pDFFileReverse": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "pDFFileReversePageIndex": {
-        "type": "integer"
-      },
-      "thumbFileObverse": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "thumbFileReverse": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "previewFileObverse": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "previewFileReverse": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "partIndex": {
-        "type": "integer"
-      },
-      "orderYear": {
-        "type": "integer"
-      },
-      "partColorObverse": {
-        "type": "long"
-      },
-      "partColorReverse": {
-        "type": "long"
-      },
-      "fileType": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "productPartName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "orderCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "allProcessStr": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "fuMoFlag": {
-        "type": "integer"
-      },
-      "moQieFlag": {
-        "type": "integer"
-      },
-      "moduleCount": {
-        "type": "integer"
-      },
-      "partSaleQty": {
-        "type": "double"
-      },
-      "specialPaperFlag": {
-        "type": "integer"
-      },
-      "qtyEnoughFlag": {
-        "type": "integer"
-      },
-      "partDesc": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "mainFlag": {
-        "type": "integer"
-      },
-      "partColour": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "holdSize": {
-        "type": "integer"
-      },
-      "bookStyle": {
-        "type": "integer"
-      },
-      "cupSize": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      }
-    }
-  }
-}

+ 0 - 33
conf/esTemplate/orderPartParamValue.json

@@ -1,33 +0,0 @@
-{
-  "orderpartparamvalue": {
-    "_parent": {
-      "type": "orderpart"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "idOrderPart": {
-        "type": "long"
-      },
-      "idParameter": {
-        "type": "long"
-      },
-      "paramValue": {
-        "type": "text"
-      },
-      "fieldType": {
-        "type": "long"
-      },
-      "paramDisplay": {
-        "type": "text"
-      },
-      "orderYear": {
-        "type": "integer"
-      }
-    }
-  }
-}

+ 0 - 173
conf/esTemplate/orderPartProcess.json

@@ -1,173 +0,0 @@
-{
-  "orderpartprocess": {
-    "_parent": {
-      "type": "orderpart"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "idOrderPart": {
-        "type": "long"
-      },
-      "idProcess": {
-        "type": "long"
-      },
-      "processMemo": {
-        "type": "text"
-      },
-      "orderIndex": {
-        "type": "long"
-      },
-      "pDFFileName": {
-        "type": "text"
-      },
-      "pDFFilePageIndex": {
-        "type": "long"
-      },
-      "processPrice": {
-        "type": "double"
-      },
-      "processQty": {
-        "type": "double"
-      },
-      "processMoney": {
-        "type": "double"
-      },
-      "processRule": {
-        "type": "text",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "idMaterial": {
-        "type": "long"
-      },
-      "orderYear": {
-        "type": "integer"
-      },
-      "processName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "obvRevId": {
-        "type": "long"
-      },
-      "isOutAssisted": {
-        "type": "integer"
-      },
-      "idOutAssistBill": {
-        "type": "long"
-      },
-      "outAssistBillCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "materialQty": {
-        "type": "double"
-      },
-      "materialPreOutFlag": {
-        "type": "integer"
-      },
-      "idActualMaterialInfo": {
-        "type": "long"
-      },
-      "actualMaterialInfoName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "preOutStockLockIdRoom": {
-        "type": "long"
-      },
-      "preOutStockLockQty": {
-        "type": "integer"
-      },
-      "preOutLockState": {
-        "type": "integer"
-      },
-      "preOutLockManId": {
-        "type": "long"
-      },
-      "preOutLockManName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "preOutStockUnlocked": {
-        "type": "integer"
-      },
-      "materialPreRequestFlag": {
-        "type": "integer"
-      },
-      "materialStockInFlag": {
-        "type": "integer"
-      },
-      "materialPickingFlag": {
-        "type": "integer"
-      },
-      "materialStockOutFlag": {
-        "type": "integer"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTime": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTime": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 140
conf/esTemplate/orderPrePay.json

@@ -1,140 +0,0 @@
-{
-  "orderprepay": {
-    "_parent": {
-      "type": "info"
-    },
-
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "prePayMoney": {
-        "type": "double"
-      },
-      "billState": {
-        "type": "integer"
-      },
-      "createMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idAccount": {
-        "type": "long"
-      },
-      "accountName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "actMoney": {
-        "type": "double"
-      },
-      "prePayMemo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "auditDateLong": {
-        "type": "long"
-      },
-      "auditMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idAuditMan": {
-        "type": "long"
-      },
-      "chargeDateCode": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "orderYear": {
-        "type": "integer"
-      },
-      "orderCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          }
-        }
-      },
-      "orderName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "orderPrintDesc": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "orderQty": {
-        "type": "double"
-      },
-      "orderMoneyTotal": {
-        "type": "double"
-      },
-      "clientName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-
-      "clientCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          }
-        }
-      },
-
-      "orderCreateTimeLong": {
-        "type": "long"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 196
conf/esTemplate/orderReceivable.json

@@ -1,196 +0,0 @@
-{
-  "orderreceivable": {
-    "_parent": {
-      "type": "info"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "idClient": {
-        "type": "long"
-      },
-      "clientName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "billMoney": {
-        "type": "double"
-      },
-      "chargeMoney": {
-        "type": "double"
-      },
-      "payMoney": {
-        "type": "double"
-      },
-      "createMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "dataKind": {
-        "type": "integer"
-      },
-      "chargeState": {
-        "type": "integer"
-      },
-      "chargeTimeLong": {
-        "type": "long"
-      },
-      "chargeMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "financeCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "orderYear": {
-        "type": "integer"
-      },
-      "printBillCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "orderCreateMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "orderCreateTimeLong": {
-        "type": "long"
-      },
-      "orderCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "maYunCode": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "orderName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "stateMemo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "orderMoney": {
-        "type": "double"
-      },
-      "orderMoneyPrePay": {
-        "type": "double"
-      },
-      "orderQty": {
-        "type": "double"
-      },
-      "orderMessage": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "billMemo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "orderStateSend": {
-        "type": "integer"
-      },
-      "orderPayKind": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      },
-      "idPaymentGroup": {
-        "type": "long"
-      },
-      "onlinePayState": {
-        "type": "long"
-      },
-      "receivableMemo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idMemoMan": {
-        "type": "long"
-      },
-      "memoMan": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "memoDate": {
-        "type": "long"
-      },
-      "memoDateLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 101
conf/esTemplate/orderSendAddress.json

@@ -1,101 +0,0 @@
-{
-  "ordersendaddress": {
-    "_parent": {
-      "type": "info"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "linkMan": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "linkPhone": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "sendProvince": {
-        "type": "keyword",
-        "index": "not_analyzed"
-      },
-      "sendCity": {
-        "type": "keyword",
-        "index": "not_analyzed"
-      },
-      "sendDistrict": {
-        "type": "keyword",
-        "index": "not_analyzed"
-      },
-      "sendAddress": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "addressQty": {
-        "type": "double"
-      },
-      "sendQty": {
-        "type": "double"
-      },
-      "sendKind": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idLogistics": {
-        "type": "long"
-      },
-      "logisticsName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "longitude": {
-        "type": "double"
-      },
-      "latitude": {
-        "type": "double"
-      },
-      "orderYear": {
-        "type": "integer"
-      },
-      "sendRegion": {
-        "type": "text"
-      }
-    }
-  }
-}

+ 0 - 219
conf/esTemplate/orderStockItem.json

@@ -1,219 +0,0 @@
-{
-  "orderstockitem": {
-    "_parent": {
-      "type": "info"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "orderCode": {
-        "type": "text",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "idClient": {
-        "type": "long"
-      },
-      "productTypeName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "orderName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "clientName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "orderQty": {
-        "type": "double"
-      },
-      "totalBoxCount": {
-        "type": "long"
-      },
-      "stockCount": {
-        "type": "long"
-      },
-      "boxCount": {
-        "type": "long"
-      },
-      "boxDesc": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "itemPrint": {
-        "type": "double"
-      },
-      "idPrintBoxMan": {
-        "type": "long"
-      },
-      "printBoxMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idInStockMan": {
-        "type": "long"
-      },
-      "inStockMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "inStockCode": {
-        "type": "text",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "idCheckMan": {
-        "type": "long"
-      },
-      "checkMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idStockPlace": {
-        "type": "long"
-      },
-      "stockPlace": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "verifyProduct": {
-        "type": "integer"
-      },
-      "idVerifyMan": {
-        "type": "long"
-      },
-      "verifyMan": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "verifyDateLong": {
-        "type": "long"
-      },
-      "idBoxedMan": {
-        "type": "long"
-      },
-      "boxedMan": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "stockMemo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "transLockFlag": {
-        "type": "integer"
-      },
-      "idTransLockMan": {
-        "type": "long"
-      },
-      "transLockMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "itemState": {
-        "type": "long"
-      },
-      "startNum": {
-        "type": "long"
-      },
-      "voidFlag": {
-        "type": "integer"
-      },
-      "inputKind": {
-        "type": "integer"
-      },
-      "orderYear": {
-        "type": "integer"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 114
conf/esTemplate/orderStockLabel.json

@@ -1,114 +0,0 @@
-{
-  "orderstocklabel": {
-    "_parent": {
-      "type": "orderstockitem"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrderStockItem": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "labelState": {
-        "type": "integer"
-      },
-      "labelQty": {
-        "type": "double"
-      },
-      "labelCount": {
-        "type": "integer"
-      },
-      "labelNum": {
-        "type": "integer"
-      },
-      "orderYear": {
-        "type": "integer"
-      },
-      "idStockPlace": {
-        "type": "long"
-      },
-      "stockPlace": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      },
-      "idOrderCreate": {
-        "type": "long"
-      },
-      "orderCreateMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "orderCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "orderName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "clintName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      }
-    }
-  }
-}

+ 17 - 23
conf/esTemplate/clientreceiveaddress.json

@@ -1,68 +1,62 @@
 {
-  "info": {
+  "orderdeliveryinfo": {
+    "_parent": {
+      "type": "info"
+    },
     "properties": {
       "id": {
         "type": "long"
       },
-      "idClient": {
+      "idOrder": {
         "type": "long"
       },
-      "receiveMan": {
+      "deliverProvince": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "receivePhone": {
+      "deliverCity": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "idShipArea": {
-        "type": "long"
-      },
-      "shipArea": {
+      "deliverDistract": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "province": {
+      "deliverAddress": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "city": {
+      "receiveMan": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "area": {
+      "contractPhone": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "address": {
+      "deliverTimeliness": {
+        "type": "integer"
+      },
+      "customerInvoiceInfo": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "coordinate": {
+      "customerMemo": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "defaultFlag": {
-        "type": "long"
-      },
       "createBy": {
         "type": "long"
       },
-      "createTime": {
-        "type": "long"
-      },
       "createTimeLong": {
         "type": "long"
       },
       "updateBy": {
         "type": "long"
       },
-      "updateTime": {
-        "type": "long"
-      },
       "updateTimeLong": {
         "type": "long"
       }
     }
   }
-}
+}

+ 40 - 0
conf/esTemplate/orderdetailitem.json

@@ -0,0 +1,40 @@
+{
+  "orderdetailitem": {
+    "_parent": {
+      "type": "info"
+    },
+    "properties": {
+      "id": {
+        "type": "long"
+      },
+      "idOrder": {
+        "type": "long"
+      },
+      "itemName": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "itemPrice": {
+        "type": "double"
+      },
+      "itemCount": {
+        "type": "integer"
+      },
+      "itemMoney": {
+        "type": "double"
+      },
+      "createBy": {
+        "type": "long"
+      },
+      "createTimeLong": {
+        "type": "long"
+      },
+      "updateBy": {
+        "type": "long"
+      },
+      "updateTimeLong": {
+        "type": "long"
+      }
+    }
+  }
+}

+ 48 - 0
conf/esTemplate/orderfinances.json

@@ -0,0 +1,48 @@
+{
+  "orderfinances": {
+    "_parent": {
+      "type": "info"
+    },
+    "properties": {
+      "id": {
+        "type": "long"
+      },
+      "idOrder": {
+        "type": "long"
+      },
+      "orderMoney": {
+        "type": "double"
+      },
+      "deliverFee": {
+        "type": "double"
+      },
+      "orderPlatformSubsidy": {
+        "type": "double"
+      },
+      "storeDiscount": {
+        "type": "double"
+      },
+      "customerPaid": {
+        "type": "double"
+      },
+      "platformServiceFee": {
+        "type": "double"
+      },
+      "storeRealCollection": {
+        "type": "double"
+      },
+      "createBy": {
+        "type": "long"
+      },
+      "createTimeLong": {
+        "type": "long"
+      },
+      "updateBy": {
+        "type": "long"
+      },
+      "updateTimeLong": {
+        "type": "long"
+      }
+    }
+  }
+}

+ 0 - 63
conf/esTemplate/paperbaseinfo.json

@@ -1,63 +0,0 @@
-{
-  "info": {
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idPaperType": {
-        "type": "long"
-      },
-      "paperName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "mtSuttle": {
-        "type": "double"
-      },
-      "paperInfoCode": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "priceType": {
-        "type": "integer"
-      },
-      "paperPrice": {
-        "type": "double"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      },
-      "voidFlag": {
-        "type": "long"
-      },
-      "sortNum": {
-        "type": "integer"
-      }
-    }
-  }
-}

+ 0 - 74
conf/esTemplate/paperinfo.json

@@ -1,74 +0,0 @@
-{
-  "info": {
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idPaperType": {
-        "type": "long"
-      },
-      "paperName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "paperCode": {
-        "type": "keyword",
-        "index": "not_analyzed"
-      },
-      "mtModel": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          }
-        }
-      },
-      "mtRule": {
-        "type": "keyword",
-        "index": "not_analyzed",
-        "fields": {
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          }
-        }
-      },
-      "mtSuttle": {
-        "type": "double",
-        "index": "not_analyzed"
-      },
-      "barCode": {
-        "type": "keyword",
-        "index": "not_analyzed"
-      },
-      "remark": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "voidFlag": {
-        "type": "long"
-      },
-      "priceType": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 64
conf/esTemplate/paperquoteinfo.json

@@ -1,64 +0,0 @@
-{
-  "info": {
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idPaperBaseInfo": {
-        "type": "long"
-      },
-      "paperBaseName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idPaperBrand": {
-        "type": "long"
-      },
-      "paperBrandName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "paperQuoteName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "priceType": {
-        "type": "integer"
-      },
-      "paperPrice": {
-        "type": "double"
-      },
-      "voidFlag": {
-        "type": "integer"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 22
conf/esTemplate/papertype.json

@@ -1,22 +0,0 @@
-{
-  "info": {
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "paperTypeName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          }
-        }
-      },
-      "voidFlag": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 31 - 0
conf/esTemplate/platforminfo.json

@@ -0,0 +1,31 @@
+{
+  "info": {
+    "properties": {
+      "id": {
+        "type": "long"
+      },
+      "platformName": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "platformType": {
+        "type": "integer"
+      },
+      "voidFlag": {
+        "type": "integer"
+      },
+      "createBy": {
+        "type": "long"
+      },
+      "createTimeLong": {
+        "type": "long"
+      },
+      "updateBy": {
+        "type": "long"
+      },
+      "updateTimeLong": {
+        "type": "long"
+      }
+    }
+  }
+}

+ 7 - 10
conf/esTemplate/clientindustryinfo.json

@@ -4,21 +4,21 @@
       "id": {
         "type": "long"
       },
-      "industryCode": {
+      "requireName": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "industryName": {
+      "requireCode": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "enable": {
-        "type": "long"
+      "valueType": {
+        "type": "integer"
       },
-      "createBy": {
-        "type": "long"
+      "voidFlag": {
+        "type": "integer"
       },
-      "createTime": {
+      "createBy": {
         "type": "long"
       },
       "createTimeLong": {
@@ -27,9 +27,6 @@
       "updateBy": {
         "type": "long"
       },
-      "updateTime": {
-        "type": "long"
-      },
       "updateTimeLong": {
         "type": "long"
       }

+ 0 - 182
conf/esTemplate/printBill.json

@@ -1,182 +0,0 @@
-{
-  "info": {
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "billYear": {
-        "type": "integer"
-      },
-      "billCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "productName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "billName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "clientName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "processText": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "outSourceProcessText": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "deliveryDate": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "deliveryDateLong": {
-        "type": "long"
-      },
-      "printTime": {
-        "type": "long"
-      },
-      "voidFlag": {
-        "type": "integer"
-      },
-      "billNote": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "billState": {
-        "type": "integer"
-      },
-      "billType": {
-        "type": "integer"
-      },
-      "billMoneyPlate": {
-        "type": "double"
-      },
-      "billMoneyPaper": {
-        "type": "double"
-      },
-      "billMoneyPrint": {
-        "type": "double"
-      },
-      "billMoneyProcess": {
-        "type": "double"
-      },
-      "billMoneyTotal": {
-        "type": "double"
-      },
-      "billMoneyAdjust": {
-        "type": "double"
-      },
-      "orderMoneyTotal": {
-        "type": "double"
-      },
-      "containsOrderIds": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "containsOrderCodes": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "breedFileUrl": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "currentVersion": {
-        "type": "long"
-      },
-      "autoPDFFlag": {
-        "type": "integer"
-      },
-      "idProduct": {
-        "type": "long"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createManName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "orderPrintRequire": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "orderSendKind": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "assembleBreedRequire": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idCompany": {
-        "type": "long"
-      },
-      "importantBill": {
-        "type": "integer"
-      },
-      "idClientLevel": {
-        "type": "long"
-      },
-      "createTime": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTime": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 276
conf/esTemplate/printBillBreed.json

@@ -1,276 +0,0 @@
-{
-  "breed": {
-    "_parent": {
-      "type": "info"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "billYear": {
-        "type": "integer"
-      },
-      "idCompany": {
-        "type": "long"
-      },
-      "idPrintBill": {
-        "type": "long"
-      },
-      "breedName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "breedTypeName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "selfProvidedPaper": {
-        "type": "long"
-      },
-      "wholePaperSize": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "paperBand": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idPaperBaseInfo": {
-        "type": "long"
-      },
-      "paperName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "idPaperCutInfo": {
-        "type": "long"
-      },
-      "cutName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "cutCount": {
-        "type": "long"
-      },
-      "cutSize": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "partCount": {
-        "type": "long"
-      },
-      "partPrintTotalQty": {
-        "type": "long"
-      },
-      "breedNo": {
-        "type": "long"
-      },
-      "breedSets": {
-        "type": "long"
-      },
-      "printCount": {
-        "type": "long"
-      },
-      "printFlowCount": {
-        "type": "long"
-      },
-      "craftFlowCount": {
-        "type": "long"
-      },
-      "wholePaperCount": {
-        "type": "long"
-      },
-      "originWholePaperCount": {
-        "type": "long"
-      },
-      "paperPrice": {
-        "type": "double"
-      },
-      "breedPaperPrice": {
-        "type": "double"
-      },
-      "idActualPaperInfo": {
-        "type": "long"
-      },
-      "actualPaperName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "idMachineType": {
-        "type": "long"
-      },
-      "idMachine": {
-        "type": "long"
-      },
-      "machineTypeName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "machineName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "colorCount": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "specialColor": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "breedFlipType": {
-        "type": "long"
-      },
-      "breedSize": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "psSize": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "psGroupCount": {
-        "type": "long"
-      },
-      "psCount": {
-        "type": "long"
-      },
-      "completeCount": {
-        "type": "long"
-      },
-      "printCount1000": {
-        "type": "double"
-      },
-      "printCosts": {
-        "type": "double"
-      },
-      "breedProcess": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "breedStatus": {
-        "type": "integer"
-      },
-      "printRequire": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "preOutStockState": {
-        "type": "integer"
-      },
-      "preOutStockLockIdRoom": {
-        "type": "long"
-      },
-      "preOutStockLockQty": {
-        "type": "integer"
-      },
-      "preOutLockState": {
-        "type": "integer"
-      },
-      "preOutLockManId": {
-        "type": "long"
-      },
-      "preOutLockManName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idPlateSizeTemplate": {
-        "type": "long"
-      },
-      "voidFlag": {
-        "type": "integer"
-      },
-      "containsOrderIds": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "preOutStockUnlocked": {
-        "type": "integer"
-      },
-      "pickPaperCount": {
-        "type": "long"
-      },
-      "paperRequireFlag": {
-        "type": "integer"
-      },
-      "paperPreRequestFlag": {
-        "type": "integer"
-      },
-      "paperStockInFlag": {
-        "type": "integer"
-      },
-      "paperPickingFlag": {
-        "type": "integer"
-      },
-      "paperStockOutFlag": {
-        "type": "integer"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTime": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTime": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 70
conf/esTemplate/printBillLifeCycle.json

@@ -1,70 +0,0 @@
-{
-  "printbilllifecycle": {
-    "_parent": {
-      "type": "breed"
-    },
-    "properties": {
-      "idPrintBill": {
-        "type": "long"
-      },
-      "idBreed": {
-        "type": "long"
-      },
-      "lifeNodeId": {
-        "type": "long"
-      },
-      "lifeNodeName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "lifeNodeState": {
-        "type": "integer"
-      },
-      "billYear": {
-        "type": "integer"
-      },
-      "referenceMasterId": {
-        "type": "long"
-      },
-      "referenceSlaveId": {
-        "type": "long"
-      },
-      "createManName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "updateManName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 126
conf/esTemplate/printBreedPart.json

@@ -1,126 +0,0 @@
-{
-  "printbreedpart": {
-    "_parent": {
-      "type": "breed"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "billYear": {
-        "type": "integer"
-      },
-      "idProduct": {
-        "type": "long"
-      },
-      "idPartInfo": {
-        "type": "long"
-      },
-      "idPrintBill": {
-        "type": "long"
-      },
-      "idPrintBreed": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "idOrderPart": {
-        "type": "long"
-      },
-      "idWorkPart": {
-        "type": "long"
-      },
-      "partHeight": {
-        "type": "double"
-      },
-      "partWidth": {
-        "type": "double"
-      },
-      "locationX": {
-        "type": "double"
-      },
-      "locationY": {
-        "type": "double"
-      },
-      "rotationAngle": {
-        "type": "long"
-      },
-      "productName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "orderName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "orderNameQuery": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "orderCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "productPartName": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "semiFeedbackStatus": {
-        "type": "integer"
-      },
-      "semiFeedbackContent": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idSemiFeedbackMan": {
-        "type": "long"
-      },
-      "semiFeedbackTimeLong": {
-        "type": "long"
-      },
-      "cropRect": {
-        "type": "text",
-        "index": "not_analyzed"
-      }
-    }
-  }
-}

+ 0 - 377
conf/esTemplate/printOrder.json

@@ -1,377 +0,0 @@
-{
-  "info": {
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "orderYear": {
-        "type": "integer"
-      },
-      "orderCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "orderName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "idProduct": {
-        "type": "long"
-      },
-      "idClient": {
-        "type": "long"
-      },
-      "clientName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "clientCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "orderFrom": {
-        "type": "integer"
-      },
-      "platformOrderID": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "orderState": {
-        "type": "integer"
-      },
-      "stateMemo": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "orderMoneyProcess": {
-        "type": "double"
-      },
-      "orderMoneyPrint": {
-        "type": "double"
-      },
-      "orderMoneyTotal": {
-        "type": "double"
-      },
-      "chargeMoney": {
-        "type": "double"
-      },
-      "payMoney": {
-        "type": "double"
-      },
-      "orderMoneySend": {
-        "type": "double"
-      },
-      "orderMoneyPre": {
-        "type": "double"
-      },
-      "kindCount": {
-        "type": "integer"
-      },
-      "orderQty": {
-        "type": "double"
-      },
-      "boxedOrderQty": {
-        "type": "double"
-      },
-      "boxedOrderQtyEx": {
-        "type": "double"
-      },
-      "payKind": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "searchPayKind": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "orderMemo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "sendMemo": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "deliverDateLong": {
-        "type": "long"
-      },
-      "checkMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "checkDateLong": {
-        "type": "long"
-      },
-      "voidFlag": {
-        "type": "integer"
-      },
-      "cutKind": {
-        "type": "integer"
-      },
-      "printRequire": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "prePrintCode": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "photographFlag": {
-        "type": "integer"
-      },
-      "partCount": {
-        "type": "integer"
-      },
-      "businessKind": {
-        "type": "integer"
-      },
-      "maYunCode": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "idSale": {
-        "type": "long"
-      },
-      "saleMan": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "idSaleWorkTeam": {
-        "type": "long"
-      },
-      "orderMessage": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "fileDescription": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "originFileLink": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "orderStateCharge": {
-        "type": "integer"
-      },
-      "createMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "orderRegion": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "productName": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "orderType": {
-        "type": "integer"
-      },
-      "versionCode": {
-        "type": "long"
-      },
-      "allProcessStr": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "packRequire": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "packKind": {
-        "type": "integer"
-      },
-      "boxRequire": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "pageQty": {
-        "type": "integer"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      },
-      "attachFile": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "attachFileLink": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "proofFile": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "proofFileLink": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "packageQty": {
-        "type": "double"
-      },
-      "webProofFileLink": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "paperRequireFlag": {
-        "type": "integer"
-      },
-      "idProductType": {
-        "type": "long"
-      },
-      "originOrderId": {
-        "type": "long"
-      },
-      "rePrintIndex": {
-        "type": "long"
-      },
-      "rePrintNeedImageProcess": {
-        "type": "long"
-      },
-      "firstOrderFlag": {
-        "type": "integer"
-      },
-      "usePreStore": {
-        "type": "integer"
-      },
-      "traceFlag": {
-        "type": "integer"
-      },
-      "dutyMan": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "idClientLevel": {
-        "type": "long"
-      },
-      "contractTeamId": {
-        "type": "long"
-      },
-      "contractManId": {
-        "type": "long"
-      },
-      "contractMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      }
-    }
-  }
-}

+ 0 - 90
conf/esTemplate/product.json

@@ -1,90 +0,0 @@
-{
-  "info": {
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idType": {
-        "type": "long"
-      },
-      "productName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "productUnit": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "makeUpType": {
-        "type": "long"
-      },
-      "billPrefix": {
-        "type":  "keyword"
-      },
-      "billCodeTimeKind": {
-        "type": "integer"
-      },
-      "orderPrefix": {
-        "type":  "keyword"
-      },
-      "isSelfHelp": {
-        "type": "long"
-      },
-      "priceFlag": {
-        "type": "long"
-      },
-      "photoFixFlag": {
-        "type": "long"
-      },
-      "voidFlag": {
-        "type": "long"
-      },
-      "saleFlag": {
-        "type": "long"
-      },
-      "idPartner": {
-        "type": "long"
-      },
-      "idProductPriceInfo": {
-        "type": "long"
-      },
-      "compageVisibleFlag": {
-        "type": "long"
-      },
-      "minDeliveryDay": {
-        "type": "integer"
-      },
-      "systemType": {
-        "type": "integer"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 0 - 33
conf/esTemplate/productImage.json

@@ -1,33 +0,0 @@
-{
-  "info": {
-    "properties": {
-      "id": {
-        "type": "long",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "idProduct": {
-        "type": "long"
-      },
-      "sortNum": {
-        "type": "long"
-      },
-      "idSkuCategory": {
-        "type": "long"
-      },
-      "imageUrl": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      }
-    }
-  }
-}

+ 22 - 16
conf/esTemplate/printBillStep.json

@@ -4,33 +4,39 @@
       "id": {
         "type": "long"
       },
-      "billYear": {
-        "type": "integer"
+      "brandName": {
+        "type": "text",
+        "index": "not_analyzed"
       },
-      "idPrintBill": {
-        "type": "long"
+      "brandLogoUrl": {
+        "type": "text",
+        "index": "not_analyzed"
       },
-      "idWorkMan": {
-        "type": "long"
+      "startingPrice": {
+        "type": "double"
+      },
+      "packagingFee": {
+        "type": "double"
       },
-      "workMan": {
+      "brandMemo": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "workTime": {
+      "voidFlag": {
+        "type": "integer"
+      },
+      "createBy": {
         "type": "long"
       },
-      "workTimeLong": {
+      "createTimeLong": {
         "type": "long"
       },
-      "workMemo": {
-        "type": "text",
-        "index": "not_analyzed"
+      "updateBy": {
+        "type": "long"
       },
-      "workExplain": {
-        "type": "text",
-        "index": "not_analyzed"
+      "updateTimeLong": {
+        "type": "long"
       }
     }
   }
-}
+}

+ 25 - 67
conf/esTemplate/outassistinfo.json

@@ -4,123 +4,81 @@
       "id": {
         "type": "long"
       },
-      "assistType": {
-        "type": "long"
-      },
-      "workType": {
+      "storeName": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "workQuality": {
-        "type": "text",
-        "index": "not_analyzed"
+      "idBrand": {
+        "type": "long"
       },
-      "settleType": {
+      "brandName": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "outAssistName": {
-        "type": "text",
-        "index": "not_analyzed",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "contactMan": {
+      "idStoreType": {
+        "type": "long"
+      },
+      "deliverSettleKind": {
+        "type": "integer"
+      },
+      "storeCodeInput": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "contactPhone": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "outAssistCode": {
-        "type": "text",
-        "index": "analyzed",
-        "analyzer": "codefull_analyzer",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          }
-        }
-      },
-      "province": {
+      "storeProvince": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "city": {
+      "storeCity": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "area": {
+      "storeDistrict": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "address": {
+      "storeAddress": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "remark": {
+      "contractPhone": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "factorySyncKey": {
+      "storeBossId": {
+        "type": "long"
+      },
+      "companyLicenseNo": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "contractUrl": {
+      "companyLicensePicUrl": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "dataBaseAlias": {
+      "legalPersonIdNo": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "shardingKey": {
+      "legalPersonName": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "enable": {
-        "type": "long"
-      },
-      "submitOnAllocation": {
-        "type": "integer"
-      },
-      "sortIndex": {
-        "type": "integer"
-      },
-      "capacity": {
-        "type": "long"
-      },
-      "needPackMaterial": {
+      "voidFlag": {
         "type": "integer"
       },
       "createBy": {
         "type": "long"
       },
-      "createTime": {
-        "type": "long"
-      },
       "createTimeLong": {
         "type": "long"
       },
       "updateBy": {
         "type": "long"
       },
-      "updateTime": {
-        "type": "long"
-      },
       "updateTimeLong": {
         "type": "long"
       }
     }
   }
-}
+}

+ 46 - 0
conf/esTemplate/storeinvoiceinfo.json

@@ -0,0 +1,46 @@
+{
+  "storeinvoiceinfo": {
+    "_parent": {
+      "type": "info"
+    },
+    "properties": {
+      "id": {
+        "type": "long"
+      },
+      "idStore": {
+        "type": "long"
+      },
+      "taxIdNo": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "companyName": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "defaultTaxItemName": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "defaultTaxItemCode": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "taxRate": {
+        "type": "double"
+      },
+      "createBy": {
+        "type": "long"
+      },
+      "createTimeLong": {
+        "type": "long"
+      },
+      "updateBy": {
+        "type": "long"
+      },
+      "updateTimeLong": {
+        "type": "long"
+      }
+    }
+  }
+}

+ 11 - 11
conf/esTemplate/clientlevel.json

@@ -4,31 +4,31 @@
       "id": {
         "type": "long"
       },
-      "levelName": {
+      "idStore": {
+        "type": "long"
+      },
+      "idPlatformInfo": {
+        "type": "long"
+      },
+      "platformName": {
         "type": "text",
         "index": "not_analyzed"
       },
-      "enable": {
-        "type": "long"
+      "platformType": {
+        "type": "integer"
       },
-      "levelValue": {
-        "type": "long"
+      "enableStatue": {
+        "type": "integer"
       },
       "createBy": {
         "type": "long"
       },
-      "createTime": {
-        "type": "long"
-      },
       "createTimeLong": {
         "type": "long"
       },
       "updateBy": {
         "type": "long"
       },
-      "updateTime": {
-        "type": "long"
-      },
       "updateTimeLong": {
         "type": "long"
       }

+ 45 - 0
conf/esTemplate/storeplatformrequire.json

@@ -0,0 +1,45 @@
+{
+  "storeplatformrequire": {
+    "_parent": {
+      "type": "info"
+    },
+    "properties": {
+      "id": {
+        "type": "long"
+      },
+      "idStore": {
+        "type": "long"
+      },
+      "idStorePlatform": {
+        "type": "long"
+      },
+      "idPlatformRequire": {
+        "type": "long"
+      },
+      "platformRequireCode": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "platformRequireName": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "itemValue": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
+      "createBy": {
+        "type": "long"
+      },
+      "createTimeLong": {
+        "type": "long"
+      },
+      "updateBy": {
+        "type": "long"
+      },
+      "updateTimeLong": {
+        "type": "long"
+      }
+    }
+  }
+}

+ 0 - 143
conf/esTemplate/workPart.json

@@ -1,143 +0,0 @@
-{
-  "workpart": {
-    "_parent": {
-      "type": "info"
-    },
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "idOrderPart": {
-        "type": "long"
-      },
-      "idOrder": {
-        "type": "long"
-      },
-      "idPart": {
-        "type": "long"
-      },
-      "workPartQty": {
-        "type": "double"
-      },
-      "workPartState": {
-        "type": "integer"
-      },
-      "lockFlag": {
-        "type": "integer"
-      },
-      "lockMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "orderYear": {
-        "type": "integer"
-      },
-      "compageVisibleFlag": {
-        "type": "integer"
-      },
-      "createMan": {
-        "type": "text",
-        "index": "not_analyzed"
-      },
-      "createBy": {
-        "type": "long"
-      },
-      "createTimeLong": {
-        "type": "long"
-      },
-      "updateBy": {
-        "type": "long"
-      },
-      "updateTimeLong": {
-        "type": "long"
-      },
-      "idPaperType": {
-        "type": "long"
-      },
-      "paperTypeName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "paperName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "paperSuttle": {
-        "type": "integer"
-      },
-      "idProduct": {
-        "type": "long"
-      },
-      "fuMoFlag": {
-        "type": "integer"
-      },
-      "moQieFlag": {
-        "type": "integer"
-      },
-      "moduleCount": {
-        "type": "integer"
-      },
-      "specialPaperFlag": {
-        "type": "integer"
-      },
-      "qtyEnoughFlag": {
-        "type": "integer"
-      },
-      "partSizeDesc": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type": "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "faceCount": {
-        "type": "integer"
-      }
-    }
-  }
-}

+ 0 - 44
conf/esTemplate/workprocess.json

@@ -1,44 +0,0 @@
-{
-  "info": {
-    "properties": {
-      "id": {
-        "type": "long"
-      },
-      "processName": {
-        "type": "text",
-        "analyzer": "index_ansj",
-        "search_analyzer": "query_ansj",
-        "fields": {
-          "raw": {
-            "type":  "keyword"
-          },
-          "number": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "number_analyzer"
-          },
-          "letter": {
-            "type": "text",
-            "index": "analyzed",
-            "analyzer": "letter_analyzer"
-          }
-        }
-      },
-      "voidFlag": {
-        "type": "long"
-      },
-      "sortNum": {
-        "type": "integer"
-      },
-      "baseMoney": {
-        "type": "double"
-      },
-      "price": {
-        "type": "double"
-      },
-      "specialFlag": {
-        "type": "long"
-      }
-    }
-  }
-}

+ 285 - 0
conf/初始化业务表.sql

@@ -0,0 +1,285 @@
+drop table if exists eoBusinessOrder1000_current;
+create table eoBusinessOrder1000_current(
+                                            id	bigint  default 0,
+                                            orderName	varchar(50) default '',
+                                            orderCode	varchar(100) default '',
+                                            orderStatus	int default 0,
+                                            incomePlatformId	bigint  default 0,
+                                            incomePlatformName	varchar(50) default '',
+                                            incomePlatformOrderCode	varchar(100) default '',
+                                            incomePlatformOrderTime	datetime default NOW(),
+                                            incomePlatformOrderTimeLong	bigint  default 0,
+                                            suggestDeliverTime	datetime default NOW(),
+                                            suggestDeliverTimeLong	bigint  default 0,
+                                            idStore	bigint  default 0,
+                                            storeName	varchar(50) default '',
+                                            deliverFee	decimal(18,4) default 0,
+                                            deliverDistance	decimal(18,4) default 0,
+                                            deliverAddressAll	varchar(500) default '',
+                                            outGoingPlatformId	bigint  default 0,
+                                            outGoingPlatformName	varchar(50) default '',
+                                            voidFlag	int default 0,
+                                            createBy	bigint  default 0,
+                                            createTime	datetime default NOW(),
+                                            createTimeLong	bigint  default 0,
+                                            updateBy	bigint  default 0,
+                                            updateTime	datetime default NOW(),
+                                            updateTimeLong	bigint  default 0,
+                                            primary key (id)
+)
+    ENGINE = INNODB
+AUTO_INCREMENT = 1
+DEFAULT CHARSET = utf8
+COMMENT = '';
+
+drop table if exists eoOrderDeliveryInfo1000_current;
+create table eoOrderDeliveryInfo1000_current(
+                                                id	bigint  default 0,
+                                                idOrder	bigint  default 0,
+                                                deliverProvince	varchar(50) default '',
+                                                deliverCity	varchar(50) default '',
+                                                deliverDistract	varchar(100) default '',
+                                                deliverAddress	varchar(500) default '',
+                                                receiveMan	varchar(100) default '',
+                                                contractPhone	varchar(100) default '',
+                                                deliverTimeliness	int default 0,
+                                                bookingDeliverTime	datetime default NOW(),
+                                                customerInvoiceInfo	varchar(100) default '',
+                                                customerMemo	varchar(2000) default '',
+                                                createBy	bigint  default 0,
+                                                createTime	datetime default NOW(),
+                                                createTimeLong	bigint  default 0,
+                                                updateBy	bigint  default 0,
+                                                updateTime	datetime default NOW(),
+                                                updateTimeLong	bigint  default 0,
+                                                primary key (id)
+)
+    ENGINE = INNODB
+    AUTO_INCREMENT = 1
+    DEFAULT CHARSET = utf8
+    COMMENT = '';
+
+
+drop table if exists eoOrderDetailItem1000_current;
+create table eoOrderDetailItem1000_current(
+                                              id	bigint  default 0,
+                                              idOrder	bigint  default 0,
+                                              itemName	varchar(50) default '',
+                                              itemPrice	decimal(18,4) default 0,
+                                              itemCount	int default 0,
+                                              itemMoney	decimal(18,4) default 0,
+                                              createBy	bigint  default 0,
+                                              createTime	datetime default NOW(),
+                                              createTimeLong	bigint  default 0,
+                                              updateBy	bigint  default 0,
+                                              updateTime	datetime default NOW(),
+                                              updateTimeLong	bigint  default 0,
+                                              primary key (id)
+)
+    ENGINE = INNODB
+    AUTO_INCREMENT = 1
+    DEFAULT CHARSET = utf8
+    COMMENT = '';
+
+drop table if exists eoOrderFinances1000_current;
+create table eoOrderFinances1000_current(
+                                            id	bigint  default 0,
+                                            idOrder	bigint  default 0,
+                                            orderMoney	decimal(18,4) default 0,
+                                            deliverFee	decimal(18,4) default 0,
+                                            orderPlatformSubsidy	decimal(18,4) default 0,
+                                            storeDiscount	decimal(18,4) default 0,
+                                            customerPaid	decimal(18,4) default 0,
+                                            platformServiceFee	decimal(18,4) default 0,
+                                            storeRealCollection	decimal(18,4) default 0,
+                                            createBy	bigint  default 0,
+                                            createTime	datetime default NOW(),
+                                            createTimeLong	bigint  default 0,
+                                            updateBy	bigint  default 0,
+                                            updateTime	datetime default NOW(),
+                                            updateTimeLong	bigint  default 0,
+                                            primary key (id)
+)
+    ENGINE = INNODB
+    AUTO_INCREMENT = 1
+    DEFAULT CHARSET = utf8
+    COMMENT = '';
+
+-- ----------------------------
+-- Table structure for eoorderstep1000_current
+-- ----------------------------
+DROP TABLE IF EXISTS `eoorderstep1000_current`;
+CREATE TABLE `eoorderstep1000_current`  (
+                                            `id` bigint(20) NOT NULL AUTO_INCREMENT,
+                                            `idOrder` bigint(20) NULL DEFAULT 0,
+                                            `idWorkMan` bigint(20) NULL DEFAULT 0,
+                                            `workMan` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+                                            `workTime` datetime NULL DEFAULT CURRENT_TIMESTAMP,
+                                            `workMemo` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+                                            `workExplain` varchar(6000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+                                            `orderYear` int(11) NULL DEFAULT 0,
+                                            PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+drop table if exists tbPlatformInfo1000;
+create table tbPlatformInfo1000(
+                                   id	bigint  default 0,
+                                   platformName	varchar(50) default '',
+                                   platformType	int default 0,
+                                   requireListSerial	varchar(100) default '',
+                                   voidFlag	int default 0,
+                                   createBy	bigint  default 0,
+                                   createTime	datetime default NOW(),
+                                   createTimeLong	bigint  default 0,
+                                   updateBy	bigint  default 0,
+                                   updateTime	datetime default NOW(),
+                                   updateTimeLong	bigint  default 0,
+                                   primary key (id)
+)
+    ENGINE = INNODB
+    AUTO_INCREMENT = 1
+    DEFAULT CHARSET = utf8
+    COMMENT = '';
+
+drop table if exists tbPlatformRequire1000;
+create table tbPlatformRequire1000(
+                                      id	bigint  default 0,
+                                      requireName	varchar(50) default '',
+                                      requireCode	varchar(100) default '',
+                                      valueType	int default 0,
+                                      voidFlag	int default 0,
+                                      createBy	bigint  default 0,
+                                      createTime	datetime default NOW(),
+                                      createTimeLong	bigint  default 0,
+                                      updateBy	bigint  default 0,
+                                      updateTime	datetime default NOW(),
+                                      updateTimeLong	bigint  default 0,
+                                      primary key (id)
+)
+    ENGINE = INNODB
+    AUTO_INCREMENT = 1
+    DEFAULT CHARSET = utf8
+    COMMENT = '';
+
+drop table if exists tbStoreBrand1000;
+create table tbStoreBrand1000(
+                                 id	bigint  default 0,
+                                 brandName	varchar(50) default '',
+                                 brandLogoUrl	varchar(100) default '',
+                                 startingPrice	decimal(18,4) default 0,
+                                 packagingFee	decimal(18,4) default 0,
+                                 brandMemo	varchar(2000) default '',
+                                 voidFlag	int default 0,
+                                 createBy	bigint  default 0,
+                                 createTime	datetime default NOW(),
+                                 createTimeLong	bigint  default 0,
+                                 updateBy	bigint  default 0,
+                                 updateTime	datetime default NOW(),
+                                 updateTimeLong	bigint  default 0,
+                                 primary key (id)
+)
+    ENGINE = INNODB
+    AUTO_INCREMENT = 1
+    DEFAULT CHARSET = utf8
+    COMMENT = '';
+
+
+drop table if exists tbStoreInfo1000;
+create table tbStoreInfo1000(
+                                id	bigint  default 0,
+                                storeName	varchar(50) default '',
+                                idBrand	bigint  default 0,
+                                brandName	varchar(50) default '',
+                                idStoreType	bigint  default 0,
+                                deliverSettleKind	int default 0,
+                                storeCodeInput	varchar(100) default '',
+                                storeProvince	varchar(50) default '',
+                                storeCity	varchar(50) default '',
+                                storeDistrict	varchar(100) default '',
+                                storeAddress	varchar(500) default '',
+                                contractPhone	varchar(100) default '',
+                                storeBossId	bigint  default 0,
+                                companyLicenseNo	varchar(100) default '',
+                                companyLicensePicUrl	varchar(100) default '',
+                                legalPersonIdNo	varchar(100) default '',
+                                legalPersonName	varchar(50) default '',
+                                voidFlag	int default 0,
+                                createBy	bigint  default 0,
+                                createTime	datetime default NOW(),
+                                createTimeLong	bigint  default 0,
+                                updateBy	bigint  default 0,
+                                updateTime	datetime default NOW(),
+                                updateTimeLong	bigint  default 0,
+                                primary key (id)
+)
+    ENGINE = INNODB
+    AUTO_INCREMENT = 1
+    DEFAULT CHARSET = utf8
+    COMMENT = '';
+
+drop table if exists tbStoreInvoiceInfo1000;
+create table tbStoreInvoiceInfo1000(
+                                       id	bigint  default 0,
+                                       taxIdNo	varchar(100) default '',
+                                       companyName	varchar(50) default '',
+                                       defaultTaxItemName	varchar(50) default '',
+                                       defaultTaxItemCode	varchar(100) default '',
+                                       taxRate	decimal(18,4) default 0,
+                                       createBy	bigint  default 0,
+                                       createTime	datetime default NOW(),
+                                       createTimeLong	bigint  default 0,
+                                       updateBy	bigint  default 0,
+                                       updateTime	datetime default NOW(),
+                                       updateTimeLong	bigint  default 0,
+                                       primary key (id)
+)
+    ENGINE = INNODB
+    AUTO_INCREMENT = 1
+    DEFAULT CHARSET = utf8
+    COMMENT = '';
+
+drop table if exists tbStorePlatform1000;
+create table tbStorePlatform1000(
+                                    id	bigint  default 0,
+                                    idStore	bigint  default 0,
+                                    idPlatformInfo	bigint  default 0,
+                                    platformName	varchar(50) default '',
+                                    platformType	int default 0,
+                                    enableStatue	int default 0,
+                                    createBy	bigint  default 0,
+                                    createTime	datetime default NOW(),
+                                    createTimeLong	bigint  default 0,
+                                    updateBy	bigint  default 0,
+                                    updateTime	datetime default NOW(),
+                                    updateTimeLong	bigint  default 0,
+                                    primary key (id)
+)
+    ENGINE = INNODB
+    AUTO_INCREMENT = 1
+    DEFAULT CHARSET = utf8
+    COMMENT = '';
+
+
+drop table if exists tbStorePlatformRequire1000;
+create table tbStorePlatformRequire1000(
+                                           id	bigint  default 0,
+                                           idStore	bigint  default 0,
+                                           idStorePlatform	bigint  default 0,
+                                           idPlatformRequire	bigint  default 0,
+                                           platformRequireCode	varchar(100) default '',
+                                           platformRequireName	varchar(50) default '',
+                                           itemValue	varchar(100) default '',
+                                           createBy	bigint  default 0,
+                                           createTime	datetime default NOW(),
+                                           createTimeLong	bigint  default 0,
+                                           updateBy	bigint  default 0,
+                                           updateTime	datetime default NOW(),
+                                           updateTimeLong	bigint  default 0,
+                                           primary key (id)
+)
+    ENGINE = INNODB
+    AUTO_INCREMENT = 1
+    DEFAULT CHARSET = utf8
+    COMMENT = '';
+
+

+ 25 - 0
ddCommon/src/main/java/com/dderp/common/api/BusinessDocService.java

@@ -0,0 +1,25 @@
+package com.dderp.common.api;
+
+import com.dderp.common.entity.platform.PlatformInfo;
+import com.dderp.common.entity.site.ERPTokenUser;
+import com.sweetfish.service.RetResult;
+import com.sweetfish.source.PageFlipper;
+import com.sweetfish.util.AutoLoad;
+import org.rex.RMap;
+
+import java.util.List;
+
+@AutoLoad(value = false)
+public interface BusinessDocService extends ScriptService {
+    //region 平台档案
+    List<PlatformInfo> queryPlatformList(RMap params, PageFlipper pageFlipper, long supplierCode);
+
+    RetResult<PlatformInfo> addPlatformInfo(PlatformInfo platformInfo, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+
+    RetResult<PlatformInfo> updatePlatformInfo(PlatformInfo platformInfo, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+
+    RetResult<PlatformInfo> voidPlatformInfo(PlatformInfo platformInfo, ERPTokenUser currentUser, String dataSourceId, long supplierCode);
+    //endregion
+
+
+}

+ 195 - 0
ddCommon/src/main/java/com/dderp/common/entity/order/BusinessOrder.java

@@ -2,6 +2,7 @@ package com.dderp.common.entity.order;
 
 import com.dderp.common.entity.base.BaseEntity;
 import com.sweetfish.util.Comment;
+import org.rex.db.RColumn;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -11,59 +12,81 @@ import java.util.List;
  * 订单
  */
 public class BusinessOrder extends BaseEntity {
+    @RColumn("id")
     private long id;
 
+    @RColumn("ordername")
     @Comment("订单名称--一般是门店名称+订单渠道")
     private String orderName;
 
+    @RColumn("ordercode")
     @Comment("订单编号")
     private String orderCode;
 
+    @RColumn("orderstatus")
     @Comment("订单状态")
     private int orderStatus;
 
+    @RColumn("incomeplatformid")
     @Comment("订单来源平台id")
     private long incomePlatformId;
 
+    @RColumn("incomeplatformname")
     @Comment("订单来源平台")
     private String incomePlatformName;
 
+    @RColumn("incomeplatformordercode")
     @Comment("来源平台的订单编号")
     private String incomePlatformOrderCode;
 
+    @RColumn("incomeplatformordertime")
     @Comment("来源平台的下单时间")
     private Date incomePlatformOrderTime;
 
+    @RColumn("incomeplatformordertimelong")
     @Comment("来源平台的下单时间")
     private long incomePlatformOrderTimeLong;
 
+    @RColumn("suggestdelivertime")
     @Comment("建议送达时间")
     private Date suggestDeliverTime;
 
+    @RColumn("suggestdelivertimelong")
     @Comment("建议送达时间")
     private long suggestDeliverTimeLong;
 
+    @RColumn("idstore")
     @Comment("门店id")
     private long idStore;
 
+    @RColumn("storename")
     @Comment("门店名称")
     private String storeName;
 
+    @RColumn("deliverfee")
     @Comment("配送费")
     private BigDecimal deliverFee;
 
+    @RColumn("deliverdistance")
     @Comment("配送距离")
     private double deliverDistance;
 
+    @RColumn("deliveraddressall")
     @Comment("配送地址,仅用于订单查询,实际定位地址在订单配送结构内")
     private String deliverAddressAll;
 
+    @RColumn("outgoingplatformid")
     @Comment("配送平台id")
     private long outGoingPlatformId;
 
+    @RColumn("outgoingplatformname")
     @Comment("配送平台名称")
     private String outGoingPlatformName;
 
+    @Comment("禁用标记")
+    @RColumn("voidflag")
+    private int voidFlag;
+
     @Comment("订单金额信息")
     private OrderFinances orderFinances;
 
@@ -74,7 +97,179 @@ public class BusinessOrder extends BaseEntity {
     private OrderDeliveryInfo orderDeliveryInfo;
 
 
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getOrderName() {
+        return orderName;
+    }
+
+    public void setOrderName(String orderName) {
+        this.orderName = orderName;
+    }
+
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+
+    public int getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(int orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public long getIncomePlatformId() {
+        return incomePlatformId;
+    }
+
+    public void setIncomePlatformId(long incomePlatformId) {
+        this.incomePlatformId = incomePlatformId;
+    }
+
+    public String getIncomePlatformName() {
+        return incomePlatformName;
+    }
+
+    public void setIncomePlatformName(String incomePlatformName) {
+        this.incomePlatformName = incomePlatformName;
+    }
+
+    public String getIncomePlatformOrderCode() {
+        return incomePlatformOrderCode;
+    }
+
+    public void setIncomePlatformOrderCode(String incomePlatformOrderCode) {
+        this.incomePlatformOrderCode = incomePlatformOrderCode;
+    }
+
+    public Date getIncomePlatformOrderTime() {
+        return incomePlatformOrderTime;
+    }
+
+    public void setIncomePlatformOrderTime(Date incomePlatformOrderTime) {
+        this.incomePlatformOrderTime = incomePlatformOrderTime;
+    }
+
+    public long getIncomePlatformOrderTimeLong() {
+        return incomePlatformOrderTimeLong;
+    }
+
+    public void setIncomePlatformOrderTimeLong(long incomePlatformOrderTimeLong) {
+        this.incomePlatformOrderTimeLong = incomePlatformOrderTimeLong;
+    }
+
+    public Date getSuggestDeliverTime() {
+        return suggestDeliverTime;
+    }
+
+    public void setSuggestDeliverTime(Date suggestDeliverTime) {
+        this.suggestDeliverTime = suggestDeliverTime;
+    }
+
+    public long getSuggestDeliverTimeLong() {
+        return suggestDeliverTimeLong;
+    }
+
+    public void setSuggestDeliverTimeLong(long suggestDeliverTimeLong) {
+        this.suggestDeliverTimeLong = suggestDeliverTimeLong;
+    }
+
+    public long getIdStore() {
+        return idStore;
+    }
+
+    public void setIdStore(long idStore) {
+        this.idStore = idStore;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public BigDecimal getDeliverFee() {
+        return deliverFee;
+    }
+
+    public void setDeliverFee(BigDecimal deliverFee) {
+        this.deliverFee = deliverFee;
+    }
+
+    public double getDeliverDistance() {
+        return deliverDistance;
+    }
+
+    public void setDeliverDistance(double deliverDistance) {
+        this.deliverDistance = deliverDistance;
+    }
+
+    public String getDeliverAddressAll() {
+        return deliverAddressAll;
+    }
+
+    public void setDeliverAddressAll(String deliverAddressAll) {
+        this.deliverAddressAll = deliverAddressAll;
+    }
+
+    public long getOutGoingPlatformId() {
+        return outGoingPlatformId;
+    }
+
+    public void setOutGoingPlatformId(long outGoingPlatformId) {
+        this.outGoingPlatformId = outGoingPlatformId;
+    }
+
+    public String getOutGoingPlatformName() {
+        return outGoingPlatformName;
+    }
+
+    public void setOutGoingPlatformName(String outGoingPlatformName) {
+        this.outGoingPlatformName = outGoingPlatformName;
+    }
+
+    public OrderFinances getOrderFinances() {
+        return orderFinances;
+    }
+
+    public void setOrderFinances(OrderFinances orderFinances) {
+        this.orderFinances = orderFinances;
+    }
+
+    public List<OrderDetailItem> getDetailItemList() {
+        return detailItemList;
+    }
+
+    public void setDetailItemList(List<OrderDetailItem> detailItemList) {
+        this.detailItemList = detailItemList;
+    }
+
+    public OrderDeliveryInfo getOrderDeliveryInfo() {
+        return orderDeliveryInfo;
+    }
 
+    public void setOrderDeliveryInfo(OrderDeliveryInfo orderDeliveryInfo) {
+        this.orderDeliveryInfo = orderDeliveryInfo;
+    }
 
+    public int getVoidFlag() {
+        return voidFlag;
+    }
 
+    public void setVoidFlag(int voidFlag) {
+        this.voidFlag = voidFlag;
+    }
 }

+ 117 - 0
ddCommon/src/main/java/com/dderp/common/entity/order/OrderDeliveryInfo.java

@@ -3,6 +3,7 @@ package com.dderp.common.entity.order;
 import com.dderp.common.entity.base.BaseEntity;
 import com.dderp.common.entity.geo.GeoPoiLocation;
 import com.sweetfish.util.Comment;
+import org.rex.db.RColumn;
 
 import java.util.Date;
 
@@ -10,40 +11,156 @@ import java.util.Date;
  * 订单配送信息
  */
 public class OrderDeliveryInfo extends BaseEntity {
+    @RColumn("id")
     private long id;
 
+    @RColumn("idorder")
     private long idOrder;
 
+    @RColumn("deliverprovince")
     @Comment("配送地-省")
     private String deliverProvince;
 
+    @RColumn("delivercity")
     @Comment("配送地-市")
     private String deliverCity;
 
+    @RColumn("deliverdistract")
     @Comment("配送地-区")
     private String deliverDistract;
 
+    @RColumn("deliveraddress")
     @Comment("配送地址")
     private String deliverAddress;
 
     @Comment("配送地的geo信息")
     private GeoPoiLocation geoPoiLocation;
 
+    @RColumn("receiveman")
     @Comment("收货人")
     private String receiveMan;
 
+    @RColumn("contractphone")
     @Comment("收货人电话")
     private String contractPhone;
 
+    @RColumn("delivertimeliness")
     @Comment("配送时效 0立即配送/1预约配送")
     private int deliverTimeliness;
 
+    @RColumn("bookingdelivertime")
     @Comment("预约送达时间")
     private Date bookingDeliverTime;
 
+    @RColumn("customerinvoiceinfo")
     @Comment("客户要求的发票信息")
     private String customerInvoiceInfo;
 
+    @RColumn("customermemo")
     @Comment("客户备注")
     private String customerMemo;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getIdOrder() {
+        return idOrder;
+    }
+
+    public void setIdOrder(long idOrder) {
+        this.idOrder = idOrder;
+    }
+
+    public String getDeliverProvince() {
+        return deliverProvince;
+    }
+
+    public void setDeliverProvince(String deliverProvince) {
+        this.deliverProvince = deliverProvince;
+    }
+
+    public String getDeliverCity() {
+        return deliverCity;
+    }
+
+    public void setDeliverCity(String deliverCity) {
+        this.deliverCity = deliverCity;
+    }
+
+    public String getDeliverDistract() {
+        return deliverDistract;
+    }
+
+    public void setDeliverDistract(String deliverDistract) {
+        this.deliverDistract = deliverDistract;
+    }
+
+    public String getDeliverAddress() {
+        return deliverAddress;
+    }
+
+    public void setDeliverAddress(String deliverAddress) {
+        this.deliverAddress = deliverAddress;
+    }
+
+    public GeoPoiLocation getGeoPoiLocation() {
+        return geoPoiLocation;
+    }
+
+    public void setGeoPoiLocation(GeoPoiLocation geoPoiLocation) {
+        this.geoPoiLocation = geoPoiLocation;
+    }
+
+    public String getReceiveMan() {
+        return receiveMan;
+    }
+
+    public void setReceiveMan(String receiveMan) {
+        this.receiveMan = receiveMan;
+    }
+
+    public String getContractPhone() {
+        return contractPhone;
+    }
+
+    public void setContractPhone(String contractPhone) {
+        this.contractPhone = contractPhone;
+    }
+
+    public int getDeliverTimeliness() {
+        return deliverTimeliness;
+    }
+
+    public void setDeliverTimeliness(int deliverTimeliness) {
+        this.deliverTimeliness = deliverTimeliness;
+    }
+
+    public Date getBookingDeliverTime() {
+        return bookingDeliverTime;
+    }
+
+    public void setBookingDeliverTime(Date bookingDeliverTime) {
+        this.bookingDeliverTime = bookingDeliverTime;
+    }
+
+    public String getCustomerInvoiceInfo() {
+        return customerInvoiceInfo;
+    }
+
+    public void setCustomerInvoiceInfo(String customerInvoiceInfo) {
+        this.customerInvoiceInfo = customerInvoiceInfo;
+    }
+
+    public String getCustomerMemo() {
+        return customerMemo;
+    }
+
+    public void setCustomerMemo(String customerMemo) {
+        this.customerMemo = customerMemo;
+    }
 }

+ 55 - 0
ddCommon/src/main/java/com/dderp/common/entity/order/OrderDetailItem.java

@@ -2,6 +2,7 @@ package com.dderp.common.entity.order;
 
 import com.dderp.common.entity.base.BaseEntity;
 import com.sweetfish.util.Comment;
+import org.rex.db.RColumn;
 
 import java.math.BigDecimal;
 
@@ -9,19 +10,73 @@ import java.math.BigDecimal;
  * 订单详情,主要是明细
  */
 public class OrderDetailItem extends BaseEntity {
+    @RColumn("id")
     private long id;
 
+    @RColumn("idorder")
     private long idOrder;
 
+    @RColumn("itemname")
     @Comment("项目名")
     private String itemName;
 
+    @RColumn("itemprice")
     @Comment("项目单价")
     private BigDecimal itemPrice;
 
+    @RColumn("itemcount")
     @Comment("项目数量")
     private int itemCount;
 
+    @RColumn("itemmoney")
     @Comment("项目总价")
     private BigDecimal itemMoney;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getIdOrder() {
+        return idOrder;
+    }
+
+    public void setIdOrder(long idOrder) {
+        this.idOrder = idOrder;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+
+    public BigDecimal getItemPrice() {
+        return itemPrice;
+    }
+
+    public void setItemPrice(BigDecimal itemPrice) {
+        this.itemPrice = itemPrice;
+    }
+
+    public int getItemCount() {
+        return itemCount;
+    }
+
+    public void setItemCount(int itemCount) {
+        this.itemCount = itemCount;
+    }
+
+    public BigDecimal getItemMoney() {
+        return itemMoney;
+    }
+
+    public void setItemMoney(BigDecimal itemMoney) {
+        this.itemMoney = itemMoney;
+    }
 }

+ 81 - 0
ddCommon/src/main/java/com/dderp/common/entity/order/OrderFinances.java

@@ -2,6 +2,7 @@ package com.dderp.common.entity.order;
 
 import com.dderp.common.entity.base.BaseEntity;
 import com.sweetfish.util.Comment;
+import org.rex.db.RColumn;
 
 import java.math.BigDecimal;
 
@@ -9,29 +10,109 @@ import java.math.BigDecimal;
  * 订单金额信息,所有的金额加算,折扣类的记为负数
  */
 public class OrderFinances extends BaseEntity {
+    @RColumn("id")
     private long id;
 
+    @RColumn("idorder")
     private long idOrder;
 
+    @RColumn("ordermoney")
     @Comment("订单金额")
     private BigDecimal orderMoney;
 
+    @RColumn("deliverfee")
     @Comment("配送费")
     private BigDecimal deliverFee;
 
+    @RColumn("orderplatformsubsidy")
     @Comment("订单平台补贴")
     private BigDecimal orderPlatformSubsidy;
 
+    @RColumn("storediscount")
     @Comment("门店优惠")
     private BigDecimal storeDiscount;
 
+    @RColumn("customerpaid")
     @Comment("客户实付")
     private BigDecimal customerPaid;
 
+    @RColumn("platformservicefee")
     @Comment("平台收取服务费")
     private BigDecimal platformServiceFee;
 
+    @RColumn("storerealcollection")
     @Comment("店铺实收金额")
     private BigDecimal storeRealCollection;
 
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getIdOrder() {
+        return idOrder;
+    }
+
+    public void setIdOrder(long idOrder) {
+        this.idOrder = idOrder;
+    }
+
+    public BigDecimal getOrderMoney() {
+        return orderMoney;
+    }
+
+    public void setOrderMoney(BigDecimal orderMoney) {
+        this.orderMoney = orderMoney;
+    }
+
+    public BigDecimal getDeliverFee() {
+        return deliverFee;
+    }
+
+    public void setDeliverFee(BigDecimal deliverFee) {
+        this.deliverFee = deliverFee;
+    }
+
+    public BigDecimal getOrderPlatformSubsidy() {
+        return orderPlatformSubsidy;
+    }
+
+    public void setOrderPlatformSubsidy(BigDecimal orderPlatformSubsidy) {
+        this.orderPlatformSubsidy = orderPlatformSubsidy;
+    }
+
+    public BigDecimal getStoreDiscount() {
+        return storeDiscount;
+    }
+
+    public void setStoreDiscount(BigDecimal storeDiscount) {
+        this.storeDiscount = storeDiscount;
+    }
+
+    public BigDecimal getCustomerPaid() {
+        return customerPaid;
+    }
+
+    public void setCustomerPaid(BigDecimal customerPaid) {
+        this.customerPaid = customerPaid;
+    }
+
+    public BigDecimal getPlatformServiceFee() {
+        return platformServiceFee;
+    }
+
+    public void setPlatformServiceFee(BigDecimal platformServiceFee) {
+        this.platformServiceFee = platformServiceFee;
+    }
+
+    public BigDecimal getStoreRealCollection() {
+        return storeRealCollection;
+    }
+
+    public void setStoreRealCollection(BigDecimal storeRealCollection) {
+        this.storeRealCollection = storeRealCollection;
+    }
 }

+ 60 - 0
ddCommon/src/main/java/com/dderp/common/entity/platform/PlatformInfo.java

@@ -2,6 +2,7 @@ package com.dderp.common.entity.platform;
 
 import com.dderp.common.entity.base.BaseEntity;
 import com.sweetfish.util.Comment;
+import org.rex.db.RColumn;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,15 +11,74 @@ import java.util.List;
  * 平台档案
  */
 public class PlatformInfo extends BaseEntity {
+    @RColumn("id")
     @Comment("")
     private long id;
 
+    @RColumn("platformname")
     @Comment("平台名称")
     private String platformName;
 
+    @RColumn("platformtype")
     @Comment("平台类别 0订单平台/1配送平台")
     private int platformType;
 
+    @RColumn("requirelistserialization")
+    @Comment("平台接入需求list的序列化字符")
+    private String requireListSerial;
+
+    @Comment("禁用标记")
+    @RColumn("voidflag")
+    private int voidFlag;
+
     @Comment("平台接入需求")
     private List<PlatformRequire> requireList = new ArrayList<>();
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getPlatformName() {
+        return platformName;
+    }
+
+    public void setPlatformName(String platformName) {
+        this.platformName = platformName;
+    }
+
+    public int getPlatformType() {
+        return platformType;
+    }
+
+    public void setPlatformType(int platformType) {
+        this.platformType = platformType;
+    }
+
+    public List<PlatformRequire> getRequireList() {
+        return requireList;
+    }
+
+    public void setRequireList(List<PlatformRequire> requireList) {
+        this.requireList = requireList;
+    }
+
+    public int getVoidFlag() {
+        return voidFlag;
+    }
+
+    public void setVoidFlag(int voidFlag) {
+        this.voidFlag = voidFlag;
+    }
+
+    public String getRequireListSerial() {
+        return requireListSerial;
+    }
+
+    public void setRequireListSerial(String requireListSerial) {
+        this.requireListSerial = requireListSerial;
+    }
 }

+ 50 - 1
ddCommon/src/main/java/com/dderp/common/entity/platform/PlatformRequire.java

@@ -2,19 +2,68 @@ package com.dderp.common.entity.platform;
 
 import com.dderp.common.entity.base.BaseEntity;
 import com.sweetfish.util.Comment;
+import org.rex.db.RColumn;
 
 /**
  * 平台接入需求档案
  */
 public class PlatformRequire extends BaseEntity {
+    @RColumn("id")
     private long id;
 
+    @RColumn("requirename")
     @Comment("接入需求的显示名称")
     private String requireName;
 
+    @RColumn("requirecode")
     @Comment("接入需求唯一code")
     private String requireCode;
 
-    @Comment("取值的选择类型")
+    @RColumn("valuetype")
+    @Comment("取值的选择类型-取字典数据即可")
     private int valueType;
+
+    @Comment("禁用标记")
+    @RColumn("voidflag")
+    private int voidFlag;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getRequireName() {
+        return requireName;
+    }
+
+    public void setRequireName(String requireName) {
+        this.requireName = requireName;
+    }
+
+    public String getRequireCode() {
+        return requireCode;
+    }
+
+    public void setRequireCode(String requireCode) {
+        this.requireCode = requireCode;
+    }
+
+    public int getValueType() {
+        return valueType;
+    }
+
+    public void setValueType(int valueType) {
+        this.valueType = valueType;
+    }
+
+    public int getVoidFlag() {
+        return voidFlag;
+    }
+
+    public void setVoidFlag(int voidFlag) {
+        this.voidFlag = voidFlag;
+    }
 }

+ 67 - 0
ddCommon/src/main/java/com/dderp/common/entity/store/StoreBrand.java

@@ -2,6 +2,7 @@ package com.dderp.common.entity.store;
 
 import com.dderp.common.entity.base.BaseEntity;
 import com.sweetfish.util.Comment;
+import org.rex.db.RColumn;
 
 import java.math.BigDecimal;
 
@@ -9,21 +10,87 @@ import java.math.BigDecimal;
  * 门店品牌档案
  */
 public class StoreBrand extends BaseEntity {
+    @RColumn("id")
     @Comment("")
     private long id;
 
+    @RColumn("brandname")
     @Comment("品牌名称")
     private String brandName;
 
+    @RColumn("brandlogourl")
     @Comment("品牌logo")
     private String brandLogoUrl;
 
+    @RColumn("startingprice")
     @Comment("起送费")
     private BigDecimal startingPrice;
 
+    @RColumn("packagingfee")
     @Comment("包装成本")
     private BigDecimal packagingFee;
 
+    @RColumn("brandmemo")
     @Comment("品牌介绍")
     private String brandMemo;
+
+    @Comment("禁用标记")
+    @RColumn("voidflag")
+    private int voidFlag;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getBrandName() {
+        return brandName;
+    }
+
+    public void setBrandName(String brandName) {
+        this.brandName = brandName;
+    }
+
+    public String getBrandLogoUrl() {
+        return brandLogoUrl;
+    }
+
+    public void setBrandLogoUrl(String brandLogoUrl) {
+        this.brandLogoUrl = brandLogoUrl;
+    }
+
+    public BigDecimal getStartingPrice() {
+        return startingPrice;
+    }
+
+    public void setStartingPrice(BigDecimal startingPrice) {
+        this.startingPrice = startingPrice;
+    }
+
+    public BigDecimal getPackagingFee() {
+        return packagingFee;
+    }
+
+    public void setPackagingFee(BigDecimal packagingFee) {
+        this.packagingFee = packagingFee;
+    }
+
+    public String getBrandMemo() {
+        return brandMemo;
+    }
+
+    public void setBrandMemo(String brandMemo) {
+        this.brandMemo = brandMemo;
+    }
+
+    public int getVoidFlag() {
+        return voidFlag;
+    }
+
+    public void setVoidFlag(int voidFlag) {
+        this.voidFlag = voidFlag;
+    }
 }

+ 30 - 0
ddCommon/src/main/java/com/dderp/common/entity/store/StoreInfo.java

@@ -4,6 +4,7 @@ import com.dderp.common.entity.base.BaseEntity;
 import com.dderp.common.entity.geo.GeoPoiLocation;
 import com.dderp.common.entity.system.LoginUser;
 import com.sweetfish.util.Comment;
+import org.rex.db.RColumn;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,59 +13,80 @@ import java.util.List;
  * 门店档案
  */
 public class StoreInfo extends BaseEntity {
+    @RColumn("id")
     private long id;
 
+    @RColumn("storename")
     @Comment("门店名称")
     private String storeName;
 
+    @RColumn("idbrand")
     @Comment("品牌id")
     private long idBrand;
 
+    @RColumn("brandname")
     @Comment("品牌名称")
     private String brandName;
 
+    @RColumn("idstoretype")
     @Comment("门店类型--此处取字典值即可")
     private long idStoreType;
 
+    @RColumn("deliversettlekind")
     @Comment("配送费结算方式 0本店自主结算/1加盟品牌方结算")
     private int deliverSettleKind;
 
+    @RColumn("storecodeinput")
     @Comment("门店编号-输入")
     private String storeCodeInput;
 
+    @RColumn("storeprovince")
     @Comment("门店所在省")
     private String storeProvince;
 
+    @RColumn("storecity")
     @Comment("门店所在市")
     private String storeCity;
 
+    @RColumn("storedistrict")
     @Comment("门店所在区")
     private String storeDistrict;
 
+    @RColumn("storeaddress")
     @Comment("门店地址")
     private String storeAddress;
 
     @Comment("门店geo信息")
     private GeoPoiLocation location;
 
+    @RColumn("contractphone")
     @Comment("门店联系电话")
     private String contractPhone;
 
+    @RColumn("storebossid")
     @Comment("门店老板的系统id")
     private long storeBossId;
 
+    @RColumn("companylicenseno")
     @Comment("门店营业执照编号")
     private String companyLicenseNo;
 
+    @RColumn("companylicensepicurl")
     @Comment("门店营业执照照片")
     private String companyLicensePicUrl;
 
+    @RColumn("legalpersonidno")
     @Comment("法人身份证号")
     private String legalPersonIdNo;
 
+    @RColumn("legalpersonname")
     @Comment("法人姓名")
     private String legalPersonName;
 
+    @Comment("禁用标记")
+    @RColumn("voidflag")
+    private int voidFlag;
+
     @Comment("门店开票信息")
     private StoreInvoiceInfo invoiceInfo;
 
@@ -241,4 +263,12 @@ public class StoreInfo extends BaseEntity {
     public void setPlatformList(List<StorePlatform> platformList) {
         this.platformList = platformList;
     }
+
+    public int getVoidFlag() {
+        return voidFlag;
+    }
+
+    public void setVoidFlag(int voidFlag) {
+        this.voidFlag = voidFlag;
+    }
 }

+ 67 - 0
ddCommon/src/main/java/com/dderp/common/entity/store/StoreInvoiceInfo.java

@@ -2,6 +2,7 @@ package com.dderp.common.entity.store;
 
 import com.dderp.common.entity.base.BaseEntity;
 import com.sweetfish.util.Comment;
+import org.rex.db.RColumn;
 
 import java.math.BigDecimal;
 
@@ -9,20 +10,86 @@ import java.math.BigDecimal;
  * 门店发票档案
  */
 public class StoreInvoiceInfo extends BaseEntity {
+    @RColumn("id")
     private long id;
 
+    @Comment("关联的门店id")
+    @RColumn("idstore")
+    private long idStore;
+
+    @RColumn("taxidno")
     @Comment("纳税人识别号")
     private String taxIdNo;
 
+    @RColumn("companyname")
     @Comment("企业名称")
     private String companyName;
 
+    @RColumn("defaulttaxitemname")
     @Comment("默认的开票项目")
     private String defaultTaxItemName;
 
+    @RColumn("defaulttaxitemcode")
     @Comment("默认税收分类编号")
     private String defaultTaxItemCode;
 
+    @RColumn("taxrate")
     @Comment("税率")
     private BigDecimal taxRate;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getIdStore() {
+        return idStore;
+    }
+
+    public void setIdStore(long idStore) {
+        this.idStore = idStore;
+    }
+
+    public String getTaxIdNo() {
+        return taxIdNo;
+    }
+
+    public void setTaxIdNo(String taxIdNo) {
+        this.taxIdNo = taxIdNo;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getDefaultTaxItemName() {
+        return defaultTaxItemName;
+    }
+
+    public void setDefaultTaxItemName(String defaultTaxItemName) {
+        this.defaultTaxItemName = defaultTaxItemName;
+    }
+
+    public String getDefaultTaxItemCode() {
+        return defaultTaxItemCode;
+    }
+
+    public void setDefaultTaxItemCode(String defaultTaxItemCode) {
+        this.defaultTaxItemCode = defaultTaxItemCode;
+    }
+
+    public BigDecimal getTaxRate() {
+        return taxRate;
+    }
+
+    public void setTaxRate(BigDecimal taxRate) {
+        this.taxRate = taxRate;
+    }
 }

+ 7 - 0
ddCommon/src/main/java/com/dderp/common/entity/store/StorePlatform.java

@@ -2,6 +2,7 @@ package com.dderp.common.entity.store;
 
 import com.dderp.common.entity.base.BaseEntity;
 import com.sweetfish.util.Comment;
+import org.rex.db.RColumn;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,20 +11,26 @@ import java.util.List;
  * 门店已开通的平台,包含订单和配送平台
  */
 public class StorePlatform extends BaseEntity {
+    @RColumn("id")
     private long id;
 
+    @RColumn("idstore")
     @Comment("门店id")
     private long idStore;
 
+    @RColumn("idplatforminfo")
     @Comment("平台档案id")
     private long idPlatformInfo;
 
+    @RColumn("platformname")
     @Comment("平台名称")
     private String platformName;
 
+    @RColumn("platformtype")
     @Comment("平台类别 0订单平台/1配送平台")
     private int platformType;
 
+    @RColumn("enablestatue")
     @Comment("是否开通 0未开通/1已开通")
     private int enableStatue;
 

+ 63 - 0
ddCommon/src/main/java/com/dderp/common/entity/store/StorePlatformRequire.java

@@ -2,29 +2,92 @@ package com.dderp.common.entity.store;
 
 import com.dderp.common.entity.base.BaseEntity;
 import com.sweetfish.util.Comment;
+import org.rex.db.RColumn;
 
 /**
  * 已填写的平台开通需求的信息
  */
 public class StorePlatformRequire extends BaseEntity {
+    @RColumn("id")
     private long id;
 
+    @RColumn("idstore")
     @Comment("门店id")
     private long idStore;
 
+    @RColumn("idstoreplatform")
     @Comment("关联的门店已开通平台id")
     private long idStorePlatform;
 
+    @RColumn("idplatformrequire")
     @Comment("平台接入需求档案id")
     private long idPlatformRequire;
 
+    @RColumn("platformrequirecode")
     @Comment("平台接入需求唯一code")
     private String platformRequireCode;
 
+    @RColumn("platformrequirename")
     @Comment("平台接入需求显示名称")
     private String platformRequireName;
 
+    @RColumn("itemvalue")
     @Comment("项目值")
     private String itemValue;
 
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getIdStore() {
+        return idStore;
+    }
+
+    public void setIdStore(long idStore) {
+        this.idStore = idStore;
+    }
+
+    public long getIdStorePlatform() {
+        return idStorePlatform;
+    }
+
+    public void setIdStorePlatform(long idStorePlatform) {
+        this.idStorePlatform = idStorePlatform;
+    }
+
+    public long getIdPlatformRequire() {
+        return idPlatformRequire;
+    }
+
+    public void setIdPlatformRequire(long idPlatformRequire) {
+        this.idPlatformRequire = idPlatformRequire;
+    }
+
+    public String getPlatformRequireCode() {
+        return platformRequireCode;
+    }
+
+    public void setPlatformRequireCode(String platformRequireCode) {
+        this.platformRequireCode = platformRequireCode;
+    }
+
+    public String getPlatformRequireName() {
+        return platformRequireName;
+    }
+
+    public void setPlatformRequireName(String platformRequireName) {
+        this.platformRequireName = platformRequireName;
+    }
+
+    public String getItemValue() {
+        return itemValue;
+    }
+
+    public void setItemValue(String itemValue) {
+        this.itemValue = itemValue;
+    }
 }

+ 27 - 0
ddCommon/src/main/java/com/dderp/common/entity/store/ViewStoreInfo.java

@@ -6,6 +6,9 @@ import com.sweetfish.util.Comment;
 
 import java.util.Map;
 
+/**
+ * 查询的商户类,仅用作接口返回
+ */
 public class ViewStoreInfo extends BaseEntity {
     @Comment("门店基础信息")
     private StoreInfo storeInfo;
@@ -28,4 +31,28 @@ public class ViewStoreInfo extends BaseEntity {
             }
         });
     }
+
+    public StoreInfo getStoreInfo() {
+        return storeInfo;
+    }
+
+    public void setStoreInfo(StoreInfo storeInfo) {
+        this.storeInfo = storeInfo;
+    }
+
+    public Map<String, Object> getOrderPlatforms() {
+        return orderPlatforms;
+    }
+
+    public void setOrderPlatforms(Map<String, Object> orderPlatforms) {
+        this.orderPlatforms = orderPlatforms;
+    }
+
+    public Map<String, Object> getDeliveryPlatforms() {
+        return deliveryPlatforms;
+    }
+
+    public void setDeliveryPlatforms(Map<String, Object> deliveryPlatforms) {
+        this.deliveryPlatforms = deliveryPlatforms;
+    }
 }