器件实体类修改

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/SearchApi.java

@@ -6,105 +6,17 @@ import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
-@FeignClient(url = "${inquiry.base-url}", name = "inquiry-server")
-@RequestMapping("/inquiry")
-public interface InquiryApi {
+@FeignClient(url = "${Component.base-url}", name = "search-server")
+@RequestMapping("/search")
+public interface SearchApi {
 
     /**
-     * 查看待报价列表（全部）
+     * 器件查询
      * @param pageNumber
      * @param pageSize
      * @return
      */
-    @GetMapping("/public")
-    IPage<PurcInquiryItemInfo> getInquiry(@RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
-                                          @RequestParam("keyword") String keyword, @RequestParam("isLogin") int isLogin);
-
-    /**
-     * 查看待报价列表（企业商机）
-     * @param useruu
-     * @param enuu
-     * @param pageNumber
-     * @param pageSize
-     * @param enableOffer   是否能报价的:1为是 0为否,作为搜索条件。  值为0或null时,筛选所有
-     * @return
-     */
-    @GetMapping("/sale/enremind")
-    IPage<InquiryEnRemind> findEnRemind(@RequestParam("useruu") Long useruu, @RequestParam("enuu") Long enuu,
-                                        @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
-                                        @RequestParam("enableOffer") Integer enableOffer);
-
-    /**
-     * 查看（个人商机）
-     * @param useruu
-     * @param enuu
-     * @param pageNumber
-     * @param pageSize
-     * @param enableOffer   是否能报价的:1为是 0为否,作为搜索条件。  值为0或null时,筛选所有
-     * @param keyword       关键词,做筛选用
-     * @return
-     */
-    @GetMapping("/sale/remind")
-    IPage<InquiryRemind> findByUserInfo(@RequestParam("useruu") Long useruu, @RequestParam("enuu") Long enuu,
-                                        @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
-                                        @RequestParam("enableOffer") Integer enableOffer, @RequestParam("keyword") String keyword);
-
-    /**
-     * 保存报价接口
-     * @param publicInquiryItem 报价单内容
-     * @return
-     */
-    @PostMapping("/sale/item/saveQuote")
-    ModelMap saveQuote(@RequestBody PublicInquiryItem publicInquiryItem);
-
-    /**
-     * 保存更新公共询价单
-     * @param inquiry   询价信息
-     * @return
-     */
-    @PostMapping("/buyer/save")
-    PurcInquiry saveInquiry(@RequestBody PurcInquiry inquiry);
-
-    /**
-     * 通过企业UU和分页参数获取已发布的询价明细
-     * @param enUU
-     * @param overdue
-     * @param pageNumber
-     * @param pageSize
-     * @param state
-     * @return
-     */
-    @GetMapping("/buyer/list")
-    IPage<PurcInquiryItemInfo> getInquiryList(@RequestParam("enUU") Long enUU, @RequestParam("overdue") Integer overdue,
-                                             @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
-                                             @RequestParam("state") String state);
-
-    /*@GetMapping("/buyer/quotations")
-    IPage<PurcInquiryItemInfo> findQuotationsByPage(@RequestParam(value = "state", defaultValue = "done") String state,
-                                                   @RequestParam("enUU") Long enUU,
-                                                   @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize);
-    */
-
-    /**
-     * 采纳
-     * @param id
-     * @param status    是否采纳：1是 0否
-     * @param enuu      企业uu
-     * @param useruu    用户uu
-     */
-    @PostMapping("/buyer/adopt")
-    void adoptQuote(@RequestParam("id") Long id, @RequestParam("status") Short status,
-                    @RequestParam("enuu") Long enuu, @RequestParam("useruu") Long useruu);
-
-    /**
-     *
-     * @param id        报价明细id
-     * @param status    是否采纳：1是 0否
-     * @param enuu      企业uu
-     * @param useruu    用户uu
-     * @param refusereason  拒绝理由
-     */
-    @PostMapping("/buyer/refuse")
-    void refuseQuote(@RequestParam("id") Long id, @RequestParam("status") Short status, @RequestParam("enuu") Long enuu,
-                     @RequestParam("useruu") Long useruu, @RequestParam("refusereason") String refusereason);
+    @GetMapping("/201819")
+    IPage<PurcInquiryItemInfo> getInquiry(@RequestParam("keyword") String keyword, @RequestParam("count") int count,@RequestParam("sorting") String sorting,
+                                          @RequestParam("type") String type, @RequestParam("page") int page, @RequestParam("filter") String filter);
 }

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/FuturesEntity.java

@@ -5,216 +5,56 @@ import java.util.Date;
 import java.util.Objects;
 
 /**
- * 商品信息
+ * 特征信息
  *
  * @author hey
  * @since 2019/1/7 13:56
  */
-public class GoodsEntity implements Serializable {
+public class FuturesEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Integer id; // 商品id
+    private Long total; // 搜索结果总数
 
-    private Integer brandid; // 商城标准品牌id，如果商品时非标产品，则无值
+    private Long page; // 页码
 
-    private String branduuid; // 商城标准品牌uuid，如果商品时非标产品，则无值
+    private Long size; // 分页大小
 
-    private String brandNameCn; // 中文品牌名称
-
-    private String brandNameEn; // 英文品牌名称，建议展示使用规则：如果中文存在用中文，不存在则用英文
-
-    private Integer kindUuid; // 商城标准类目id，如果商品时非标产品，则无值
-
-    private String kindNameCn; // 产品名称
-
-    private String code; // 产品型号
-
-    private String uuid; // 商城标准产品uuid，如果商品时非标产品，则无值
-
-    private String spec; // 产品规格
-
-    private String packaging; // 包装方式
-
-    private String storeName; // 店铺名称
-
-    private String storeid; // 店铺uuid
-
-    private Double reserve; // 商品库存
-
-    private Double minBuyQty; // 最小起订量
-
-    private Boolean breakUp; // 是否可拆卖
-
-    private Integer b2cMinDelivery; // 最小交期
-
-    private Integer b2cMaxDelivery; // 最大交期
-
-    private String attach; // 商品规格书，如果有
-
-    private QtyPrice prices; // 分段价格
+    private ProductEntity content; // 期货物料列表
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getBrandid() {
-        return brandid;
-    }
-
-    public void setBrandid(Integer brandid) {
-        this.brandid = brandid;
-    }
-
-    public String getBranduuid() {
-        return branduuid;
-    }
-
-    public void setBranduuid(String branduuid) {
-        this.branduuid = branduuid;
-    }
-
-    public String getBrandNameCn() {
-        return brandNameCn;
-    }
-
-    public void setBrandNameCn(String brandNameCn) {
-        this.brandNameCn = brandNameCn;
-    }
-
-    public String getBrandNameEn() {
-        return brandNameEn;
-    }
-
-    public void setBrandNameEn(String brandNameEn) {
-        this.brandNameEn = brandNameEn;
-    }
-
-    public Integer getKindUuid() {
-        return kindUuid;
-    }
-
-    public void setKindUuid(Integer kindUuid) {
-        this.kindUuid = kindUuid;
-    }
-
-    public String getKindNameCn() {
-        return kindNameCn;
-    }
-
-    public void setKindNameCn(String kindNameCn) {
-        this.kindNameCn = kindNameCn;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public String getSpec() {
-        return spec;
-    }
-
-    public void setSpec(String spec) {
-        this.spec = spec;
-    }
-
-    public String getPackaging() {
-        return packaging;
-    }
-
-    public void setPackaging(String packaging) {
-        this.packaging = packaging;
-    }
-
-    public String getStoreName() {
-        return storeName;
-    }
-
-    public void setStoreName(String storeName) {
-        this.storeName = storeName;
-    }
-
-    public String getStoreid() {
-        return storeid;
-    }
-
-    public void setStoreid(String storeid) {
-        this.storeid = storeid;
-    }
-
-    public Double getReserve() {
-        return reserve;
-    }
-
-    public void setReserve(Double reserve) {
-        this.reserve = reserve;
-    }
-
-    public Double getMinBuyQty() {
-        return minBuyQty;
-    }
-
-    public void setMinBuyQty(Double minBuyQty) {
-        this.minBuyQty = minBuyQty;
-    }
-
-    public Boolean getBreakUp() {
-        return breakUp;
-    }
-
-    public void setBreakUp(Boolean breakUp) {
-        this.breakUp = breakUp;
-    }
-
-    public Integer getB2cMinDelivery() {
-        return b2cMinDelivery;
+    public Long getTotal() {
+        return total;
     }
 
-    public void setB2cMinDelivery(Integer b2cMinDelivery) {
-        this.b2cMinDelivery = b2cMinDelivery;
+    public void setTotal(Long total) {
+        this.total = total;
     }
 
-    public Integer getB2cMaxDelivery() {
-        return b2cMaxDelivery;
+    public Long getPage() {
+        return page;
     }
 
-    public void setB2cMaxDelivery(Integer b2cMaxDelivery) {
-        this.b2cMaxDelivery = b2cMaxDelivery;
+    public void setPage(Long page) {
+        this.page = page;
     }
 
-    public String getAttach() {
-        return attach;
+    public Long getSize() {
+        return size;
     }
 
-    public void setAttach(String attach) {
-        this.attach = attach;
+    public void setSize(Long size) {
+        this.size = size;
     }
 
-    public QtyPrice getPrices() {
-        return prices;
+    public ProductEntity getContent() {
+        return content;
     }
 
-    public void setPrices(QtyPrice prices) {
-        this.prices = prices;
+    public void setContent(ProductEntity content) {
+        this.content = content;
     }
 }

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/GoodsEntity.java

@@ -5,76 +5,216 @@ import java.util.Date;
 import java.util.Objects;
 
 /**
- * 附件
+ * 商品信息
  *
- * @author chenwei
- * @since 2018/1/13 13:56
+ * @author hey
+ * @since 2019/1/7 13:56
  */
-public class QtyPrice implements Serializable {
+public class GoodsEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Double start; // 分段起始数量
+    private Long id; // 商品id
 
-    private Double end; // 分段截止数量
+    private Long brandid; // 商城标准品牌id，如果商品时非标产品，则无值
 
-    private Double rMBPrice; // 人民币含税价格，人民币和美金二者只会有其一
+    private String branduuid; // 商城标准品牌uuid，如果商品时非标产品，则无值
 
-    private Double rMBNTPrice; // 人民币不含税价格，，人民币和美金二者只会有其一
+    private String brandNameCn; // 中文品牌名称
 
-    private Double uSDPrice; // 美金含税价格，人民币和美金二者只会有其一
+    private String brandNameEn; // 英文品牌名称，建议展示使用规则：如果中文存在用中文，不存在则用英文
 
-    private Double uSDNTPrice; // 美金不含税价格，人民币和美金二者只会有其一
+    private Long kindUuid; // 商城标准类目id，如果商品时非标产品，则无值
+
+    private String kindNameCn; // 产品名称
+
+    private String code; // 产品型号
+
+    private String uuid; // 商城标准产品uuid，如果商品时非标产品，则无值
+
+    private String spec; // 产品规格
+
+    private String packaging; // 包装方式
+
+    private String storeName; // 店铺名称
+
+    private String storeid; // 店铺uuid
+
+    private Double reserve; // 商品库存
+
+    private Double minBuyQty; // 最小起订量
+
+    private Boolean breakUp; // 是否可拆卖
+
+    private Long b2cMinDelivery; // 最小交期
+
+    private Long b2cMaxDelivery; // 最大交期
+
+    private String attach; // 商品规格书，如果有
+
+    private QtyPrice prices; // 分段价格
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
 
-    public Double getStart() {
-        return start;
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getBrandid() {
+        return brandid;
+    }
+
+    public void setBrandid(Long brandid) {
+        this.brandid = brandid;
+    }
+
+    public String getBranduuid() {
+        return branduuid;
+    }
+
+    public void setBranduuid(String branduuid) {
+        this.branduuid = branduuid;
+    }
+
+    public String getBrandNameCn() {
+        return brandNameCn;
+    }
+
+    public void setBrandNameCn(String brandNameCn) {
+        this.brandNameCn = brandNameCn;
+    }
+
+    public String getBrandNameEn() {
+        return brandNameEn;
+    }
+
+    public void setBrandNameEn(String brandNameEn) {
+        this.brandNameEn = brandNameEn;
+    }
+
+    public Long getKindUuid() {
+        return kindUuid;
+    }
+
+    public void setKindUuid(Long kindUuid) {
+        this.kindUuid = kindUuid;
+    }
+
+    public String getKindNameCn() {
+        return kindNameCn;
+    }
+
+    public void setKindNameCn(String kindNameCn) {
+        this.kindNameCn = kindNameCn;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getPackaging() {
+        return packaging;
+    }
+
+    public void setPackaging(String packaging) {
+        this.packaging = packaging;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreid() {
+        return storeid;
+    }
+
+    public void setStoreid(String storeid) {
+        this.storeid = storeid;
+    }
+
+    public Double getReserve() {
+        return reserve;
+    }
+
+    public void setReserve(Double reserve) {
+        this.reserve = reserve;
+    }
+
+    public Double getMinBuyQty() {
+        return minBuyQty;
     }
 
-    public void setStart(Double start) {
-        this.start = start;
+    public void setMinBuyQty(Double minBuyQty) {
+        this.minBuyQty = minBuyQty;
     }
 
-    public Double getEnd() {
-        return end;
+    public Boolean getBreakUp() {
+        return breakUp;
     }
 
-    public void setEnd(Double end) {
-        this.end = end;
+    public void setBreakUp(Boolean breakUp) {
+        this.breakUp = breakUp;
     }
 
-    public Double getrMBPrice() {
-        return rMBPrice;
+    public Long getB2cMinDelivery() {
+        return b2cMinDelivery;
     }
 
-    public void setrMBPrice(Double rMBPrice) {
-        this.rMBPrice = rMBPrice;
+    public void setB2cMinDelivery(Long b2cMinDelivery) {
+        this.b2cMinDelivery = b2cMinDelivery;
     }
 
-    public Double getrMBNTPrice() {
-        return rMBNTPrice;
+    public Long getB2cMaxDelivery() {
+        return b2cMaxDelivery;
     }
 
-    public void setrMBNTPrice(Double rMBNTPrice) {
-        this.rMBNTPrice = rMBNTPrice;
+    public void setB2cMaxDelivery(Long b2cMaxDelivery) {
+        this.b2cMaxDelivery = b2cMaxDelivery;
     }
 
-    public Double getuSDPrice() {
-        return uSDPrice;
+    public String getAttach() {
+        return attach;
     }
 
-    public void setuSDPrice(Double uSDPrice) {
-        this.uSDPrice = uSDPrice;
+    public void setAttach(String attach) {
+        this.attach = attach;
     }
 
-    public Double getuSDNTPrice() {
-        return uSDNTPrice;
+    public QtyPrice getPrices() {
+        return prices;
     }
 
-    public void setuSDNTPrice(Double uSDNTPrice) {
-        this.uSDNTPrice = uSDNTPrice;
+    public void setPrices(QtyPrice prices) {
+        this.prices = prices;
     }
 }

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/ProductEntity.java

@@ -5,129 +5,57 @@ import java.util.Date;
 import java.util.Objects;
 
 /**
- * 商品信息
+ * 物料信息
  *
  * @author hey
  * @since 2019/1/7 13:56
  */
-public class GoodsEntity implements Serializable {
+public class ProductEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Integer id = 1; // 商品id
+    private Long id; // 物料id
 
-    private Integer brandid = 2; // 商城标准品牌id，如果商品时非标产品，则无值
+    private String prodNum; // 物料编号（客户ERP里面的编号）
 
-    private String branduuid = 3; // 商城标准品牌uuid，如果商品时非标产品，则无值
+    private String spec; // 物料规格
 
-    private String brandNameCn = 4; // 中文品牌名称
+    private String unit; // 物料单位
 
-    private String brandNameEn = 5; // 英文品牌名称，建议展示使用规则：如果中文存在用中文，不存在则用英文
+    private Long enUU; // 物料所属企业uu号
 
-    private Integer kindUuid = 6; // 商城标准类目id，如果商品时非标产品，则无值
+    private String enName; // 企业名称
 
-    private String kindNameCn = 7; // 产品名称
+    private String kind; // 物料名称
 
-    private String code = 8; // 产品型号
+    private String pcmpcode; // 物料型号
 
-    private String uuid = 9; // 商城标准产品uuid，如果商品时非标产品，则无值
+    private String pbranden; // 物料品牌
 
-    private String spec = 10; // 产品规格
+    private String packaging; // 包装方式
 
-    private String packaging = 11; // 包装方式
+    private Long createTime; // 创建时间
 
-    private String storeName = 12; // 店铺名称
-
-    private String storeid = 13; // 店铺uuid
-
-    private Double reserve = 14; // 商品库存
-
-    private Double minBuyQty = 15; // 最小起订量
-
-    private Boolean breakUp = 16; // 是否可拆卖
-
-    private Integer b2cMinDelivery; // 最小交期
-
-    private Integer b2cMaxDelivery; // 最大交期
-
-    private String attach; // 商品规格书，如果有
-
-    private QtyPrice prices; // 分段价格
+    private Double erpReserve; // 库存
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Integer getBrandid() {
-        return brandid;
-    }
-
-    public void setBrandid(Integer brandid) {
-        this.brandid = brandid;
-    }
-
-    public String getBranduuid() {
-        return branduuid;
-    }
-
-    public void setBranduuid(String branduuid) {
-        this.branduuid = branduuid;
-    }
-
-    public String getBrandNameCn() {
-        return brandNameCn;
-    }
-
-    public void setBrandNameCn(String brandNameCn) {
-        this.brandNameCn = brandNameCn;
-    }
-
-    public String getBrandNameEn() {
-        return brandNameEn;
-    }
-
-    public void setBrandNameEn(String brandNameEn) {
-        this.brandNameEn = brandNameEn;
-    }
-
-    public Integer getKindUuid() {
-        return kindUuid;
+    public String getProdNum() {
+        return prodNum;
     }
 
-    public void setKindUuid(Integer kindUuid) {
-        this.kindUuid = kindUuid;
-    }
-
-    public String getKindNameCn() {
-        return kindNameCn;
-    }
-
-    public void setKindNameCn(String kindNameCn) {
-        this.kindNameCn = kindNameCn;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
+    public void setProdNum(String prodNum) {
+        this.prodNum = prodNum;
     }
 
     public String getSpec() {
@@ -138,83 +66,75 @@ public class GoodsEntity implements Serializable {
         this.spec = spec;
     }
 
-    public String getPackaging() {
-        return packaging;
-    }
-
-    public void setPackaging(String packaging) {
-        this.packaging = packaging;
+    public String getUnit() {
+        return unit;
     }
 
-    public String getStoreName() {
-        return storeName;
+    public void setUnit(String unit) {
+        this.unit = unit;
     }
 
-    public void setStoreName(String storeName) {
-        this.storeName = storeName;
+    public Long getEnUU() {
+        return enUU;
     }
 
-    public String getStoreid() {
-        return storeid;
+    public void setEnUU(Long enUU) {
+        this.enUU = enUU;
     }
 
-    public void setStoreid(String storeid) {
-        this.storeid = storeid;
+    public String getEnName() {
+        return enName;
     }
 
-    public Double getReserve() {
-        return reserve;
+    public void setEnName(String enName) {
+        this.enName = enName;
     }
 
-    public void setReserve(Double reserve) {
-        this.reserve = reserve;
+    public String getKind() {
+        return kind;
     }
 
-    public Double getMinBuyQty() {
-        return minBuyQty;
+    public void setKind(String kind) {
+        this.kind = kind;
     }
 
-    public void setMinBuyQty(Double minBuyQty) {
-        this.minBuyQty = minBuyQty;
+    public String getPcmpcode() {
+        return pcmpcode;
     }
 
-    public Boolean getBreakUp() {
-        return breakUp;
+    public void setPcmpcode(String pcmpcode) {
+        this.pcmpcode = pcmpcode;
     }
 
-    public void setBreakUp(Boolean breakUp) {
-        this.breakUp = breakUp;
+    public String getPbranden() {
+        return pbranden;
     }
 
-    public Integer getB2cMinDelivery() {
-        return b2cMinDelivery;
+    public void setPbranden(String pbranden) {
+        this.pbranden = pbranden;
     }
 
-    public void setB2cMinDelivery(Integer b2cMinDelivery) {
-        this.b2cMinDelivery = b2cMinDelivery;
-    }
-
-    public Integer getB2cMaxDelivery() {
-        return b2cMaxDelivery;
+    public String getPackaging() {
+        return packaging;
     }
 
-    public void setB2cMaxDelivery(Integer b2cMaxDelivery) {
-        this.b2cMaxDelivery = b2cMaxDelivery;
+    public void setPackaging(String packaging) {
+        this.packaging = packaging;
     }
 
-    public String getAttach() {
-        return attach;
+    public Long getCreateTime() {
+        return createTime;
     }
 
-    public void setAttach(String attach) {
-        this.attach = attach;
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
     }
 
-    public QtyPrice getPrices() {
-        return prices;
+    public Double getErpReserve() {
+        return erpReserve;
     }
 
-    public void setPrices(QtyPrice prices) {
-        this.prices = prices;
+    public void setErpReserve(Double erpReserve) {
+        this.erpReserve = erpReserve;
     }
 }

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/QtyPrice.java

@@ -5,148 +5,76 @@ import java.util.Date;
 import java.util.Objects;
 
 /**
- * 附件
+ * 分段数量
  *
- * @author chenwei
- * @since 2018/1/13 13:56
+ * @author hey
+ * @since 2019/1/7 13:56
  */
-public class Attach implements Serializable {
+public class QtyPrice implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
-
-    /**
-     * 路径
-     */
-    private String path;
-
-    /**
-     * 描述语
-     */
-    private String description;
-
-    /**
-     * 文件名称
-     */
-    private String name;
-
-    /**
-     * 文件大小
-     */
-    private Long size;
-
-    /**
-     * 关联的表
-     */
-    private String relatedTable;
-
-    /**
-     * 关联的数据主键值
-     */
-    private Long relatedKey;
-
-    /**
-     * 保存时间
-     */
-    private Date date;
-
-    public Long getId() {
-        return id;
-    }
+    private Double start; // 分段起始数量
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+    private Double end; // 分段截止数量
 
-    public String getPath() {
-        return path;
-    }
+    private Double rMBPrice; // 人民币含税价格，人民币和美金二者只会有其一
 
-    public void setPath(String path) {
-        this.path = path;
-    }
+    private Double rMBNTPrice; // 人民币不含税价格，，人民币和美金二者只会有其一
 
-    public String getDescription() {
-        return description;
-    }
+    private Double uSDPrice; // 美金含税价格，人民币和美金二者只会有其一
 
-    public void setDescription(String description) {
-        this.description = description;
-    }
+    private Double uSDNTPrice; // 美金不含税价格，人民币和美金二者只会有其一
 
-    public String getName() {
-        return name;
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public Double getStart() {
+        return start;
     }
 
-    public Long getSize() {
-        return size;
+    public void setStart(Double start) {
+        this.start = start;
     }
 
-    public void setSize(Long size) {
-        this.size = size;
+    public Double getEnd() {
+        return end;
     }
 
-    public String getRelatedTable() {
-        return relatedTable;
+    public void setEnd(Double end) {
+        this.end = end;
     }
 
-    public void setRelatedTable(String relatedTable) {
-        this.relatedTable = relatedTable;
+    public Double getrMBPrice() {
+        return rMBPrice;
     }
 
-    public Long getRelatedKey() {
-        return relatedKey;
+    public void setrMBPrice(Double rMBPrice) {
+        this.rMBPrice = rMBPrice;
     }
 
-    public void setRelatedKey(Long relatedKey) {
-        this.relatedKey = relatedKey;
+    public Double getrMBNTPrice() {
+        return rMBNTPrice;
     }
 
-    public Date getDate() {
-        return date;
+    public void setrMBNTPrice(Double rMBNTPrice) {
+        this.rMBNTPrice = rMBNTPrice;
     }
 
-    public void setDate(Date date) {
-        this.date = date;
+    public Double getuSDPrice() {
+        return uSDPrice;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Attach attach = (Attach) o;
-        return Objects.equals(id, attach.id) &&
-                Objects.equals(path, attach.path) &&
-                Objects.equals(description, attach.description) &&
-                Objects.equals(name, attach.name) &&
-                Objects.equals(size, attach.size) &&
-                Objects.equals(relatedTable, attach.relatedTable) &&
-                Objects.equals(relatedKey, attach.relatedKey) &&
-                Objects.equals(date, attach.date);
+    public void setuSDPrice(Double uSDPrice) {
+        this.uSDPrice = uSDPrice;
     }
 
-    @Override
-    public int hashCode() {
-
-        return Objects.hash(id, path, description, name, size, relatedTable, relatedKey, date);
+    public Double getuSDNTPrice() {
+        return uSDNTPrice;
     }
 
-    @Override
-    public String toString() {
-        return "Attach{" +
-                "id=" + id +
-                ", path='" + path + '\'' +
-                ", description='" + description + '\'' +
-                ", name='" + name + '\'' +
-                ", size=" + size +
-                ", relatedTable='" + relatedTable + '\'' +
-                ", relatedKey=" + relatedKey +
-                ", date=" + date +
-                '}';
+    public void setuSDNTPrice(Double uSDNTPrice) {
+        this.uSDNTPrice = uSDNTPrice;
     }
 }

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/SearchComponentResp.java

@@ -5,56 +5,36 @@ import java.util.Date;
 import java.util.Objects;
 
 /**
- * 特征信息
+ * 器件查询
  *
  * @author hey
  * @since 2019/1/7 13:56
  */
-public class FuturesEntity implements Serializable {
+public class SearchComponentResp implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Long total; // 搜索结果总数
+    private StockEntity stock; // 现货
 
-    private Long page; // 页码
-
-    private Long size; // 分页大小
-
-    private ProductEntity content; // 期货物料列表
+    private FuturesEntity futures; // 期货
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
 
-    public Long getTotal() {
-        return total;
-    }
-
-    public void setTotal(Long total) {
-        this.total = total;
-    }
-
-    public Long getPage() {
-        return page;
-    }
-
-    public void setPage(Long page) {
-        this.page = page;
-    }
-
-    public Long getSize() {
-        return size;
+    public StockEntity getStock() {
+        return stock;
     }
 
-    public void setSize(Long size) {
-        this.size = size;
+    public void setStock(StockEntity stock) {
+        this.stock = stock;
     }
 
-    public ProductEntity getContent() {
-        return content;
+    public FuturesEntity getFutures() {
+        return futures;
     }
 
-    public void setContent(ProductEntity content) {
-        this.content = content;
+    public void setFutures(FuturesEntity futures) {
+        this.futures = futures;
     }
 }

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/StockEntity.java

@@ -5,56 +5,56 @@ import java.util.Date;
 import java.util.Objects;
 
 /**
- * 特征信息
+ * 仓库信息
  *
  * @author hey
  * @since 2019/1/7 13:56
  */
-public class FuturesEntity implements Serializable {
+public class StockEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Integer total; // 搜索结果总数
+    private Long total; // 搜索结果总数
 
-    private Integer page; // 页码
+    private Long page; // 页码
 
-    private Integer size; // 分页大小
+    private Long size; // 分页大小
 
-    private ProductEntity content; // 期货物料列表
+    private GoodsEntity content; // 现货在售商品列表
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
 
-    public Integer getTotal() {
+    public Long getTotal() {
         return total;
     }
 
-    public void setTotal(Integer total) {
+    public void setTotal(Long total) {
         this.total = total;
     }
 
-    public Integer getPage() {
+    public Long getPage() {
         return page;
     }
 
-    public void setPage(Integer page) {
+    public void setPage(Long page) {
         this.page = page;
     }
 
-    public Integer getSize() {
+    public Long getSize() {
         return size;
     }
 
-    public void setSize(Integer size) {
+    public void setSize(Long size) {
         this.size = size;
     }
 
-    public ProductEntity getContent() {
+    public GoodsEntity getContent() {
         return content;
     }
 
-    public void setContent(ProductEntity content) {
+    public void setContent(GoodsEntity content) {
         this.content = content;
     }
 }