瀏覽代碼

问题处理

yzc 1 年之前
父節點
當前提交
7cf4844e51

+ 6 - 0
hx-account/src/main/java/com/fjhx/account/service/write/impl/WriteOffRecordsServiceImpl.java

@@ -110,6 +110,12 @@ public class WriteOffRecordsServiceImpl extends ServiceImpl<WriteOffRecordsMappe
                     .setSql("remainder = remainder + " + accountPaymentRecords.getAmount())
             );
         }
+
+
+        //删除打款记录
+        accountPaymentRecordsService.remove(q -> q.eq(AccountPaymentRecords::getAccountPaymentId, accountPayment.getId()));
+
+
         //删除打款对应的流水
         List<AccountRunningWater> accountRunningWaterList = accountRunningWaterService.list(q -> q.eq(AccountRunningWater::getBusinessId, accountPayment.getId()));
         Assert.notEmpty(accountRunningWaterList, "查询不到打款流水信息");

+ 16 - 14
hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -748,20 +748,22 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             throw new ServiceException("销售合同类型为空");
         }
 
-        switch (contractType) {
-            // 外销合同
-            case "1":
-                setExportContractInfo(contractPdfInfoVo, contract);
-                break;
-            // 内销合同
-            case "2":
-                // todo 内销合同实现逻辑
-                break;
-            default:
-                //未知合同类型默认当外销合同处理
-                setExportContractInfo(contractPdfInfoVo, contract);
-//                throw new ServiceException("未知销售合同类型");
-        }
+//        switch (contractType) {
+//            // 外销合同
+//            case "1":
+//                setExportContractInfo(contractPdfInfoVo, contract);
+//                break;
+//            // 内销合同
+//            case "2":
+//                // todo 内销合同实现逻辑
+//                break;
+//            default:
+//                //未知合同类型默认当外销合同处理
+//                setExportContractInfo(contractPdfInfoVo, contract);
+////                throw new ServiceException("未知销售合同类型");
+//        }
+        //赋值pdf信息
+        setExportContractInfo(contractPdfInfoVo, contract);
 
         return contractPdfInfoVo;
     }