Browse Source

主项目无需勾后联动BUG修复

anderx 10 months ago
parent
commit
a60ac4265e

+ 4 - 1
src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml

@@ -715,7 +715,10 @@ project_type = values(project_type)
         <if test="type !=null">
             and a.project_type = #{type}
         </if>
-        and a.bname like concat(#{businessName},'%')
+        <if test="businessName !=null">
+            and a.bname like concat(#{businessName},'%')
+        </if>
+
     </select>
     <select id="selectByTid" resultMap="BusinessProjectMap">
         select

+ 1 - 4
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -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);