From ba382bc1fe0f8a426cccd706433bb206081f92ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Thu, 2 Apr 2026 09:50:07 +0000 Subject: [PATCH] Merge #83 into master from cc_20260330_fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:新管家退款单字段补充修改；三明治门店详细地址获取逻辑修改 * cc_20260330_fix: (12 commits squashed) - fix:日志 - fix:问题修复 - fix:闭店二级审批改为运营片区总顾问 - fix:在营和暂停营业允许发起闭店 - fix:新管家支行接口路径修改 - Merge branch 'master' into cc_20260330_fix # Conflicts: # coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdXgjServiceImpl.java - fix:新管家退款单字段补充修改 - fix:新管家退款单字段补充修改 - Merge branch 'master' into cc_20260330_fix # Conflicts: # coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java - fix:三明治铺位详细地址更新到门店地址字段 - fix:三明治铺位详细地址更新到门店地址字段 - fix:退款账户类型全部改为CORP Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/83 --- .../close/refund/CloseStoreRefundAddRequest.java | 7 ++++++- .../cool/store/service/impl/PointServiceImpl.java | 15 +++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java index e3185ad98..054ff6202 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java @@ -10,12 +10,14 @@ import com.cool.store.request.xgj.XgjReimburseRequest; import com.cool.store.utils.CoolDateUtils; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.commons.collections4.CollectionUtils; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Collections; import java.util.Date; +import java.util.List; /** *

@@ -115,6 +117,9 @@ public class CloseStoreRefundAddRequest { @NotBlank(message = "联行号不能为空") private String bankBranchNo; + @ApiModelProperty("往来单位性质") + private List partnerProperty; + public XgjReimburseRequest convertToXgjRequest(CloseStoreMkUserDTO mkUserDTO, Integer closeReason, StoreDO storeDO) { StoreCloseReasonEnum closeReasonEnum = StoreCloseReasonEnum.getByCode(closeReason); return XgjReimburseRequest.builder() @@ -135,7 +140,7 @@ public class CloseStoreRefundAddRequest { .bankAcctName(businessName) .bankAcctNumber(accountNumber) .bankName(bankName) - .accountType("PERSONAL") + .accountType("CORP") .bankBranchNo(bankBranchNo) .expenseList(Collections.singletonList( XgjReimburseFeeRequest.builder() diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index fe83b2b34..624d242fc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -562,14 +562,6 @@ public class PointServiceImpl implements PointService { if (AuditStatusEnum.REJECT.equals(auditStatus)) { return auditRejectDeal(pointInfo, request.getReason()); } - // 如果是三明治，将地址写入门店信息表 - ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(pointInfo.getShopId()); - if (Objects.nonNull(shopInfo) && Integer.valueOf(shopInfo.getFranchiseBrand()).equals(FranchiseBrandEnum.ZXSMZ.getCode())) { - ShopInfoDO updateShopInfo = new ShopInfoDO(); - updateShopInfo.setId(pointInfo.getShopId()); - updateShopInfo.setDetailAddress(pointInfo.getAddress()); - shopInfoDAO.updateShopInfo(updateShopInfo); - } //处理下一节点任务及更新point状态 return dealNextAuditRecord(pointInfo, pointAuditRecordMap, pointTodo.getNodeNo()); } @@ -1045,6 +1037,13 @@ public class PointServiceImpl implements PointService { updateDetail.setLineSign(request.getLineSign()); updateDetail.setLineSignTime(new Date()); pointDetailInfoDAO.updatePointDetailInfo(updateDetail); + // 如果是三明治，将地址写入门店信息表 + if (Integer.valueOf(shopInfo.getFranchiseBrand()).equals(FranchiseBrandEnum.ZXSMZ.getCode())) { + ShopInfoDO updateShopInfo = new ShopInfoDO(); + updateShopInfo.setId(shopId); + updateShopInfo.setDetailAddress(pointInfo.getAddress()); + shopInfoDAO.updateShopInfo(updateShopInfo); + } List updateStatusList = new ArrayList<>(); //如果铺位是已审核 则进入上传租赁合同状态 if (PointStatusEnum.POINT_STATUS_5.getCode().equals(pointInfo.getPointStatus())) {