已报价商机调整

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -759,19 +759,24 @@ public class SaleServiceImpl implements SaleService{
         }
         Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
         //Long userUU = 1000002503L, enUU = 10041559L;
-        IPage<InquiryEnRemind> inquiryEnRemindIPage = inquiryApi.findEnRemind(userUU, enUU, remindReqDTO.getPageNumber(),
-                remindReqDTO.getPageSize(), remindReqDTO.getEnableOffer(), remindReqDTO.getKeyword(), remindReqDTO.getQuoted(),
-                remindReqDTO.getFromDate(), remindReqDTO.getEndDate());
-        List<InquiryEnRemind> inquiryEnRemindList = inquiryEnRemindIPage.getContent();
-        if (CollectionUtils.isEmpty(inquiryEnRemindList)){
-            return null;
+        IPage<InquiryEnRemind> inquiryEnRemindIPage = null;
+        if (remindReqDTO.getQuoted() != 1) {
+            inquiryEnRemindIPage = inquiryApi.findEnRemind(userUU, enUU, remindReqDTO.getPageNumber(),
+                    remindReqDTO.getPageSize(), remindReqDTO.getEnableOffer(), remindReqDTO.getKeyword(), remindReqDTO.getQuoted(),
+                    remindReqDTO.getFromDate(), remindReqDTO.getEndDate());
+            List<InquiryEnRemind> inquiryEnRemindList = inquiryEnRemindIPage.getContent();
+            if (CollectionUtils.isEmpty(inquiryEnRemindList)) {
+                return null;
+            }
+            List<RemindRspDTO> remindRspDTOList = convertToRemindRspDTO(JsonUtils.toJsonString(inquiryEnRemindList), "enterprise");
+            //转换成分页对象
+            IPage<RemindRspDTO> remindRspDTOIPage = new IPage<RemindRspDTO>(inquiryEnRemindIPage.getNumber(), inquiryEnRemindIPage.getSize(),
+                    inquiryEnRemindIPage.getNumberOfElements(), remindRspDTOList, inquiryEnRemindIPage.isFirst(), inquiryEnRemindIPage.isLast(),
+                    inquiryEnRemindIPage.getTotalElements());
+            return remindRspDTOIPage;
+        }else {
+            return getRemindRspDTO(enUU, userUU, remindReqDTO);
         }
-        List<RemindRspDTO> remindRspDTOList = convertToRemindRspDTO(JsonUtils.toJsonString(inquiryEnRemindList), "enterprise");
-        //转换成分页对象
-        IPage<RemindRspDTO> remindRspDTOIPage = new IPage<RemindRspDTO>(inquiryEnRemindIPage.getNumber(), inquiryEnRemindIPage.getSize(),
-                inquiryEnRemindIPage.getNumberOfElements(),remindRspDTOList, inquiryEnRemindIPage.isFirst(), inquiryEnRemindIPage.isLast(),
-                inquiryEnRemindIPage.getTotalElements());
-        return remindRspDTOIPage;
     }
 
     /**
@@ -783,19 +788,100 @@ public class SaleServiceImpl implements SaleService{
     public IPage<RemindRspDTO> findRemindByUserInfo(RemindReqDTO remindReqDTO) {
         Long userUU = accountApi.getAccountById(BaseContextHolder.getUserId()).getData().getUu();
         Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
-        IPage<InquiryRemind> inquiryRemindIpage = inquiryApi.findRemindByUserInfo(userUU, enUU, remindReqDTO.getPageNumber(), remindReqDTO.getPageSize(),
-                remindReqDTO.getEnableOffer(),remindReqDTO.getKeyword(), remindReqDTO.getQuoted(),
-                remindReqDTO.getFromDate(), remindReqDTO.getEndDate());
-        List<InquiryRemind> inquiryRemindList = inquiryRemindIpage.getContent();
-        if (CollectionUtils.isEmpty(inquiryRemindList)){
-            return null;
+        if (remindReqDTO.getQuoted() != -1) {
+            IPage<InquiryRemind> inquiryRemindIpage = inquiryApi.findRemindByUserInfo(userUU, enUU, remindReqDTO.getPageNumber(), remindReqDTO.getPageSize(),
+                    remindReqDTO.getEnableOffer(), remindReqDTO.getKeyword(), remindReqDTO.getQuoted(),
+                    remindReqDTO.getFromDate(), remindReqDTO.getEndDate());
+            List<InquiryRemind> inquiryRemindList = inquiryRemindIpage.getContent();
+            if (CollectionUtils.isEmpty(inquiryRemindList)) {
+                return null;
+            }
+            List<RemindRspDTO> remindRspDTOList = convertToRemindRspDTO(JsonUtils.toJsonString(inquiryRemindList), "personal");
+            //转换成分页对象
+            IPage<RemindRspDTO> remindRspDTOIPage = new IPage<RemindRspDTO>(inquiryRemindIpage.getNumber(), inquiryRemindIpage.getSize(),
+                    inquiryRemindIpage.getNumberOfElements(), remindRspDTOList, inquiryRemindIpage.isFirst(), inquiryRemindIpage.isLast(),
+                    inquiryRemindIpage.getTotalElements());
+            return remindRspDTOIPage;
+        }else {
+            return getRemindRspDTO(enUU, userUU, remindReqDTO);
+        }
+    }
+
+    /**
+     * 查询已报过价的商机
+     * @param enUU              企业UU
+     * @param userUU            个人UU,企业商机传入userUU=null
+     * @param remindReqDTO
+     * @return
+     */
+    private IPage<RemindRspDTO> getRemindRspDTO(Long enUU, Long userUU, RemindReqDTO remindReqDTO){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("userUU", userUU);
+        jsonObject.put("enUU", enUU);
+        jsonObject.put("fromDate", remindReqDTO.getFromDate());
+        jsonObject.put("endDate", remindReqDTO.getEndDate());
+        jsonObject.put("fromDelivery", null);
+        jsonObject.put("endDelivery", null);
+        String filter = jsonObject.toJSONString();
+        IPage<PublicInquiryItemInfo> publicInquiryItemInfoIPage = inquiryApi.findQuotationList(remindReqDTO.getPageNumber(), remindReqDTO.getPageSize(), remindReqDTO.getKeyword(), "done", 1, filter);
+        List<PublicInquiryItemInfo> publicInquiryItemInfoList = publicInquiryItemInfoIPage.getContent();
+        List<RemindRspDTO> remindRspDTOList = new ArrayList<>();
+        RemindRspDTO remindRspDTO = null;
+
+        for (PublicInquiryItemInfo publicInquiryItemInfo : publicInquiryItemInfoList) {
+            remindRspDTO = new RemindRspDTO();
+            //询价单信息
+            PublicInquiryInfo publicInquiryInfo = publicInquiryItemInfo.getInquiry();
+            if (!ObjectUtils.isEmpty(publicInquiryInfo)) {
+                remindRspDTO.setCustName(publicInquiryInfo.getEnName());
+            }
+            Product product = publicInquiryItemInfo.getProduct();
+            if (!ObjectUtils.isEmpty(product)) {
+                remindRspDTO.setProdBrand(product.getBrand());
+                remindRspDTO.setProdName(product.getTitle());
+                remindRspDTO.setProdOrispeccode(product.getCmpCode());
+                remindRspDTO.setProdSpec(product.getSpec());
+                remindRspDTO.setProdUnit(StringUtils.isEmpty(product.getUnit()) ? "PCS" : product.getUnit());
+            }
+
+            remindRspDTO.setNeedQty(publicInquiryItemInfo.getNeedquantity());
+            remindRspDTO.setStartDate(publicInquiryItemInfo.getDate());
+            remindRspDTO.setEndDate(publicInquiryItemInfo.getEndDate());
+            remindRspDTO.setQuoted(1);
+            remindRspDTO.setUserName(publicInquiryItemInfo.getUserName());
+            remindRspDTO.setUserTel(publicInquiryItemInfo.getUserTel());
+            remindRspDTO.setUserUU(publicInquiryItemInfo.getUserUU());
+            remindRspDTO.setSourceId(publicInquiryItemInfo.getSourceId());
+            remindRspDTO.setEnUU(publicInquiryInfo.getEnUU());
+            remindRspDTO.setRecorderUU(publicInquiryItemInfo.getUserUU());
+            remindRspDTO.setInquiryCode(publicInquiryInfo.getCode());
+            remindRspDTO.setInquiryId(publicInquiryInfo.getId());
+
+            QuotationRspDTO quotationRspDTO = new QuotationRspDTO();
+            quotationRspDTO.setAgreed(publicInquiryItemInfo.getAgreed());
+            quotationRspDTO.setRefusereason(publicInquiryItemInfo.getRefusereason());
+            quotationRspDTO.setLeadTime(publicInquiryItemInfo.getLeadtime());
+            quotationRspDTO.setTaxRate(new BigDecimal(publicInquiryItemInfo.getTaxrate()).doubleValue());
+            //分段报价明细
+            List<InquiryReplayDTO> inquiryReplayDTOList = new ArrayList<InquiryReplayDTO>();
+            List<PublicInquiryReplyInfo> publicInquiryReplyList = publicInquiryItemInfo.getReplies();
+            if (!CollectionUtils.isEmpty(publicInquiryReplyList)) {
+                for (PublicInquiryReplyInfo publicInquiryReplyInfo : publicInquiryReplyList) {
+                    InquiryReplayDTO inquiryReplayDTO = new InquiryReplayDTO(publicInquiryReplyInfo.getId(), publicInquiryReplyInfo.getLapQty(), publicInquiryReplyInfo.getPrice());
+                    inquiryReplayDTOList.add(inquiryReplayDTO);
+                }
+            }
+            quotationRspDTO.setReplies(inquiryReplayDTOList);
+            remindRspDTO.setQutations(quotationRspDTO);
+
+            remindRspDTOList.add(remindRspDTO);
         }
-        List<RemindRspDTO> remindRspDTOList = convertToRemindRspDTO(JsonUtils.toJsonString(inquiryRemindList), "personal");
-        //转换成分页对象
-        IPage<RemindRspDTO> remindRspDTOIPage = new IPage<RemindRspDTO>(inquiryRemindIpage.getNumber(), inquiryRemindIpage.getSize(),
-                inquiryRemindIpage.getNumberOfElements(),remindRspDTOList, inquiryRemindIpage.isFirst(), inquiryRemindIpage.isLast(),
-                inquiryRemindIpage.getTotalElements());
-        return remindRspDTOIPage;
+        //构造回写数据
+        IPage<RemindRspDTO> Ipage = new IPage<RemindRspDTO>(publicInquiryItemInfoIPage.getNumber(), publicInquiryItemInfoIPage.getSize(),
+                publicInquiryItemInfoIPage.getNumberOfElements(), remindRspDTOList,
+                publicInquiryItemInfoIPage.isFirst(), publicInquiryItemInfoIPage.isLast(),
+                publicInquiryItemInfoIPage.getTotalElements());
+        return Ipage;
     }
 
     /**

applications/transfers/mall-api/pom.xml

@@ -37,6 +37,11 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
             <scope>test</scope>
         </dependency>
+      <dependency>
+        <groupId>com.alibaba</groupId>
+        <artifactId>fastjson</artifactId>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
 
 </project>

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

@@ -1,11 +1,9 @@
 package com.usoftchina.saas.inquiry.api;
 
-import com.usoftchina.saas.exception.BizException;
-import com.usoftchina.saas.exception.ExceptionCode;
+import com.usoftchina.saas.inquiry.po.inquiry.PublicInquiryItemInfo;
 import com.usoftchina.saas.inquiry.po.inquiry.*;
 import feign.Response;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.stereotype.Component;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
@@ -63,6 +61,28 @@ public interface InquiryApi {
                                               @RequestParam("quoted") Integer quoted, @RequestParam("fromDate") Long fromDate,
                                               @RequestParam("endDate") Long endDate);
 
+    /**
+     * 查看已报价列表
+     * @param pageNumber    页码
+     * @param pageSize      每页大小
+     * @param keyword       关键字
+     * @param _state        状态  已报价 为 done
+     * @param overdue       为空或不等于1时，只查看未过报价截止日期，为1时，查看所有已报价
+     * @param filter
+     *          <p> userUU          用户UU 不为空时，只查看此用户报价的单      </p>
+     *          <p> fromDate        筛选报价时间 开始                       </p>
+     *          <p> endDate         筛选报价时间 结束                       </p>
+     *          <p> fromDelivery    发布时间筛选 开始                       </p>
+     *          <p> endDelivery     发布时间筛选 结束                       </p>
+     *          <p> enUU            企业UU报价企业UU                       </p>
+     * @return
+     */
+    @GetMapping("/public/quotation/list")
+    IPage<PublicInquiryItemInfo> findQuotationList(@RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
+                                                   @RequestParam("keyword") String keyword, @RequestParam("_state") String _state,
+                                                   @RequestParam("overdue") Integer overdue, @RequestParam("filter") String filter);
+
+
     /**
      * 保存报价接口
      * @param publicInquiryItem 报价单内容

applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PublicInquiryInfo.java

@@ -0,0 +1,249 @@
+package com.usoftchina.saas.inquiry.po.inquiry;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Set;
+
+/**
+ *  公共询价单主表
+ *    <pre>
+ *        这里是公共询价转成报价后存的数据信息，与以前的采购询价分开
+ *    </pre>
+ * @Author chenwei
+ * @Date 2019-03-25
+ */
+public class PublicInquiryInfo implements Serializable {
+
+    private Long id;
+
+    /**
+     * 询价单所属企业UU
+     */
+    private Long enUU;
+
+    /**
+     * 询价企业名称（方便搜索）
+     */
+    private String enName;
+
+    /**
+     * 询价企业信息
+     */
+    private Enterprise enterprise;
+
+    /**
+     * 询价单所属用户UU
+     */
+    private Long recorderUU;
+
+    /**
+     * 流水号
+     */
+    private String code;
+
+    /**
+     * 单据归属日期
+     */
+    private Date date;
+
+    /**
+     * 录入人
+     */
+    private String recorder;
+
+    /**
+     * 报价截止日期
+     */
+    private Date endDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 环保要求
+     */
+    private String environment;
+
+    /**
+     * 询价明细
+     */
+    private Set<PublicInquiryItemInfo> inquiryItems;
+
+    /**
+     * 来源系统单据ID
+     */
+    private Long sourceId;
+
+    /**
+     * 是否过期
+     */
+    private Short overdue;
+
+    /**
+     * 应用来源，主要是为了平台公共询价做处理
+     */
+    private String sourceApp;
+
+    /**
+     * 收货地址
+     */
+    private String ship;
+
+    /**
+     * 是否开票<br>
+     * 1. 是<br>
+     * 0. 否
+     */
+    private Short invoice;
+
+    /**
+     * 询价类型
+     */
+    private String inquirytype;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    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 Enterprise getEnterprise() {
+        return enterprise;
+    }
+
+    public void setEnterprise(Enterprise enterprise) {
+        this.enterprise = enterprise;
+    }
+
+    public Long getRecorderUU() {
+        return recorderUU;
+    }
+
+    public void setRecorderUU(Long recorderUU) {
+        this.recorderUU = recorderUU;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getRecorder() {
+        return recorder;
+    }
+
+    public void setRecorder(String recorder) {
+        this.recorder = recorder;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getEnvironment() {
+        return environment;
+    }
+
+    public void setEnvironment(String environment) {
+        this.environment = environment;
+    }
+
+    public Set<PublicInquiryItemInfo> getInquiryItems() {
+        return inquiryItems;
+    }
+
+    public void setInquiryItems(Set<PublicInquiryItemInfo> inquiryItems) {
+        this.inquiryItems = inquiryItems;
+    }
+
+    public Long getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(Long sourceId) {
+        this.sourceId = sourceId;
+    }
+
+    public Short getOverdue() {
+        return overdue;
+    }
+
+    public void setOverdue(Short overdue) {
+        this.overdue = overdue;
+    }
+
+    public String getSourceApp() {
+        return sourceApp;
+    }
+
+    public void setSourceApp(String sourceApp) {
+        this.sourceApp = sourceApp;
+    }
+
+    public String getShip() {
+        return ship;
+    }
+
+    public void setShip(String ship) {
+        this.ship = ship;
+    }
+
+    public Short getInvoice() {
+        return invoice;
+    }
+
+    public void setInvoice(Short invoice) {
+        this.invoice = invoice;
+    }
+
+    public String getInquirytype() {
+        return inquirytype;
+    }
+
+    public void setInquirytype(String inquirytype) {
+        this.inquirytype = inquirytype;
+    }
+}

applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PublicInquiryItemInfo.java

@@ -0,0 +1,674 @@
+package com.usoftchina.saas.inquiry.po.inquiry;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author chenwei
+ * @Date 2019-03-25
+ */
+public class PublicInquiryItemInfo implements Serializable {
+    /**
+     * id
+     */
+    private Long id;
+    /**
+     * 来源（买家ERP采购询价明细）的ID
+     */
+    private Long sourceId;
+    /**
+     * 序号
+     */
+    private Short number;
+    /**
+     * 询价单
+     */
+    private PublicInquiryInfo inquiry;
+    /**
+     * 买家采购员UU
+     */
+    private Long userUU;
+    /**
+     * 联系人姓名
+     */
+    private String userName;
+    /**
+     * 联系人电话
+     */
+    private String userTel;
+    /**
+     * 产品id
+     */
+    private Long productId;
+    /**
+     * 产品
+     */
+    private Product product;
+    /**
+     * 币种
+     */
+    private String currency;
+    /**
+     * 税率
+     */
+    private Float taxrate;
+    /**
+     * 供应商UU
+     */
+    private Long vendUU;
+    /**
+     * 供应商企业信息
+     */
+    private Enterprise enterprise;
+    /**
+     * 供应商联系人UU
+     */
+    private Long vendUserUU;
+    /**
+     * （买家预先提供的）有效期始
+     */
+    private Date fromDate;
+    /**
+     * （卖家报的）最小订购量
+     */
+    private Double minOrderQty;
+    /**
+     * （卖家报的）最小包装量
+     */
+    private Double minPackQty;
+    /**
+     * （卖家报的）供应商物料编号
+     */
+    private String vendorprodcode;
+    /**
+     * （卖家报的）交货周期（天数）
+     */
+    private Long leadtime;
+    /**
+     * {未回复、已回复}
+     */
+    private Short status;
+    /**
+     * (针对买家的)报价信息传输状态{待上传、已下载}
+     */
+    private Short sendStatus;
+    /**
+     * (针对卖家的)报价信息传输状态{待上传、已下载}
+     */
+    private Short replySendStatus;
+    /**
+     * 是否采纳
+     */
+    private Short agreed;
+    /**
+     * (针对卖家的)是否采纳信息传输状态{待上传、已下载}
+     */
+    private Short decideStatus;
+    /**
+     * (针对卖家的)作废信息传输状态{待上传、已下载}
+     */
+    private Short invalidStatus;
+    /**
+     * 录入时间
+     */
+    private Date date;
+    /**
+     *  报价是否过期
+     */
+    private Short overdue;
+    /**
+     * 应用来源ERP、B2B
+     */
+    private String source;
+    /**
+     * 报价的应用
+     */
+    private String qutoApp;
+    /**
+     * 需求数量
+     */
+    private Double needquantity;
+    /**
+     * erp传输状态
+     *
+     * <pre>erp发出数据传输请求时，赋给状态，完成后更新状态</pre>
+     *
+     * 1、 传输完成<br>
+     * 0、 正在传输
+     *
+     */
+    private Short erpstatus;
+
+	/*这下面是供应商报价时存的相关信息；
+	* 因为存在非客户报价，而且公共服务里面没有企业信息，现存入相关字段，后续处理*/
+    /**
+     * 供应商名称
+     */
+    private String vendName;
+
+    /**
+     * 供应商营业执照
+     */
+    private String businessCode;
+
+    /**
+     * 报价时间
+     */
+    private Date offerTime;
+
+    /**
+     * 分段报价明细
+     */
+    private List<PublicInquiryReplyInfo> replies;
+
+    /**
+     * 截止日期
+     */
+    private Date endDate;
+
+
+    /**
+     * ************* 上传的物料信息，物料冗余字段 *************
+     */
+    /**
+     * 物料编号
+     */
+    private String prodCode;
+
+    /**
+     * 名称
+     */
+    private String prodTitle;
+
+    /**
+     * 规格
+     */
+    private String spec;
+
+    /**
+     * 型号
+     */
+    private String cmpCode;
+
+    /**
+     * 品牌
+     */
+    private String inbrand;
+    /**
+     * ******end*******
+     */
+
+    /**
+     * 剩余时间
+     */
+    private Long remainingTime;
+
+    /**
+     * 报价附件信息
+     */
+    private String attachUrl;
+
+    /**
+     * 报价附件名称
+     */
+    private String attachName;
+
+    /**
+     * 供应商企业信息
+     */
+    private User user;
+
+    /**
+     * 买家发出公共询价单时录入的币别
+     */
+    private String custCurrency;
+
+    /**
+     * 拒绝采纳理由
+     */
+    private String refusereason;
+
+    /******** 替代物料信息  */
+
+    /**
+     * 替代型号
+     */
+    private String replaceCmpCode;
+
+    /**
+     * 替代规格
+     */
+    private String replaceSpec;
+
+    /**
+     * 替代品牌
+     */
+    private String replaceBrand;
+
+    /**
+     * 是否替代物料报价  1 是替代料报价， 0为普通报价
+     */
+    private Short isReplace = 0;
+
+    /**
+     * 总计价格（用于商城bom求购明细价格分析  dongbw  2018年9月5日 14:59:48）
+     */
+    private Double sumPrice;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(Long sourceId) {
+        this.sourceId = sourceId;
+    }
+
+    public Short getNumber() {
+        return number;
+    }
+
+    public void setNumber(Short number) {
+        this.number = number;
+    }
+
+    public PublicInquiryInfo getInquiry() {
+        return inquiry;
+    }
+
+    public void setInquiry(PublicInquiryInfo inquiry) {
+        this.inquiry = inquiry;
+    }
+
+    public Long getUserUU() {
+        return userUU;
+    }
+
+    public void setUserUU(Long userUU) {
+        this.userUU = userUU;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserTel() {
+        return userTel;
+    }
+
+    public void setUserTel(String userTel) {
+        this.userTel = userTel;
+    }
+
+    public Long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Long productId) {
+        this.productId = productId;
+    }
+
+    public Product getProduct() {
+        return product;
+    }
+
+    public void setProduct(Product product) {
+        this.product = product;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public Float getTaxrate() {
+        return taxrate;
+    }
+
+    public void setTaxrate(Float taxrate) {
+        this.taxrate = taxrate;
+    }
+
+    public Long getVendUU() {
+        return vendUU;
+    }
+
+    public void setVendUU(Long vendUU) {
+        this.vendUU = vendUU;
+    }
+
+    public Enterprise getEnterprise() {
+        return enterprise;
+    }
+
+    public void setEnterprise(Enterprise enterprise) {
+        this.enterprise = enterprise;
+    }
+
+    public Long getVendUserUU() {
+        return vendUserUU;
+    }
+
+    public void setVendUserUU(Long vendUserUU) {
+        this.vendUserUU = vendUserUU;
+    }
+
+    public Date getFromDate() {
+        return fromDate;
+    }
+
+    public void setFromDate(Date fromDate) {
+        this.fromDate = fromDate;
+    }
+
+    public Double getMinOrderQty() {
+        return minOrderQty;
+    }
+
+    public void setMinOrderQty(Double minOrderQty) {
+        this.minOrderQty = minOrderQty;
+    }
+
+    public Double getMinPackQty() {
+        return minPackQty;
+    }
+
+    public void setMinPackQty(Double minPackQty) {
+        this.minPackQty = minPackQty;
+    }
+
+    public String getVendorprodcode() {
+        return vendorprodcode;
+    }
+
+    public void setVendorprodcode(String vendorprodcode) {
+        this.vendorprodcode = vendorprodcode;
+    }
+
+    public Long getLeadtime() {
+        return leadtime;
+    }
+
+    public void setLeadtime(Long leadtime) {
+        this.leadtime = leadtime;
+    }
+
+    public Short getStatus() {
+        return status;
+    }
+
+    public void setStatus(Short status) {
+        this.status = status;
+    }
+
+    public Short getSendStatus() {
+        return sendStatus;
+    }
+
+    public void setSendStatus(Short sendStatus) {
+        this.sendStatus = sendStatus;
+    }
+
+    public Short getReplySendStatus() {
+        return replySendStatus;
+    }
+
+    public void setReplySendStatus(Short replySendStatus) {
+        this.replySendStatus = replySendStatus;
+    }
+
+    public Short getAgreed() {
+        return agreed;
+    }
+
+    public void setAgreed(Short agreed) {
+        this.agreed = agreed;
+    }
+
+    public Short getDecideStatus() {
+        return decideStatus;
+    }
+
+    public void setDecideStatus(Short decideStatus) {
+        this.decideStatus = decideStatus;
+    }
+
+    public Short getInvalidStatus() {
+        return invalidStatus;
+    }
+
+    public void setInvalidStatus(Short invalidStatus) {
+        this.invalidStatus = invalidStatus;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public Short getOverdue() {
+        return overdue;
+    }
+
+    public void setOverdue(Short overdue) {
+        this.overdue = overdue;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getQutoApp() {
+        return qutoApp;
+    }
+
+    public void setQutoApp(String qutoApp) {
+        this.qutoApp = qutoApp;
+    }
+
+    public Double getNeedquantity() {
+        return needquantity;
+    }
+
+    public void setNeedquantity(Double needquantity) {
+        this.needquantity = needquantity;
+    }
+
+    public Short getErpstatus() {
+        return erpstatus;
+    }
+
+    public void setErpstatus(Short erpstatus) {
+        this.erpstatus = erpstatus;
+    }
+
+    public String getVendName() {
+        return vendName;
+    }
+
+    public void setVendName(String vendName) {
+        this.vendName = vendName;
+    }
+
+    public String getBusinessCode() {
+        return businessCode;
+    }
+
+    public void setBusinessCode(String businessCode) {
+        this.businessCode = businessCode;
+    }
+
+    public Date getOfferTime() {
+        return offerTime;
+    }
+
+    public void setOfferTime(Date offerTime) {
+        this.offerTime = offerTime;
+    }
+
+    public List<PublicInquiryReplyInfo> getReplies() {
+        return replies;
+    }
+
+    public void setReplies(List<PublicInquiryReplyInfo> replies) {
+        this.replies = replies;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getProdCode() {
+        return prodCode;
+    }
+
+    public void setProdCode(String prodCode) {
+        this.prodCode = prodCode;
+    }
+
+    public String getProdTitle() {
+        return prodTitle;
+    }
+
+    public void setProdTitle(String prodTitle) {
+        this.prodTitle = prodTitle;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getCmpCode() {
+        return cmpCode;
+    }
+
+    public void setCmpCode(String cmpCode) {
+        this.cmpCode = cmpCode;
+    }
+
+    public String getInbrand() {
+        return inbrand;
+    }
+
+    public void setInbrand(String inbrand) {
+        this.inbrand = inbrand;
+    }
+
+    public Long getRemainingTime() {
+        return remainingTime;
+    }
+
+    public void setRemainingTime(Long remainingTime) {
+        this.remainingTime = remainingTime;
+    }
+
+    public String getAttachUrl() {
+        return attachUrl;
+    }
+
+    public void setAttachUrl(String attachUrl) {
+        this.attachUrl = attachUrl;
+    }
+
+    public String getAttachName() {
+        return attachName;
+    }
+
+    public void setAttachName(String attachName) {
+        this.attachName = attachName;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public String getCustCurrency() {
+        return custCurrency;
+    }
+
+    public void setCustCurrency(String custCurrency) {
+        this.custCurrency = custCurrency;
+    }
+
+    public String getRefusereason() {
+        return refusereason;
+    }
+
+    public void setRefusereason(String refusereason) {
+        this.refusereason = refusereason;
+    }
+
+    public String getReplaceCmpCode() {
+        return replaceCmpCode;
+    }
+
+    public void setReplaceCmpCode(String replaceCmpCode) {
+        this.replaceCmpCode = replaceCmpCode;
+    }
+
+    public String getReplaceSpec() {
+        return replaceSpec;
+    }
+
+    public void setReplaceSpec(String replaceSpec) {
+        this.replaceSpec = replaceSpec;
+    }
+
+    public String getReplaceBrand() {
+        return replaceBrand;
+    }
+
+    public void setReplaceBrand(String replaceBrand) {
+        this.replaceBrand = replaceBrand;
+    }
+
+    public Short getIsReplace() {
+        return isReplace;
+    }
+
+    public void setIsReplace(Short isReplace) {
+        this.isReplace = isReplace;
+    }
+
+    public Double getSumPrice() {
+        return sumPrice;
+    }
+
+    public void setSumPrice(Double sumPrice) {
+        this.sumPrice = sumPrice;
+    }
+}

applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PublicInquiryReplyInfo.java

@@ -0,0 +1,52 @@
+package com.usoftchina.saas.inquiry.po.inquiry;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 公共询价单报价明细
+ * @Author chenwei
+ * @Date 2019-03-25
+ */
+public class PublicInquiryReplyInfo implements Serializable {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * （买家或卖家定义的）分段数量
+     */
+    private Double lapQty;
+
+    /**
+     * （卖家报的）单价
+     */
+    private Double price;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Double getLapQty() {
+        return lapQty;
+    }
+
+    public void setLapQty(Double lapQty) {
+        this.lapQty = lapQty;
+    }
+
+    public Double getPrice() {
+        return price;
+    }
+
+    public void setPrice(Double price) {
+        this.price = price;
+    }
+}

applications/transfers/mall-api/src/test/java/com/usoftchina/saas/inquiry/test/InquiryApiTest.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.inquiry.test;
 
+import com.alibaba.fastjson.JSONObject;
 import com.usoftchina.saas.inquiry.api.InquiryApi;
 import com.usoftchina.saas.inquiry.po.inquiry.*;
 import com.usoftchina.saas.utils.JsonUtils;
@@ -194,4 +195,18 @@ public class InquiryApiTest {
             System.out.println("result3: " + sb);
         }
     }
+
+    @Test
+    public void testI_findQuotationList(){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("userUU", null);
+        jsonObject.put("enUU", "10050690");
+        jsonObject.put("fromDate", null);
+        jsonObject.put("endDate", null);
+        jsonObject.put("fromDelivery", null);
+        jsonObject.put("endDelivery", null);
+        String filter = jsonObject.toJSONString();
+        IPage<PublicInquiryItemInfo> publicInquiryItemInfoIPage = inquiryApi.findQuotationList(1, 10, null, "done", 1, filter);
+        System.out.println(JsonUtils.toJsonString(publicInquiryItemInfoIPage));
+    }
 }