Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -0,0 +1,22 @@
+package com.usoftchina.inquiry.api;
+
+import com.usoftchina.inquiry.po.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.data.domain.Page;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient(url = "${Component.base-url}", name = "search-server")
+@RequestMapping("/search")
+public interface SearchApi {
+
+    /**
+     * 器件查询
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @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

@@ -0,0 +1,60 @@
+package com.usoftchina.inquiry.po;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 特征信息
+ *
+ * @author hey
+ * @since 2019/1/7 13:56
+ */
+public class FuturesEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long total; // 搜索结果总数
+
+    private Long page; // 页码
+
+    private Long size; // 分页大小
+
+    private ProductEntity content; // 期货物料列表
+
+    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 void setSize(Long size) {
+        this.size = size;
+    }
+
+    public ProductEntity getContent() {
+        return content;
+    }
+
+    public void setContent(ProductEntity content) {
+        this.content = content;
+    }
+}

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

@@ -0,0 +1,220 @@
+package com.usoftchina.inquiry.po;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 商品信息
+ *
+ * @author hey
+ * @since 2019/1/7 13:56
+ */
+public class GoodsEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // 商品id
+
+    private Long brandid; // 商城标准品牌id，如果商品时非标产品，则无值
+
+    private String branduuid; // 商城标准品牌uuid，如果商品时非标产品，则无值
+
+    private String brandNameCn; // 中文品牌名称
+
+    private String brandNameEn; // 英文品牌名称，建议展示使用规则：如果中文存在用中文，不存在则用英文
+
+    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 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 setMinBuyQty(Double minBuyQty) {
+        this.minBuyQty = minBuyQty;
+    }
+
+    public Boolean getBreakUp() {
+        return breakUp;
+    }
+
+    public void setBreakUp(Boolean breakUp) {
+        this.breakUp = breakUp;
+    }
+
+    public Long getB2cMinDelivery() {
+        return b2cMinDelivery;
+    }
+
+    public void setB2cMinDelivery(Long b2cMinDelivery) {
+        this.b2cMinDelivery = b2cMinDelivery;
+    }
+
+    public Long getB2cMaxDelivery() {
+        return b2cMaxDelivery;
+    }
+
+    public void setB2cMaxDelivery(Long b2cMaxDelivery) {
+        this.b2cMaxDelivery = b2cMaxDelivery;
+    }
+
+    public String getAttach() {
+        return attach;
+    }
+
+    public void setAttach(String attach) {
+        this.attach = attach;
+    }
+
+    public QtyPrice getPrices() {
+        return prices;
+    }
+
+    public void setPrices(QtyPrice prices) {
+        this.prices = prices;
+    }
+}

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

@@ -0,0 +1,140 @@
+package com.usoftchina.inquiry.po;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 物料信息
+ *
+ * @author hey
+ * @since 2019/1/7 13:56
+ */
+public class ProductEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // 物料id
+
+    private String prodNum; // 物料编号（客户ERP里面的编号）
+
+    private String spec; // 物料规格
+
+    private String unit; // 物料单位
+
+    private Long enUU; // 物料所属企业uu号
+
+    private String enName; // 企业名称
+
+    private String kind; // 物料名称
+
+    private String pcmpcode; // 物料型号
+
+    private String pbranden; // 物料品牌
+
+    private String packaging; // 包装方式
+
+    private Long createTime; // 创建时间
+
+    private Double erpReserve; // 库存
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getProdNum() {
+        return prodNum;
+    }
+
+    public void setProdNum(String prodNum) {
+        this.prodNum = prodNum;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public Long getEnUU() {
+        return enUU;
+    }
+
+    public void setEnUU(Long enUU) {
+        this.enUU = enUU;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public String getKind() {
+        return kind;
+    }
+
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
+    public String getPcmpcode() {
+        return pcmpcode;
+    }
+
+    public void setPcmpcode(String pcmpcode) {
+        this.pcmpcode = pcmpcode;
+    }
+
+    public String getPbranden() {
+        return pbranden;
+    }
+
+    public void setPbranden(String pbranden) {
+        this.pbranden = pbranden;
+    }
+
+    public String getPackaging() {
+        return packaging;
+    }
+
+    public void setPackaging(String packaging) {
+        this.packaging = packaging;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
+    public Double getErpReserve() {
+        return erpReserve;
+    }
+
+    public void setErpReserve(Double erpReserve) {
+        this.erpReserve = erpReserve;
+    }
+}

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

@@ -0,0 +1,80 @@
+package com.usoftchina.inquiry.po;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 分段数量
+ *
+ * @author hey
+ * @since 2019/1/7 13:56
+ */
+public class QtyPrice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Double start; // 分段起始数量
+
+    private Double end; // 分段截止数量
+
+    private Double rMBPrice; // 人民币含税价格，人民币和美金二者只会有其一
+
+    private Double rMBNTPrice; // 人民币不含税价格，，人民币和美金二者只会有其一
+
+    private Double uSDPrice; // 美金含税价格，人民币和美金二者只会有其一
+
+    private Double uSDNTPrice; // 美金不含税价格，人民币和美金二者只会有其一
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Double getStart() {
+        return start;
+    }
+
+    public void setStart(Double start) {
+        this.start = start;
+    }
+
+    public Double getEnd() {
+        return end;
+    }
+
+    public void setEnd(Double end) {
+        this.end = end;
+    }
+
+    public Double getrMBPrice() {
+        return rMBPrice;
+    }
+
+    public void setrMBPrice(Double rMBPrice) {
+        this.rMBPrice = rMBPrice;
+    }
+
+    public Double getrMBNTPrice() {
+        return rMBNTPrice;
+    }
+
+    public void setrMBNTPrice(Double rMBNTPrice) {
+        this.rMBNTPrice = rMBNTPrice;
+    }
+
+    public Double getuSDPrice() {
+        return uSDPrice;
+    }
+
+    public void setuSDPrice(Double uSDPrice) {
+        this.uSDPrice = uSDPrice;
+    }
+
+    public Double getuSDNTPrice() {
+        return uSDNTPrice;
+    }
+
+    public void setuSDNTPrice(Double uSDNTPrice) {
+        this.uSDNTPrice = uSDNTPrice;
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.usoftchina.inquiry.po;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 器件查询
+ *
+ * @author hey
+ * @since 2019/1/7 13:56
+ */
+public class SearchComponentResp implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private StockEntity stock; // 现货
+
+    private FuturesEntity futures; // 期货
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public StockEntity getStock() {
+        return stock;
+    }
+
+    public void setStock(StockEntity stock) {
+        this.stock = stock;
+    }
+
+    public FuturesEntity getFutures() {
+        return futures;
+    }
+
+    public void setFutures(FuturesEntity futures) {
+        this.futures = futures;
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.usoftchina.inquiry.po;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 仓库信息
+ *
+ * @author hey
+ * @since 2019/1/7 13:56
+ */
+public class StockEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long total; // 搜索结果总数
+
+    private Long page; // 页码
+
+    private Long size; // 分页大小
+
+    private GoodsEntity content; // 现货在售商品列表
+
+    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 void setSize(Long size) {
+        this.size = size;
+    }
+
+    public GoodsEntity getContent() {
+        return content;
+    }
+
+    public void setContent(GoodsEntity content) {
+        this.content = content;
+    }
+}