兑换信息导入

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java

@@ -48,7 +48,8 @@ public interface ErrorCodeConstants {
 
     ErrorCode SCORE_RULE_NOT_EXISTS = new ErrorCode(1004008004, "score.rule.not.exists");
     ErrorCode SCORE_RULE_DELETE_ERROR = new ErrorCode(1004008005, "score.rule.delete.error");
-    ErrorCode SCORE_RULE_UPDATE_ERROR = new ErrorCode(1004008005, "score.rule.update.error");
+    ErrorCode SCORE_RULE_UPDATE_ERROR = new ErrorCode(1004008006, "score.rule.update.error");
+    ErrorCode SCORE_RULE_FIELD_ERROR = new ErrorCode(1004008007, "score.rule.field.error");
 
 
 }

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/RelationSymbolEnum.java

+package cn.iocoder.yudao.module.member.enums;
+
+public enum RelationSymbolEnum {
+    GT(1, "大于"),
+    EQ(2, "等于"),
+    LT(3, "小于");
+
+    private final int value;
+    private final String name;
+
+    RelationSymbolEnum(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
\ No newline at end of file

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/TransportType.java

+package cn.iocoder.yudao.module.member.enums;
+
+public enum TransportType {
+    OCEAN_LCL(1, "海运拼柜"),
+    SPECIAL_LINE_AIR_FREIGHT(3, "专线空运");
+
+    private final int value;
+
+    private final String name;
+
+    TransportType(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

yudao-module-member/yudao-module-member-impl/pom.xml

@@ -44,5 +44,10 @@
             <version>${revision}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-depository-core</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
 </project>

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/scoreRule/ScoreRuleController.java

@@ -5,6 +5,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import cn.iocoder.yudao.module.depository.service.warehouse.WarehouseService;
+import cn.iocoder.yudao.module.depository.vo.warehouse.WarehouseTreeRegionVO;
 import cn.iocoder.yudao.module.member.convert.scoreRule.ScoreRuleConvert;
 import cn.iocoder.yudao.module.member.dal.dataobject.scoreRule.ScoreRuleDO;
 import cn.iocoder.yudao.module.member.service.scoreRule.ScoreRuleService;
@@ -12,6 +14,7 @@ import cn.iocoder.yudao.module.member.vo.scoreRule.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.ListUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -36,6 +39,8 @@ public class ScoreRuleController {
 
     @Resource
     private ScoreRuleService scoreRuleService;
+    @Resource
+    private WarehouseService warehouseService;
 
     @PostMapping("/create")
     @ApiOperation("创建积分规则")
@@ -54,19 +59,17 @@ public class ScoreRuleController {
 
     @PostMapping("/delete")
     @ApiOperation("删除积分规则")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('member:score-rule:delete')")
-    public CommonResult<Boolean> deleteScoreRule(@NotNull @RequestBody Long id) {
-        scoreRuleService.deleteScoreRule(id);
+    public CommonResult<Boolean> deleteScoreRule(@Valid @RequestBody IdReqVo idReqVo) {
+        scoreRuleService.deleteScoreRule(idReqVo.getId());
         return success(true);
     }
 
     @PostMapping("/get")
     @ApiOperation("获得积分规则详情")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('member:score-rule:query')")
-    public CommonResult<ScoreRuleBackDetailVO> getScoreRule(@NotNull @RequestBody Long id) {
-        ScoreRuleBackDetailVO scoreRuleBackDetailVO = scoreRuleService.getScoreRule(id);
+    public CommonResult<ScoreRuleBackDetailVO> getScoreRule(@Valid @RequestBody IdReqVo idReqVo) {
+        ScoreRuleBackDetailVO scoreRuleBackDetailVO = scoreRuleService.getScoreRule(idReqVo.getId());
         return success(scoreRuleBackDetailVO);
     }
 
@@ -74,7 +77,7 @@ public class ScoreRuleController {
     @ApiOperation("获得积分规则列表")
     @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
     @PreAuthorize("@ss.hasPermission('member:score-rule:query')")
-    public CommonResult<List<ScoreRuleBackVO>> getScoreRuleList(@NotNull @RequestBody Collection<Long> ids) {
+    public CommonResult<List<ScoreRuleBackVO>> getScoreRuleList(@NotNull @RequestParam Collection<Long> ids) {
         List<ScoreRuleBackVO> list = scoreRuleService.getScoreRuleList(ids);
         return success(list);
     }
@@ -90,24 +93,34 @@ public class ScoreRuleController {
     @ApiOperation("启用关闭")
     @PreAuthorize("@ss.hasPermission('member:score-rule:update')")
     public CommonResult<Boolean> updateStatus(@Valid @RequestBody ScoreRuleStatusReqVO scoreRuleStatusReqVO) {
-        Boolean res = scoreRuleService.updateStatus(scoreRuleStatusReqVO);
-        return success(res);
+        scoreRuleService.updateStatus(scoreRuleStatusReqVO);
+        return success(true);
     }
     @PostMapping("/copy")
     @ApiOperation("复制规则")
     @PreAuthorize("@ss.hasPermission('member:score-rule:create')")
-    public CommonResult<Long> copyScoreRule(@NotNull @RequestBody Long id) {
-        Long newId = scoreRuleService.copyScoreRule(id);
-        return success(id);
+    public CommonResult<Long> copyScoreRule(@Valid @RequestBody IdReqVo idReqVo) {
+        return success(scoreRuleService.copyScoreRule(idReqVo.getId()));
     }
     @PostMapping("/delay")
     @ApiOperation("延期规则")
     @PreAuthorize("@ss.hasPermission('member:score-rule:update')")
     public CommonResult<Boolean> delayScoreRule(@Valid @RequestBody ScoreDelayReqVO scoreDelayReqVO) {
-        Boolean res = scoreRuleService.delayScoreRule(scoreDelayReqVO);
-        return success(res);
+        scoreRuleService.delayScoreRule(scoreDelayReqVO);
+        return success(true);
+    }
+
+    @GetMapping("/getWarehouseTreeRegionList")
+    @ApiOperation("获得目的国、目的城市、目的仓列表")
+    public CommonResult<List<WarehouseTreeRegionVO>> WarehouseTreeRegionList() {
+        List<WarehouseTreeRegionVO> listIn = warehouseService.getWarehouseTreeRegionList(1);
+        List<WarehouseTreeRegionVO> listOut = warehouseService.getWarehouseTreeRegionList(2);
+        List<WarehouseTreeRegionVO> list = ListUtils.sum(listIn, listOut);
+        return success(list);
     }
 
+
+
     @GetMapping("/export-excel")
     @ApiOperation("导出积分规则Excel")
     @PreAuthorize("@ss.hasPermission('member:score-rule:export')")

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/scoreRule/ScoreRuleDO.java

@@ -71,7 +71,7 @@ public class ScoreRuleDO extends BaseDO {
     /**
      * 积分有效期
      */
-    private Integer socrePeriod;
+    private Integer scorePeriod;
     /**
      * 排序值
      */

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/scoreRule/ScoreRuleMapper.java

 package cn.iocoder.yudao.module.member.dal.mysql.scoreRule;
 
 import java.util.*;
+
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQuery;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.AbstractMapper;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.member.dal.dataobject.scoreRule.ScoreRuleDO;
 import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
+import cn.iocoder.yudao.module.member.enums.RelationSymbolEnum;
 import cn.iocoder.yudao.module.member.vo.scoreRule.ScoreRuleQueryVO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 积分规则 DO Mapper
+ * 积分规则 Mapper
+ *
  * @author 系统管理员
  */
 @Mapper
@@ -18,58 +22,51 @@ public interface ScoreRuleMapper extends AbstractMapper<ScoreRuleDO> {
     @Override
     default PageResult<ScoreRuleDO> selectPage(PageVO page, Object object) {
         if (object instanceof ScoreRuleQueryVO) {
-            ScoreRuleQueryVO vo = (ScoreRuleQueryVO)object;
-            return selectPage(page, new LambdaQuery<ScoreRuleDO>()
-                .eqIfPresent(ScoreRuleDO::getType, vo.getType())
-                .eqIfPresent(ScoreRuleDO::getTitleZh, vo.getTitleZh())
-                .eqIfPresent(ScoreRuleDO::getTitleEn, vo.getTitleEn())
-                .eqIfPresent(ScoreRuleDO::getDescZh, vo.getDescZh())
-                .eqIfPresent(ScoreRuleDO::getDescEn, vo.getDescEn())
-                .eqIfPresent(ScoreRuleDO::getCoverImageZh, vo.getCoverImageZh())
-                .eqIfPresent(ScoreRuleDO::getCoverImageEn, vo.getCoverImageEn())
-                .eqIfPresent(ScoreRuleDO::getGetScoreOnce, vo.getGetScoreOnce())
-                .eqIfPresent(ScoreRuleDO::getMaxScoreTotal, vo.getMaxScoreTotal())
-                .betweenIfPresent(ScoreRuleDO::getStartTime, vo.getBeginStartTime(), vo.getEndStartTime())
-                .betweenIfPresent(ScoreRuleDO::getEndTime, vo.getBeginEndTime(), vo.getEndEndTime())
-                .eqIfPresent(ScoreRuleDO::getSocrePeriod, vo.getSocrePeriod())
-                .eqIfPresent(ScoreRuleDO::getOrderNum, vo.getOrderNum())
-                .eqIfPresent(ScoreRuleDO::getPushActivity, vo.getPushActivity())
-                .eqIfPresent(ScoreRuleDO::getShowPlatform, vo.getShowPlatform())
-                .eqIfPresent(ScoreRuleDO::getStatus, vo.getStatus())
-                .eqIfPresent(ScoreRuleDO::getExtra, vo.getExtra())
-                .betweenIfPresent(ScoreRuleDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
-                    .orderByDesc(ScoreRuleDO::getId));
-        }
+            ScoreRuleQueryVO vo = (ScoreRuleQueryVO) object;
+            LambdaQueryWrapperX<ScoreRuleDO> queryWrapperX = new LambdaQuery<ScoreRuleDO>()
+                    .eqIfPresent(ScoreRuleDO::getType, vo.getType())
+                    .eqIfPresent(ScoreRuleDO::getStatus, vo.getStatus())
+                    .betweenIfPresent(ScoreRuleDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
+                    .orderByDesc(ScoreRuleDO::getId);
+            if (vo.getGetScoreOnceSymbol() != null && vo.getGetScoreOnce() != null) {
+                queryWrapperX.gt(vo.getGetScoreOnceSymbol() == RelationSymbolEnum.GT.getValue(), ScoreRuleDO::getGetScoreOnce, vo.getGetScoreOnce())
+                        .eq(vo.getGetScoreOnceSymbol() == RelationSymbolEnum.EQ.getValue(), ScoreRuleDO::getGetScoreOnce, vo.getGetScoreOnce())
+                        .lt(vo.getGetScoreOnceSymbol() == RelationSymbolEnum.LT.getValue(), ScoreRuleDO::getGetScoreOnce, vo.getGetScoreOnce());
+            }
+            if (vo.getMaxScoreTotalSymbol() != null && vo.getMaxScoreTotal() != null) {
+                queryWrapperX.gt(vo.getMaxScoreTotalSymbol() == RelationSymbolEnum.GT.getValue(), ScoreRuleDO::getMaxScoreTotal, vo.getMaxScoreTotal())
+                        .eq(vo.getMaxScoreTotalSymbol() == RelationSymbolEnum.EQ.getValue(), ScoreRuleDO::getMaxScoreTotal, vo.getMaxScoreTotal())
+                        .lt(vo.getMaxScoreTotalSymbol() == RelationSymbolEnum.LT.getValue(), ScoreRuleDO::getMaxScoreTotal, vo.getMaxScoreTotal());
+            }
+            queryWrapperX.and(vo.getTitle() != null, wrapper ->
+                    wrapper.like(ScoreRuleDO::getTitleEn, vo.getTitle())
+                            .or()
+                            .like(ScoreRuleDO::getTitleZh, vo.getTitle())
 
+            );
+            queryWrapperX.and(vo.getDesc() != null, wrapper ->
+                    wrapper.like(ScoreRuleDO::getDescZh, vo.getDesc())
+                            .or()
+                            .like(ScoreRuleDO::getDescEn, vo.getDesc())
+
+            );
+            return selectPage(page, queryWrapperX);
+        }
         return null;
     }
 
     @Override
     default List<ScoreRuleDO> selectList(Object object) {
         if (object instanceof ScoreRuleQueryVO) {
-            ScoreRuleQueryVO vo = (ScoreRuleQueryVO)object;
+            ScoreRuleQueryVO vo = (ScoreRuleQueryVO) object;
             return selectList(new LambdaQuery<ScoreRuleDO>()
-                .eqIfPresent(ScoreRuleDO::getType, vo.getType())
-                .eqIfPresent(ScoreRuleDO::getTitleZh, vo.getTitleZh())
-                .eqIfPresent(ScoreRuleDO::getTitleEn, vo.getTitleEn())
-                .eqIfPresent(ScoreRuleDO::getDescZh, vo.getDescZh())
-                .eqIfPresent(ScoreRuleDO::getDescEn, vo.getDescEn())
-                .eqIfPresent(ScoreRuleDO::getCoverImageZh, vo.getCoverImageZh())
-                .eqIfPresent(ScoreRuleDO::getCoverImageEn, vo.getCoverImageEn())
-                .eqIfPresent(ScoreRuleDO::getGetScoreOnce, vo.getGetScoreOnce())
-                .eqIfPresent(ScoreRuleDO::getMaxScoreTotal, vo.getMaxScoreTotal())
-                .betweenIfPresent(ScoreRuleDO::getStartTime, vo.getBeginStartTime(), vo.getEndStartTime())
-                .betweenIfPresent(ScoreRuleDO::getEndTime, vo.getBeginEndTime(), vo.getEndEndTime())
-                .eqIfPresent(ScoreRuleDO::getSocrePeriod, vo.getSocrePeriod())
-                .eqIfPresent(ScoreRuleDO::getOrderNum, vo.getOrderNum())
-                .eqIfPresent(ScoreRuleDO::getPushActivity, vo.getPushActivity())
-                .eqIfPresent(ScoreRuleDO::getShowPlatform, vo.getShowPlatform())
-                .eqIfPresent(ScoreRuleDO::getStatus, vo.getStatus())
-                .eqIfPresent(ScoreRuleDO::getExtra, vo.getExtra())
-                .betweenIfPresent(ScoreRuleDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
+                    .eqIfPresent(ScoreRuleDO::getType, vo.getType())
+                    .eqIfPresent(ScoreRuleDO::getGetScoreOnce, vo.getGetScoreOnce())
+                    .eqIfPresent(ScoreRuleDO::getMaxScoreTotal, vo.getMaxScoreTotal())
+                    .eqIfPresent(ScoreRuleDO::getStatus, vo.getStatus())
+                    .betweenIfPresent(ScoreRuleDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
                     .orderByDesc(ScoreRuleDO::getId));
         }
-
         return null;
     }
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/job/ScoreRuleExpireTask.java

+package cn.iocoder.yudao.module.member.job;
+
+import cn.iocoder.yudao.framework.common.util.date.DateUtils;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQuery;
+import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreRule.ScoreRuleDO;
+import cn.iocoder.yudao.module.member.enums.ScoreRuleStatusEnum;
+import cn.iocoder.yudao.module.member.service.scoreRule.ScoreRuleService;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 会员积分过期定时任务
+ */
+@Component
+@Slf4j
+public class ScoreRuleExpireTask implements JobHandler {
+    /**
+     * 积分规则的过期时间为每日的0点整
+     * 任务每天0点整运行，扫描当天0点过期的积分进行状态修改
+     * @param param 参数
+     * @return
+     * @throws Exception
+     */
+
+    @Resource
+    private ScoreRuleService scoreRuleService;
+
+    @Override
+    public String execute(String param) throws Exception {
+        log.info("score rule expire task running");
+        LambdaQuery<ScoreRuleDO> scoreRuleDOLambdaQuery = new LambdaQuery<>();
+        scoreRuleDOLambdaQuery.eq(ScoreRuleDO::getStatus, ScoreRuleStatusEnum.ENABLED.getValue());
+        scoreRuleDOLambdaQuery.le(ScoreRuleDO::getEndTime, DateUtils.getNextNDayStart(new Date(), 0));
+        List<ScoreRuleDO> todoList = scoreRuleService.selectList(scoreRuleDOLambdaQuery);
+        log.info("score rule expire task, to expire rule count :{}", todoList.size());
+        if (CollectionUtils.isEmpty(todoList)) {
+            return "success";
+        } else {
+            todoList.forEach(scoreRuleDO -> scoreRuleDO.setStatus(ScoreRuleStatusEnum.EXPIRED.getValue()));
+            scoreRuleService.updateBatch(todoList);
+        }
+        return "success";
+    }
+}

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/scoreRule/ScoreRuleService.java

@@ -72,7 +72,7 @@ public interface ScoreRuleService extends IService<ScoreRuleDO> {
      * @param scoreRuleStatusReqVO 积分规则状态
      * @return
      */
-    Boolean updateStatus(ScoreRuleStatusReqVO scoreRuleStatusReqVO);
+    void updateStatus(ScoreRuleStatusReqVO scoreRuleStatusReqVO);
 
     /**
      * 积分规则复制
@@ -86,5 +86,5 @@ public interface ScoreRuleService extends IService<ScoreRuleDO> {
      * @param scoreDelayReqVO 积分规则延期
      * @return
      */
-    Boolean delayScoreRule(ScoreDelayReqVO scoreDelayReqVO);
+    void delayScoreRule(ScoreDelayReqVO scoreDelayReqVO);
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/scoreRule/IdReqVo.java

+package cn.iocoder.yudao.module.member.vo.scoreRule;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("管理后台 - 积分规则id请求 VO")
+public class IdReqVo {
+    @ApiModelProperty(value = "主键", required = true)
+    @NotNull(message = "主键不能为空")
+    private Long id;
+}

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/scoreRule/ScoreRuleBaseVO.java

@@ -24,7 +24,7 @@ public class ScoreRuleBaseVO {
     private Integer type;
 
     @ApiModelProperty(value = "规则标题中文", required = true)
-    @NotNull(message = "规则标题中文不能为空")
+    @NotBlank(message = "规则标题中文不能为空")
     private String titleZh;
 
     @ApiModelProperty(value = "规则标题英文", required = true)

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/scoreRule/ScoreRuleQueryVO.java

 package cn.iocoder.yudao.module.member.vo.scoreRule;
 
 import lombok.*;
+
 import java.util.*;
+
 import io.swagger.annotations.*;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,64 +17,25 @@ public class ScoreRuleQueryVO {
     @ApiModelProperty(value = "指标类型")
     private Integer type;
 
-    @ApiModelProperty(value = "规则标题中文")
-    private String titleZh;
-
-    @ApiModelProperty(value = "规则标题英文")
-    private String titleEn;
-
-    @ApiModelProperty(value = "规则说明中文")
-    private String descZh;
-
-    @ApiModelProperty(value = "规则说明英文")
-    private String descEn;
+    @ApiModelProperty(value = "规则标题")
+    private String title;
 
-    @ApiModelProperty(value = "封面图中文")
-    private String coverImageZh;
-
-    @ApiModelProperty(value = "封面图英文")
-    private String coverImageEn;
+    @ApiModelProperty(value = "规则说明")
+    private String desc;
 
+    @ApiModelProperty(value = "单次获取积分数查询条件（1大于，2等于，3小于）")
+    private Integer getScoreOnceSymbol;
     @ApiModelProperty(value = "单次获取积分数")
     private Integer getScoreOnce;
 
+    @ApiModelProperty(value = "单次获取积分数查询条件（1大于，2等于，3小于）")
+    private Integer maxScoreTotalSymbol;
     @ApiModelProperty(value = "累积最高积分")
     private Integer maxScoreTotal;
 
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "开始活动开始时间")
-    private Date beginStartTime;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "结束活动开始时间")
-    private Date endStartTime;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "开始活动结束时间")
-    private Date beginEndTime;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "结束活动结束时间")
-    private Date endEndTime;
-
-    @ApiModelProperty(value = "积分有效期")
-    private Integer socrePeriod;
-
-    @ApiModelProperty(value = "排序值")
-    private Integer orderNum;
-
-    @ApiModelProperty(value = "是否推送")
-    private Integer pushActivity;
-
-    @ApiModelProperty(value = "展示平台")
-    private String showPlatform;
-
     @ApiModelProperty(value = "活动状态")
     private Integer status;
 
-    @ApiModelProperty(value = "扩展字段")
-    private String extra;
-
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始创建时间")
     private Date beginCreateTime;
@@ -80,5 +43,4 @@ public class ScoreRuleQueryVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "结束创建时间")
     private Date endCreateTime;
-
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/scoreRule/extra/ScoreRuleShareExtraVO.java

@@ -14,5 +14,5 @@ public class ScoreRuleShareExtraVO {
     @ApiModelProperty(value = "活动链接", required = true)
     private String activityUrl ;
     @ApiModelProperty(value = "是否分享（0是，1否）默认是", required = true)
-    private String shareStatus ;
+    private Integer shareStatus ;
 }

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/convert/channel/ChannelConvert.java

@@ -26,6 +26,7 @@ public interface ChannelConvert {
     ChannelRespVO convert(ChannelDO bean);
 
     List<ChannelRespVO> convertList(List<ChannelDO> list);
+    List<ChannelSimpleRespVO> convertSimpleList(List<ChannelDO> list);
 
     PageResult<ChannelRespVO> convertPage(PageResult<ChannelDO> page);
 

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/service/channel/ChannelService.java

@@ -86,4 +86,6 @@ public interface ChannelService extends IService<ChannelDO> {
      * @return 渠道管理分页
      */
     PageResult<ChannelRespVO> channelPage(ChannelPageReqVO pageVO);
+
+    List<ChannelDO> getChannelSimpleList();
 }

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/service/channel/impl/ChannelServiceImpl.java

@@ -19,6 +19,7 @@ import cn.iocoder.yudao.module.sale.service.channel.ChannelService;
 import cn.iocoder.yudao.module.sale.service.channelPackaging.ChannelPackagingService;
 import cn.iocoder.yudao.module.sale.service.channelPriceStepClearance.ChannelPriceStepClearanceService;
 import cn.iocoder.yudao.module.sale.vo.channel.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.commons.lang3.StringUtils;
@@ -233,4 +234,9 @@ public class ChannelServiceImpl extends AbstractService<ChannelMapper, ChannelDO
         List<ChannelRespVO> channelList = pageResult.getList();
         return pageResult;
     }
+
+    @Override
+    public List<ChannelDO> getChannelSimpleList() {
+        return channelMapper.selectList(new LambdaQueryWrapper<ChannelDO>());
+    }
 }

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/vo/channel/ChannelSimpleRespVO.java

+package cn.iocoder.yudao.module.sale.vo.channel;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@ApiModel("渠道精简信息 Response VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChannelSimpleRespVO {
+    @ApiModelProperty(value = "", required = true)
+    private Long channelId;
+
+    @ApiModelProperty(value = "中文标题")
+    private String nameZh;
+
+    @ApiModelProperty(value = "英文标题")
+    private String nameEn;
+}
\ No newline at end of file

yudao-module-sale/yudao-module-sale-rest/src/main/java/cn/iocoder/yudao/module/sale/controller/admin/channel/ChannelController.java

@@ -110,6 +110,13 @@ public class ChannelController {
         return success(ChannelConvert.INSTANCE.convertList(list));
     }
 
+    @GetMapping("/list-all-simple")
+    @ApiOperation(value = "获得渠道精简信息列表", notes = "主要用于前端的下拉选项")
+    public CommonResult<List<ChannelSimpleRespVO>> getChannelSimpleList() {
+        List<ChannelDO> list = channelService.getChannelSimpleList();
+        return success(ChannelConvert.INSTANCE.convertSimpleList(list));
+    }
+
     @GetMapping("/select")
     @ApiOperation("获得可用渠道列表查询(参数可选择一个，最终以目的地国家来查询，不传代表查询所有)")
     @ApiImplicitParams({