报价采纳拒绝

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

@@ -8,10 +8,7 @@ import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.page.PageRequest;
-import com.usoftchina.saas.purchase.dto.DeviceDTO;
-import com.usoftchina.saas.purchase.dto.DeviceReqDTO;
-import com.usoftchina.saas.purchase.dto.InquiryReqDTO;
-import com.usoftchina.saas.purchase.dto.PurchaseFormDTO;
+import com.usoftchina.saas.purchase.dto.*;
 import com.usoftchina.saas.purchase.po.PurchaseList;
 import com.usoftchina.saas.purchase.service.PurchaseService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -210,7 +207,8 @@ public class PurchaseController {
      * @return
      */
     @PostMapping("/inquiry/deal")
-    public Result dealInquiry(){
+    public Result dealInquiry(InquiryDealReqDTO inquiryDealReqDTO){
+        purchaseService.DealInquiry(inquiryDealReqDTO);
         return Result.success();
     }
 

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

@@ -151,4 +151,10 @@ public interface PurchaseService extends CommonBaseService<PurchaseMapper, Purch
      * @return
      */
     IPage<InquiryRspDTO> getInquiryList(InquiryReqDTO inquiryReqDTO);
+
+    /**
+     * 报价信息的采纳/拒绝
+     * @param inquiryDealReqDTO
+     */
+    void DealInquiry(InquiryDealReqDTO inquiryDealReqDTO);
 }

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

@@ -693,6 +693,22 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 purcInquiryItemInfoIPage.getTotalElements());
         return remindRspDTOIPage;
     }
+
+    /**
+     * 报价的采纳/拒绝
+     * @param inquiryDealReqDTO
+     */
+    @Override
+    public void DealInquiry(InquiryDealReqDTO inquiryDealReqDTO) {
+        Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
+        Long userUU = accountApi.getAccountById(BaseContextHolder.getUserId()).getData().getUu();
+        if (inquiryDealReqDTO.getStatus() == 1){
+            inquiryApi.adoptQuote(inquiryDealReqDTO.getId(), inquiryDealReqDTO.getStatus(), enUU, userUU);
+        }else{
+            inquiryApi.refuseQuote(inquiryDealReqDTO.getId(), inquiryDealReqDTO.getStatus(), enUU, userUU, inquiryDealReqDTO.getRefusereason());
+        }
+    }
+
     /**
      * 将平台返回的结果集转成SAAS的传输对象
      * @param purcInquiryItemInfoList

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -50,7 +50,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@10.1.81.61:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
 management:
   endpoints:
     web:
@@ -92,4 +92,7 @@ hystrix:
 inquiry:
   base-url: https://test-inquiry.uuzcc.cn
 Component:
-  base-url: https://test-mall.uuzcc.cn
+  base-url: https://test-mall.uuzcc.cn
+logging:
+  level:
+    com.usoftchina.saas.purchase: debug