Преглед на файлове

会员进度详情去掉增字比对

anderx преди 1 година
родител
ревизия
ba82e29ae7
променени са 1 файла, в които са добавени 6 реда и са изтрити 2 реда
  1. 6 2
      src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

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

@@ -81,7 +81,6 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
             }
         }
         if (tOrderTask.getProgressTid()==null){
-             taskDetails=taskDetailsMapper.selectByTid(id);
             //首先直接查找,找不到的情况下找订单
             //如果是会员
             TOrderTaskBo thisTask = null;
@@ -98,7 +97,12 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
             Integer tid=null;
             for (TOrderTaskBo e : collect2) {
                 e.getServiceLife();
-                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());