个人账户发起询价修改

src/main/java/com/uas/ps/inquiry/controller/InquiryForBuyerController.java

@@ -1,6 +1,5 @@
 package com.uas.ps.inquiry.controller;
 
-import com.uas.ps.inquiry.entity.Constant;
 import com.alibaba.fastjson.JSON;
 import com.uas.ps.inquiry.entity.InquiryDetailInfo;
 import com.uas.ps.inquiry.entity.InquiryProductInfo;
@@ -42,7 +41,7 @@ public class InquiryForBuyerController {
     @RequestMapping(value = "/detail", method = RequestMethod.GET)
     public InquiryDetailInfo findById(Long id, Long enuu) {
         long start = System.currentTimeMillis();
-        log.info("/inquiry/buyer/save, 客户查询供应商报价详情, id: {}, enuu: {}, ", id, enuu);
+        log.info("/inquiry/buyer/detail, 客户查询供应商报价详情, id: {}, enuu: {}, ", id, enuu);
         InquiryDetailInfo detailInfo = inquiryService.findById(id, enuu);
         log.info("/inquiry/buyer/detail, 耗时: {}", (System.currentTimeMillis() - start));
         return detailInfo;

src/main/java/com/uas/ps/inquiry/controller/InquiryForSaleController.java

@@ -191,7 +191,7 @@ public class InquiryForSaleController {
 
     /**
      * 分配企业商机
-     *              暂无
+     *              UAS
      * @param userUU
      * @param enRemindId
      * @return
@@ -207,7 +207,7 @@ public class InquiryForSaleController {
 
     /**
      * 分配平台商机
-     *              暂无
+     *              UAS
      * @param userUU
      * @param enUU
      * @param itemId

src/main/java/com/uas/ps/inquiry/controller/PublicApiController.java

@@ -104,9 +104,9 @@ public class PublicApiController {
     @RequestMapping(value = "/sum/all/time", method = RequestMethod.GET)
     public HashMap<String, Object> sumRecentPublishWithTime(Long time) throws Exception {
         long start = System.currentTimeMillis();
-        log.info("/api/sum/publish/time get 参数：time{}", new Date(time));
+        log.info("/api/sum/all/time get 参数：time{}", new Date(time));
         HashMap<String, Object> map = publicInquiryService.sumRecentPublishWithTime(time);
-        log.info("/api/sum/publish/time get 耗时: {}", (System.currentTimeMillis() - start));
+        log.info("/api/sum/all/time get 耗时: {}", (System.currentTimeMillis() - start));
         return map;
     }
 
@@ -119,9 +119,9 @@ public class PublicApiController {
     @RequestMapping(value = "/sum/all/scope", method = RequestMethod.GET)
     public ModelMap sumPublishWithTimeScope(Long starttime, Long endtime) throws Exception {
         long start = System.currentTimeMillis();
-        log.info("/api/sum/publish/scope get 参数：starttime{}, endtime:{}", new Date(starttime), new Date(endtime));
+        log.info("/api/sum/all/scope get 参数：starttime{}, endtime:{}", new Date(starttime), new Date(endtime));
         ModelMap map = publicInquiryService.sumPublishWithTimeScope(starttime, endtime);
-        log.info("/api/sum/publish/scope get 耗时: {}", (System.currentTimeMillis() - start));
+        log.info("/api/sum/all/scope get 耗时: {}", (System.currentTimeMillis() - start));
         return map;
     }
 }

src/main/java/com/uas/ps/inquiry/service/impl/InquiryServiceImpl.java

@@ -266,15 +266,16 @@ public class InquiryServiceImpl implements InquiryService {
                 e.printStackTrace();
             }
         }
-        if (null == currentInquiry.getEnUU()) {
-            throw new IllegalOperatorException("未传入询价企业UU");
-        }
+        // 个人可以发询价
+//        if (null == currentInquiry.getEnUU()) {
+//            throw new IllegalOperatorException("未传入询价企业UU");
+//        }
         //通过流水号和企业号找到公共询价单
         List<PurcInquiry> existInquiryList = purcInquiryDao.findByCodeAndEnUU(currentInquiry.getCode(), currentInquiry.getEnUU());
         if (!CollectionUtils.isEmpty(existInquiryList)) {
             throw new IllegalOperatorException("单号重复");
         } else {
-            if (null == currentInquiry.getEnName()) {
+            if (null == currentInquiry.getEnName() && null != currentInquiry.getEnUU()) {
                 Enterprise e = enterpriseDao.findOne(currentInquiry.getEnUU());
                 if (null != e) {
                     currentInquiry.setEnName(e.getEnName());

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -443,7 +443,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                     formData.put("enUU", item.getInquiry().getEnUU());
                     formData.put("pCmpCode", item.getCmpCode());
                     long start = System.currentTimeMillis();
-                    log.info("enUU和cmpCode获取其他有相同物料的企业号, enUU:{}, code:{]", item.getInquiry().getEnUU(), item.getCmpCode());
+                    log.info("enUU和cmpCode获取其他有相同物料的企业号, enUU:{}, code:{}", item.getInquiry().getEnUU(), item.getCmpCode());
                     HttpUtil.Response res = HttpUtil.sendGetRequest(url, formData);
                     log.info("/product/businessOpportunity , 型号：{}, 耗时：{}", item.getCmpCode(), (System.currentTimeMillis() - start));
                     if (res.getStatusCode() == HttpStatus.OK.value()) {