diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
index 9930e4cf9..7e9d3aa02 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
@@ -218,6 +218,9 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
         franchiseFeeDO.setXgjFeesPaid(request.getPaidFees());
         if (request.getPayableFee().compareTo(request.getPaidFees())==-1&&XGJCollectionStatusEnum.PARTIAL_PAYMENT.getCode().equals(request.getPaymentStatus())){
             franchiseFeeDO.setXgjRemainderPayableAmount(new BigDecimal("0"));
+            franchiseFeeDO.setXgjCollectionStatus(XGJCollectionStatusEnum.COMPLETED.getCode());
+            //如果多缴费 都缴部分退款或者其他用处 这里缴费费用还是填写所需缴的费用
+            franchiseFeeDO.setXgjFeesPaid(request.getPaidFees().add(request.getRemainingFee()));
             LinePayDO lastPay = linePayMapper.getLastPay(franchiseFeeDO.getShopId());
             lastPay.setRemark(lastPay.getRemark()+"系统监测到您多缴费"+request.getRemainingFee().abs()+"元 请申请退款或留做他用!");
             linePayMapper.updateByPrimaryKeySelective(lastPay);
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
index c4473018d..0ae0e6d0e 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
@@ -171,21 +171,21 @@ public class LinePayServiceImpl implements LinePayService {
         if (request.getId()!=null){
             payIdMap.remove(request.getId());
         }
-        //判断缴费金额不能大于未缴费金额
-        BigDecimal total = payIdMap.values().stream()
-                .map(LinePayDO::getAmount)
-                .reduce(BigDecimal.ZERO, BigDecimal::add);
-        //应缴金额
-        BigDecimal amountDue = new BigDecimal(franchiseFeeDO.getYearFranchiseFee())
-                .add(new BigDecimal(franchiseFeeDO.getLoanMargin()))
-                .add(new BigDecimal(franchiseFeeDO.getFirstYearFee()))
-                .add(new BigDecimal(franchiseFeeDO.getFirstYearManageFee()))
-                .add(new BigDecimal(franchiseFeeDO.getPerformanceBond()));
-        //未缴费金额
-        BigDecimal amountUnpaid = amountDue.subtract(total);
-        if( request.getAmount().compareTo(amountUnpaid) > 0 ){
-            throw new ServiceException(ErrorCodeEnum.PAY_AMOUNT_ERROR);
-        }
+//        //判断缴费金额不能大于未缴费金额
+//        BigDecimal total = payIdMap.values().stream()
+//                .map(LinePayDO::getAmount)
+//                .reduce(BigDecimal.ZERO, BigDecimal::add);
+//        //应缴金额
+//        BigDecimal amountDue = new BigDecimal(franchiseFeeDO.getYearFranchiseFee())
+//                .add(new BigDecimal(franchiseFeeDO.getLoanMargin()))
+//                .add(new BigDecimal(franchiseFeeDO.getFirstYearFee()))
+//                .add(new BigDecimal(franchiseFeeDO.getFirstYearManageFee()))
+//                .add(new BigDecimal(franchiseFeeDO.getPerformanceBond()));
+//        //未缴费金额
+//        BigDecimal amountUnpaid = amountDue.subtract(total);
+//        if( request.getAmount().compareTo(amountUnpaid) > 0 ){
+//            throw new ServiceException(ErrorCodeEnum.PAY_AMOUNT_ERROR);
+//        }
         Set<String> payUserList = list.stream().map(LinePayDO::getPayUserName).collect(Collectors.toSet());
         if (!payUserList.contains(request.getPayUserName()) && payUserList.size() >= 2) {
             throw new ServiceException(ErrorCodeEnum.PAY_USER_NAME_ERROR);