+ * 闭店账号关闭类型枚举类 + *
+ * + * @author wangff + * @since 2025/10/9 + */ +@Getter +@AllArgsConstructor +public enum AccountCloseTypeEnum { + + DIRECT_CLOSE(0, "直接关闭"), + APPLY_CLOSE(1, "申请关闭"), + ; + + private final Integer type; + + private final String msg; +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreAccountStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreAccountStatusEnum.java new file mode 100644 index 000000000..ca06bc00f --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreAccountStatusEnum.java @@ -0,0 +1,26 @@ +package com.cool.store.enums.close; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + *+ * 闭店账号状态枚举类 + *
+ * + * @author wangff + * @since 2025/10/8 + */ +@Getter +@AllArgsConstructor +public enum CloseStoreAccountStatusEnum { + + IN_USE(1, "使用中"), + CLOSED(2, "已关闭"), + CLOSING(3, "关闭中"), + ; + + private final Integer status; + + private final String msg; +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreAccountTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreAccountTypeEnum.java new file mode 100644 index 000000000..4f1a90130 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreAccountTypeEnum.java @@ -0,0 +1,34 @@ +package com.cool.store.enums.close; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + *+ * 闭店账号类型枚举类 + *
+ * + * @author wangff + * @since 2025/10/8 + */ +@Getter +@AllArgsConstructor +public enum CloseStoreAccountTypeEnum { + + IT_ACCOUNT(0, "IT账号"), + TAKE_OUT_ACCOUNT(1, "外卖账号"), + ; + + private final Integer type; + + private final String msg; + + public static String getMsgByType(Integer type) { + for (CloseStoreAccountTypeEnum value : CloseStoreAccountTypeEnum.values()) { + if (value.getType().equals(type)) { + return value.getMsg(); + } + } + return null; + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreAuditStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreAuditStatusEnum.java new file mode 100644 index 000000000..a609eed65 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreAuditStatusEnum.java @@ -0,0 +1,27 @@ +package com.cool.store.enums.close; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + *+ * 闭店审批状态枚举类 + *
+ * + * @author wangff + * @since 2025/10/8 + */ +@Getter +@AllArgsConstructor +public enum CloseStoreAuditStatusEnum { + + PENDING(0, "待处理"), + PASS(1, "通过"), + REJECTED(2, "拒绝"), + + ; + + private final Integer status; + + private final String msg; +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreFileEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreFileEnum.java new file mode 100644 index 000000000..d7eff679b --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreFileEnum.java @@ -0,0 +1,30 @@ +package com.cool.store.enums.close; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + *+ * 闭店材料 枚举类 + *
+ * + * @author wangff + * @since 2025/11/27 + */ +@Getter +@AllArgsConstructor +public enum CloseStoreFileEnum { + + HT("close_store_file_ht", "合同"), + YJT("close_store_file_yjt", "押金条"), + SQS("close_store_file_sqs", "授权书"), + MTZ("close_store_file_mtz", "门头字摧毁照片"), + TKD("close_store_file_tkd", "退款单"), + SFZ("close_store_file_sfz", "身份证复印件"), + YHK("close_store_file_yhk", "银行卡复印件"), + ; + + private final String code; + + private final String desc; +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreStageEnum.java new file mode 100644 index 000000000..0ada6c799 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreStageEnum.java @@ -0,0 +1,49 @@ +package com.cool.store.enums.close; + +/** + * @Author suzhuhong + * @Date 2025/9/22 11:21 + * @Version 1.0 + */ +public enum CloseStoreStageEnum { + + CLOSE_STORE_STAGE_1(1, "材料上交"), + CLOSE_STORE_STAGE_2(2, "账号关闭"), + CLOSE_STORE_STAGE_3(3, "退款"), + ; + + /** + * 闭店阶段 + */ + private Integer closeStoreStage; + + /** + * 闭店阶段名称 + */ + private String closeStoreName; + + + + CloseStoreStageEnum(Integer closeStoreStage, String closeStoreName) { + this.closeStoreStage = closeStoreStage; + this.closeStoreName = closeStoreName; + } + + public static CloseStoreStageEnum getCloseStoreStageEnum(Integer closeStoreStage) { + for (CloseStoreStageEnum closeStoreStageEnum : CloseStoreStageEnum.values()) { + if (closeStoreStageEnum.getCloseStoreStage().equals(closeStoreStage)) { + return closeStoreStageEnum; + } + } + return null; + } + + + public Integer getCloseStoreStage() { + return closeStoreStage; + } + + public String getCloseStoreName() { + return closeStoreName; + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreStatusEnum.java new file mode 100644 index 000000000..a0b54e7fe --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreStatusEnum.java @@ -0,0 +1,81 @@ +package com.cool.store.enums.close; + +/** + * @Author suzhuhong + * @Date 2025/9/22 18:57 + * @Version 1.0 + */ +public enum CloseStoreStatusEnum { + // 督导审批中 + UNDER_APPROVAL(1, "审批中"), + // 大区老总审批中 + MANAGER_UNDER_APPROVAL(2, "审批中"), + REVIEW_NOT_APPROVED(5, "审批拒绝"), + CANCELED(10, "已取消"), + CLOSING(15, "闭店中"), + COMPLETED(20, "已完成"), + + ; + private Integer closeStoreStatus; + + private String closeStoreStatusName; + + + CloseStoreStatusEnum(Integer closeStoreStatus, String closeStoreStatusName) { + this.closeStoreStatus = closeStoreStatus; + this.closeStoreStatusName = closeStoreStatusName; + } + + public Integer getCloseStoreStatus() { + return closeStoreStatus; + } + + public String getCloseStoreStatusName() { + return closeStoreStatusName; + } + + public static CloseStoreStatusEnum getByCloseStoreStatus(Integer closeStoreStatus){ + for (CloseStoreStatusEnum value : CloseStoreStatusEnum.values()) { + if (value.getCloseStoreStatus().equals(closeStoreStatus)){ + return value; + } + } + return null; + } + + public static String getNameByStatus(Integer closeStoreStatus) { + for (CloseStoreStatusEnum value : CloseStoreStatusEnum.values()) { + if (value.getCloseStoreStatus().equals(closeStoreStatus)){ + return value.getCloseStoreStatusName(); + } + } + return null; + } + + /** + * 获取下一个审批通过状态 + * @param status 审批状态 + * @return 审批状态 + */ + public static Integer getNextPassStatus(Integer status) { + CloseStoreStatusEnum currentStatus = getByCloseStoreStatus(status); + if (currentStatus == null) { + throw new IllegalArgumentException("闭店申请状态为空"); + } + switch (currentStatus) { + case UNDER_APPROVAL: + return MANAGER_UNDER_APPROVAL.getCloseStoreStatus(); + case MANAGER_UNDER_APPROVAL: + return CLOSING.getCloseStoreStatus(); + case CLOSING: + return COMPLETED.getCloseStoreStatus(); + default: + return null; + } + } + + public static boolean isApprove(Integer status) { + return CloseStoreStatusEnum.UNDER_APPROVAL.getCloseStoreStatus().equals(status) + || CloseStoreStatusEnum.MANAGER_UNDER_APPROVAL.getCloseStoreStatus().equals(status); + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageEnum.java new file mode 100644 index 000000000..37de0ec29 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageEnum.java @@ -0,0 +1,132 @@ +package com.cool.store.enums.close; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * @author zhangchenbiao + * @FileName: ShopStageEnum + * @Description:店铺阶段 + * @date 2024-04-10 17:34 + */ +public enum CloseStoreSubStageEnum { + + CLOSE_STORE_SUB_STAGE_10(CloseStoreStageEnum.CLOSE_STORE_STAGE_1, 10, "关店所需材料上交", 1), + CLOSE_STORE_SUB_STAGE_20(CloseStoreStageEnum.CLOSE_STORE_STAGE_2, 20, "账号关闭", 2), + CLOSE_STORE_SUB_STAGE_30(CloseStoreStageEnum.CLOSE_STORE_STAGE_3, 30, "押金退款", 3), + CLOSE_STORE_SUB_STAGE_40(CloseStoreStageEnum.CLOSE_STORE_STAGE_3, 40, "货款退款", 3), + ; + + /** + * 阶段 + */ + private CloseStoreStageEnum closeStoreStageEnum; + + /** + * 子阶段 + */ + private Integer closeStoreSubStage; + + /** + * 子阶段名称 + */ + private String closeStoreSubStageName; + + /** + * 计划完成天数 + */ + private Integer planCompleteDays; + + CloseStoreSubStageEnum(CloseStoreStageEnum closeStoreStageEnum, Integer closeStoreSubStage, String closeStoreSubStageName, Integer planCompleteDays) { + this.closeStoreStageEnum = closeStoreStageEnum; + this.closeStoreSubStage = closeStoreSubStage; + this.closeStoreSubStageName = closeStoreSubStageName; + this.planCompleteDays = planCompleteDays; + } + + + public static List+ * 闭店材料状态 枚举类 + *
+ * + * @author wangff + * @since 2025/11/26 + */ +@Getter +@AllArgsConstructor +public enum FileStatusEnum { + + NOT_UPLOAD(0, "未上传"), + QUALIFIED(1, "合格"), + UNQUALIFIED(2, "不合格"), + UPLOADED(3, "已上传"), + APPROVING(4, "审批中"), + MODIFIED(5, "已修改"), + ; + + private final Integer status; + + private final String desc; + + public static String getDescByStatus(Integer status) { + for (FileStatusEnum value : FileStatusEnum.values()) { + if (value.status.equals(status)) { + return value.desc; + } + } + return null; + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/close/RecordTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/RecordTypeEnum.java new file mode 100644 index 000000000..16c9724ee --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/RecordTypeEnum.java @@ -0,0 +1,30 @@ +package com.cool.store.enums.close; + +/** + * @Author suzhuhong + * @Date 2025/9/23 13:45 + * @Version 1.0 + */ +public enum RecordTypeEnum { + + CLOSE_STORE_RECORD_TYPE_10(1, "申请提交"), + CLOSE_STORE_RECORD_TYPE_20(2, "审批操作"), + ; + + private Integer recordType; + + private String recordTypeName; + + RecordTypeEnum(Integer recordType, String recordTypeName) { + this.recordType = recordType; + this.recordTypeName = recordTypeName; + } + + public Integer getRecordType() { + return recordType; + } + + public String getRecordTypeName() { + return recordTypeName; + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/close/RefundPayStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/RefundPayStatusEnum.java new file mode 100644 index 000000000..0f0dc5a2f --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/RefundPayStatusEnum.java @@ -0,0 +1,37 @@ +package com.cool.store.enums.close; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + *+ * 退款支付状态枚举类 + *
+ * + * @author wangff + * @since 2025/12/1 + */ +@Getter +@AllArgsConstructor +public enum RefundPayStatusEnum { + + APPROVING("APPROVING", "审批中"), + ABANDON("ABANDON", "作废"), + SETTLEMENT("SETTLEMENT", "结算中"), + PAY_SUCCESS("PAY_SUCCESS", "支付成功"), + PAY_FAIL("PAY_FAIL", "支付失败"), + ; + + private final String status; + + private final String desc; + + public static String getDescByStatus(String status) { + for (RefundPayStatusEnum value : values()) { + if (value.status.equals(status)) { + return value.desc; + } + } + return ""; + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/close/XgjRefundPayStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/XgjRefundPayStatusEnum.java new file mode 100644 index 000000000..47c8f179f --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/XgjRefundPayStatusEnum.java @@ -0,0 +1,29 @@ +package com.cool.store.enums.close; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + *+ * 新管家退管单支付状态枚举类 + *
+ * + * @author wangff + * @since 2025/11/28 + */ +@Getter +@AllArgsConstructor +public enum XgjRefundPayStatusEnum { + + APPROVING("APPROVING", "审批中"), + ABANDON("ABANDON", "作废"), + SETTLEMENT("SETTLEMENT", "结算中"), + PAY_SUCCESS("PAY_SUCCESS", "支付成功"), + PAY_FAIL("PAY_FAIL", "支付失败"), + REJECTED("REJECTED", "驳回") + ; + + private final String status; + + private final String desc; +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/master/StoreCloseNatureEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/master/StoreCloseNatureEnum.java new file mode 100644 index 000000000..529bc58d9 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/master/StoreCloseNatureEnum.java @@ -0,0 +1,39 @@ +package com.cool.store.enums.master; + +import com.cool.store.enums.close.CloseTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + *+ * 门店闭店性质枚举类 + *
+ * + * @author wangff + * @since 2025/9/16 + */ +@Getter +@AllArgsConstructor +public enum StoreCloseNatureEnum { + // 这里的描述跟标品略微不同，但是描述不要改！！！跟每刻保持一致！！！ + REQUIRE_CLOSE(0, "我们管理要求闭店", CloseTypeEnum.NO_ORDER_AUTO), + + ONESELF_CLOSE(1, "加盟商自行闭店", CloseTypeEnum.INITIATE), + ; + + + private final Integer code; + + private final String desc; + + private final CloseTypeEnum closeType; + + public static String getDescByCode(Integer code) { + for (StoreCloseNatureEnum value : StoreCloseNatureEnum.values()) { + if (value.code.equals(code)) { + return value.desc; + } + } + return null; + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/master/StoreCloseReasonEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/master/StoreCloseReasonEnum.java new file mode 100644 index 000000000..79c3fe32f --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/master/StoreCloseReasonEnum.java @@ -0,0 +1,57 @@ +package com.cool.store.enums.master; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + *+ * 门店闭店原因枚举类 + *
+ * + * @author wangff + * @since 2025/9/16 + */ +@Getter +@AllArgsConstructor +public enum StoreCloseReasonEnum { + // 这里的描述跟标品略微不同，但是描述不要改！！！跟每刻保持一致！！！ + REASON0(0, "不进货（外购）", StoreCloseNatureEnum.REQUIRE_CLOSE), + REASON1(1, "门店形象差（不升级）", StoreCloseNatureEnum.REQUIRE_CLOSE), + REASON2(2, "顾客投诉率高", StoreCloseNatureEnum.REQUIRE_CLOSE), + REASON3(3, "加盟老板失联", StoreCloseNatureEnum.REQUIRE_CLOSE), + REASON4(4, "其他严重违反加盟规定", StoreCloseNatureEnum.REQUIRE_CLOSE), + REASON5(5, "卫生操作不达标", StoreCloseNatureEnum.REQUIRE_CLOSE), + + REASON6(6, "人员不足", StoreCloseNatureEnum.ONESELF_CLOSE), + REASON7(7, "商圈转移或拆迁", StoreCloseNatureEnum.ONESELF_CLOSE), + REASON8(8, "生意差", StoreCloseNatureEnum.ONESELF_CLOSE), + REASON9(9, "房东不租", StoreCloseNatureEnum.ONESELF_CLOSE), + REASON19(10, "想转行或想长休", StoreCloseNatureEnum.ONESELF_CLOSE), + + ; + + + private final Integer code; + + private final String desc; + + private final StoreCloseNatureEnum closeNature; + + public static String getDescByCode(Integer code) { + for (StoreCloseReasonEnum value : StoreCloseReasonEnum.values()) { + if (value.code.equals(code)) { + return value.desc; + } + } + return null; + } + + public static StoreCloseReasonEnum getByCode(Integer code) { + for (StoreCloseReasonEnum value : StoreCloseReasonEnum.values()) { + if (value.code.equals(code)) { + return value; + } + } + return null; + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/BeanUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/BeanUtil.java index 4d6936f79..60afd26c8 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/BeanUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/BeanUtil.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.copier.CopyOptions; import com.github.pagehelper.PageInfo; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -51,4 +52,13 @@ public class BeanUtil extends cn.hutool.core.bean.BeanUtil { newPage.setList(list); return newPage; } + + public static void copyPropertiesIgnoreId(Object source, Object target, String... ignoreProperties) { + if (source == null || target == null) { + return; + } + String[] mergedIgnoreProperties = Arrays.copyOf(ignoreProperties, ignoreProperties.length + 1); + mergedIgnoreProperties[ignoreProperties.length] = "id"; + copyProperties(source, target, mergedIgnoreProperties); + } } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java index e66faa121..df0471985 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java @@ -161,6 +161,13 @@ public class CoolDateUtils { return LocalDate.now().format(getDateFormatter(DATE_FORMAT_DAY)); } + /** + * 获取当前时间字符串 (yyyy-MM-dd HH:mm:ss) + */ + public static String getCurrentDateTime() { + return LocalDateTime.now().format(getDateFormatter(DATE_FORMAT_SEC)); + } + /** * 获取上月同一天的日期字符串 (yyyy-MM-dd) * 如果上个月没有同一天(如当前是3月31日，但2月没有31日)，则返回上个月的最后一天 diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/RocketMqUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/RocketMqUtil.java index 4ff5d3615..059983b81 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/RocketMqUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/RocketMqUtil.java @@ -22,16 +22,16 @@ import java.util.stream.Collectors; @Slf4j public class RocketMqUtil { - private static final String INSTANCE_ID = "MQ_INST_1947409023213164_BX3sLZnA"; + private static final String INSTANCE_ID = "MQ_INST_1748142459508127_BZfpFxuJ"; /** * 本地 */ private static final String LOCAL_INSTANCE_ID = "MQ_INST_1255228665351616_BX3wfyPO"; - private static final String INSTANCE_ID_ONLINE_HD_PRE = "MQ_INST_1947409023213164_BX5N7rwl"; - private static final String ACCESS_KEY = "LTAI5tJbgtyoHUvofTaeP1RP"; - private static final String ACCESS_SECRET = "myg755iCx0j4PyQkHMaUVeOr0bw1tA"; + private static final String INSTANCE_ID_ONLINE_HD_PRE = "MQ_INST_1748142459508127_BZegx2xc"; + private static final String ACCESS_KEY = "LTAI5tGBwmXwZkMuHK4MudMJ"; + private static final String ACCESS_SECRET = "bnZoUMRQ9834STgz5E291YrqlBu6yn"; /** * 使用AK&SK初始化账号Client * @param accessKeyId @@ -61,6 +61,11 @@ public class RocketMqUtil { return new Client(config); } + public static void main(String[] args) throws Exception { +// initGroup("local"); +// initOnlineAndHdAndPreGroup("online"); + } + /** * 新增测试、开发环境的group * @author chenyupeng diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/CloseStoreAccountInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/CloseStoreAccountInfoDAO.java new file mode 100644 index 000000000..48b65066e --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/CloseStoreAccountInfoDAO.java @@ -0,0 +1,75 @@ +package com.cool.store.dao; + +import com.alibaba.fastjson.JSONObject; +import com.cool.store.constants.RedisConstant; +import com.cool.store.entity.CloseStoreAccountInfoDO; +import com.cool.store.mapper.CloseStoreAccountInfoMapper; +import com.cool.store.utils.RedisUtilPool; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import tk.mybatis.mapper.entity.Example; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2025/9/22 16:54 + * @Version 1.0 + */ +@Repository +@RequiredArgsConstructor +public class CloseStoreAccountInfoDAO { + private final CloseStoreAccountInfoMapper closeStoreAccountInfoMapper; + private final RedisUtilPool redisUtilPool; + + /** + * 根据闭店申请id查询 + * @param closeStoreId 闭店申请id + * @return 账号列表 + */ + public List+ * 闭店资料详情DAO + *
+ * + * @author wangff + * @since 2025/10/7 + */ +@RequiredArgsConstructor +@Repository +public class CloseStoreFileDetailDAO { + private final CloseStoreFileDetailMapper closeStoreFileDetailMapper; + + /** + * 新增或编辑闭店资料邮寄地址信息 + * @param request 闭店资料邮寄地址信息Request + * @return boolean + */ + public boolean insertOrUpdateMailAddress(CloseStoreMailAddressRequest request) { + return closeStoreFileDetailMapper.insertOrUpdateMailAddress(request) > 0; + } + + /** + * 新增或编辑闭店资料邮寄信息 + * @param request 闭店资料邮寄信息Request + * @param mailStatus 邮寄状态 + */ + public void insertOrUpdateMailInfo(CloseStoreMailInfoRequest request, Boolean mailStatus) { + closeStoreFileDetailMapper.insertOrUpdateMailInfo(request, mailStatus); + } + + /** + * 新增或编辑闭店资料信息 + * + * @param request 闭店材料审批Request + */ + public void insertOrUpdateFileInfoSelective(CloseStoreFileApproveRequest request, Boolean approveComplete) { + closeStoreFileDetailMapper.insertOrUpdateFileInfoSelective(request, approveComplete); + } + + /** + * 根据闭店申请id查询 + * @param closeStoreId 闭店申请id + * @return 闭店资料详情 + */ + public CloseStoreFileDetailDO getByCloseStoreId(Long closeStoreId) { + return closeStoreFileDetailMapper.selectOne(CloseStoreFileDetailDO.builder().closeStoreId(closeStoreId).build()); + } + + /** + * 初始化数据 + * @param closeStoreId 闭店申请id + */ + public void init(Long closeStoreId) { + CloseStoreFileDetailDO detailDO = CloseStoreFileDetailDO.builder().closeStoreId(closeStoreId).build(); + closeStoreFileDetailMapper.insertSelective(detailDO); + } + + public void updateByCloseStoreIdSelective(CloseStoreFileDetailDO detailDO) { + Example example = new Example(CloseStoreFileDetailDO.class); + example.createCriteria().andEqualTo("closeStoreId", detailDO.getCloseStoreId()); + closeStoreFileDetailMapper.updateByExampleSelective(detailDO, example); + } +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/CloseStoreFileInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/CloseStoreFileInfoDAO.java new file mode 100644 index 000000000..6030f43d7 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/CloseStoreFileInfoDAO.java @@ -0,0 +1,87 @@ +package com.cool.store.dao; + +import com.alibaba.fastjson.JSONObject; +import com.cool.store.constants.RedisConstant; +import com.cool.store.entity.CloseStoreFileInfoDO; +import com.cool.store.enums.close.FileStatusEnum; +import com.cool.store.mapper.CloseStoreFileInfoMapper; +import com.cool.store.utils.RedisUtilPool; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import tk.mybatis.mapper.entity.Example; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2025/9/22 16:53 + * @Version 1.0 + */ +@Repository +@RequiredArgsConstructor +public class CloseStoreFileInfoDAO { + private final CloseStoreFileInfoMapper closeStoreFileInfoMapper; + private final RedisUtilPool redisUtilPool; + + /** + * 批量更新 + * @param list 实体列表 + * @return boolean + */ + public boolean updateBatch(List+ * 闭店退款信息DAO + *
+ * + * @author wangff + * @since 2025/10/13 + */ +@Repository +@RequiredArgsConstructor +public class CloseStoreRefundInfoDAO { + private final CloseStoreRefundInfoMapper closeStoreRefundInfoMapper; + + /** + * 根据id查询 + */ + public CloseStoreRefundInfoDO getById(Long id) { + return closeStoreRefundInfoMapper.selectByPrimaryKey(id); + } + + /** + * 更新退款状态 + * @param id id + * @param refundStatus 退款状态 + */ + public void updateRefundStatus(Long id, String refundStatus, Date refundTime) { + closeStoreRefundInfoMapper.updateByPrimaryKeySelective(CloseStoreRefundInfoDO.builder().id(id).refundStatus(refundStatus).refundTime(refundTime).build()); + } + + /** + * 根据id批量更新退款状态 + * @param list 退款信息列表 + */ + public void updateRefundStatusBatchById(List+ * 每刻用户信息DTO + *
+ * + * @author wangff + * @since 2025/11/28 + */ +@Data +public class CloseStoreMkUserDTO { + /** + * 名称 + */ + private String name; + + /** + * 工号 + */ + private String jobnumber; + + /** + * 部门编码 + */ + private String depCode; + + /** + * 部门名称 + */ + private String depName; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreMasterIssueDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreMasterIssueDTO.java new file mode 100644 index 000000000..ce1562300 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreMasterIssueDTO.java @@ -0,0 +1,30 @@ +package com.cool.store.dto.store; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + *+ * 门店主数据下发DTO + *
+ * + * @author wangff + * @since 2025/10/10 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class StoreMasterIssueDTO { + /** + * 企业id + */ + private String enterpriseId; + + /** + * 门店id列表 + */ + private List+ * 新管家支行DTO + *
+ * + * @author wangff + * @since 2025/12/1 + */ +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class XgjBranchBankDTO { + @ApiModelProperty("银行名称") + private String matchBankName; + + @ApiModelProperty("支行号") + private String basBankNo; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/xgj/XgjPartnerAccountDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/xgj/XgjPartnerAccountDTO.java new file mode 100644 index 000000000..81bc3e8a0 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/xgj/XgjPartnerAccountDTO.java @@ -0,0 +1,32 @@ +package com.cool.store.dto.xgj; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *+ * 新管家供应商账户信息DTO + *
+ * + * @author wangff + * @since 2025/11/28 + */ +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class XgjPartnerAccountDTO { + @ApiModelProperty("账户名称") + private String accountName; + + @ApiModelProperty("银行账号") + private String accountNumber; + + @ApiModelProperty("开户银行") + private String bankName; + + @ApiModelProperty("开户支行号") + private String bankBranchNo; + + @ApiModelProperty("账户类型") + private String accountType; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/xgj/XgjPartnerDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/xgj/XgjPartnerDTO.java new file mode 100644 index 000000000..ecda12762 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/xgj/XgjPartnerDTO.java @@ -0,0 +1,43 @@ +package com.cool.store.dto.xgj; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + *+ * 新管家供应商DTO + *
+ * + * @author wangff + * @since 2025/11/28 + */ +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class XgjPartnerDTO { + @ApiModelProperty("父节点名称") + private String parentName; + + @ApiModelProperty("父节点编码") + private String parentBizCode; + + @ApiModelProperty("往来单位名称") + private String name; + + @ApiModelProperty("往来单位英文名") + private String nameEN; + + @ApiModelProperty("往来单位编码") + private String businessCode; + + @ApiModelProperty("往来单位关系") + private List+ * 新管家分页DTO + *
+ * + * @author wangff + * @since 2025/11/28 + */ +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class XgjPartnerPageDTO { + @ApiModelProperty("是否有下一页") + private Boolean hasNextPage; + + @ApiModelProperty("列表") + private List+ * 信管家支付结果DTO + *
+ * + * @author wangff + * @since 2025/12/3 + */ +@Data +public class XgjPayResultDTO { + /** + * {@link XgjRefundPayStatusEnum#getStatus()} + */ + @ApiModelProperty("支付状态") + private String status; + + @ApiModelProperty("msg") + private String message; + + @ApiModelProperty("每刻订单号") + private String outNo; + + @ApiModelProperty("支付成功时间，yyyy-MM-dd HH:mm:ss") + private String paySuccessTime; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/xgj/XgjPaymentDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/xgj/XgjPaymentDTO.java new file mode 100644 index 000000000..26e61b9d5 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/xgj/XgjPaymentDTO.java @@ -0,0 +1,33 @@ +package com.cool.store.dto.xgj; + +import com.cool.store.enums.close.XgjRefundPayStatusEnum; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *+ * 新管家单据支付结果DTO + *
+ * + * @author wangff + * @since 2025/11/28 + */ +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class XgjPaymentDTO { + @ApiModelProperty("每刻单号") + private String outNo; + + @ApiModelProperty("新管家单号") + private String orderNo; + + /** + * {@link XgjRefundPayStatusEnum#getStatus()} + */ + @ApiModelProperty("支付状态") + private String status; + + @ApiModelProperty("反馈信息") + private String message; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreAccountInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreAccountInfoDO.java new file mode 100644 index 000000000..15e466c21 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreAccountInfoDO.java @@ -0,0 +1,70 @@ +package com.cool.store.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "zxjp_close_store_account_info") +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class CloseStoreAccountInfoDO { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + /** + * 闭店申请ID + */ + @Column(name = "close_store_id") + private Long closeStoreId; + + /** + * 系统名称 + */ + @Column(name = "system_name") + private String systemName; + + /** + * 系统code + */ + @Column(name = "system_code") + private String systemCode; + + /** + * 账号分类，0-IT账号，1-外卖账号 + */ + @Column(name = "account_type") + private Integer accountType; + + /** + * 状态：1-使用中, 2-已关闭, 3-关闭中 + */ + @Column(name = "status") + private Integer status; + + /** + * 关闭类型，0直接关闭，1申请关闭 + */ + @Column(name = "close_type") + private Integer closeType; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; + + +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreAuditRecordDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreAuditRecordDO.java new file mode 100644 index 000000000..71ae2a6c0 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreAuditRecordDO.java @@ -0,0 +1,92 @@ +package com.cool.store.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "zxjp_close_store_audit_record") +@Data@Builder +@NoArgsConstructor +@AllArgsConstructor +public class CloseStoreAuditRecordDO { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + /** + * 闭店申请ID + */ + @Column(name = "close_store_id") + private Long closeStoreId; + + /** + * 记录类型：1-申请提交，2-审批操作 + */ + @Column(name = "record_type") + private Integer recordType; + + /** + * 备注 + */ + @Column(name = "action_remark") + private String actionRemark; + + /** + * 实际处理人 + */ + @Column(name = "handler_user_id") + private String handlerUserId; + + /** + * 实际处理人名称 + */ + @Column(name = "handler_user_name") + private String handlerUserName; + + /** + * 处理人集合 + */ + @Column(name = "handler_user_ids") + private String handlerUserIds; + + /** + * 收到任务时间 + */ + @Column(name = "receive_task_time") + private Date receiveTaskTime; + + /** + * 完成任务时间 + */ + @Column(name = "finish_task_time") + private Date finishTaskTime; + + /** + * 审核状态 0待处理,1通过,2拒绝 + */ + @Column(name = "audit_status") + private Integer auditStatus; + + /** + * 删除标识 + */ + private Integer deleted; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新时间 + */ + @Column(name = "updated_time") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreFileDetailDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreFileDetailDO.java new file mode 100644 index 000000000..e2984f665 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreFileDetailDO.java @@ -0,0 +1,115 @@ +package com.cool.store.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import javax.persistence.*; + +/** + *+ * 闭店资料详情 + *
+ * + * @author wangff + * @since 2025/10/7 + */ +@Table(name = "zxjp_close_store_file_detail") +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class CloseStoreFileDetailDO { + /** + * id + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + /** + * 闭店申请ID + */ + @Column(name = "close_store_id") + private Long closeStoreId; + + /** + * 审批完成状态 + */ + @Column(name = "approve_complete") + private Integer approveComplete; + + /** + * 邮件单号 + */ + @Column(name = "mail_number") + private String mailNumber; + + /** + * 邮件状态，0未邮寄，1已邮寄 + */ + @Column(name = "mail_status") + private Integer mailStatus; + + /** + * 快递公司 + */ + @Column(name = "mail_company") + private String mailCompany; + + /** + * 材料邮寄地址 + */ + @Column(name = "mail_address") + private String mailAddress; + + /** + * 收件人 + */ + @Column(name = "mail_addressee") + private String mailAddressee; + + /** + * 收件人手机号 + */ + @Column(name = "mail_mobile") + private String mailMobile; + + /** + * 户名 + */ + @Column(name = "bank_account") + private String bankAccount; + + /** + * 开户行 + */ + @Column(name = "bank_opening") + private String bankOpening; + + /** + * 退款账号 + */ + @Column(name = "refund_account") + private String refundAccount; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 督导审批意见 + */ + @Column(name = "remark") + private String remark; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreFileInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreFileInfoDO.java new file mode 100644 index 000000000..e511658f5 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreFileInfoDO.java @@ -0,0 +1,80 @@ +package com.cool.store.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "zxjp_close_store_file_info") +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class CloseStoreFileInfoDO { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + /** + * 闭店申请ID + */ + @Column(name = "close_store_id") + private Long closeStoreId; + + /** + * 资料code + */ + @Column(name = "file_code") + private String fileCode; + + /** + * 资料名称 + */ + @Column(name = "file_name") + private String fileName; + + /** + * 邮件状态 + */ + @Column(name = "mail_status") + private Integer mailStatus; + + /** + * 材料审批状态 1-合格 2-不合格 + */ + @Column(name = "approve_status") + private Integer approveStatus; + + /** + * 材料状态 0-未上传 1-合格 2-不合格 3-已上传 4-审批中 5-已修改 + */ + @Column(name = "file_status") + private Integer fileStatus; + + /** + * 审批意见 + */ + @Column(name = "approve_opinion") + private String approveOpinion; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 图片列表 + */ + @Column(name = "urls") + private String urls; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreInfoDO.java new file mode 100644 index 000000000..b7ee3ee80 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreInfoDO.java @@ -0,0 +1,98 @@ +package com.cool.store.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "zxjp_close_store_info") +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class CloseStoreInfoDO { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + /** + * 闭店申请单号 + */ + @Column(name = "close_store_no") + private String closeStoreNo; + + /** + * 门店ID + */ + @Column(name = "store_id") + private String storeId; + + /** + * 区域ID + */ + @Column(name = "region_id") + private Long regionId; + + /** + * 计划闭店日期 + */ + @Column(name = "plan_close_data") + private Date planCloseData; + + /** + * 实际闭店日期 + */ + @Column(name = "actual_close_data") + private Date actualCloseData; + + /** + * 闭店发起方式 1-主动发起 2-云流水发起 + */ + @Column(name = "close_type") + private Integer closeType; + + /** + * 闭店原因 + */ + @Column(name = "close_reason") + private Integer closeReason; + + /** + * 闭店原因说明 + */ + @Column(name = "reason_description") + private String reasonDescription; + + /** + * 闭店状态 1-审批中 5-审核未通过 10-进行中 15已完成 20-已取消 + */ + @Column(name = "close_status") + private Integer closeStatus; + + /** + * 督导 + */ + @Column(name = "supervisor_user_id") + private String supervisorUserId; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 发起人id + */ + @Column(name = "apply_user_id") + private String applyUserId; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreRefundInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreRefundInfoDO.java new file mode 100644 index 000000000..83d37eee1 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreRefundInfoDO.java @@ -0,0 +1,190 @@ +package com.cool.store.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.Date; +import javax.persistence.*; + +@Table(name = "zxjp_close_store_refund_info") +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class CloseStoreRefundInfoDO { + /** + * id + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + /** + * 闭店申请id + */ + @Column(name = "close_store_id") + private Long closeStoreId; + + /** + * 退款申请单号 + */ + @Column(name = "refund_no") + private String refundNo; + + /** + * 退款类型(闭店子阶段code) + */ + private Integer type; + + /** + * 退款状态 + */ + @Column(name = "refund_status") + private String refundStatus; + + /** + * 每刻退款单号 + */ + @Column(name = "refund_order_no") + private String refundOrderNo; + + /** + * 退款时间 + */ + @Column(name = "refund_time") + private Date refundTime; + + /** + * 公司抬头 + */ + @Column(name = "invoice_title") + private String invoiceTitle; + + /** + * 提交人id + */ + @Column(name = "submitter_id") + private String submitterId; + + /** + * 提交人名称 + */ + @Column(name = "submitter_name") + private String submitterName; + + /** + * 退款事由 + */ + @Column(name = "refund_reason") + private String refundReason; + + /** + * 退款类型，加盟部/加盟公司等 + */ + @Column(name = "refund_type") + private String refundType; + + /** + * 退款项目，加盟关店设备退款/加盟关店费用等 + */ + @Column(name = "refund_project") + private String refundProject; + + /** + * 其他说明 + */ + private String remark; + + /** + * 退款加盟商编码 + */ + @Column(name = "business_code") + private String businessCode; + + /** + * 退款加盟商名称 + */ + @Column(name = "business_name") + private String businessName; + + /** + * 退款加盟商收款账户 + */ + @Column(name = "business_account") + private String businessAccount; + + /** + * 费用类型code + */ + @Column(name = "expense_type_code") + private String expenseTypeCode; + + /** + * 费用申请日期 + */ + @Column(name = "expense_apply_time") + private Date expenseApplyTime; + + /** + * 应退金额 + */ + @Column(name = "expected_amount") + private BigDecimal expectedAmount; + + /** + * 实退金额 + */ + @Column(name = "actual_amount") + private BigDecimal actualAmount; + + /** + * 扣款金额 + */ + @Column(name = "deduct_amount") + private BigDecimal deductAmount; + + /** + * 扣款原因 + */ + @Column(name = "deduct_reason") + private String deductReason; + + /** + * 闭店原因 + */ + @Column(name = "close_reason") + private Integer closeReason; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 银行账户 + */ + @Column(name = "account_number") + private String accountNumber; + + /** + * 开户行 + */ + @Column(name = "bank_name") + private String bankName; + + /** + * 联行号 + */ + @Column(name = "bank_branch_no") + private String bankBranchNo; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreStageInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreStageInfoDO.java new file mode 100644 index 000000000..0ead7337b --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreStageInfoDO.java @@ -0,0 +1,92 @@ +package com.cool.store.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "zxjp_close_store_stage_info") +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class CloseStoreStageInfoDO { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + /** + * 闭店申请ID + */ + @Column(name = "close_store_id") + private Long closeStoreId; + + /** + * 闭店阶段 + */ + @Column(name = "shop_stage") + private Integer shopStage; + + /** + * 闭店子阶段 + */ + @Column(name = "shop_sub_stage") + private Integer shopSubStage; + + /** + * 店铺阶段状态 + */ + @Column(name = "shop_sub_stage_status") + private Integer shopSubStageStatus; + + /** + * 当前阶段是否结束 0未结束 1已结束 + */ + @Column(name = "is_terminated") + private Integer isTerminated; + + /** + * 预估完成时间 + */ + @Column(name = "plan_complete_time") + private String planCompleteTime; + + /** + * 实际完成时间 + */ + @Column(name = "actual_complete_time") + private String actualCompleteTime; + + /** + * 备注 + */ + private String remark; + + /** + * xfsg_shop_audit_info.id + */ + @Column(name = "audit_id") + private Long auditId; + + /** + * 删除标识 + */ + private Integer deleted; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; + + +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/store/StoreMasterSignerInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/store/StoreMasterSignerInfoDO.java index f3518fc6f..69f5450f5 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/store/StoreMasterSignerInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/store/StoreMasterSignerInfoDO.java @@ -18,6 +18,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor +@Table(name = "store_master_signer_info_${enterpriseId}") public class StoreMasterSignerInfoDO implements Serializable { @ApiModelProperty("主键") private Long id; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreFileApproveRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreFileApproveRequest.java new file mode 100644 index 000000000..bf08bca0c --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreFileApproveRequest.java @@ -0,0 +1,42 @@ +package com.cool.store.request.close.file; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + *+ * 闭店材料审批Request + *
+ * + * @author wangff + * @since 2025/10/7 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class CloseStoreFileApproveRequest { + @ApiModelProperty(value = "闭店申请id", required = true) + @NotNull(message = "闭店申请id不能为空") + private Long closeStoreId; + + @ApiModelProperty("材料信息列表") + @NotEmpty(message = "材料信息列表不能为空") + private List+ * 闭店审批Request + *
+ * + * @author wangff + * @since 2025/11/26 + */ +@Data +public class CloseStoreFileAuditRequest { + @ApiModelProperty("闭店申请id") + @NotNull(message = "闭店申请id不能为空") + private Long closeStoreId; + + @ApiModelProperty("审批状态 1通过 2拒绝") + @NotNull(message = "审批状态不能为空") + private Integer status; + + @ApiModelProperty("审批意见") + private String remark; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreFileInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreFileInfoRequest.java new file mode 100644 index 000000000..cf5597712 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreFileInfoRequest.java @@ -0,0 +1,46 @@ +package com.cool.store.request.close.file; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + *+ * 闭店材料信息Request + *
+ * + * @author wangff + * @since 2025/10/7 + */ +@Data +public class CloseStoreFileInfoRequest { + @ApiModelProperty("闭店申请id") + @NotNull(message = "闭店申请id不能为空") + private Long closeStoreId; + + @ApiModelProperty("闭店材料id") + @NotNull(message = "闭店材料id不能为空") + private Long id; + + @ApiModelProperty("邮件状态 0-未邮寄 1已邮寄") + private Integer mailStatus; + + @ApiModelProperty("材料审批状态 1-合格 2-不合格") + private Integer approveStatus; + + @ApiModelProperty("审批意见") + private String approveOpinion; + + @ApiModelProperty("图片列表") + private String urls; + + @ApiModelProperty("户名") + private String bankAccount; + + @ApiModelProperty("开户行") + private String bankOpening; + + @ApiModelProperty("退款账号") + private String refundAccount; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreFileSubmitRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreFileSubmitRequest.java new file mode 100644 index 000000000..4eec07d50 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreFileSubmitRequest.java @@ -0,0 +1,28 @@ +package com.cool.store.request.close.file; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + *+ * 闭店材料提交Request + *
+ * + * @author wangff + * @since 2025/11/26 + */ +@Data +public class CloseStoreFileSubmitRequest { + @ApiModelProperty("闭店申请id") + @NotNull(message = "闭店申请id不能为空") + private Long closeStoreId; + + @ApiModelProperty("闭店材料id") + @NotNull(message = "闭店材料id不能为空") + private Long id; + + @ApiModelProperty("图片列表，逗号隔开") + private String urls; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreMailAddressRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreMailAddressRequest.java new file mode 100644 index 000000000..fe37770ed --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreMailAddressRequest.java @@ -0,0 +1,30 @@ +package com.cool.store.request.close.file; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + *+ * 闭店资料邮寄地址信息Request + *
+ * + * @author wangff + * @since 2025/10/7 + */ +@Data +public class CloseStoreMailAddressRequest { + @ApiModelProperty(value = "闭店申请ID", required = true) + @NotNull(message = "闭店申请ID不能为空") + private Long closeStoreId; + + @ApiModelProperty("材料邮寄地址") + private String mailAddress; + + @ApiModelProperty("收件人") + private String mailAddressee; + + @ApiModelProperty("收件人手机号") + private String mailMobile; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreMailInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreMailInfoRequest.java new file mode 100644 index 000000000..72baeaf99 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreMailInfoRequest.java @@ -0,0 +1,29 @@ +package com.cool.store.request.close.file; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + *+ * 闭店资料邮寄信息Request + *
+ * + * @author wangff + * @since 2025/10/7 + */ +@Data +public class CloseStoreMailInfoRequest { + @ApiModelProperty(value = "闭店申请ID", required = true) + @NotNull(message = "闭店申请ID不能为空") + private Long closeStoreId; + + @ApiModelProperty(value = "邮件单号", required = true) + @NotBlank(message = "邮件单号不能为空") + private String mailNumber; + + @ApiModelProperty("快递公司") + private String mailCompany; +} 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 new file mode 100644 index 000000000..28c3bd644 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java @@ -0,0 +1,141 @@ +package com.cool.store.request.close.refund; + +import com.cool.store.dto.close.CloseStoreMkUserDTO; +import com.cool.store.entity.CloseStoreRefundInfoDO; +import com.cool.store.entity.StoreDO; +import com.cool.store.enums.master.StoreCloseReasonEnum; +import com.cool.store.request.xgj.XgjReimburseFeeRequest; +import com.cool.store.request.xgj.XgjReimburseRequest; +import com.cool.store.utils.CoolDateUtils; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.math.BigDecimal; +import java.util.Collections; +import java.util.Date; + +/** + *+ * 闭店退款新增Request + *
+ * + * @author wangff + * @since 2025/10/13 + */ +@Data +public class CloseStoreRefundAddRequest { + @ApiModelProperty("闭店申请id") + @NotNull(message = "闭店申请id不能为空") + private Long closeStoreId; + + @ApiModelProperty("退款类型") + @NotNull(message = "退款类型不能为空") + private Integer type; + + @ApiModelProperty("公司抬头，字典表close_store_invoice_title") + @NotBlank(message = "公司抬头") + private String invoiceTitle; + + @ApiModelProperty("提交人每刻工号") + private String submitterId; + + @ApiModelProperty("提交人名称") + private String submitterName; + + @ApiModelProperty("退款事由") + @NotBlank(message = "退款事由") + private String refundReason; + + @ApiModelProperty("退款类型，字典表编码close_store_refund_type") + @NotBlank(message = "退款类型不能为空") + private String refundType; + + @ApiModelProperty("其他说明") + private String remark; + + @ApiModelProperty("退款加盟商编码") + @NotBlank(message = "退款加盟商编码不能为空") + private String businessCode; + + @ApiModelProperty("退款加盟商名称") + @NotBlank(message = "退款加盟商名称不能为空") + private String businessName; + + @ApiModelProperty("退款加盟商收款账户") + @NotBlank(message = "退款加盟商收款账户不能为空") + private String businessAccount; + + @ApiModelProperty("退款项目，type=30固定为'加盟关店费用'，type=40固定为'加盟关店贷款退款'") + @NotBlank(message = "退款项目不能为空") + private String refundProject; + + @ApiModelProperty("费用申请日期") + @NotNull(message = "费用申请日期不能为空") + private Date expenseApplyTime; + + @ApiModelProperty("费用类型code，测试环境目前写死'04.006'") + @NotBlank(message = "费用类型code不能为空") + private String expenseTypeCode; + + @ApiModelProperty("应退金额") + @NotNull(message = "应退金额不能为空") + private BigDecimal expectedAmount; + + @ApiModelProperty("实退金额") + @NotNull(message = "实退金额不能为空") + private BigDecimal actualAmount; + + @ApiModelProperty("扣款金额") + @NotNull(message = "扣款金额不能为空") + private BigDecimal deductAmount; + + @ApiModelProperty("扣款原因") + private String deductReason; + + @ApiModelProperty("银行账户") + @NotBlank(message = "银行账户不能为空") + private String accountNumber; + + @ApiModelProperty("开户行") + @NotBlank(message = "开户行不能为空") + private String bankName; + + @ApiModelProperty("联行号") + @NotBlank(message = "联行号不能为空") + private String bankBranchNo; + + public XgjReimburseRequest convertToXgjRequest(CloseStoreMkUserDTO mkUserDTO, Integer closeReason, StoreDO storeDO) { + StoreCloseReasonEnum closeReasonEnum = StoreCloseReasonEnum.getByCode(closeReason); + return XgjReimburseRequest.builder() + .legalEntity(invoiceTitle) + .coverUser(mkUserDTO.getJobnumber()) + .reimburseName(refundReason) + .cf175(refundType) + .cf176(refundProject) + .cf333(closeReasonEnum.getCloseNature().getDesc()) + .cf334(closeReasonEnum.getDesc()) + .cf177(storeDO.getStoreNum()) + .cf178(storeDO.getStoreName()) + .comments(remark) + .tradingPartner(businessCode) + .cf242("375|其他合法收入——资金退还") + .cf243("") + .bankAcctNumber(accountNumber) + .bankName(bankName) + .accountType("BANK") + .bankBranchNo(bankBranchNo) + .expenseList(Collections.singletonList( + XgjReimburseFeeRequest.builder() + .expenseTypeCode(expenseTypeCode) + .consumeAmount(expectedAmount) + .refundAmount(actualAmount) + .deductionAmount(deductAmount) + .consumeTime(CoolDateUtils.DateFormat(expenseApplyTime, "yyyy-MM-dd HH:mm:ss")) + .build() + )) + .build(); + } +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundQueryRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundQueryRequest.java new file mode 100644 index 000000000..9092195a9 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundQueryRequest.java @@ -0,0 +1,26 @@ +package com.cool.store.request.close.refund; + +import com.cool.store.common.PageBasicInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + *+ * 闭店退款查询Request + *
+ * + * @author wangff + * @since 2025/12/2 + */ +@Data +public class CloseStoreRefundQueryRequest extends PageBasicInfo { + @ApiModelProperty("闭店申请id") + @NotNull(message = "闭店申请id不能为空") + private Long closeStoreId; + + @ApiModelProperty("退款类型，30/40") + @NotNull(message = "退款类型不能为空") + private Integer type; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundSkipRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundSkipRequest.java new file mode 100644 index 000000000..cadad4d37 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundSkipRequest.java @@ -0,0 +1,21 @@ +package com.cool.store.request.close.refund; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *+ * 退款流程跳过Request + *
+ * + * @author wangff + * @since 2025/12/3 + */ +@Data +public class CloseStoreRefundSkipRequest { + @ApiModelProperty("闭店申请id") + private Long closeStoreId; + + @ApiModelProperty("退款类型，30/40") + private Integer type; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundUpdateRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundUpdateRequest.java new file mode 100644 index 000000000..36dc140e4 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundUpdateRequest.java @@ -0,0 +1,100 @@ +package com.cool.store.request.close.refund; + +import com.cool.store.dto.close.CloseStoreMkUserDTO; +import com.cool.store.entity.CloseStoreRefundInfoDO; +import com.cool.store.entity.StoreDO; +import com.cool.store.enums.master.StoreCloseReasonEnum; +import com.cool.store.request.xgj.XgjReimburseFeeRequest; +import com.cool.store.request.xgj.XgjReimburseRequest; +import com.cool.store.utils.CoolDateUtils; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Collections; +import java.util.Date; + +/** + *+ * 闭店退款更新Request + *
+ * + * @author wangff + * @since 2025/10/13 + */ +@Data +public class CloseStoreRefundUpdateRequest { + @ApiModelProperty("退款记录id") + @NotNull(message = "退款记录id不能为空") + private Long id; + + @ApiModelProperty("闭店申请id") + @NotNull(message = "闭店申请id不能为空") + private Long closeStoreId; + + @ApiModelProperty("公司抬头，字典表close_store_invoice_title") + @NotBlank(message = "公司抬头") + private String invoiceTitle; + + @ApiModelProperty("提交人每刻工号") + private String submitterId; + + @ApiModelProperty("提交人名称") + private String submitterName; + + @ApiModelProperty("退款事由") + @NotBlank(message = "退款事由") + private String refundReason; + + @ApiModelProperty("退款类型，字典表编码close_store_refund_type") + @NotBlank(message = "退款类型不能为空") + private String refundType; + + @ApiModelProperty("其他说明") + private String remark; + + @ApiModelProperty("退款加盟商编码") + @NotBlank(message = "退款加盟商编码不能为空") + private String businessCode; + + @ApiModelProperty("退款加盟商名称") + @NotBlank(message = "退款加盟商名称不能为空") + private String businessName; + + @ApiModelProperty("费用申请日期") + @NotNull(message = "费用申请日期不能为空") + private Date expenseApplyTime; + + @ApiModelProperty("费用类型code，测试环境目前写死'04.006'") + @NotBlank(message = "费用类型code不能为空") + private String expenseTypeCode; + + @ApiModelProperty("应退金额") + @NotNull(message = "应退金额不能为空") + private BigDecimal expectedAmount; + + @ApiModelProperty("实退金额") + @NotNull(message = "实退金额不能为空") + private BigDecimal actualAmount; + + @ApiModelProperty("扣款金额") + @NotNull(message = "扣款金额不能为空") + private BigDecimal deductAmount; + + @ApiModelProperty("扣款原因") + private String deductReason; + + @ApiModelProperty("银行账户") + @NotBlank(message = "银行账户不能为空") + private String accountNumber; + + @ApiModelProperty("开户行") + @NotBlank(message = "开户行不能为空") + private String bankName; + + @ApiModelProperty("联行号") + @NotBlank(message = "联行号不能为空") + private String bankBranchNo; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/CloseStoreApplyRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/CloseStoreApplyRequest.java new file mode 100644 index 000000000..0185e93b8 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/CloseStoreApplyRequest.java @@ -0,0 +1,42 @@ +package com.cool.store.request.close.store; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * @Author suzhuhong + * @Date 2025/9/23 15:57 + * @Version 1.0 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class CloseStoreApplyRequest { + + @ApiModelProperty("计划关店时间") + @NotNull(message = "计划关店时间不能为空") + private Date planCloseDate; + + @ApiModelProperty("关店原因") + @NotNull(message = "闭店原因不能为空") + private Integer closeReason; + + @ApiModelProperty("闭店原因说明") + private String reasonDescription; + + @ApiModelProperty(value = "闭店发起方式", hidden = true) + private Integer closeType; + + @ApiModelProperty("门店id") + @NotBlank(message = "门店id不能为空") + private String storeId; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/CloseStoreAuditRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/CloseStoreAuditRequest.java new file mode 100644 index 000000000..3c3a9f818 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/CloseStoreAuditRequest.java @@ -0,0 +1,31 @@ +package com.cool.store.request.close.store; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + *+ * 闭店申请审批Request + *
+ * + * @author wangff + * @since 2025/10/8 + */ +@Data +public class CloseStoreAuditRequest { + @ApiModelProperty("审批记录id") + @NotNull(message = "审批记录id不能为空") + private Long auditRecordId; + + @ApiModelProperty("审批意见") + private String remark; + + @ApiModelProperty("正式闭店时间") + private Date actualCloseData; + + @ApiModelProperty("闭店原因") + private Integer closeReason; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/CloseStoreCancelRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/CloseStoreCancelRequest.java new file mode 100644 index 000000000..5d479d15e --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/CloseStoreCancelRequest.java @@ -0,0 +1,21 @@ +package com.cool.store.request.close.store; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + *+ * 取消闭店申请Request + *
+ * + * @author wangff + * @since 2025/11/13 + */ +@Data +public class CloseStoreCancelRequest { + @ApiModelProperty("闭店申请id") + @NotNull(message = "闭店申请id不能为空") + private Long closeStoreId; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/CloseStoreQueryRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/CloseStoreQueryRequest.java new file mode 100644 index 000000000..0dd5360d9 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/CloseStoreQueryRequest.java @@ -0,0 +1,51 @@ +package com.cool.store.request.close.store; + +import com.cool.store.common.PageBasicInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + *+ * 闭店申请查询Request + *
+ * + * @author wangff + * @since 2025/10/9 + */ +@Data +public class CloseStoreQueryRequest extends PageBasicInfo { + @ApiModelProperty("审核状态 0待处理,1通过,2拒绝") + private Integer auditStatus; + + @ApiModelProperty("门店名称/编号") + private String storeNameOrNum; + + @ApiModelProperty("所属品牌，逗号隔开") + private String joinBrandList; + + @ApiModelProperty("签约人姓名") + private String signerName; + + @ApiModelProperty("签约人电话") + private String signerMobile; + + @ApiModelProperty("闭店发起方式 1-主动发起 2-云流水发起") + private Integer closeType; + + @ApiModelProperty("闭店状态") + private Integer closeStatus; + + @ApiModelProperty("闭店申请单号") + private String closeStoreNo; + + @ApiModelProperty(value = "是否查询store表", hidden = true) + private Boolean queryStore = false; + + @ApiModelProperty(value = "是否查询signer表", hidden = true) + private Boolean querySigner = false; + + @ApiModelProperty(value = "所属品牌列表", hidden = true) + private List+ * mini闭店申请查询Request + *
+ * + * @author wangff + * @since 2025/10/9 + */ +@Data +public class MiniCloseStoreQueryRequest extends PageBasicInfo { + @ApiModelProperty("门店id") + private String storeId; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/ReCloseStoreApplyRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/ReCloseStoreApplyRequest.java new file mode 100644 index 000000000..31352da5d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/ReCloseStoreApplyRequest.java @@ -0,0 +1,18 @@ +package com.cool.store.request.close.store; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2025/9/24 10:18 + * @Version 1.0 + */ +@Data +public class ReCloseStoreApplyRequest { + + @ApiModelProperty("闭店信息ID") + private Long closeStoreId; + + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/ThirdCloseStoreApplyRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/ThirdCloseStoreApplyRequest.java new file mode 100644 index 000000000..d2f5704f0 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/store/ThirdCloseStoreApplyRequest.java @@ -0,0 +1,47 @@ +package com.cool.store.request.close.store; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + *+ * 三方闭店申请Request + *
+ * + * @author wangff + * @since 2025/10/23 + */ +@Data +public class ThirdCloseStoreApplyRequest { + @ApiModelProperty("计划关店时间") + @NotNull(message = "计划关店时间不能为空") + private Date planCloseDate; + + @ApiModelProperty("关店原因") + @NotNull(message = "闭店原因不能为空") + private Integer closeReason; + + @ApiModelProperty("闭店原因说明") + private String reasonDescription; + + @ApiModelProperty("门店编码") + @NotBlank(message = "门店编码不能为空") + private String storeNum; + + @ApiModelProperty(value = "闭店发起方式", hidden = true) + private Integer closeType; + + public CloseStoreApplyRequest convert(String storeId) { + return CloseStoreApplyRequest.builder() + .planCloseDate(planCloseDate) + .closeReason(closeReason) + .reasonDescription(reasonDescription) + .storeId(storeId) + .closeType(closeType) + .build(); + } +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/huoma/AccountCloseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/huoma/AccountCloseRequest.java new file mode 100644 index 000000000..0685d282e --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/huoma/AccountCloseRequest.java @@ -0,0 +1,24 @@ +package com.cool.store.request.huoma; + +import lombok.Data; + +/** + *+ * 火码账号关闭Request + *
+ * + * @author wangff + * @since 2025/11/5 + */ +@Data +public class AccountCloseRequest { + /** + * 门店编码 + */ + private String shop_sn; + + /** + * 门店开关 0关店 1开店 + */ + private Integer enable; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjAccountCloseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjAccountCloseRequest.java new file mode 100644 index 000000000..4f6370e77 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjAccountCloseRequest.java @@ -0,0 +1,25 @@ +package com.cool.store.request.xgj; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + *+ * 新管家账号关闭Request + *
+ * + * @author wangff + * @since 2025/11/27 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class XgjAccountCloseRequest { + @ApiModelProperty("门店编码") + private String storeCode; + + @ApiModelProperty("关店时间，yyyy-MM-dd HH:mm:ss") + private String closeTime; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjBankQueryRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjBankQueryRequest.java new file mode 100644 index 000000000..14b261d1a --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjBankQueryRequest.java @@ -0,0 +1,18 @@ +package com.cool.store.request.xgj; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *+ * 新管家支行查询Request + *
+ * + * @author wangff + * @since 2025/12/1 + */ +@Data +public class XgjBankQueryRequest { + @ApiModelProperty("支行行名") + private String openBankName; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjPartnerAccountRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjPartnerAccountRequest.java new file mode 100644 index 000000000..87ee14d04 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjPartnerAccountRequest.java @@ -0,0 +1,30 @@ +package com.cool.store.request.xgj; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *+ * 新管家供应商账户信息Request + *
+ * + * @author wangff + * @since 2025/11/28 + */ +@Data +public class XgjPartnerAccountRequest { + @ApiModelProperty("账户名称") + private String accountName; + + @ApiModelProperty("银行账号") + private String accountNumber; + + @ApiModelProperty("开户银行") + private String bankName; + + @ApiModelProperty("开户支行号") + private String bankBranchNo; + + @ApiModelProperty("账户类型") + private String accountType; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjPartnerQueryRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjPartnerQueryRequest.java new file mode 100644 index 000000000..f8bd953ae --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjPartnerQueryRequest.java @@ -0,0 +1,38 @@ +package com.cool.store.request.xgj; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + *+ * 新管家往来单位查询Request + *
+ * + * @author wangff + * @since 2025/11/28 + */ +@Data +public class XgjPartnerQueryRequest { + @ApiModelProperty("查询开始（创建/更新）时间戳（包含、秒级）") + private Long startTime; + + @ApiModelProperty("查询结束时间戳") + private Long endTime; + + @ApiModelProperty("分页序号（默认为1）") + private Integer pageNo; + + @ApiModelProperty("分页大小（默认50，上限150）") + private Integer pageSize; + + @ApiModelProperty("往来单位编码") + private List+ * 新管家获取单据支付结果Request + *
+ * + * @author wangff + * @since 2025/11/28 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class XgjPaymentRequest { + @ApiModelProperty("每刻单号") + private String outNo; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjReimburseFeeRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjReimburseFeeRequest.java new file mode 100644 index 000000000..8e432fef3 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjReimburseFeeRequest.java @@ -0,0 +1,41 @@ +package com.cool.store.request.xgj; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + *+ * 新管家报销单费用明细Request + *
+ * + * @author wangff + * @since 2025/11/28 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class XgjReimburseFeeRequest { + @ApiModelProperty(value = "费用类型编码", required = true) + private String expenseTypeCode; + + @ApiModelProperty(value = "应退金额", required = true) + private BigDecimal consumeAmount; + + @ApiModelProperty(value = "实退金额", required = true) + private BigDecimal refundAmount; + + @ApiModelProperty(value = "扣款金额", required = true) + private BigDecimal deductionAmount; + + @ApiModelProperty(value = "消费时间，yyyy-MM-dd HH:mm:ss", required = true) + private String consumeTime; + + @ApiModelProperty(value = "备注说明", required = false) + private String comments; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjReimburseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjReimburseRequest.java new file mode 100644 index 000000000..f36d5d902 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjReimburseRequest.java @@ -0,0 +1,109 @@ +package com.cool.store.request.xgj; + +import com.alibaba.fastjson.annotation.JSONField; +import com.cool.store.utils.UUIDUtils; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + *+ * 新管家报销单Request + *
+ * + * @author wangff + * @since 2025/11/28 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class XgjReimburseRequest { + + @ApiModelProperty("公司抬头") + private String legalEntity; + + @ApiModelProperty("提交人(编码)") + private String coverUser; + + @ApiModelProperty("退款事由") + private String reimburseName; + + @ApiModelProperty("退款类型(填提供的中文选项)") + @JsonProperty("CF175") + @JSONField(name = "CF175") + private String cf175; + + @ApiModelProperty("退款项目(填提供的中文选项)") + @JsonProperty("CF176") + @JSONField(name = "CF176") + private String cf176; + + @ApiModelProperty("关店分类(填提供的中文选项)") + @JsonProperty("CF333") + @JSONField(name = "CF333") + private String cf333; + + @ApiModelProperty("关店原因1(填提供的中文选项)，管理要求闭店时填写") + @JsonProperty("CF334") + @JSONField(name = "CF334") + private String cf334; + + @ApiModelProperty("关店原因2(填提供的中文选项)，加盟商自行闭店时填写") + @JsonProperty("CF335") + @JSONField(name = "CF335") + private String cf335; + + @ApiModelProperty("门店编码") + @JsonProperty("CF177") + @JSONField(name = "CF177") + private String cf177; + + @ApiModelProperty("门店名称") + @JsonProperty("CF178") + @JSONField(name = "CF178") + private String cf178; + + @ApiModelProperty("其他说明") + private String comments; + + @ApiModelProperty("退款加盟商编码") + private String tradingPartner; + + @ApiModelProperty("汇款用途(填提供的中文选项)") + @JsonProperty("CF242") + @JSONField(name = "CF242") + private String cf242; + + @ApiModelProperty("汇款备注(填提供的中文选项)") + @JsonProperty("CF243") + @JSONField(name = "CF243") + private String cf243; + + @ApiModelProperty("账户名") + private String bankAcctName; + + @ApiModelProperty("银行账户") + private String bankAcctNumber; + + @ApiModelProperty("开户行") + private String bankName; + + @ApiModelProperty("收款账户类型") + private String accountType; + + @ApiModelProperty("联行号") + private String bankBranchNo; + + @ApiModelProperty("费用明细") + private List+ * 新管家同步供应商Request + *
+ * + * @author wangff + * @since 2025/11/28 + */ +@Data +public class XgjSavePartnerRequest { + @ApiModelProperty("往来单位名称") + private String name; + + @ApiModelProperty("往来单位编码") + private String businessCode; + + @ApiModelProperty("所属分类") + private String parentName; + + @ApiModelProperty("所属分类编码") + private String parentBizCode; + + @ApiModelProperty("往来关系") + private String partnerType; + + @ApiModelProperty("往来性质") + private String partnerProperty; + + @ApiModelProperty("往来单位账户列表") + private List+ * 闭店账号VO + *
+ * + * @author wangff + * @since 2025/10/8 + */ +@Data +public class CloseStoreAccountVO { + @ApiModelProperty("id") + private Long id; + + @ApiModelProperty("账号名称") + private String systemName; + + @ApiModelProperty("系统code") + private String systemCode; + + @ApiModelProperty("账号分类，0-IT账号，1-外卖账号") + private Integer accountType; + + @ApiModelProperty("账号分类") + private String accountTypeName; + + @ApiModelProperty("账号状态，1-使用中, 2-已关闭, 3-关闭中") + private Integer status; + + @ApiModelProperty("关闭类型，0直接关闭，1申请关闭") + private Integer closeType; + + public String getAccountTypeName() { + return CloseStoreAccountTypeEnum.getMsgByType(accountType); + } +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/file/CloseStoreFileDetailMiniVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/file/CloseStoreFileDetailMiniVO.java new file mode 100644 index 000000000..de4e09003 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/file/CloseStoreFileDetailMiniVO.java @@ -0,0 +1,45 @@ +package com.cool.store.vo.close.file; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + *+ * 小程序闭店资料详情VO + *
+ * + * @author wangff + * @since 2025/10/7 + */ +@Data +public class CloseStoreFileDetailMiniVO { + + @ApiModelProperty("闭店申请id") + private Long closeStoreId; + + @ApiModelProperty("邮件单号") + private String mailNumber; + + @ApiModelProperty("邮件状态，0未邮寄，1已邮寄") + private Integer mailStatus; + + @ApiModelProperty("快递公司") + private String mailCompany; + + @ApiModelProperty("材料邮寄地址") + private String mailAddress; + + @ApiModelProperty("收件人") + private String mailAddressee; + + @ApiModelProperty("收件人手机号") + private String mailMobile; + + @ApiModelProperty("材料信息列表") + private List+ * 闭店资料详情VO + *
+ * + * @author wangff + * @since 2025/10/7 + */ +@Data +public class CloseStoreFileDetailVO { + + @ApiModelProperty("闭店申请id") + private Long closeStoreId; + + @ApiModelProperty("邮件单号") + private String mailNumber; + + @ApiModelProperty("邮件状态，0未邮寄，1已邮寄") + private Integer mailStatus; + + @ApiModelProperty("快递公司") + private String mailCompany; + + @ApiModelProperty("材料邮寄地址") + private String mailAddress; + + @ApiModelProperty("收件人") + private String mailAddressee; + + @ApiModelProperty("收件人手机号") + private String mailMobile; + + @ApiModelProperty("材料信息列表") + private List+ * 小程序闭店材料信息VO + *
+ * + * @author wangff + * @since 2025/10/7 + */ +@Data +public class CloseStoreFileInfoMiniVO { + @ApiModelProperty("id") + private Long id; + + @ApiModelProperty("资料code") + private String fileCode; + + @ApiModelProperty("资料名称") + private String fileName; + + @ApiModelProperty("材料审批状态 1-合格 2-不合格") + private Integer approveStatus; + + @ApiModelProperty("材料状态 0-未上传 1-合格 2-不合格 3-已上传 4-审批中 5-已修改") + private Integer fileStatus; + + @ApiModelProperty("材料状态") + private String fileStatusName; + + @ApiModelProperty("审批意见") + private String approveOpinion; + + @ApiModelProperty("模板链接") + private String templateUrl; + + @ApiModelProperty("图片列表") + private String urls; + + public String getFileStatusName() { + return FileStatusEnum.getDescByStatus(this.fileStatus); + } +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/file/CloseStoreFileInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/file/CloseStoreFileInfoVO.java new file mode 100644 index 000000000..7a3985304 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/file/CloseStoreFileInfoVO.java @@ -0,0 +1,39 @@ +package com.cool.store.vo.close.file; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *+ * 闭店材料信息VO + *
+ * + * @author wangff + * @since 2025/10/7 + */ +@Data +public class CloseStoreFileInfoVO { + @ApiModelProperty("id") + private Long id; + + @ApiModelProperty("资料code") + private String fileCode; + + @ApiModelProperty("资料名称") + private String fileName; + + @ApiModelProperty("邮件状态 0-未邮寄 1已邮寄") + private Integer mailStatus; + + @ApiModelProperty("材料审批状态 1-合格 2-不合格") + private Integer approveStatus; + + @ApiModelProperty("材料状态 0-未上传 1-合格 2-不合格 3-已上传 4-审批中 5-已修改") + private Integer fileStatus; + + @ApiModelProperty("审批意见") + private String approveOpinion; + + @ApiModelProperty("图片列表") + private String urls; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/refund/CloseStoreRefundDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/refund/CloseStoreRefundDetailVO.java new file mode 100644 index 000000000..520c60837 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/refund/CloseStoreRefundDetailVO.java @@ -0,0 +1,138 @@ +package com.cool.store.vo.close.refund; + +import com.cool.store.annotation.DictField; +import com.cool.store.enums.close.RefundPayStatusEnum; +import com.cool.store.enums.master.StoreCloseReasonEnum; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.Objects; + +/** + *+ * 闭店退款详情VO + *
+ * + * @author wangff + * @since 2025/10/13 + */ +@Data +public class CloseStoreRefundDetailVO { + // ===== 单据信息 ===== + @ApiModelProperty("退款单id") + private Long id; + + @ApiModelProperty("闭店申请id") + private Long closeStoreId; + + @ApiModelProperty("退款申请单号") + private String refundNo; + + @ApiModelProperty("退款类型(闭店子阶段code)") + private Integer type; + + @ApiModelProperty("退款状态") + private String refundStatus; + + @ApiModelProperty("退款状态名称") + @DictField + private String refundStatusName; + + @ApiModelProperty("每刻退款单号") + private String refundOrderNo; + + @ApiModelProperty("退款时间") + private Date refundTime; + + // ===== 基础信息 ===== + @ApiModelProperty("公司抬头") + private String invoiceTitle; + + @ApiModelProperty("公司抬头名称") + @DictField + private String invoiceTitleName; + + @ApiModelProperty("提交人id") + private String submitterId; + + @ApiModelProperty("提交人名称") + private String submitterName; + + // ===== 闭店信息 ===== + @ApiModelProperty("关店原因") + private Integer closeReason; + + @ApiModelProperty("关店原因名称") + private String closeReasonName; + + @ApiModelProperty("关店分类名称") + private String closeNatureName; + + // ===== 退款信息 ===== + @ApiModelProperty("退款事由") + private String refundReason; + + @ApiModelProperty("退款类型") + private String refundType; + + @ApiModelProperty("退款类型") + private String refundTypeName; + + @ApiModelProperty("退款项目") + private String refundProject; + + @ApiModelProperty("其他说明") + private String remark; + + @ApiModelProperty("退款加盟商编码") + private String businessCode; + + @ApiModelProperty("退款加盟商名称") + private String businessName; + + @ApiModelProperty("退款加盟商收款账户") + private String businessAccount; + + // ===== 费用信息 ===== + @ApiModelProperty("费用类型code") + private String expenseTypeCode; + + @ApiModelProperty("费用申请日期") + private Date expenseApplyTime; + + @ApiModelProperty("应退金额") + private BigDecimal expectedAmount; + + @ApiModelProperty("实退金额") + private BigDecimal actualAmount; + + @ApiModelProperty("扣款金额") + private BigDecimal deductAmount; + + @ApiModelProperty("扣款原因") + private String deductReason; + + @ApiModelProperty("银行账户") + private String accountNumber; + + @ApiModelProperty("开户行") + private String bankName; + + @ApiModelProperty("联行号") + private String bankBranchNo; + + public String getRefundStatusName() { + return RefundPayStatusEnum.getDescByStatus(refundStatus); + } + + public String getCloseNatureName() { + StoreCloseReasonEnum closeReasonEnum = StoreCloseReasonEnum.getByCode(closeReason); + return Objects.nonNull(closeReasonEnum) ? closeReasonEnum.getCloseNature().getDesc() : ""; + } + + public String getCloseReasonName() { + return StoreCloseReasonEnum.getDescByCode(closeReason); + } +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/refund/CloseStoreRefundListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/refund/CloseStoreRefundListVO.java new file mode 100644 index 000000000..055b35c3a --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/refund/CloseStoreRefundListVO.java @@ -0,0 +1,46 @@ +package com.cool.store.vo.close.refund; + +import com.cool.store.enums.close.RefundPayStatusEnum; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + *+ * 闭店退款列表VO + *
+ * + * @author wangff + * @since 2025/12/2 + */ +@Data +public class CloseStoreRefundListVO { + @ApiModelProperty("id") + private Long id; + + @ApiModelProperty("退款申请单号") + private String refundNo; + + @ApiModelProperty("退款状态") + private String refundStatus; + + @ApiModelProperty("退款状态名称") + private String refundStatusName; + + @ApiModelProperty("每刻退款单号") + private String refundOrderNo; + + @ApiModelProperty("退款时间") + private Date refundTime; + + @ApiModelProperty("退款加盟商名称") + private String businessName; + + @ApiModelProperty("退款加盟商收款账户") + private String businessAccount; + + public String getRefundStatusName() { + return RefundPayStatusEnum.getDescByStatus(this.refundStatus); + } +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/refund/CloseStoreRefundSimpleVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/refund/CloseStoreRefundSimpleVO.java new file mode 100644 index 000000000..5f481e8f2 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/refund/CloseStoreRefundSimpleVO.java @@ -0,0 +1,45 @@ +package com.cool.store.vo.close.refund; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + *+ * 闭店退款简单信息VO + *
+ * + * @author wangff + * @since 2025/10/13 + */ +@Data +public class CloseStoreRefundSimpleVO { + @ApiModelProperty("id") + private Long id; + + @ApiModelProperty("退款类型(闭店子阶段code)") + private Integer type; + + @ApiModelProperty("闭店申请id") + private Long closeStoreId; + + @ApiModelProperty("退款申请单号") + private String refundNo; + + @ApiModelProperty("每刻退款单号") + private String refundOrderNo; + + @ApiModelProperty("退款项目") + private String refundProject; + + @ApiModelProperty("退款状态") + private String refundStatus; + + @ApiModelProperty("退款时间") + private Date refundTime; + + @ApiModelProperty("应退金额") + private BigDecimal expectedAmount; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreAuditRecordVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreAuditRecordVO.java new file mode 100644 index 000000000..15a7bdba0 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreAuditRecordVO.java @@ -0,0 +1,30 @@ +package com.cool.store.vo.close.store; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + *+ * 审批记录VO + *
+ * + * @author wangff + * @since 2025/10/9 + */ +@Data +public class CloseStoreAuditRecordVO { + + @ApiModelProperty("实际处理人名称") + private String handlerUserName; + + @ApiModelProperty("完成任务时间") + private Date finishTaskTime; + + @ApiModelProperty("审核状态 0待处理,1通过,2拒绝") + private Integer auditStatus; + + @ApiModelProperty("备注") + private String actionRemark; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreInfoDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreInfoDetailVO.java new file mode 100644 index 000000000..c64c7d2b4 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreInfoDetailVO.java @@ -0,0 +1,96 @@ +package com.cool.store.vo.close.store; + +import com.cool.store.enums.close.CloseStoreStatusEnum; +import com.cool.store.enums.master.BrandTypeEnum; +import com.cool.store.enums.master.StoreCloseReasonEnum; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + *+ * 闭店申请详情VO + *
+ * + * @author wangff + * @since 2025/10/9 + */ +@Data +public class CloseStoreInfoDetailVO { + @ApiModelProperty("闭店申请id") + private Long id; + + @ApiModelProperty("审批记录id") + private Long auditId; + + @ApiModelProperty("闭店申请单号") + private String closeStoreNo; + + @ApiModelProperty("门店id") + private String storeId; + + @ApiModelProperty("门店名称") + private String storeName; + + @ApiModelProperty("门店编号") + private String storeNum; + + @ApiModelProperty("所属品牌") + private Integer joinBrand; + + @ApiModelProperty("所属品牌名称") + private Integer joinBrandName; + + @ApiModelProperty("详细地址") + private String storeAddress; + + @ApiModelProperty("签约人1姓名") + private String signer1Name; + + @ApiModelProperty("签约人1手机号") + private String signer1Mobile; + + @ApiModelProperty("签约人2姓名") + private String signer2Name; + + @ApiModelProperty("签约人2手机号") + private String signer2Mobile; + + @ApiModelProperty("计划闭店时间") + private Date planCloseData; + + @ApiModelProperty("正式闭店时间") + private Date actualCloseData; + + @ApiModelProperty("闭店发起方式 1-主动发起 2-云流水发起") + private Integer closeType; + + @ApiModelProperty("闭店原因") + private Integer closeReason; + + @ApiModelProperty("闭店原因名称") + private String closeReasonName; + + @ApiModelProperty("闭店原因说明") + private String reasonDescription; + + @ApiModelProperty("闭店状态") + private Integer closeStatus; + + @ApiModelProperty("闭店状态名称") + private String closeStatusName; + + + public String getCloseStatusName() { + return CloseStoreStatusEnum.getNameByStatus(closeStatus); + } + + public String getJoinBrandName() { + return BrandTypeEnum.getDescByCode(joinBrand); + } + + public String getCloseReasonName() { + return StoreCloseReasonEnum.getDescByCode(closeReason); + } +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreInfoListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreInfoListVO.java new file mode 100644 index 000000000..198522069 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreInfoListVO.java @@ -0,0 +1,85 @@ +package com.cool.store.vo.close.store; + +import com.cool.store.enums.close.CloseStoreStatusEnum; +import com.cool.store.enums.master.BrandTypeEnum; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + *+ * 闭店申请记录列表VO + *
+ * + * @author wangff + * @since 2025/10/9 + */ +@Data +public class CloseStoreInfoListVO { + @ApiModelProperty("审批记录id") + private Long auditRecordId; + + @ApiModelProperty("闭店申请id") + private Long closeStoreId; + + @ApiModelProperty("闭店申请单号") + private String closeStoreNo; + + @ApiModelProperty("门店id") + private String storeId; + + @ApiModelProperty("门店名称") + private String storeName; + + @ApiModelProperty("门店编号") + private String storeNum; + + @ApiModelProperty("所属品牌") + private Integer joinBrand; + + @ApiModelProperty("所属品牌名称") + private String joinBrandName; + + @ApiModelProperty("详细地址") + private String storeAddress; + + @ApiModelProperty("签约人1姓名") + private String signer1Name; + + @ApiModelProperty("签约人1手机号") + private String signer1Mobile; + + @ApiModelProperty("签约人2姓名") + private String signer2Name; + + @ApiModelProperty("签约人2手机号") + private String signer2Mobile; + + @ApiModelProperty("计划闭店时间") + private Date planCloseData; + + @ApiModelProperty("闭店发起方式 1-主动发起 2-云流水发起") + private Integer closeType; + + @ApiModelProperty("闭店状态") + private Integer closeStatus; + + @ApiModelProperty("闭店状态名称") + private String closeStatusName; + + @ApiModelProperty("已完成流程数量") + private Integer completeProcessNum; + + @ApiModelProperty("总流程数量") + private Integer totalProcessNum; + + + public String getCloseStatusName() { + return CloseStoreStatusEnum.getNameByStatus(closeStatus); + } + + public String getJoinBrandName() { + return BrandTypeEnum.getDescByCode(joinBrand); + } +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreSimpleVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreSimpleVO.java new file mode 100644 index 000000000..d45251c05 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreSimpleVO.java @@ -0,0 +1,50 @@ +package com.cool.store.vo.close.store; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + *+ * 闭店申请简单信息VO + *
+ * + * @author wangff + * @since 2025/10/9 + */ +@Data +public class CloseStoreSimpleVO { + @ApiModelProperty("门店id") + private String storeId; + + @ApiModelProperty("门店名称") + private String storeName; + + @ApiModelProperty("门店编号") + private String storeNum; + + @ApiModelProperty("闭店状态名称") + private String closeStatusName; + + @ApiModelProperty("签约人1姓名") + private String signer1Name; + + @ApiModelProperty("签约人1手机号") + private String signer1Mobile; + + @ApiModelProperty("签约人2姓名") + private String signer2Name; + + @ApiModelProperty("签约人2手机号") + private String signer2Mobile; + + @ApiModelProperty("已完成流程数量") + private Integer completeProcessNum; + + @ApiModelProperty("总流程数量") + private Integer totalProcessNum; + + @ApiModelProperty("闭店流程阶段信息") + private List+ * 闭店状态VO + *
+ * + * @author wangff + * @since 2025/10/10 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class CloseStoreStatusVO { + @ApiModelProperty("闭店状态编码") + private Integer closeStatus; + + @ApiModelProperty("闭店状态") + private String closeStatusName; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreSubStageStatusVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreSubStageStatusVO.java new file mode 100644 index 000000000..9f4d69832 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/CloseStoreSubStageStatusVO.java @@ -0,0 +1,49 @@ +package com.cool.store.vo.close.store; + +import com.cool.store.enums.close.CloseStoreSubStageEnum; +import com.cool.store.enums.close.CloseStoreSubStageStatusEnum; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *+ * 闭店流程子阶段状态VO + *
+ * + * @author wangff + * @since 2025/10/16 + */ +@Data +public class CloseStoreSubStageStatusVO { + @ApiModelProperty("闭店阶段") + private Integer shopStage; + + @ApiModelProperty("闭店子阶段") + private Integer shopSubStage; + + @ApiModelProperty("闭店子阶段名称") + private String shopSubStageName; + + @ApiModelProperty("店铺阶段状态") + private Integer shopSubStageStatus; + + @ApiModelProperty("阶段状态名称") + private String shopSubStageStatusName; + + @ApiModelProperty("当前阶段是否结束 0未结束 1已结束") + private Integer isTerminated; + + @ApiModelProperty("预估完成时间") + private String planCompleteTime; + + @ApiModelProperty("实际完成时间") + private String actualCompleteTime; + + public String getShopSubStageName() { + return CloseStoreSubStageEnum.getSubStageNameBySubStage(shopSubStage); + } + + public String getShopSubStageStatusName() { + return CloseStoreSubStageStatusEnum.getStatusNameByStatus(shopSubStageStatus); + } +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/MiniCloseStoreSimpleVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/MiniCloseStoreSimpleVO.java new file mode 100644 index 000000000..7ebda0023 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/MiniCloseStoreSimpleVO.java @@ -0,0 +1,52 @@ +package com.cool.store.vo.close.store; + +import com.cool.store.enums.close.CloseStoreStatusEnum; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + *+ * mini闭店申请简单信息VO + *
+ * + * @author wangff + * @since 2025/10/9 + */ +@Data +public class MiniCloseStoreSimpleVO { + @ApiModelProperty("闭店申请id") + private Long id; + + @ApiModelProperty("闭店申请单号") + private String closeStoreNo; + + @ApiModelProperty("门店id") + private String storeId; + + @ApiModelProperty("门店名称") + private String storeName; + + @ApiModelProperty("门店编号") + private String storeNum; + + @ApiModelProperty("闭店状态") + private Integer closeStatus; + + @ApiModelProperty("闭店状态名称") + private String closeStatusName; + + @ApiModelProperty("闭店发起方式 1-主动发起 2-云流水发起") + private Integer closeType; + + @ApiModelProperty("计划闭店时间") + private Date planCloseData; + + @ApiModelProperty("申请日期") + private Date createTime; + + public String getCloseStatusName() { + return CloseStoreStatusEnum.getNameByStatus(closeStatus); + } +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/StoreCloseReasonVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/StoreCloseReasonVO.java new file mode 100644 index 000000000..4fbe4b55f --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/store/StoreCloseReasonVO.java @@ -0,0 +1,28 @@ +package com.cool.store.vo.close.store; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + *+ * 门店闭店原因VO + *
+ * + * @author wangff + * @since 2025/9/16 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class StoreCloseReasonVO { + @ApiModelProperty("闭店原因编码") + private Integer closeReasonCode; + + @ApiModelProperty("闭店原因描述") + private String closeReasonDesc; + + @ApiModelProperty("闭店发起方式") + private Integer closeType; +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HuoMaService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HuoMaService.java index 7c764ccf9..fa7a0b9e5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HuoMaService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HuoMaService.java @@ -1,6 +1,7 @@ package com.cool.store.service; import com.cool.store.request.OrderSummaryRequest; +import com.cool.store.request.huoma.AccountCloseRequest; import com.cool.store.request.huoma.ShopBasicInfoRequest; import com.cool.store.response.IncomeBaseResponse; import com.cool.store.response.IncomeSummaryResponse; @@ -53,4 +54,11 @@ public interface HuoMaService { * @description:获取店铺交易分析 */ IncomeSummaryResponse getIncomeSummary (OrderSummaryRequest requestBody); + + /** + * 账号关闭 + * @param requestBody 火码账号关闭Request + * @return 火码账号关闭Response + */ + Boolean accountClose(AccountCloseRequest requestBody); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ThirdXgjService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ThirdXgjService.java new file mode 100644 index 000000000..6373d5519 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ThirdXgjService.java @@ -0,0 +1,60 @@ +package com.cool.store.service; + +import com.cool.store.dto.xgj.XgjBranchBankDTO; +import com.cool.store.dto.xgj.XgjPartnerPageDTO; +import com.cool.store.dto.xgj.XgjPayResultDTO; +import com.cool.store.request.xgj.*; + +import java.util.List; + +/** + *+ * 新管家三方接口服务类 + *
+ * + * @author wangff + * @since 2025/11/28 + */ +public interface ThirdXgjService { + + /** + * 新管家账号关闭 + * @param request 新管家账号关闭Request + * @return 是否成功 + */ + String accountClose(XgjAccountCloseRequest request); + + /** + * 新管家报销单 + * @param request 新管家报销单Request + * @return 每刻单号 + */ + String reimburse(XgjReimburseRequest request); + + /** + * 新管家供应商同步 + * @param request 新管家同步供应商Request + * @return java.lang.String + */ + String savePartner(XgjSavePartnerRequest request); + + /** + * 获取单据支付结果 + * @param request 新管家获取单据支付结果Request + * @return 新管家单据支付结果DTO + */ + XgjPayResultDTO queryOrderStatus(XgjPaymentRequest request); + + /** + * 查询往来单位列表 + * @param request 新管家往来单位查询Request + * @return 新管家分页DTO + */ + XgjPartnerPageDTO queryPartnerPage(XgjPartnerQueryRequest request); + + /** + * 查询支行列表 + * @return 新管家支行列表 + */ + List+ * 账号关闭工厂 + *
+ * + * @author wangff + * @since 2025/10/8 + */ +@Service +@RequiredArgsConstructor +public class AccountCloseFactory { + private final Map+ * 账号关闭 + *
+ * + * @author wangff + * @since 2025/10/8 + */ +public interface AccountCloseStrategy { + + /** + * 申请账号关闭 + * @return 是否成功 + */ + Boolean accountClose(String storeId); + + /** + * 获取系统code + */ + String getSystemCode(); +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/close/CloseStoreAccountService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/close/CloseStoreAccountService.java new file mode 100644 index 000000000..ad35868a6 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/close/CloseStoreAccountService.java @@ -0,0 +1,36 @@ +package com.cool.store.service.close; + +import com.cool.store.vo.close.account.CloseStoreAccountVO; + +import java.util.List; + +/** + *+ * 闭店账号关闭 服务类 + *
+ * + * @author wangff + * @since 2025/10/8 + */ +public interface CloseStoreAccountService { + + /** + * 查询账号列表 + * @param closeStoreId 闭店申请id + * @return 闭店账号VO列表 + */ + List+ * 闭店资料 服务类 + *
+ * + * @author wangff + * @since 2025/10/7 + */ +public interface CloseStoreFileService { + + /** + * 更新材料邮寄地址 + * @param request 闭店资料邮寄地址信息Request + * @return 是否成功 + */ + Boolean updateMailAddress(CloseStoreMailAddressRequest request); + + /** + * 提交材料审批 + * @param request 闭店材料审批Request + * @return 是否成功 + */ + Boolean submitFileApprove(CloseStoreFileApproveRequest request); + + /** + * 单个材料提交审批 + * @param request 闭店材料信息Request + * @return 是否成功 + */ + Boolean submitFileApproveSingle(CloseStoreFileInfoRequest request); + + /** + * 查询闭店资料详情 + * @param closeStoreId 闭店申请id + * @return 闭店资料详情VO + */ + CloseStoreFileDetailVO getFileDetail(Long closeStoreId); + + /** + * 查询小程序闭店资料详情 + * @param closeStoreId 闭店申请id + * @return 小程序闭店资料详情VO + */ + CloseStoreFileDetailMiniVO getMiniFileDetail(Long closeStoreId); + + /** + * 提交材料 + * @param request 闭店资料邮寄信息Request + * @return 是否成功 + */ + Boolean submitFile(CloseStoreMailInfoRequest request); + + /** + * 修改材料 + * @param request 闭店材料提交Request + * @return 是否成功 + */ + Boolean updateFile(CloseStoreFileSubmitRequest request); + + /** + * 督导审批 + * @param request 审批Request + * @return 是否成功 + */ + Boolean supervisionAudit(CloseStoreFileAuditRequest request); +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/close/CloseStoreRefundService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/close/CloseStoreRefundService.java new file mode 100644 index 000000000..e41223713 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/close/CloseStoreRefundService.java @@ -0,0 +1,82 @@ +package com.cool.store.service.close; + +import com.cool.store.dto.close.CloseStoreMkUserDTO; +import com.cool.store.request.close.refund.CloseStoreRefundAddRequest; +import com.cool.store.request.close.refund.CloseStoreRefundQueryRequest; +import com.cool.store.request.close.refund.CloseStoreRefundSkipRequest; +import com.cool.store.request.close.refund.CloseStoreRefundUpdateRequest; +import com.cool.store.vo.close.refund.CloseStoreRefundDetailVO; +import com.cool.store.vo.close.refund.CloseStoreRefundListVO; +import com.cool.store.vo.close.refund.CloseStoreRefundSimpleVO; +import com.github.pagehelper.PageInfo; + +import java.util.Date; +import java.util.List; + +/** + *+ * 闭店退款 服务类 + *
+ * + * @author wangff + * @since 2025/10/13 + */ +public interface CloseStoreRefundService { + + /** + * 新增退款记录 + * @param request 闭店退款新增Request + */ + Boolean addRefund(CloseStoreRefundAddRequest request); + + /** + * 编辑退款记录 + * @param request 闭店退款更新Request + */ + Boolean updateRefund(CloseStoreRefundUpdateRequest request); + + /** + * 获取当前用户的每刻用户信息 + * @return 每刻用户信息DTO + */ + CloseStoreMkUserDTO getCurrentMkUser(); + + /** + * 查询退款详情 + * @param id 退款信息id + * @return 闭店退款详情VO + */ + CloseStoreRefundDetailVO getRefundDetail(Long id); + + /** + * 完成退款 + */ + void completeRefund(Long refundId, Date refundTime); + + /** + * 查询退款简单信息列表 + * @param closeStoreId 闭店申请id + * @return 闭店退款简单信息VO列表 + */ + List+ * 账号关闭 + *
+ * + * @author wangff + * @since 2025/10/8 + */ +public abstract class AbstractAccountClose implements AccountCloseStrategy { + @Resource + private StoreDao storeDao; + + @Override + public Boolean accountClose(String storeId) { + // 各平台待对接 + return true; + } + + protected StoreDO getStore(String storeId) { + StoreDO storeDO = storeDao.getByStoreId(storeId); + if (Objects.isNull(storeDO)) { + throw new ServiceException(ErrorCodeEnum.STORE_NOT_FIND); + } + return storeDO; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreAccountServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreAccountServiceImpl.java new file mode 100644 index 000000000..38b440c4b --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreAccountServiceImpl.java @@ -0,0 +1,80 @@ +package com.cool.store.service.close.impl; + +import com.cool.store.dao.CloseStoreAccountInfoDAO; +import com.cool.store.dao.CloseStoreInfoDAO; +import com.cool.store.dao.CloseStoreStageInfoDAO; +import com.cool.store.entity.CloseStoreAccountInfoDO; +import com.cool.store.entity.CloseStoreInfoDO; +import com.cool.store.enums.close.*; +import com.cool.store.service.close.AccountCloseFactory; +import com.cool.store.service.close.AccountCloseStrategy; +import com.cool.store.service.close.CloseStoreAccountService; +import com.cool.store.service.close.CloseStoreService; +import com.cool.store.utils.BeanUtil; +import com.cool.store.vo.close.account.CloseStoreAccountVO; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; + +/** + *+ * 闭店账号关闭 服务实现类 + *
+ * + * @author wangff + * @since 2025/10/8 + */ +@Service +@RequiredArgsConstructor +public class CloseStoreAccountServiceImpl implements CloseStoreAccountService { + private final CloseStoreAccountInfoDAO closeStoreAccountInfoDAO; + private final AccountCloseFactory accountCloseFactory; + private final CloseStoreStageInfoDAO closeStoreStageInfoDAO; + private final CloseStoreService closeStoreService; + private final CloseStoreInfoDAO closeStoreInfoDAO; + + @Override + public List+ * 闭店资料 服务实现类 + *
+ * + * @author wangff + * @since 2025/10/7 + */ +@Service +@RequiredArgsConstructor +public class CloseStoreFileServiceImpl implements CloseStoreFileService { + private final CloseStoreFileDetailDAO closeStoreFileDetailDAO; + private final CloseStoreFileInfoDAO closeStoreFileInfoDAO; + private final CloseStoreStageInfoDAO closeStoreStageInfoDAO; + private final CloseStoreService closeStoreService; + private final RedisUtilPool redisUtilPool; + + private static final CloseStoreStageEnum STAGE = CloseStoreStageEnum.CLOSE_STORE_STAGE_1; + private static final CloseStoreSubStageEnum SUB_STAGE = CloseStoreSubStageEnum.CLOSE_STORE_SUB_STAGE_10; + + @Override + @Transactional + public Boolean updateMailAddress(CloseStoreMailAddressRequest request) { + closeStoreStageInfoDAO.verifyStage(request.getCloseStoreId(), STAGE, SUB_STAGE, CLOSE_STORE_SUB_STAGE_STATUS_10); + + closeStoreFileDetailDAO.insertOrUpdateMailAddress(request); + closeStoreService.closeStoreProcessFlow(request.getCloseStoreId(), SUB_STAGE); + return true; + } + + @Override + @Transactional + public Boolean submitFileApprove(CloseStoreFileApproveRequest request) { + // 校验流程是否在材料待审批阶段 + closeStoreStageInfoDAO.verifyStage(request.getCloseStoreId(), STAGE, SUB_STAGE, CLOSE_STORE_SUB_STAGE_STATUS_18); + // 修改材料详情 + boolean approveCompleted = ListUtils.emptyIfNull(request.getFileList()).stream().allMatch(v -> CommonConstants.INDEX_ONE.equals(v.getApproveStatus())); + closeStoreFileDetailDAO.insertOrUpdateFileInfoSelective(request, approveCompleted); + // 修改所有材料的审批状态 + if (CollectionUtils.isNotEmpty(request.getFileList())) { + List+ * 闭店退款 服务实现类 + *
+ * + * @author wangff + * @since 2025/10/13 + */ +@Service +@RequiredArgsConstructor +public class CloseStoreRefundServiceImpl implements CloseStoreRefundService { + private final CloseStoreRefundInfoDAO closeStoreRefundInfoDAO; + private final CloseStoreInfoDAO closeStoreInfoDAO; + private final CloseStoreStageInfoDAO closeStoreStageInfoDAO; + private final CloseStoreService closeStoreService; + private final StoreDao storeDao; + private final RedisUtilPool redisUtilPool; + private final ThirdXgjService thirdXgjService; + private final EnterpriseUserDAO enterpriseUserDAO; + private final DictService dictService; + + @Override + public Boolean addRefund(CloseStoreRefundAddRequest request) { + if (!CloseStoreSubStageEnum.CLOSE_STORE_SUB_STAGE_30.getCloseStoreSubStage().equals(request.getType()) + && !CloseStoreSubStageEnum.CLOSE_STORE_SUB_STAGE_40.getCloseStoreSubStage().equals(request.getType())) { + throw new ServiceException(ErrorCodeEnum.CLOSE_STORE_REFUND_TYPE_ERROR); + } + CloseStoreMkUserDTO mkUser = getCurrentMkUser(); + // 校验是否有每刻权限 + if (Objects.isNull(mkUser)) { + throw new ServiceException(ErrorCodeEnum.CLOSE_STORE_REFUND_MK_USER_NOT_EXIST); + } + // 是否存在非作废状态的记录，则不能新增 + if (closeStoreRefundInfoDAO.existEffectiveRecord(request.getCloseStoreId(), request.getType())) { + throw new ServiceException(ErrorCodeEnum.CLOSE_STORE_REFUND_EXIST_EFFECTIVE_RECORD); + } + CloseStoreInfoDO closeStoreInfo = closeStoreInfoDAO.getById(request.getCloseStoreId()); + if (Objects.isNull(closeStoreInfo)) { + throw new ServiceException(ErrorCodeEnum.CLOSE_STORE_INFO_NOT_EXIST); + } + StoreDO storeDO = storeDao.getByStoreId(closeStoreInfo.getStoreId()); + if (Objects.isNull(storeDO)) { + throw new ServiceException(ErrorCodeEnum.STORE_NOT_FIND); + } + + CloseStoreSubStageEnum subStage = CloseStoreSubStageEnum.getSubStageByStage(request.getType()); + CloseStoreSubStageStatusEnum expectedStageStatus = CloseStoreSubStageEnum.CLOSE_STORE_SUB_STAGE_30.equals(subStage) ? CloseStoreSubStageStatusEnum.CLOSE_STORE_SUB_STAGE_STATUS_35 : CloseStoreSubStageStatusEnum.CLOSE_STORE_SUB_STAGE_STATUS_45; + assert subStage != null; + // 校验阶段状态 + closeStoreStageInfoDAO.verifyStage(request.getCloseStoreId(), subStage.getCloseStoreStageEnum(), subStage, expectedStageStatus); + + CloseStoreRefundInfoDO refundInfoDO = BeanUtil.toBean(request, CloseStoreRefundInfoDO.class); + refundInfoDO.setRefundNo(generateCloseStoreNo()); + // 提交新管家 + XgjReimburseRequest xgjReimburseRequest = request.convertToXgjRequest(mkUser, closeStoreInfo.getCloseReason(), storeDO); + String orderNo = thirdXgjService.reimburse(xgjReimburseRequest); + refundInfoDO.setRefundOrderNo(orderNo); + refundInfoDO.setRefundStatus(RefundPayStatusEnum.APPROVING.getStatus()); + refundInfoDO.setSubmitterId(StringUtils.isNotBlank(refundInfoDO.getSubmitterId()) ? refundInfoDO.getSubmitterId() : mkUser.getJobnumber()); + refundInfoDO.setSubmitterName(StringUtils.isNotBlank(refundInfoDO.getSubmitterName()) ? refundInfoDO.getSubmitterName() : mkUser.getName()); + return closeStoreRefundInfoDAO.insertSelective(refundInfoDO); + } + + @Override + public Boolean updateRefund(CloseStoreRefundUpdateRequest request) { + CloseStoreMkUserDTO mkUser = getCurrentMkUser(); + // 校验是否有每刻权限 + if (Objects.isNull(mkUser)) { + throw new ServiceException(ErrorCodeEnum.CLOSE_STORE_REFUND_MK_USER_NOT_EXIST); + } + CloseStoreRefundInfoDO old = closeStoreRefundInfoDAO.getById(request.getId()); + if (Objects.isNull(old)) { + throw new ServiceException(ErrorCodeEnum.CLOSE_STORE_REFUND_INFO_NOT_EXIST); + } + CloseStoreSubStageEnum subStage = CloseStoreSubStageEnum.getSubStageByStage(old.getType()); + CloseStoreSubStageStatusEnum expectedStageStatus = CloseStoreSubStageEnum.CLOSE_STORE_SUB_STAGE_30.equals(subStage) ? CloseStoreSubStageStatusEnum.CLOSE_STORE_SUB_STAGE_STATUS_35 : CloseStoreSubStageStatusEnum.CLOSE_STORE_SUB_STAGE_STATUS_45; + assert subStage != null; + // 校验阶段状态 + closeStoreStageInfoDAO.verifyStage(request.getCloseStoreId(), subStage.getCloseStoreStageEnum(), subStage, expectedStageStatus); + + CloseStoreRefundInfoDO refundInfoDO = BeanUtil.toBean(request, CloseStoreRefundInfoDO.class); + refundInfoDO.setSubmitterId(StringUtils.isNotBlank(refundInfoDO.getSubmitterId()) ? refundInfoDO.getSubmitterId() : mkUser.getJobnumber()); + refundInfoDO.setSubmitterName(StringUtils.isNotBlank(refundInfoDO.getSubmitterName()) ? refundInfoDO.getSubmitterName() : mkUser.getName()); + return closeStoreRefundInfoDAO.updateSelective(refundInfoDO); + } + + @Override + public CloseStoreMkUserDTO getCurrentMkUser() { + EnterpriseUserDO user = enterpriseUserDAO.getUserInfoById(CurrentUserHolder.getUserId()); + String mkUserStr = redisUtilPool.hashGet(RedisConstant.MK_USER_MAPPING, user.getJobnumber()); + if (StringUtils.isNotBlank(mkUserStr)) { + return JSONObject.parseObject(mkUserStr, CloseStoreMkUserDTO.class); + } + return null; + } + + @Override + public CloseStoreRefundDetailVO getRefundDetail(Long id) { + CloseStoreRefundInfoDO refundInfoDO = closeStoreRefundInfoDAO.getById(id); + if (Objects.nonNull(refundInfoDO)) { + CloseStoreRefundDetailVO vo = BeanUtil.toBean(refundInfoDO, CloseStoreRefundDetailVO.class); + CloseStoreInfoDO closeStoreInfoDO = closeStoreInfoDAO.getById(refundInfoDO.getCloseStoreId()); + if (Objects.nonNull(closeStoreInfoDO)) { + vo.setCloseReason(closeStoreInfoDO.getCloseReason()); + } + dictService.fillDictField(vo); + return vo; + } + return null; + } + + @Override + @Transactional + public void completeRefund(Long refundId, Date refundTime) { + CloseStoreRefundInfoDO refundInfoDO = closeStoreRefundInfoDAO.getById(refundId); + if (Objects.nonNull(refundInfoDO) && !RefundPayStatusEnum.PAY_SUCCESS.getStatus().equals(refundInfoDO.getRefundStatus())) { + CloseStoreSubStageEnum subStage = CloseStoreSubStageEnum.getSubStageByStage(refundInfoDO.getType()); + if (Objects.nonNull(subStage)) { + // 修改退款状态 + closeStoreRefundInfoDAO.updateRefundStatus(refundId, RefundPayStatusEnum.PAY_SUCCESS.getStatus(), refundTime); + // 流程流转 + closeStoreService.closeStoreProcessFlow(refundInfoDO.getCloseStoreId(), subStage); + } + } + } + + @Override + public List+ * 火码账号关闭 + *
+ * + * @author wangff + * @since 2025/10/8 + */ +@Service +@RequiredArgsConstructor +public class HuomaAccountClose extends AbstractAccountClose { + private final HuoMaService huoMaService; + + @Override + public String getSystemCode() { + return "huoma"; + } + + @Override + public Boolean accountClose(String storeId) { + StoreDO storeDO = getStore(storeId); + AccountCloseRequest request = new AccountCloseRequest(); + request.setShop_sn(storeDO.getStoreNum()); + request.setEnable(0); + return huoMaService.accountClose(request); + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/XinguanjiaAccountClose.java b/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/XinguanjiaAccountClose.java new file mode 100644 index 000000000..279a514c9 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/XinguanjiaAccountClose.java @@ -0,0 +1,37 @@ +package com.cool.store.service.close.impl; + +import com.cool.store.entity.StoreDO; +import com.cool.store.request.xgj.XgjAccountCloseRequest; +import com.cool.store.service.ThirdXgjService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + +/** + *+ * 新掌柜账号关闭 + *
+ * + * @author wangff + * @since 2025/10/8 + */ +@Service +@RequiredArgsConstructor +public class XinguanjiaAccountClose extends AbstractAccountClose { + private final ThirdXgjService thirdXgjService; + + @Override + public String getSystemCode() { + return "xinguanjia"; + } + + @Override + public Boolean accountClose(String storeId) { + StoreDO storeDO = getStore(storeId); + String closeTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + thirdXgjService.accountClose(new XgjAccountCloseRequest(storeDO.getStoreNum(), closeTime)); + return true; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdHuoMaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdHuoMaServiceImpl.java index e782f319b..602e91bc7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdHuoMaServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdHuoMaServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.request.OrderSummaryRequest; +import com.cool.store.request.huoma.AccountCloseRequest; import com.cool.store.request.huoma.ShopBasicInfoRequest; import com.cool.store.response.IncomeBaseResponse; import com.cool.store.response.IncomeSummaryResponse; @@ -22,6 +23,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -85,6 +87,13 @@ public class ThirdHuoMaServiceImpl implements HuoMaService { return executeApiCall(apiUrl,requestBody,IncomeSummaryResponse.class); } + @Override + public Boolean accountClose(AccountCloseRequest requestBody) { + String apiUrl = url + "/dzgV1/shop/setShopEnableSwitch"; + executeApiCall(apiUrl, requestBody, List.class); + return true; + } + private+ * 新管家三方接口 服务实现类 + *
+ * + * @author wangff + * @since 2025/11/28 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class ThirdXgjServiceImpl implements ThirdXgjService { + @Value("${xgj.api.auth.url}") + private String xgjUrl; + + @Value("${xgj.api.token.url}") + private String xgjTokenUrl; + + @Value("${xgj.api.auth.username}") + private String xgjUsername; + + @Value("${xgj.api.auth.secret}") + private String xgjSecret; + + @Resource + OkHttpClient okHttpClient; + @Resource + ObjectMapper objectMapper; + + @Override + public String accountClose(XgjAccountCloseRequest request) { + String apiUrl = xgjUrl + "/dmp/dmp-join/open/closeStore"; + return executePostApiCall(apiUrl, request, String.class); + } + + @Override + public String reimburse(XgjReimburseRequest request) { + String apiUrl = xgjUrl + "/dmp/dmp-join/open/dmpJoinCloseOpen"; + return executePostApiCall(apiUrl, request, String.class); + } + + @Override + public String savePartner(XgjSavePartnerRequest request) { + String apiUrl = xgjUrl + "/dmp/dmp-join/open/saveMKPartner"; + return executePostApiCall(apiUrl, request, String.class); + } + + @Override + public XgjPayResultDTO queryOrderStatus(XgjPaymentRequest request) { + String apiUrl = xgjUrl + "/dmp/dmp-join/open/quryOrderStatus"; + return executePostApiCall(apiUrl, request, XgjPayResultDTO.class); + } + + @Override + public XgjPartnerPageDTO queryPartnerPage(XgjPartnerQueryRequest request) { + String apiUrl = xgjUrl + "/dmp/dmp-join/open/partnerPage"; + return executePostApiCall(apiUrl, request, XgjPartnerPageDTO.class); + } + + @Override + public List+ * 闭店账号关闭 前端控制器 + *
+ * + * @author wangff + * @since 2025/10/8 + */ +@Api(tags = "闭店账号关闭") +@RestController +@RequestMapping("/pc/close/account") +@RequiredArgsConstructor +@Validated +public class CloseStoreAccountController { + private final CloseStoreAccountService closeStoreAccountService; + + @ApiOperation("获取账号列表") + @GetMapping("/accountList") + @ApiImplicitParam(name = "closeStoreId", value = "闭店申请id", required = true, dataType = "Long") + public ResponseResult+ * 闭店审批 前端控制器 + *
+ * + * @author wangff + * @since 2025/10/9 + */ +@Api(tags = "闭店管理") +@RestController +@RequestMapping("/pc/close/store") +@RequiredArgsConstructor +@Validated +public class CloseStoreController { + private final CloseStoreService closeStoreService; + + @ApiOperation("闭店审批待办") + @GetMapping("/todoPage") + public ResponseResult+ * 闭店材料 前端控制器 + *
+ * + * @author wangff + * @since 2025/10/7 + */ +@Api(tags = "闭店材料") +@RestController +@RequestMapping("/pc/close/file") +@RequiredArgsConstructor +@Validated +public class CloseStoreFileController { + private final CloseStoreFileService closeStoreFileService; + + @ApiOperation("更新材料邮寄地址") + @PostMapping("/updateMailAddress") + public ResponseResult+ * 闭店退款 前端控制器 + *
+ * + * @author wangff + * @since 2025/10/13 + */ +@Api(tags = "闭店退款") +@RestController +@RequestMapping("/pc/close/refund") +@RequiredArgsConstructor +@Validated +public class CloseStoreRefundController { + private final CloseStoreRefundService closeStoreRefundService; + + @ApiOperation("获取当前用户的每刻用户信息") + @GetMapping("/getCurrentMkUser") + public ResponseResult+ * 闭店账号关闭 前端控制器 + *
+ * + * @author wangff + * @since 2025/10/8 + */ +@Api(tags = "mini账号关闭") +@RestController +@RequestMapping("/mini/close/account") +@RequiredArgsConstructor +@Validated +public class MiniCloseStoreAccountController { + private final CloseStoreAccountService closeStoreAccountService; + + @ApiOperation("获取账号列表") + @GetMapping("/accountList") + @ApiImplicitParam(name = "closeStoreId", value = "闭店申请id", required = true, dataType = "Long") + public ResponseResult+ * 闭店审批 前端控制器 + *
+ * + * @author wangff + * @since 2025/10/9 + */ +@Api(tags = "mini闭店管理") +@RestController +@RequestMapping("/mini/close/store") +@RequiredArgsConstructor +@Validated +public class MiniCloseStoreController { + private final CloseStoreService closeStoreService; + + @ApiOperation("申请闭店") + @PostMapping("/apply") + public ResponseResult+ * 小程序闭店材料 前端控制器 + *
+ * + * @author wangff + * @since 2025/10/7 + */ +@Api(tags = "mini闭店材料") +@RestController +@RequestMapping("/mini/close/file") +@RequiredArgsConstructor +@Validated +public class MiniCloseStoreFileController { + private final CloseStoreFileService closeStoreFileService; + + @ApiOperation("查询闭店材料详情") + @GetMapping("/detail") + @ApiImplicitParam(name = "closeStoreId", value = "闭店申请id", required = true, dataType = "Long") + public ResponseResult+ * 闭店退款 前端控制器 + *
+ * + * @author wangff + * @since 2025/10/13 + */ +@Api(tags = "mini闭店退款") +@RestController +@RequestMapping("/mini/close/refund") +@RequiredArgsConstructor +@Validated +public class MiniCloseStoreRefundController { + private final CloseStoreRefundService closeStoreRefundService; + + @ApiOperation("退款信息列表") + @GetMapping("/list") + @ApiImplicitParam(name = "closeStoreId", value = "闭店申请id", required = true, dataType = "Long") + public ResponseResult