From b48383cfbab275b7b5c870549d11903908128a07 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 11 八月 2023 13:24:54 +0800
Subject: [PATCH] #核价功能完善

---
 src/main/java/com/zy/crm/manager/controller/PriOnlineController.java |   26 ++++++++++----------------
 1 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java b/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java
index 37dfe12..6f155f2 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java
@@ -5,20 +5,14 @@
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.core.common.DateUtils;
-import com.zy.crm.manager.entity.Item;
-import com.zy.crm.manager.entity.Order;
-import com.zy.crm.manager.entity.Pri;
-import com.zy.crm.manager.entity.PriOnline;
-import com.zy.crm.manager.service.ItemService;
-import com.zy.crm.manager.service.OrderService;
-import com.zy.crm.manager.service.PriOnlineService;
+import com.zy.crm.manager.entity.*;
+import com.zy.crm.manager.service.*;
 import com.core.annotations.ManagerAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
 import com.core.common.R;
 import com.core.domain.KeyValueVo;
 import com.zy.crm.common.web.BaseController;
-import com.zy.crm.manager.service.PriService;
 import com.zy.crm.system.entity.Role;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
@@ -41,7 +35,7 @@
     private PriService priService;
 
     @Autowired
-    private OrderService orderService;
+    private PlanService planService;
 
     @RequestMapping(value = "/priOnline/{id}/auth")
     @ManagerAuth
@@ -137,13 +131,13 @@
         priOnline.setStatus(0);
         //涓氬姟鍛�
 //        Item item = itemService.selectById(priOnline.getItemId());
-        Order order = orderService.selectById(priOnline.getItemId());
-        priOnline.setMemberId(order.getUserId());
+        Plan plan = planService.selectById(priOnline.getItemId());
+        priOnline.setMemberId(plan.getUserId());
 
 
         //璁剧疆椤圭洰娴佺▼
-        order.setStep(2);
-        orderService.updateById(order);
+        plan.setStep(2);
+        planService.updateById(plan);
 
         priOnlineService.insert(priOnline);
         return R.ok();
@@ -174,8 +168,8 @@
         priOnline.setDeptId(getDeptId());
         //涓氬姟鍛�
 //        Item item = itemService.selectById(priOnline.getItemId());
-        Order order = orderService.selectById(priOnline.getItemId());
-        priOnline.setMemberId(order.getUserId());
+        Plan plan = planService.selectById(priOnline.getItemId());
+        priOnline.setMemberId(plan.getUserId());
 
         priOnlineService.insert(priOnline);
         return R.ok();
@@ -312,7 +306,7 @@
         for (PriOnline priOnline : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
             map.put("id", priOnline.getId());
-            map.put("value", priOnline.getOrderNum() + "/" + priOnline.getOrderId$() + "/" + priOnline.getMemberId$());
+            map.put("value", priOnline.getOrderNum() + "/" + priOnline.getPlanId$() + "/" + priOnline.getMemberId$());
             result.add(map);
         }
         return R.ok(result);

--
Gitblit v1.9.1