增加

1、增加部分项目缴费，缴一部分费用功能
修改
1、上传大小修改为220MB

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/biz/ExpenseOrderItemDO.java

@@ -70,12 +70,16 @@ public class ExpenseOrderItemDO {
      * 金额（四舍五入保留两位小数）
      */
     private BigDecimal roundTwoDecimalAmount;
+    /**
+     * 已缴金额
+     */
+    private BigDecimal payAmount;
     /**
      * 数量
      */
     private Integer count;
     /**
-     * 支付状态，0: 未缴费 1：已缴费
+     * 支付状态，0: 未缴费 1：已缴费 2:部分缴费
      */
     private Integer payStatus;
     /**

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ExpenseOrderServiceImpl.java

@@ -404,19 +404,6 @@ public class ExpenseOrderServiceImpl implements ExpenseOrderService {
                     expenseSubsidyAccountMapper.updateById(expenseSubsidyAccountDO);
                 }
             }
-            if(item.getPayType().equals(BusinessConstants.CONSUMER_VOUCHER)){
-                // 查询对应的月份账消费券
-                List<ElderlyConsumerVouchersDO> consumerVouchersDOList = elderlyConsumerVouchersMapper.selectList(new LambdaQueryWrapperX<ElderlyConsumerVouchersDO>()
-                        .eq(ElderlyConsumerVouchersDO::getBillingMonth, expenseOrder.getBillingMonth())
-                        .eq(ElderlyConsumerVouchersDO::getElderId, expenseOrder.getElderId())
-                        .eq(ElderlyConsumerVouchersDO::getReturnStatus, BooleanEnum.FALSE.getValue()));
-                if (CollectionUtil.isNotEmpty(consumerVouchersDOList)) {
-                    for (ElderlyConsumerVouchersDO consumerVouchersDO : consumerVouchersDOList) {
-                        consumerVouchersDO.setReturnStatus(BooleanEnum.TRUE.getValue());
-                    }
-                    elderlyConsumerVouchersMapper.updateBatch(consumerVouchersDOList);
-                }
-            }
 
             //判断是否使用了账户会员卡进行支付
             if (item.getPayType().equals(BusinessConstants.MEMBER_CARD)) {
@@ -457,12 +444,21 @@ public class ExpenseOrderServiceImpl implements ExpenseOrderService {
             item.setTenantId(expenseOrder.getTenantId());
             expensePayOrderItemMapper.insert(item);
         }
-
+        boolean isPartialPay = false;
+        if (items.size() == 1 && items.size() == saveReqVO.getExpenseOrderItems().size()) {
+            isPartialPay = !items.get(0).getPayAmount().equals(saveReqVO.getExpenseOrderItems().get(0).getTotalAmount());
+        }
         //修改勾选的收费项状态
         for (ExpenseOrderItemDO expenseOrderItem : saveReqVO.getExpenseOrderItems()) {
             expenseOrderItem.setPayTime(saveReqVO.getPayTime());
-            expenseOrderItem.setPayStatus(BooleanEnum.TRUE.getValue());
+            expenseOrderItem.setPayStatus(isPartialPay ? 2 :BooleanEnum.TRUE.getValue());
             expenseOrderItem.setPayOrderId(payOrder.getId());
+            // 某个项目部分缴费，只能是一个
+            if(isPartialPay){
+                expenseOrderItem.setPayAmount(items.get(0).getPayAmount());
+            }else {
+                expenseOrderItem.setPayAmount(expenseOrderItem.getTotalAmount());
+            }
             expenseOrderItemMapper.updateById(expenseOrderItem);
 
 
@@ -563,7 +559,7 @@ public class ExpenseOrderServiceImpl implements ExpenseOrderService {
         List<ExpenseOrderItemDO> expenseOrderItems = expenseOrderItemMapper.selectList(new LambdaQueryWrapperX<ExpenseOrderItemDO>()
                 .eq(ExpenseOrderItemDO::getExpenseOrderId, expenseOrder.getId())
                 .eq(ExpenseOrderItemDO::getIsShow, BooleanEnum.TRUE.getValue()));
-        List<ExpenseOrderItemDO> paySuccessCollect = expenseOrderItems.stream().filter(e -> Objects.equals(e.getPayStatus(), BooleanEnum.TRUE.getValue())).collect(Collectors.toList());
+        List<ExpenseOrderItemDO> paySuccessCollect = expenseOrderItems.stream().filter(e -> !Objects.equals(e.getPayStatus(), BooleanEnum.FALSE.getValue())).collect(Collectors.toList());
         if (expenseOrder.getPayableAmount() == null) {
             expenseOrder.setPayableAmount(BigDecimal.ZERO);
         }

yudao-server/src/main/resources/application.yaml

@@ -14,8 +14,8 @@ spring:
   servlet:
     # 文件上传相关配置项
     multipart:
-      max-file-size: 60MB # 单个文件大小
-      max-request-size: 150MB # 设置总上传的文件大小
+      max-file-size: 220MB # 单个文件大小
+      max-request-size: 400MB # 设置总上传的文件大小
 #      location: D:\\
   mvc:
     pathmatch: