|
|
@@ -1521,6 +1521,17 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
tChangeTaskMapper.updateByTid(tt.getSplitSuper(),null,tt.getCid(),2,member);
|
|
|
}
|
|
|
}
|
|
|
+ //新增修改时,会员处理
|
|
|
+ List<TChangeTask> tChangeTasks = tChangeTaskMapper.selectBySuper(tt.getTid(), null, tt.getCid());
|
|
|
+ int a=0,b=0,c=0;
|
|
|
+ for (TChangeTask e : tChangeTasks) {
|
|
|
+ if (a==0&&e.getHtMember()!=null&&e.getHtMember()==1)a=e.getHtMember();
|
|
|
+ if (b==0&&e.getAdditionalDeduction()!=null&&e.getAdditionalDeduction()==1)b=e.getAdditionalDeduction();
|
|
|
+ if (c==0&&e.getRdAwardsubsidy()!=null&&e.getRdAwardsubsidy()==1)c=e.getRdAwardsubsidy();
|
|
|
+ }
|
|
|
+ t.setHtMember(a);
|
|
|
+ t.setAdditionalDeduction(b);
|
|
|
+ t.setRdAwardsubsidy(c);
|
|
|
//如果没有tid是新增项目则直接删除
|
|
|
}else {
|
|
|
if (t.getType()==3) {
|
|
|
@@ -1694,9 +1705,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
List<TChangeTask> tChangeTasks = tChangeTaskMapper.selectBySuper(tid, null, tChangeTask.getCid());
|
|
|
int a=0,b=0,c=0;
|
|
|
for (TChangeTask e : tChangeTasks) {
|
|
|
- if (a==0&&e.getHtMember()==1)a=e.getHtMember();
|
|
|
- if (b==0&&e.getAdditionalDeduction()==1)b=e.getAdditionalDeduction();
|
|
|
- if (c==0&&e.getRdAwardsubsidy()==1)c=e.getRdAwardsubsidy();
|
|
|
+ if (a==0&&e.getHtMember()!=null&&e.getHtMember()==1)a=e.getHtMember();
|
|
|
+ if (b==0&&e.getAdditionalDeduction()!=null&&e.getAdditionalDeduction()==1)b=e.getAdditionalDeduction();
|
|
|
+ if (c==0&&e.getRdAwardsubsidy()!=null&&e.getRdAwardsubsidy()==1)c=e.getRdAwardsubsidy();
|
|
|
}
|
|
|
tChangeTask.setHtMember(a);
|
|
|
tChangeTask.setAdditionalDeduction(b);
|