From 3602392d8d84b3fa4ec57eb1963fd082ea858e00 Mon Sep 17 00:00:00 2001 From: suzhuhong Date: Mon, 13 Apr 2026 15:19:00 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Abug=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/impl/FranchiseFeeServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 e59872a09..93b12b17a 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 @@ -329,8 +329,10 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { //如果多缴费 都缴部分退款或者其他用处 这里缴费费用还是填写所需缴的费用 franchiseFeeDO.setXgjFeesPaid(request.getPaidFees().add(request.getRemainingFee())); LinePayDO lastPay = linePayMapper.getLastPay(franchiseFeeDO.getShopId()); - lastPay.setRemark(lastPay.getRemark()+"系统监测到您多缴费"+request.getPaidFees().subtract(request.getPayableFee())+"元 请申请退款或留做他用!"); - linePayMapper.updateByPrimaryKeySelective(lastPay); + if (lastPay!=null){ + lastPay.setRemark(lastPay.getRemark()+"系统监测到您多缴费"+request.getPaidFees().subtract(request.getPayableFee())+"元 请申请退款或留做他用!"); + linePayMapper.updateByPrimaryKeySelective(lastPay); + } ShopStageInfoDO shopStageStatus = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_8); if (shopStageStatus!=null&&SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(shopStageStatus.getShopSubStageStatus())){ shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(),stageList);