Просмотр исходного кода

修复会员只派单边的提交的BUG

anderx 1 год назад
Родитель
Сommit
b6a04067c9

+ 6 - 3
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -96,7 +96,6 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
             }
             Integer tid=null;
             for (TOrderTaskBo e : collect2) {
-                e.getServiceLife();
                 //添加判定去掉赠字比对
                 String serviceYear2 = e.getServiceYear();
                 if (serviceYear2.contains("(赠)")){
@@ -162,12 +161,16 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
             }
             Integer tid=null;
             for (TOrderTaskBo e : collect2) {
-                if (e.getServiceYear().equals(serviceYear)){
+                //添加判定去掉赠字比对
+                String serviceYear2 = e.getServiceYear();
+                if (serviceYear2.contains("(赠)")){
+                    serviceYear2=serviceYear2.replace("(赠)", "");
+                }
+                if (serviceYear2.equals(serviceYear)){
                     Map<String,Object> map=new HashMap<>();
                     map.put("serviceYear", e.getServiceYear());
                     map.put("taskName", e.getCommodityName());
                     map.put("id",e.getId());
-
                     list.add(map);
                 }
             }