1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

@@ -689,14 +689,16 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
         }
         //确认保证金抵粮款
         else if ("7".equals(expenseInfo.getFlag())) {
-            List<ExpenseInfo> expenseInfoList=this.selectList(new EntityWrapper<ExpenseInfo>()
-            .eq("relation_id",expenseInfo1.getRelationId()));
-            if (!CollectionUtils.isEmpty(expenseInfoList)){
-                for (ExpenseInfo expenseInfo2:expenseInfoList){
-                    expenseInfo2.setStatusFlag(StatusEnum.COMPLETED.getFlag());
-                    expenseInfo2.setStatus(StatusEnum.COMPLETED.getName());
-                    this.updateById(expenseInfo2);
-                }
+            expenseInfo.setStatusFlag(StatusEnum.COMPLETED.getFlag());
+            expenseInfo.setStatus(StatusEnum.COMPLETED.getName());
+            ExpenseInfo expenseInfo2=this.selectOne(new EntityWrapper<ExpenseInfo>()
+            .eq("relation_id",expenseInfo1.getRelationId())
+            .ne("id",expenseInfo.getId()));
+            if (expenseInfo2!=null){
+                expenseInfo2.setStatusFlag(StatusEnum.COMPLETED.getFlag());
+                expenseInfo2.setStatus(StatusEnum.COMPLETED.getName());
+                expenseInfo2.setAddressUrl(expenseInfo.getAddressUrl());
+                this.updateById(expenseInfo2);
             }
         }
         // 主表信息编辑