zhs 3 년 전
부모
커밋
3d47c6a280
2개의 변경된 파일26개의 추가작업 그리고 3개의 파일을 삭제
  1. 22 3
      src/main/java/com/supplier/controller/PrivateOrderController.java
  2. 4 0
      src/main/java/com/supplier/model/Supplier.java

+ 22 - 3
src/main/java/com/supplier/controller/PrivateOrderController.java

@@ -2,6 +2,8 @@ package com.supplier.controller;
 
 import com.supplier.model.Ignore;
 import com.supplier.model.PrivateOrder;
+import com.supplier.model.Supplier;
+import com.supplier.service.PersonalServce;
 import com.supplier.service.PrivateOrderService;
 import com.supplier.util.ParsingToken;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,9 +21,12 @@ import java.util.*;
 @RestController
 @RequestMapping("privateOrder")
 public class PrivateOrderController {
-
+    //订制
     @Autowired
     private PrivateOrderService privateOrderService;
+    //供应商信息
+    @Autowired
+    private PersonalServce personalServce;
 
     /**
      * 查询私人订制
@@ -43,6 +48,14 @@ public class PrivateOrderController {
             int count = 0;
             List<PrivateOrder> list = new ArrayList<PrivateOrder>();
             if(privateOrder.getOrderType() == 0){
+                //后台管理员控制供应商是否能继续接受定制单进行报价
+                Supplier supplier = personalServce.getPresonalMessage((String) userMap.get("code"));
+                if(supplier.getAcceptType().equals("1")){
+                    map.put("count", count);
+                    map.put("data", list);
+                    map.put("msg", "200");
+                    return map;
+                }
                 list = privateOrderService.getPrivateOrderZeor(privateOrder);
                 count = privateOrderService.getPrivateOrderCountZeor(privateOrder);
             } else if(privateOrder.getOrderType() == 2) {
@@ -88,14 +101,20 @@ public class PrivateOrderController {
             int count = 0;
             List<PrivateOrder> list = new ArrayList<PrivateOrder>();
             if(privateOrder.getOrderTypeVal().equals("0")){
+                //后台管理员控制供应商是否能继续接受定制单进行报价
+                Supplier supplier = personalServce.getPresonalMessage((String) userMap.get("code"));
+                if(supplier.getAcceptType().equals("1")){
+                    map.put("count", count);
+                    map.put("data", list);
+                    map.put("msg", "200");
+                    return map;
+                }
                 list = privateOrderService.getPrivateOrderZeorSmall(privateOrder);
                 count = privateOrderService.getPrivateOrderCountZeor(privateOrder);
             } else {
                 count = privateOrderService.getPrivateOrderCountSmall(privateOrder);
                 list = privateOrderService.getPrivateOrderSmall(privateOrder);
             }
-
-
             map.put("count", count);
             map.put("data", list);
             map.put("msg", "200");

+ 4 - 0
src/main/java/com/supplier/model/Supplier.java

@@ -154,4 +154,8 @@ public class Supplier implements Serializable {
      * 条数
      */
     private int limit;
+    /**
+     * 是否接受定制单
+     */
+    private String acceptType;
 }