Merge branch 'refs/heads/master' into cc_20251112_wallet

# Conflicts:
#	coolstore-partner-web/src/main/resources/application-ab.properties
#	coolstore-partner-web/src/main/resources/application-test.properties

coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java

@@ -232,4 +232,7 @@ public class CommonConstants {
     public static final int REFRESH_TOKEN_EXPIRE = 30 * 24 * 60 * 60;
 
     public static final int BATCH_SIZE = 200;
+
+    public static final Integer INDEX_ZERO = 0;
+    public static final Integer INDEX_ONE = 1;
 }

coolstore-partner-common/src/main/java/com/cool/store/enums/BusinessModelEnum.java

@@ -9,7 +9,8 @@ package com.cool.store.enums;
 public enum BusinessModelEnum {
     NULL(0, "无"),
     DIRECT_SALES(1, "直营"),
-    JOIN_SALES(2, "加盟");
+    JOIN_SALES(2, "加盟"),
+    JOINT_STORE(3, "联营");
 
     private Integer code;
     private String desc;

coolstore-partner-common/src/main/java/com/cool/store/utils/CommonUtil.java

@@ -0,0 +1,25 @@
+package com.cool.store.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 公共工具
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/10/29
+ */
+public class CommonUtil {
+    public static BigDecimal convertToBig(String value) {
+        if (StringUtils.isBlank(value)) {
+            return BigDecimal.ZERO;
+        }
+        try {
+            return new BigDecimal(value);
+        } catch (Exception ignored) {}
+        return BigDecimal.ZERO;
+    }
+}