Browse Source

变更新增会员子会员不删除BUG修复

anderx 3 years ago
parent
commit
554d7d9222

+ 2 - 0
src/main/java/com/goafanti/common/dao/TChangeTaskMapper.java

@@ -48,4 +48,6 @@ public interface TChangeTaskMapper {
 
 
     void selectByServiceYear(@Param("serviceYear") String serviceYear, @Param("sliptSuper")Integer sliptSuper, @Param("changeSplitSuper")Integer changeSplitSuper);
+
+    void deleteByChangeSplitSuper(Integer tid);
 }

+ 4 - 0
src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.xml

@@ -43,6 +43,7 @@
     delete from t_change_task
     where id = #{id,jdbcType=INTEGER}
   </delete>
+
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TChangeTask" useGeneratedKeys="true">
     insert into t_change_task (tid, cid, order_no,
       main, commodity_id, commodity_name,
@@ -360,6 +361,9 @@
    <update id="deleteByTid">
   		delete from t_change_task where tid= #{tid};
   </update>
+  <delete id="deleteByChangeSplitSuper">
+    delete from t_change_task where change_split_super= #{tid};
+  </delete>
   <update id="updateMemberByTid">
     update t_change_task
     <set>

+ 7 - 2
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -1065,8 +1065,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 							tChangeDunMapper.updateByTid(tt.getTid(),tt.getCid(),3);
 						}else if (tt.getSplitStatus()==1) {
 							//删除父类下所有的子类
-							tChangeTaskMapper.updateByTid(null,tt.getTid(),tt.getCid(),3);
-							tChangeDunMapper.updateByTid(tt.getTid(),tt.getCid(),3);
+							if (tt.getType()==1){
+								tChangeTaskMapper.deleteByChangeSplitSuper(tt.getTid());
+							}else {
+								tChangeTaskMapper.updateByTid(null,tt.getTid(),tt.getCid(),3);
+								tChangeDunMapper.updateByTid(tt.getTid(),tt.getCid(),3);
+							}
 						}else if(tt.getSplitStatus()==2) {
 							List<TChangeTask> list=tChangeTaskMapper.selectBySuper(tt.getSplitSuper(),null,tt.getCid());
 							boolean flag=true;
@@ -1097,6 +1101,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				}else {
 					if (t.getType()==3) {
 						tChangeTaskMapper.deleteByPrimaryKey(t.getId());
+						tChangeTaskMapper.deleteByChangeSplitSuper(t.getId());
 						tChangeDunMapper.deleteByCtid(t.getId());
 					}
 				}