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

Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

Browse Source
This commit is contained in:
shuo.wang
2025-04-09 16:56:50 +08:00
parent b329c10432 f9219e028e
commit 616c8b15f4
27 changed files with 849 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,6 +243,10 @@ public enum ErrorCodeEnum {
THIRD_API_ERROR(151001,"第三方服务异常->{0}",null),
THIRD_API_SIGN_ERROR(151002,"签名失败->{0}",null),
THIRD_API_TIME_IS_NULL(151003,"单据⽇期不能为空",null),
SYSTEM_DATA_ERROR(151004,"平台账号不能为空",null),
CURRENT_STATUS_NOT_OPERATION(151005,"平台账号当前非审核状态！不能提交审核",null),
CURRENT_ENTRY_STATUS_NOT_OPERATION(151006,"进件状态未审核！不能执行该操作",null),
;

3
coolstore-partner-common/src/main/java/com/cool/store/enums/OpenStatusEnum.java
View File

@@ -27,6 +27,9 @@ public enum OpenStatusEnum {
private String name;
public static List<Integer> getSpecialList(){
return Arrays.asList(OPENSTATUSENUM_4.getCode(),OPENSTATUSENUM_5.getCode(),OPENSTATUSENUM_6.getCode());
}
OpenStatusEnum(Integer code,String name){
this.code = code;

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

@@ -10,7 +10,7 @@ import java.util.List;
*/
public enum ShopAccountEnum {
HuoMa("火码POS",OpenStatusEnum.OPENSTATUSENUM_1),
HUOMA("火码POS",OpenStatusEnum.OPENSTATUSENUM_1),
YLS("云流水",OpenStatusEnum.OPENSTATUSENUM_1),
XZG("新掌柜",OpenStatusEnum.OPENSTATUSENUM_1),
MTTG("美团团购",OpenStatusEnum.OPENSTATUSENUM_1),
@@ -23,7 +23,11 @@ public enum ShopAccountEnum {
public static List<String> getSpecialList(){
return Arrays.asList(HuoMa.getSystemName(),YLS.getSystemName(),XZG.getSystemName());
return Arrays.asList(HUOMA.getSystemName(),YLS.getSystemName(),XZG.getSystemName());
}
public static List<ShopAccountEnum> getSpecialEnumList(){
return Arrays.asList(HUOMA,YLS,XZG);
}
private String systemName;

4
coolstore-partner-common/src/main/java/com/cool/store/utils/PasswordUtil.java
View File

@@ -44,7 +44,7 @@ public class PasswordUtil {
}
/**
* 使用 SHA-256 加密密码
* 使用 MD5 加密密码
*
* @param plainPassword 明文密码
* @param salt 盐值
@@ -52,7 +52,7 @@ public class PasswordUtil {
*/
public static String encryptPassword(String plainPassword, byte[] salt) {
try {
MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
MessageDigest messageDigest = MessageDigest.getInstance("MD5");
// 将盐值和明文密码拼接后进行哈希计算
messageDigest.update(salt);
byte[] hashedBytes = messageDigest.digest(plainPassword.getBytes());