Merge remote-tracking branch 'origin/master'

alien-entity/src/main/java/shop/alien/entity/store/ActivitySignInConfig.java

@@ -33,6 +33,9 @@ public class ActivitySignInConfig {
     @ApiModelProperty(value = "活动规则")
     private String activityRule;
 
+    @ApiModelProperty(value = "奖励类型1，积分，2.其他")
+    private Integer baseRewardType;
+
     @ApiModelProperty(value = "基础奖励积分")
     private Integer basePoints;
 

alien-entity/src/main/java/shop/alien/entity/store/vo/ActivityConfigVo.java

@@ -1,6 +1,7 @@
 package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,6 +19,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @JsonInclude
+@ApiModel(value = "ActivityConfigVo对象", description = "ActivityConfigVo")
 public class ActivityConfigVo extends ActivitySignInConfig {
 
     @ApiModelProperty(value = "签到奖励配置列表")

alien-entity/src/main/resources/mapper/ManagementInfoMapper.xml

@@ -38,6 +38,7 @@
         FROM
             store_info store
                 LEFT JOIN ( SELECT * FROM store_income_details_record WHERE created_time > #{startDate} AND created_time < #{endDate} ) income ON store.id = income.store_id
+        WHERE store.delete_flag = 0
         GROUP BY
             store.id
         ORDER BY