Merge branch 'dev/2024/0508/update-admin-Y' of feifan/mall-backend-admin into master

添加可设置的用户签到获得身价

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/orderpercentage/vo/OrderPercentagePageReqVO.java

@@ -55,4 +55,11 @@ public class OrderPercentagePageReqVO extends PageParam {
 
     @Schema(description = "收藏商品获取身价值，同一SPU商品收藏多次无效", example = "1")
     private String collectSocialStatus;
+
+    @Schema(description = "用户签到可获取的最大身价值")
+    private String signInSocialStatusMax;
+
+    @Schema(description = "签到获取身价", example = "1")
+    private String signInSocialStatus;
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/orderpercentage/vo/OrderPercentageRespVO.java

@@ -64,5 +64,14 @@ public class OrderPercentageRespVO {
     private String baseMaxQuota;
 
     @Schema(description = "收藏商品获取身价值，同一SPU商品收藏多次无效", example = "1")
+    @ExcelProperty("收藏商品获取身价值，同一SPU商品收藏多次无效")
     private String collectSocialStatus;
+
+    @Schema(description = "用户签到可获取的最大身价值")
+    @ExcelProperty("用户签到可获取的最大身价值")
+    private String signInSocialStatusMax;
+
+    @Schema(description = "签到获取身价", example = "1")
+    @ExcelProperty("签到获取身价")
+    private String signInSocialStatus;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/orderpercentage/vo/OrderPercentageSaveReqVO.java

@@ -49,5 +49,11 @@ public class OrderPercentageSaveReqVO {
     @Schema(description = "收藏商品获取身价值，同一SPU商品收藏多次无效", example = "1")
     private String collectSocialStatus;
 
+    @Schema(description = "用户签到可获取的最大身价值")
+    private String signInSocialStatusMax;
+
+    @Schema(description = "签到获取身价", example = "1")
+    private String signInSocialStatus;
+
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/orderpercentage/OrderPercentageDO.java

@@ -82,6 +82,15 @@ public class OrderPercentageDO extends BaseDO {
      */
     private String collectSocialStatus;
 
+    /**
+     * 用户签到可获取的最大身价值
+     */
+    private String signInSocialStatusMax;
+    /**
+     * 签到获取身价
+     */
+    private String signInSocialStatus;
+
     public String getGrossProfitBonusQuotaPerc() {
         double grossProfitBonusQuotaPerc = Double.parseDouble(this.grossProfitBonusQuotaPerc);
         if(grossProfitBonusQuotaPerc > GROSS_PROFIT_BONUS_QUOTA_PERC){