商机列表增加报价信息/报价采纳拒绝信息返回

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/InquiryReplayDTO.java

@@ -0,0 +1,56 @@
+package com.usoftchina.saas.sale.dto;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author chenwei
+ * @Date 2019/01/08
+ */
+public class InquiryReplayDTO 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;
+    }
+
+    public InquiryReplayDTO(Long id, Double lapQty, Double price) {
+        this.id = id;
+        this.lapQty = lapQty;
+        this.price = price;
+    }
+
+    public InquiryReplayDTO() {
+    }
+}

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/QuotationRspDTO.java

@@ -0,0 +1,46 @@
+package com.usoftchina.saas.sale.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author chenwei
+ * @Date 2019/01/08
+ */
+public class QuotationRspDTO implements Serializable {
+
+    /**
+     * 是否采纳 1 为已采纳 0为已拒绝  空 未处理
+     */
+    private Short agreed;
+    /**
+     * 拒绝采纳理由
+     */
+    private String refusereason;
+
+    private List<InquiryReplayDTO> replies;
+
+    public Short getAgreed() {
+        return agreed;
+    }
+
+    public void setAgreed(Short agreed) {
+        this.agreed = agreed;
+    }
+
+    public String getRefusereason() {
+        return refusereason;
+    }
+
+    public void setRefusereason(String refusereason) {
+        this.refusereason = refusereason;
+    }
+
+    public List<InquiryReplayDTO> getReplies() {
+        return replies;
+    }
+
+    public void setReplies(List<InquiryReplayDTO> replies) {
+        this.replies = replies;
+    }
+}

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/RemindRspDTO.java

@@ -83,6 +83,11 @@ public class RemindRspDTO implements Serializable {
      */
     private Long inquiryId;
 
+    /**
+     * 报价信息
+     */
+    private QuotationRspDTO qutations;
+
     public String getCustName() {
         return custName;
     }
@@ -226,4 +231,12 @@ public class RemindRspDTO implements Serializable {
     public void setInquiryId(Long inquiryId) {
         this.inquiryId = inquiryId;
     }
+
+    public QuotationRspDTO getQutations() {
+        return qutations;
+    }
+
+    public void setQutations(QuotationRspDTO qutations) {
+        this.qutations = qutations;
+    }
 }

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

@@ -3,10 +3,7 @@ package com.usoftchina.saas.sale.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.inquiry.api.InquiryApi;
-import com.usoftchina.saas.inquiry.po.inquiry.IPage;
-import com.usoftchina.saas.inquiry.po.inquiry.InquiryEnRemind;
-import com.usoftchina.saas.inquiry.po.inquiry.InquiryRemind;
-import com.usoftchina.saas.inquiry.po.inquiry.PublicInquiryItem;
+import com.usoftchina.saas.inquiry.po.inquiry.*;
 import com.usoftchina.saas.account.api.AccountApi;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.base.Result;
@@ -779,6 +776,22 @@ public class SaleServiceImpl implements SaleService{
                 remindRspDTO.setRecorderUU(userUU);
                 remindRspDTO.setInquiryCode(inquiryEnRemind.getCode());
                 remindRspDTO.setInquiryId(inquiryEnRemind.getId());
+
+                QuotationRspDTO quotationRspDTO = new QuotationRspDTO();
+                PublicInquiryItem publicInquiryItem = inquiryEnRemind.getQuotation();
+                quotationRspDTO.setAgreed(publicInquiryItem.getAgreed());
+                quotationRspDTO.setRefusereason(publicInquiryItem.getRefusereason());
+                //分段报价明细
+                List<InquiryReplayDTO> inquiryReplayDTOList = new ArrayList<InquiryReplayDTO>();
+                List<PublicInquiryReply> publicInquiryReplyList = publicInquiryItem.getReplies();
+                if (!CollectionUtils.isEmpty(publicInquiryReplyList)) {
+                    for (PublicInquiryReply publicInquiryReply : publicInquiryReplyList) {
+                        InquiryReplayDTO inquiryReplayDTO = new InquiryReplayDTO(publicInquiryReply.getId(), publicInquiryReply.getLapQty(), publicInquiryReply.getPrice());
+                        inquiryReplayDTOList.add(inquiryReplayDTO);
+                    }
+                }
+                quotationRspDTO.setReplies(inquiryReplayDTOList);
+                remindRspDTO.setQutations(quotationRspDTO);
                 remindRspDTOList.add(remindRspDTO);
             }
         }else if("personal".equals(type)){
@@ -808,6 +821,22 @@ public class SaleServiceImpl implements SaleService{
                 remindRspDTO.setRecorderUU(userUU);
                 remindRspDTO.setInquiryCode(inquiryRemind.getCode());
                 remindRspDTO.setInquiryId(inquiryRemind.getId());
+                //报价信息
+                QuotationRspDTO quotationRspDTO = new QuotationRspDTO();
+                PublicInquiryItem publicInquiryItem = inquiryRemind.getQuotation();
+                quotationRspDTO.setAgreed(publicInquiryItem.getAgreed());
+                quotationRspDTO.setRefusereason(publicInquiryItem.getRefusereason());
+                //分段报价明细
+                List<InquiryReplayDTO> inquiryReplayDTOList = new ArrayList<InquiryReplayDTO>();
+                List<PublicInquiryReply> publicInquiryReplyList = publicInquiryItem.getReplies();
+                if (!CollectionUtils.isEmpty(publicInquiryReplyList)) {
+                    for (PublicInquiryReply publicInquiryReply : publicInquiryReplyList) {
+                        InquiryReplayDTO inquiryReplayDTO = new InquiryReplayDTO(publicInquiryReply.getId(), publicInquiryReply.getLapQty(), publicInquiryReply.getPrice());
+                        inquiryReplayDTOList.add(inquiryReplayDTO);
+                    }
+                }
+                quotationRspDTO.setReplies(inquiryReplayDTOList);
+                remindRspDTO.setQutations(quotationRspDTO);
                 remindRspDTOList.add(remindRspDTO);
             }
         }