Browse Source

合并后清除数据BUG修复

anderx 2 years ago
parent
commit
7d8955b884

+ 2 - 1
src/main/java/com/goafanti/common/dao/TemporaryReceivablesMapper.java

@@ -29,7 +29,7 @@ public interface TemporaryReceivablesMapper {
 
     List<TemporaryReceivables> selectByaid(@Param("aid") String aid,@Param("mergeStatus") Integer mergeStatus);
 
-    void deleteNormalByaid(String aid);
+    void deleteNormalByaid(@Param("aid") String aid,@Param("mergeStatus") Integer mergeStatus);
 
 
 
@@ -44,4 +44,5 @@ public interface TemporaryReceivablesMapper {
     int selectReceivablesNumberRepeats(TemporaryReceivables tr);
 
     void waitngMerge(@Value("list") List<Integer> list);
+
 }

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

@@ -169,7 +169,7 @@
   </delete>
   <delete id="deleteNormalByaid">
   delete from temporary_receivables
-    where aid = #{aid} and status &lt; 2
+    where aid = #{aid} and status &lt; 2 and merge_status =#{mergeStatus}
   </delete>
   <select id="selectByaid" resultMap="BaseResultMap">
     select

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

@@ -242,7 +242,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		}
 		if(!listBull.isEmpty()) {
 			tOrderBillNewMapper.insertBatch(listBull);
-			temporaryReceivablesMapper.deleteNormalByaid(TokenManager.getAdminId());
+			temporaryReceivablesMapper.deleteNormalByaid(TokenManager.getAdminId(),mergeStatus);
 		}else {
 			return -1;
 		}