Merge branch 'feature-b2b-chenwei-20190111' into dev

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProductServiceImpl.java

@@ -25,8 +25,11 @@ import com.usoftchina.saas.document.entities.*;
 import com.usoftchina.saas.document.mapper.*;
 import com.usoftchina.saas.document.service.*;
 import com.usoftchina.saas.exception.BizException;
+import com.usoftchina.saas.inquiry.api.PublicProductApi;
 import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.transfers.api.SendMessageApi;
 import com.usoftchina.saas.utils.CollectionUtils;
+import com.usoftchina.saas.utils.JsonUtils;
 import com.usoftchina.saas.utils.ObjectUtils;
 import com.usoftchina.saas.utils.RegexpUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,10 +60,10 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
     private ProductunitService productunitService;
     @Autowired
     private ProducttypeService producttypeService;
-    /*@Autowired
-    private SendMessageApi sendMessageApi;*/
-    /*@Autowired
-    private PublicProductApi publicProductApi;*/
+    @Autowired
+    private SendMessageApi sendMessageApi;
+    @Autowired
+    private PublicProductApi publicProductApi;
     @Autowired
     private CompanyApi companyApi;
     @Autowired
@@ -796,7 +799,7 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
      */
     @Override
     public void createProdSaler(ProductSalerDTO productSalerDTO){
-        /*Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
+        Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
         Long userUU = accountApi.getAccountById(BaseContextHolder.getUserId()).getData().getUu();
         ProductSalerUploadDTO productSalerUploadDTO = new ProductSalerUploadDTO(productSalerDTO.getProdId(), productSalerDTO.getProdCode(), enUU, userUU);
         if (productSalerDTO.getOperate() == 0){
@@ -807,7 +810,7 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
             //绑定
             publicProductApi.updateProdSaler(JsonUtils.toJsonString(productSalerDTO));
             productSalerMapper.bind(productSalerDTO.getProdId(), BaseContextHolder.getUserId(), BaseContextHolder.getCompanyId());
-        }*/
+        }
     }
 
     private List<ProductReserveCostDTO> geReserveCost(ListReqDTO listReqDTO) {

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/InquiryAddDTO.java

@@ -14,6 +14,7 @@ public class InquiryAddDTO implements Serializable {
     private String prodSpec;
     private String prodOrispeccode;
     private String prodBrand;
+    private String prodUnit;
     private Long leadTime;
 
     public String getProdCode() {
@@ -56,6 +57,14 @@ public class InquiryAddDTO implements Serializable {
         this.prodBrand = prodBrand;
     }
 
+    public String getProdUnit() {
+        return prodUnit;
+    }
+
+    public void setProdUnit(String prodUnit) {
+        this.prodUnit = prodUnit;
+    }
+
     public Long getLeadTime() {
         return leadTime;
     }

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

@@ -14,7 +14,7 @@ public class QuotationRspDTO implements Serializable {
     private String tel;
     private String replaceOrispeccode;
     private Long leadTime;
-    private Double texRate;
+    private Double taxRate;
     /**
      * 是否采纳 1 为已采纳 0为已拒绝  空 未处理
      */
@@ -66,12 +66,12 @@ public class QuotationRspDTO implements Serializable {
         this.leadTime = leadTime;
     }
 
-    public Double getTexRate() {
-        return texRate;
+    public Double getTaxRate() {
+        return taxRate;
     }
 
-    public void setTexRate(Double texRate) {
-        this.texRate = texRate;
+    public void setTaxRate(Double taxRate) {
+        this.taxRate = taxRate;
     }
 
     public Short getAgreed() {

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/PurchaseApplication.java

@@ -17,8 +17,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 @EnableEurekaClient
 @EnableTransactionManagement
-@EnableFeignClients({"com.usoftchina.saas",
-                     "com.usoftchina.inquiry"})
+@EnableFeignClients("com.usoftchina.saas")
 @EnableAuthClient
 @MapperScan("com.usoftchina.saas.purchase.mapper")
 @EnableDynamicDataSource

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseController.java

@@ -2,7 +2,7 @@ package com.usoftchina.saas.purchase.controller;
 
 
 import com.github.pagehelper.PageInfo;
-import com.usoftchina.inquiry.po.inquiry.IPage;
+import com.usoftchina.saas.inquiry.po.inquiry.IPage;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/PurchaseService.java

@@ -1,7 +1,7 @@
 package com.usoftchina.saas.purchase.service;
 
 import com.github.pagehelper.PageInfo;
-import com.usoftchina.inquiry.po.inquiry.IPage;
+import com.usoftchina.saas.inquiry.po.inquiry.IPage;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -2,11 +2,11 @@ package com.usoftchina.saas.purchase.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.usoftchina.inquiry.api.InquiryApi;
-import com.usoftchina.inquiry.api.SearchApi;
-import com.usoftchina.inquiry.po.inquiry.*;
-import com.usoftchina.inquiry.po.search.ProductEntity;
-import com.usoftchina.inquiry.po.search.SearchComponentResp;
+import com.usoftchina.saas.inquiry.api.InquiryApi;
+import com.usoftchina.saas.inquiry.api.SearchApi;
+import com.usoftchina.saas.inquiry.po.inquiry.*;
+import com.usoftchina.saas.inquiry.po.search.ProductEntity;
+import com.usoftchina.saas.inquiry.po.search.SearchComponentResp;
 import com.usoftchina.saas.account.api.AccountApi;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.account.dto.AccountDTO;
@@ -759,6 +759,16 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
             purcInquiryItem.setProdTitle(inquiryAddDTO.getProdName());
             purcInquiryItem.setSpec(inquiryAddDTO.getProdSpec());
             purcInquiryItem.setInbrand(inquiryAddDTO.getProdBrand());
+            //询价明细  物料信息
+            Product product = new Product();
+            product.setBrand(inquiryAddDTO.getProdBrand());
+            product.setTitle(inquiryAddDTO.getProdName());
+            product.setCmpCode(inquiryAddDTO.getProdOrispeccode());
+            product.setSpec(inquiryAddDTO.getProdSpec());
+            product.setLeadtime(new BigDecimal(inquiryAddDTO.getLeadTime()).doubleValue());
+            product.setCode(inquiryAddDTO.getProdCode());
+            product.setUnit(inquiryAddDTO.getProdUnit());
+            purcInquiryItem.setProduct(product);
 
             Set<PurcInquiryItem> purcInquiryItemSet = new HashSet<PurcInquiryItem>();
             purcInquiryItemSet.add(purcInquiryItem);
@@ -825,12 +835,12 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                     QuotationRspDTO quotationRspDTO = new QuotationRspDTO();
                     quotationRspDTO.setId(publicInquiryItem.getId());
                     quotationRspDTO.setVendName(publicInquiryItem.getVendName());
-                    quotationRspDTO.setTexRate(new BigDecimal(publicInquiryItem.getTaxrate()).doubleValue());
+                    quotationRspDTO.setTaxRate(new BigDecimal(publicInquiryItem.getTaxrate()).doubleValue());
                     quotationRspDTO.setLeadTime(publicInquiryItem.getLeadtime());
-                    quotationRspDTO.setTel(publicInquiryItem.getUserTel());
+                    quotationRspDTO.setTel(publicInquiryItem.getUser().getUserTel());
                     quotationRspDTO.setAgreed(publicInquiryItem.getAgreed());
                     quotationRspDTO.setRefusereason(publicInquiryItem.getRefusereason());
-                    quotationRspDTO.setReplaceOrispeccode(publicInquiryItem.getCmpCode());
+                    quotationRspDTO.setReplaceOrispeccode(publicInquiryItem.getReplaceCmpCode());
                     //分段报价信息
                     List<PublicInquiryReply> publicInquiryReplyList = publicInquiryItem.getReplies();
                     List<InquiryReplayDTO> inquiryReplayDTOList = new ArrayList<InquiryReplayDTO>();

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/RemindReqDTO.java

@@ -19,7 +19,7 @@ public class RemindReqDTO implements Serializable {
     /**
      * 可报价为1  不可报价为0
      */
-    private int enableOffer;
+    private Integer enableOffer;
     /**
      * 搜索关键字
      */
@@ -53,11 +53,11 @@ public class RemindReqDTO implements Serializable {
         this.pageSize = pageSize;
     }
 
-    public int getEnableOffer() {
+    public Integer getEnableOffer() {
         return enableOffer;
     }
 
-    public void setEnableOffer(int enableOffer) {
+    public void setEnableOffer(Integer enableOffer) {
         this.enableOffer = enableOffer;
     }
 

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/SaleApplication.java

@@ -17,8 +17,7 @@ import org.springframework.context.annotation.ComponentScan;
 @SpringBootApplication
 @MapperScan("com.usoftchina.saas.sale.mapper")
 @EnableEurekaClient
-@EnableFeignClients({"com.usoftchina.saas",
-                    "com.usoftchina.inquiry"})
+@EnableFeignClients("com.usoftchina.saas")
 @EnableAuthClient
 @EnableDynamicDataSource
 @ComponentScan(basePackages = {"com.usoftchina.saas"})

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/SaleController.java

@@ -1,8 +1,8 @@
 package com.usoftchina.saas.sale.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.usoftchina.inquiry.po.inquiry.IPage;
-import com.usoftchina.inquiry.po.inquiry.PublicInquiryItem;
+import com.usoftchina.saas.inquiry.po.inquiry.IPage;
+import com.usoftchina.saas.inquiry.po.inquiry.PublicInquiryItem;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
@@ -223,7 +223,7 @@ public class SaleController {
      * @return
      */
     @PostMapping("/businessChance/saveQuote")
-    public Result saveQuote(PublicInquiryItem publicInquiryItem){
+    public Result saveQuote(@RequestBody PublicInquiryItem publicInquiryItem){
         return Result.success(saleService.saveQuote(publicInquiryItem));
     }
 }

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

@@ -1,8 +1,8 @@
 package com.usoftchina.saas.sale.service;
 
 import com.github.pagehelper.PageInfo;
-import com.usoftchina.inquiry.po.inquiry.IPage;
-import com.usoftchina.inquiry.po.inquiry.PublicInquiryItem;
+import com.usoftchina.saas.inquiry.po.inquiry.IPage;
+import com.usoftchina.saas.inquiry.po.inquiry.PublicInquiryItem;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;

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

@@ -2,11 +2,8 @@ package com.usoftchina.saas.sale.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.usoftchina.inquiry.api.InquiryApi;
-import com.usoftchina.inquiry.po.inquiry.IPage;
-import com.usoftchina.inquiry.po.inquiry.InquiryEnRemind;
-import com.usoftchina.inquiry.po.inquiry.InquiryRemind;
-import com.usoftchina.inquiry.po.inquiry.PublicInquiryItem;
+import com.usoftchina.saas.inquiry.api.InquiryApi;
+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;
@@ -737,6 +734,9 @@ public class SaleServiceImpl implements SaleService{
         LOGGER.info("publicInquiryItem, {}", JsonUtils.toJsonString(publicInquiryItem));
         ModelMap modelMap = inquiryApi.saveQuote(publicInquiryItem);
         LOGGER.info("返回结果, ModelMap{}", JsonUtils.toJsonString(modelMap));
+        if ("false".equals(modelMap.get("success"))){
+            throw new BizException(73000, String.valueOf(modelMap.get("message")));
+        }
         return null;
     }
 
@@ -776,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)){
@@ -805,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);
             }
         }

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

@@ -1,6 +1,6 @@
-package com.usoftchina.inquiry.api;
+package com.usoftchina.saas.inquiry.api;
 
-import com.usoftchina.inquiry.po.inquiry.*;
+import com.usoftchina.saas.inquiry.po.inquiry.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.api;
+package com.usoftchina.saas.inquiry.api;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

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

@@ -1,6 +1,6 @@
-package com.usoftchina.inquiry.api;
+package com.usoftchina.saas.inquiry.api;
 
-import com.usoftchina.inquiry.po.search.SearchComponentResp;
+import com.usoftchina.saas.inquiry.po.search.SearchComponentResp;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.api;
+package com.usoftchina.saas.inquiry.api;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.ui.ModelMap;

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.util.Date;
 import java.util.Set;

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 
 import java.io.Serializable;

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import org.springframework.util.CollectionUtils;
 

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 
 import java.io.Serializable;

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.util.*;
 

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.util.*;
 

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.search;
+package com.usoftchina.saas.inquiry.po.search;
 
 
 import java.io.Serializable;

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

@@ -1,9 +1,7 @@
-package com.usoftchina.inquiry.po.search;
+package com.usoftchina.saas.inquiry.po.search;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 商品信息

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

@@ -1,8 +1,6 @@
-package com.usoftchina.inquiry.po.search;
+package com.usoftchina.saas.inquiry.po.search;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.Objects;
 
 /**
  * 物料信息

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

@@ -1,8 +1,6 @@
-package com.usoftchina.inquiry.po.search;
+package com.usoftchina.saas.inquiry.po.search;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.Objects;
 
 /**
  * 分段数量

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

@@ -1,7 +1,6 @@
-package com.usoftchina.inquiry.po.search;
+package com.usoftchina.saas.inquiry.po.search;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 器件查询

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.search;
+package com.usoftchina.saas.inquiry.po.search;
 
 
 import java.io.Serializable;

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

@@ -1,7 +1,7 @@
-package com.usoftchina.inquiry.test;
+package com.usoftchina.saas.inquiry.test;
 
-import com.usoftchina.inquiry.api.InquiryApi;
-import com.usoftchina.inquiry.po.inquiry.*;
+import com.usoftchina.saas.inquiry.api.InquiryApi;
+import com.usoftchina.saas.inquiry.po.inquiry.*;
 import com.usoftchina.saas.utils.JsonUtils;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -55,41 +55,41 @@ public class InquiryApiTest {
     @Test
     public void testD_saveQuote(){
         PublicInquiryItem publicInquiryItem = new PublicInquiryItem();
-        publicInquiryItem.setSourceId(2443698L);
-        publicInquiryItem.setVendUU(10050549L);     //祝通鸿
-        publicInquiryItem.setVendUserUU(1000027410L);   //祝通鸿
+        publicInquiryItem.setSourceId(2443743L);
+        publicInquiryItem.setVendUU(10050572L);     //李剑辉
+        publicInquiryItem.setVendUserUU(1000027286L);   //李剑辉
         publicInquiryItem.setIsReplace((short) 0);
-        publicInquiryItem.setCmpCode("MT8783V");
-        publicInquiryItem.setSpec("MT8783V/CT,VFBGA641,SMD,无卤");
+        publicInquiryItem.setCmpCode("E0400010077");
+        publicInquiryItem.setSpec("");
         publicInquiryItem.setDate(new Date());
-        publicInquiryItem.setEndDate(new Date(System.currentTimeMillis() + 3 * 24 * 60 * 60 * 1000));
-        publicInquiryItem.setInbrand("MTK");
-        publicInquiryItem.setProdTitle("控制器IC");
+        publicInquiryItem.setEndDate(new Date(System.currentTimeMillis() + 2 * 24 * 60 * 60 * 1000));
+        publicInquiryItem.setInbrand("ARROW");
+        publicInquiryItem.setProdTitle("贴片电阻");
         publicInquiryItem.setQutoApp("sp");
         publicInquiryItem.setCurrency("RMB");
-        publicInquiryItem.setLeadtime(3L);
+        publicInquiryItem.setLeadtime(2L);
         publicInquiryItem.setTaxrate(0.16f);
         //分段报价信息
         List<PublicInquiryReply> replyList = new ArrayList<PublicInquiryReply>();
         PublicInquiryReply publicInquiryReply = new PublicInquiryReply();
-        publicInquiryReply.setLapQty(100.0);
-        publicInquiryReply.setPrice(23.13);
+        publicInquiryReply.setLapQty(1.0);
+        publicInquiryReply.setPrice(2.13);
         replyList.add(publicInquiryReply);
         publicInquiryReply = new PublicInquiryReply();
-        publicInquiryReply.setLapQty(200.0);
-        publicInquiryReply.setPrice(22.13);
+        publicInquiryReply.setLapQty(10000.0);
+        publicInquiryReply.setPrice(1.73);
         replyList.add(publicInquiryReply);
 
         //买家采购员信息
-        publicInquiryItem.setUserName("何炎");
-        publicInquiryItem.setUserTel("13978887888");
-        publicInquiryItem.setUserUU(1000012297L);
+        publicInquiryItem.setUserName("陈囿余");
+        publicInquiryItem.setUserTel("13538100180");
+        publicInquiryItem.setUserUU(1000006382L);
         //询价单信息
         PublicInquiry inquiry = new PublicInquiry();
-        inquiry.setId(2293571L);
-        inquiry.setEnUU(10050573L);
-        inquiry.setRecorderUU(1000012297L);
-        inquiry.setCode("sp1546790412000295579");
+        inquiry.setId(2443743L);
+        inquiry.setEnUU(10030994L);
+        inquiry.setRecorderUU(1000006382L);
+        inquiry.setCode("MALL1547178327304");
 
         publicInquiryItem.setInquiry(inquiry);
         publicInquiryItem.setReplies(replyList);

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

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.test;
+package com.usoftchina.saas.inquiry.test;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -9,7 +9,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @Date 2019/01/04
  */
 @SpringBootApplication(scanBasePackages = "com.usoftchina")
-@EnableFeignClients("com.usoftchina.inquiry")
+@EnableFeignClients("com.usoftchina.saas.inquiry")
 public class InquiryTest {
 
     public static void main(String[] args) {

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

@@ -1,6 +1,6 @@
-package com.usoftchina.inquiry.test;
+package com.usoftchina.saas.inquiry.test;
 
-import com.usoftchina.inquiry.api.PublicProductApi;
+import com.usoftchina.saas.inquiry.api.PublicProductApi;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;

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

@@ -1,7 +1,7 @@
-package com.usoftchina.inquiry.test;
+package com.usoftchina.saas.inquiry.test;
 
-import com.usoftchina.inquiry.api.SearchApi;
-import com.usoftchina.inquiry.po.search.SearchComponentResp;
+import com.usoftchina.saas.inquiry.api.SearchApi;
+import com.usoftchina.saas.inquiry.po.search.SearchComponentResp;
 import com.usoftchina.saas.utils.JsonUtils;
 import org.junit.FixMethodOrder;
 import org.junit.Test;

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

@@ -1,6 +1,6 @@
-package com.usoftchina.inquiry.test;
+package com.usoftchina.saas.inquiry.test;
 
-import com.usoftchina.inquiry.api.SearchUUApi;
+import com.usoftchina.saas.inquiry.api.SearchUUApi;
 import com.usoftchina.saas.utils.CollectionUtils;
 import com.usoftchina.saas.utils.JsonUtils;
 import org.junit.FixMethodOrder;

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendProductTask.java

@@ -1,6 +1,6 @@
 package com.usoftchina.saas.transfers.task;
 
-import com.usoftchina.inquiry.api.PublicProductApi;
+import com.usoftchina.saas.inquiry.api.PublicProductApi;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.api.ProductApi;