查看订单 融合packageid

apply-net/src/main/java/com/winsun/controller/RongHeController.java

@@ -340,7 +340,7 @@ public class RongHeController {
             School school = schoolMapper.selectById(schoolId);
             School school = schoolMapper.selectById(schoolId);
             order.setHehuorenSchool(school.getSchoolName());
             order.setHehuorenSchool(school.getSchoolName());
             order.setHehuorenName(sysUser.getName());
             order.setHehuorenName(sysUser.getName());
-            order.setPackageId(productId);
+//            order.setPackageId(productId);
             order.setHehuorenArea(school.getSubName());
             order.setHehuorenArea(school.getSubName());
             order.setSignImg(filePath);
             order.setSignImg(filePath);
             List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId);
             List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId);

apply-net/src/main/java/com/winsun/controller/SupervisorController.java

@@ -58,7 +58,7 @@ public class SupervisorController {
         if (map.size() == 0) {
         if (map.size() == 0) {
             return ResponseData.error("当前订单不存在！");
             return ResponseData.error("当前订单不存在！");
         }
         }
-        if (map.get("packageId") != null) {
+        if (map.get("packageId") != null && map.get("kapin") != "融合办理") {
             Package aPackage = packageMapper.selectById(Integer.parseInt(map.get("packageId").toString()));
             Package aPackage = packageMapper.selectById(Integer.parseInt(map.get("packageId").toString()));
             map.put("packageName", aPackage.getPackageName());
             map.put("packageName", aPackage.getPackageName());
             map.put("advImg", aPackage.getAdvImg());
             map.put("advImg", aPackage.getAdvImg());

task/src/main/java/com/winsun/TimingTask/OrderTask.java

@@ -245,7 +245,6 @@ public class OrderTask {
 
 
     }
     }
     // 新用户完成存销售清单
     // 新用户完成存销售清单
-    // 新用户完成存销售清单
     public void insertCompleteOrder(Order order){
     public void insertCompleteOrder(Order order){
         try{
         try{
             SysUser sysUser = sysUserMapper.selectById(order.getHehuorenId());
             SysUser sysUser = sysUserMapper.selectById(order.getHehuorenId());