suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cc_20250605_shopReport

Browse Source
This commit is contained in:
shuo.wang
2025-06-10 15:42:39 +08:00
parent f9c79eaf0c 7d28b7f739
commit 3fe7d80d8f
57 changed files with 1603 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
View File

@@ -194,6 +194,8 @@ public class RedisConstant {
*/
public static final String COOLINGPERIOD_FIRSTLOGIN_KEY = "coolingPeriodFirstLoginCache:{0}";
public static final String REDIS_KEY_PREFIX = "daily_id:{0}";
/**
* 七天
*/

25
coolstore-partner-common/src/main/java/com/cool/store/enums/ClaimStatusEnum.java Normal file
View File

@@ -0,0 +1,25 @@
package com.cool.store.enums;
/**
* @Author: WangShuo
* @Date: 2025/05/30/15:52
* @Version 1.0
* @注释:
*/
public enum ClaimStatusEnum {
TO_BE_CLAIMED(0,"待认领"),
CLAIMED(1,"已认领");
private Integer code;
private String message;
ClaimStatusEnum(Integer code,String message){
this.code = code;
this.message =message;
}
public Integer getCode(){
return code;
}
public String getMessage(){
return message;
}
}

11
coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
View File

@@ -263,6 +263,17 @@ public enum ErrorCodeEnum {
USER_ACCOUNT_WAIT_AUDIT(151015, "账号信息等待审核",null),
SHOP_HAVE_NOT_OVER_ACCORDING(1511014,"该加盟商下有未结束跟进的门店，请先结束门店",null),
MOBILE_NOT_EXIST(151016,"手机号不存在，请先维护手机号！",null),
API_CALL_ERROR(1511020,"接口调用错误",null),
ADD_PAY_INFO_FAIL(1511021,"添加缴费信息失败",null),
UPDATE_ERROR(1511022,"修改信息失败",null),
CLAIM_STATUS_ERROR(1511023,"当前状态为已认领，不能进行操作",null),
PAY_USER_NAME_ERROR(1511024,"付款人最多为2人",null),
DELETE_ERROR(1511025,"删除信息失败",null),
RECEIPT_NOT_EXIST(1511026,"收款单不存在或已被删除",null),
XGJ_COLLECTION_STATUS_COMPLETE(1511027,"新管家收费状态已完成，请确认！",null),
PAY_AMOUNT_ERROR(1511028,"缴费金额不能大于未缴金额",null),
;

8
coolstore-partner-common/src/main/java/com/cool/store/enums/ExtendFieldTypeEnum.java
View File

@@ -17,12 +17,18 @@ public enum ExtendFieldTypeEnum {
TEST_SIGNATORY_NAME_2("extend_field_1746670671614","签约人2名称"),
TEST_SIGNATORY_MOBILE_2("extend_field_1746670686307","签约人2手机号"),
TEST_ORDER_NAME("extend_field_1747103227333","订单小程序名称"),
TEST_JOIN_MODE("extend_field_1749175173890","加盟模式"),
TEST_STORE_TYPE("extend_field_1749175177455","门店类型"),
TEST_BRAND("extend_field_1749177175079","品牌"),
ONLINE_STORE_MANAGER_MOBILE("extend_field_1746598536903","店长手机号"),
ONLINE_SIGNATORY_NAME_1("extend_field_1746598562255","签约人1名称"),
ONLINE_SIGNATORY_MOBILE_1("extend_field_1746598570479","签约人2手机号"),
ONLINE_SIGNATORY_NAME_2("extend_field_1746598584139","签约人2名称"),
ONLINE_SIGNATORY_MOBILE_2("extend_field_1746598594140","签约人2手机号"),
ONLINE_ORDER_NAME("extend_field_1746599049206","订单小程序名称"),;
ONLINE_ORDER_NAME("extend_field_1746599049206","订单小程序名称"),
ONLINE_JOIN_MODE("extend_field_1748315801670","加盟模式"),
ONLINE_STORE_TYPE("extend_field_1748315809671","门店类型"),
ONLINE_BRAND("extend_field_1749176993442","品牌"),;
private String key;

25
coolstore-partner-common/src/main/java/com/cool/store/enums/XGJCollectionStatusEnum.java Normal file
View File

@@ -0,0 +1,25 @@
package com.cool.store.enums;
/**
* @Author: WangShuo
* @Date: 2025/06/04/11:16
* @Version 1.0
* @注释:
*/
public enum XGJCollectionStatusEnum {
WAIT_PAY(0, "待缴费"),
PARTIAL_PAYMENT(1, "部分缴款"),
COMPLETED(2, "已完成");
private Integer code;
private String message;
XGJCollectionStatusEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
public Integer getCode() {
return code;
}
public String getMessage() {
return message;
}
}

4
coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayTypeEnum.java
View File

@@ -8,7 +8,9 @@ package com.cool.store.enums.point;
*/
public enum PayTypeEnum {
WX_PAY(1,"微信支付"),
BANK_PAY(2,"银行转账");
BANK_PAY(2,"银行转账"),
ONLINE_PAY(3,"线上支付"),
OFFLINE_PAY(4,"线下支付");
private Integer code;
private String desc;

2
coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
View File

@@ -39,7 +39,7 @@ public enum ShopSubStageStatusEnum {
//缴纳加盟费/保证金
SHOP_SUB_STAGE_STATUS_70(ShopSubStageEnum.SHOP_STAGE_7, 700, "待内勤发布账单", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_71(ShopSubStageEnum.SHOP_STAGE_7, 710, "待加盟商缴费", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_72(ShopSubStageEnum.SHOP_STAGE_7, 720, "待内勤审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_72(ShopSubStageEnum.SHOP_STAGE_7, 720, "对账确认中", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_73(ShopSubStageEnum.SHOP_STAGE_7, 730, "已缴费", Boolean.TRUE),
SHOP_SUB_STAGE_STATUS_74(ShopSubStageEnum.SHOP_STAGE_7, 740, "审核不通过", Boolean.FALSE),

9
coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java
View File

@@ -34,6 +34,7 @@ public class CoolDateUtils {
public static final String DATE_FORMAT_SEC_5 = "yyyy.MM.dd HH:mm";
public static final String DATE_FORMAT_SEC_6 = "yyyy.MM.dd";
public static final String DATE_FORMAT_SEC_7 = "yyyy/MM/dd HH:mm";
public static final String DATE_FORMAT_SEC_8 = "yyyyMMdd";
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -136,6 +137,14 @@ public class CoolDateUtils {
return str;
}
/**
* 获取当前日期 yyyyMMdd
* @return
*/
public static final String getToday(){
DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern(DATE_FORMAT_SEC_8);
return LocalDate.now().format(DATE_FORMATTER);
}
/**
* 获取当前日期字符串 (yyyy-MM-dd)

6
coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java
View File

@@ -6,6 +6,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.text.MessageFormat;
/**
* redis常量工具类
@@ -113,4 +115,8 @@ public class RedisConstantUtil {
return active + "_" + RedisConstant.GET_AI_MODULE + eid;
}
public String getPaymentReceiptCode(String today){
return active + "_" + MessageFormat.format(RedisConstant.REDIS_KEY_PREFIX, today);
}
}

15
coolstore-partner-common/src/main/java/com/cool/store/utils/UUIDUtils.java
View File

@@ -1,8 +1,13 @@
package com.cool.store.utils;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import org.apache.commons.lang3.StringUtils;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Random;
/**
* 唯一性ID工具类
*
@@ -12,6 +17,10 @@ import org.apache.commons.lang3.StringUtils;
*/
public class UUIDUtils {
private static final String ID_PREFIX = "12";
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern(CoolDateUtils.DATE_FORMAT_SEC_8);
/**
* 简化的UUID，去掉了横线，使用性能更好的ThreadLocalRandom生成UUID
*/
@@ -26,5 +35,9 @@ public class UUIDUtils {
long uuid = (int) (Math.random() * 90000000 + 10000000);
return uuid;
}
// 生成 UUID 方法
public static String generateCustomUUID(Integer randomCount) {
String today = LocalDate.now().format(DATE_FORMATTER);
return ID_PREFIX + today + String.format("%04d", randomCount);
}
}