Эх сурвалжийг харах

移动端报价增加税率和币别

hejq 8 жил өмнө
parent
commit
de4b7ed561

+ 2 - 2
src/main/java/com/uas/ps/inquiry/controller/InquiryForSaleController.java

@@ -165,11 +165,11 @@ public class InquiryForSaleController {
      */
     @HttpLog
     @RequestMapping(value = "/mobile/quote", method = RequestMethod.POST)
-    public ModelMap quote(Long inquiryItemId, Long en_uu, Long useruu, Long leadtime, Double minPackQty, Double minOrderQty, String replies) throws Exception {
+    public ModelMap quote(Long inquiryItemId, Long en_uu, Long useruu, Long leadtime, Double minPackQty, Double minOrderQty, String replies, String currency, Float taxrate) throws Exception {
         List<PublicInquiryReply> replyList = JSONObject.parseArray(replies, PublicInquiryReply.class);
         logger.log("公共询价", "作为卖家,对公共询价进行报价操作", "sourceid: " + inquiryItemId,
                 useruu, en_uu, InquirySource.UU.name());
-        return saleService.quoteInquiry(inquiryItemId, en_uu, useruu, replyList, leadtime, minPackQty, minOrderQty);
+        return saleService.quoteInquiry(inquiryItemId, en_uu, useruu, replyList, leadtime, minPackQty, minOrderQty, currency, taxrate);
     }
 
     /**

+ 4 - 1
src/main/java/com/uas/ps/inquiry/service/InquiryForSaleService.java

@@ -98,9 +98,12 @@ public interface InquiryForSaleService {
      * @param leadtime 交货周期
      * @param minOrderQty 最小订购
      * @param minPackQty 最小包装
+     * @param useruu 个人UU
+     * @param currency 币别
+     * @param taxrate 税率
      * @return
      */
-    ModelMap quoteInquiry(Long id, Long enuu, Long useruu, List<PublicInquiryReply> replies, Long leadtime, Double minPackQty, Double minOrderQty) throws Exception;
+    ModelMap quoteInquiry(Long id, Long enuu, Long useruu, List<PublicInquiryReply> replies, Long leadtime, Double minPackQty, Double minOrderQty, String currency, Float taxrate) throws Exception;
 
     /**
      * 通过分页信息查询询价推荐信息

+ 6 - 2
src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -274,14 +274,16 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
      *
      * @param id      公共询价明细id
      * @param enuu    报价企业UU号
-     * @param useruu
      * @param replies 报价信息
      * @param leadtime 交货周期
      * @param minOrderQty 最小订购
      * @param minPackQty 最小包装
+     * @param useruu 个人UU
+     * @param currency 币别
+     * @param taxrate 税率
      */
     @Override
-    public ModelMap quoteInquiry(Long id, Long enuu, Long useruu, List<PublicInquiryReply> replies, Long leadtime, Double minPackQty, Double minOrderQty) throws Exception {
+    public ModelMap quoteInquiry(Long id, Long enuu, Long useruu, List<PublicInquiryReply> replies, Long leadtime, Double minPackQty, Double minOrderQty,  String currency, Float taxrate) throws Exception {
         ModelMap map = new ModelMap();
         PublicInquiryItem existInquiry = infoDao.findByVendUUAndSourceId(enuu, id);
         if (null != existInquiry) {
@@ -299,6 +301,8 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
         inquiryItem.setLeadtime(leadtime);
         inquiryItem.setQutoApp(InquirySource.UU.name());
         inquiryItem.setReplies(replies);
+        inquiryItem.setCurrency(currency);
+        inquiryItem.setTaxrate(taxrate);
         // 先判断客户询价单是否存在这张单据
         if (CollectionUtils.isEmpty(saleInquiries)) {
             inquiry = new PublicInquiry(item.getInquiry());