|
|
@@ -240,7 +240,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if(t.getCommodityPrice()!=null) {
|
|
|
order.setTotalAmount(order.getTotalAmount());
|
|
|
}
|
|
|
-
|
|
|
addTTaskMember(t);
|
|
|
addTaskMid(t);
|
|
|
//如果是会员添加同性质不同项目
|
|
|
@@ -248,9 +247,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
InputAddTask t2=new InputAddTask();
|
|
|
BeanUtils.copyProperties(t,t2);
|
|
|
if (bp.getProjectType().equals(NewProjectTypeEnum.HT.getCode())){
|
|
|
- if (t.getHtMember()==1) {
|
|
|
//会员项目替换
|
|
|
- List<BusinessProjectBo> additionalDeductionList = businessProjectMapper.selectByFirstBName("高新会员", 1);
|
|
|
+ List<BusinessProjectBo> additionalDeductionList = businessProjectMapper.selectByFirstBName(null, 1);
|
|
|
for (BusinessProjectBo e : additionalDeductionList) {
|
|
|
if (!e.getId().equals(t.getCommodityId())) {
|
|
|
t2.setCommodityId(e.getId());
|
|
|
@@ -263,7 +261,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- }
|
|
|
}
|
|
|
if (bp.getProjectType().equals(NewProjectTypeEnum.SIMPLE.getCode())){
|
|
|
List<BusinessProjectBo> list = businessProjectMapper.selectByFirstBName("简单会员", 2);
|