1.结算查询bug

src/main/java/com/ydtech/modules/fnc/dao/IncomeTaskRelationshipMapper.java

@@ -10,4 +10,7 @@ import java.util.List;
 @Mapper
 public interface IncomeTaskRelationshipMapper extends BaseMapper<IncomeTaskRelationshipEntity> {
     List<String> getByTaskId(String taskId);
+
+    void deleteByIncomeId(String id);
+
 }

src/main/java/com/ydtech/modules/fnc/service/IncomeTaskRelationshipService.java

@@ -10,4 +10,6 @@ public interface IncomeTaskRelationshipService extends IService<IncomeTaskRelati
 
     List<String> getByTaskId(String taskId);
 
+    void deleteByIncomeId(String id);
+
 }

src/main/java/com/ydtech/modules/fnc/service/impl/IncomeTaskRelationshipServiceImpl.java

@@ -35,4 +35,9 @@ public class IncomeTaskRelationshipServiceImpl extends ServiceImpl<IncomeTaskRel
 
         return baseMapper.getByTaskId(taskId);
     }
+
+    @Override
+    public void deleteByIncomeId(String id) {
+        baseMapper.deleteByIncomeId(id);
+    }
 }

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -1970,6 +1970,7 @@ handlingProportion,
         settlementDocumentaryFeesVo.setInvoicingMethod(insPlyIncomeVo.getInvoicingMethod());  //开票方式
         settlementDocumentaryFeesVo.setTaxPoints(insPlyIncomeVo.getTaxPoints());  //税点
         settlementDocumentaryFeesVo.setExpendAmount(insPlyIncomeVo.getInvoicCommissionFeevalue().multiply(BigDecimal.ONE.subtract(insPlyIncomeVo.getTaxPoints().divide(new BigDecimal(100)))));
+        settlementDocumentaryFeesVo.setTaskId(insPlyIncomeVo.getTaskId());
         settlementDocumentaryFeesVo.setSettlementAmount(insPlyIncomeVo.getSettlementAmount());   //进账金额
         settlementDocumentaryFeesVo.setTotalAmount(insPlyIncomeVo.getInvoicCommissionFeevalue());
         settlementDocumentaryFeesVo.setHandlingFeesStatus("0");
@@ -2369,7 +2370,12 @@ handlingProportion,
             sumUnSettledAmount = sumUnSettledAmount.add(item.getUnSettledAmount());
             sumAllInvoicCommissionFeevalue = sumAllInvoicCommissionFeevalue.add(item.getAllInvoicCommissionFeevalue());
         }
-
+        if(sumCommissionFeevalue.compareTo(sumReadyCommissionFeevalue) <0){
+            sumAllInvoicCommissionFeevalue=sumCommissionFeevalue;
+            sumReadyCommissionFeevalue=sumCommissionFeevalue;
+            sumNoInvoicCommissionFeevalue =sumCommissionFeevalue.subtract(sumAllInvoicCommissionFeevalue);
+            sumUnSettledAmount=sumAllInvoicCommissionFeevalue.subtract(sumReadyCommissionFeevalue);
+        }
         insPlyIncome.setCommissionFeevalue(sumCommissionFeevalue);
         insPlyIncome.setInvoicCommissionFeevalue(sumInvoicCommissionFeevalue);
         insPlyIncome.setReadyCommissionFeevalue(sumReadyCommissionFeevalue);

src/main/java/com/ydtech/modules/fnc/service/impl/SettlementDocumentaryFeesServiceImpl.java

@@ -15,6 +15,7 @@ import com.ydtech.modules.fnc.dao.SettlementDocumentaryFeesMapper;
 import com.ydtech.modules.fnc.entity.InsPlyIncome;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesEntity;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryLogEntity;
+import com.ydtech.modules.fnc.service.IncomeTaskRelationshipService;
 import com.ydtech.modules.fnc.service.SettlementDocumentaryFeesService;
 import com.ydtech.modules.fnc.service.SettlementDocumentaryLogService;
 import com.ydtech.modules.fnc.vo.InsPlyIncomeVo;
@@ -40,6 +41,8 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
     private SettlementDocumentaryLogService settlementDocumentaryLogService;
     @Autowired
     private InsPlyIncomeMapper insPlyIncomeMapper;
+    @Autowired
+    private IncomeTaskRelationshipService  incomeTaskRelationshipService;
 
 
     @Override
@@ -185,6 +188,7 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
      * @param settlementDocumentaryFeesVo
      */
     @Override
+    @Transactional
     public HttpResult<Object> voidInvoicing(SettlementDocumentaryFeesVo settlementDocumentaryFeesVo) {
         SettlementDocumentaryFeesEntity oldSettlementDocumentaryFeesEntity = baseMapper.selectById(settlementDocumentaryFeesVo.getId());
 
@@ -210,9 +214,12 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
             wrapper.set(InsPlyIncome::getSettlementUserId, null);
             wrapper.set(InsPlyIncome::getSettlementTime, null);
             insPlyIncomeMapper.update(item, wrapper);
+
+            incomeTaskRelationshipService.deleteByIncomeId(item.getId());  //作废后删除关系任务表
         }
 
 
+
         SettlementDocumentaryFeesEntity settlementDocumentaryFeesEntity = new SettlementDocumentaryFeesEntity();
         BeanUtils.copyProperties(settlementDocumentaryFeesVo, settlementDocumentaryFeesEntity);
         settlementDocumentaryFeesEntity.setSettlementStatus("3");  // 3  为作废

src/main/resources/mapper/modules/fnc/IncomeTaskRelationshipMapper.xml

@@ -23,7 +23,11 @@
                 </where>
     </select>
 
-
+    <delete id="deleteByIncomeId">
+        delete
+        from income_task_relationship a
+        where a.income_id = #{id}
+    </delete>