Merge remote-tracking branch 'origin/dev' into dev

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

@@ -413,6 +413,6 @@ public class PublicInquiryController {
     @RequestMapping(value = "/findItemByItemId", method = RequestMethod.GET)
     public PurcInquiryItemInfo findItemByItemId(Long itemId, Long enuu) {
         logger.log("公共询价", "获取询价信息", "id: " + itemId, Constant.UU, enuu, InquirySource.B2B.name());
-        return publicInquiryService.findItemByItemId(itemId);
+        return publicInquiryService.findItemByItemId(itemId, enuu);
     }
 }

src/main/java/com/uas/ps/inquiry/service/PublicInquiryService.java

@@ -219,6 +219,6 @@ public interface PublicInquiryService {
      * @param itemId 明细id
      * @return
      */
-    PurcInquiryItemInfo findItemByItemId(Long itemId);
+    PurcInquiryItemInfo findItemByItemId(Long itemId, Long enuu);
 }
 

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

@@ -940,8 +940,16 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
      * @return
      */
     @Override
-    public PurcInquiryItemInfo findItemByItemId(Long itemId) {
-        return inquiryItemInfoDao.findOne(itemId);
+    public PurcInquiryItemInfo findItemByItemId(Long itemId, Long enuu) {
+        PurcInquiryItemInfo itemInfo = inquiryItemInfoDao.findOne(itemId);
+         PublicInquiryItem item = publicInquiryItemDao.findByVendUUAndSourceId(enuu, itemInfo.getId());
+        itemInfo.setQuoted(Constant.NO);
+        if (null != item) {
+            itemInfo.setAgreed(item.getAgreed());
+            itemInfo.setQuteId(item.getId());
+            itemInfo.setQuoted(Constant.YES);
+        }
+        return itemInfo;
     }
 
     /**

src/main/resources/config/application-cloud.properties

@@ -1,4 +1,4 @@
-datasource.url=jdbc:mysql://10.10.0.208:3306/mall_prod?characterEncoding=utf-8&useSSL=false
+datasource.url=jdbc:mysql://10.10.0.208:8066/mall_prod?characterEncoding=utf-8&useSSL=false
 datasource.username=sa
 datasource.password=Select123!#%*(
 datasource.driverClassName=com.mysql.jdbc.Driver