From d71dfb05c525314002c9373b903308bf2d0af462 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 6 Jun 2025 11:34:09 +0800 Subject: [PATCH] =?UTF-8?q?=20//=E5=AE=A1=E6=89=B9=E6=8B=92=E7=BB=9D?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=20=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/dao/LinePayDAO.java | 6 ++++++ .../main/java/com/cool/store/mapper/LinePayMapper.java | 2 ++ .../src/main/resources/mapper/LinePayMapper.xml | 8 ++++++++ .../cool/store/service/impl/DataHandlerServerImpl.java | 6 ++++++ 4 files changed, 22 insertions(+) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java index a85471f59..04b401288 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java @@ -108,4 +108,10 @@ public class LinePayDAO { } return linePayMapper.updateXgjClaimStatus(shopIds,xgjClaimStatus,payBusinessType); } + public Integer deleteByShopId(List shopIds){ + if (CollectionUtils.isEmpty(shopIds)){ + return null; + } + return linePayMapper.deleteByShopId(shopIds); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java index 75c99d824..00ed3bc54 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java @@ -68,4 +68,6 @@ public interface LinePayMapper { Integer dataUpdateLinePay(@Param("list") List linePayDOList); Integer updateXgjClaimStatus(@Param("list") List shopIds,@Param("xgjClaimStatus") Integer xgjClaimStatus,@Param("payBusinessType") Integer payBusinessType); + + Integer deleteByShopId(@Param("list")List shopIds); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml index 0362abba3..a7ad533d9 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml @@ -48,6 +48,14 @@ from xfsg_line_pay where id = #{id,jdbcType=BIGINT} + + update xfsg_line_pay + set deleted = 1 + where shop_id in + + #{item} + + SELECT LAST_INSERT_ID() diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java index 550c2b4e6..fa4a8c811 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java @@ -1070,6 +1070,12 @@ public class DataHandlerServerImpl implements DataHandlerServer { List waitPayStageList = shopStageInfoDAO.getShopStageInfoByShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus()); List waitPayShopIds = waitPayStageList.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList()); franchiseFeeDAO.batchUpdateXgjCollectionStatus(waitPayShopIds, XGJCollectionStatusEnum.WAIT_PAY.getCode()); + //审批拒绝阶段 + List refuseStageList = shopStageInfoDAO.getShopStageInfoByShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_74.getShopSubStageStatus()); + List refuseShopIds = refuseStageList.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList()); + franchiseFeeDAO.batchUpdateXgjCollectionStatus(refuseShopIds, XGJCollectionStatusEnum.WAIT_PAY.getCode()); + linePayDAO.deleteByShopId(refuseShopIds); + shopStageInfoDAO.dataUpdateStatus(refuseShopIds,ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_71); return true; }