消息通知配置与商家认证

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/CommissionConfigService.java

@@ -5,6 +5,8 @@ import com.chelvc.cloud.vehicle.api.param.CommissionConfigModifyParam;
 import com.chelvc.cloud.vehicle.api.param.CommissionConfigPagingParam;
 import com.chelvc.framework.common.model.Pagination;
 
+import java.util.List;
+
 /**
  * 邀请别人消费，邀请人数的不同抽成配置接口
  *
@@ -44,4 +46,10 @@ public interface CommissionConfigService {
      */
     void deleteCommissionConfig(Long id);
 
+    /**
+     * 分佣配置列表
+     * @return
+     */
+    List<CommissionConfigDTO> listCommissionConfig();
+
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/CommissionConfigService.java

@@ -10,4 +10,9 @@ import com.chelvc.cloud.vehicle.server.entity.CommissionConfig;
  * @date 2023/12/16
  */
 public interface CommissionConfigService extends IService<CommissionConfig> {
+    /**
+     * 查询抽成比列
+     * @return 抽成比例信息
+     */
+    CommissionConfig queryCommissionRate(Integer min);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CategoryServiceImpl.java

@@ -72,7 +72,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
         for (CategoryDTO categoryDTO:categoryList){
             List<CategoryDTO> categorys = new ArrayList<>();
             for (CategoryDTO categorydto:categoryDTOS){
-                if (categorydto.getParentId() == categoryDTO.getId()){
+                if (categorydto.getParentId().equals(categoryDTO.getId()) ){
                     categorys.add(categorydto);
                 }
             }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CommissionConfigServiceImpl.java

@@ -16,6 +16,7 @@ import lombok.NonNull;
 import org.apache.dubbo.config.annotation.DubboService;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 抽成业务操作实现
@@ -60,6 +61,20 @@ public class CommissionConfigServiceImpl extends ServiceImpl<CommissionConfigMap
         ResourceUtils.required(this.getById(id), "该轮播图存在");
         this.baseMapper.deleteById(id);
     }
+    @Override
+    public List<CommissionConfigDTO> listCommissionConfig(){
+        List<CommissionConfig> configList = this.lambdaQuery().
+                orderByAsc(CommissionConfig::getCommissionRate).list();
+        return CommissionConfigCopier.INSTANCE.copying(configList);
+    }
+
+    @Override
+    public CommissionConfig queryCommissionRate(Integer min){
+        List<CommissionConfig> configList = this.lambdaQuery().
+                gt(CommissionConfig::getMinInvitees,min).
+                orderByDesc(CommissionConfig::getMinInvitees).list();
+        return configList.get(0);
+    }
 
 
  }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/IncomeRecordServiceImpl.java

@@ -29,6 +29,7 @@ public class IncomeRecordServiceImpl extends ServiceImpl<IncomeRecordMapper, Inc
         incomeRecord.setCreateTime(new Date());
         incomeRecord.setUpdateTime(new Date());
         incomeRecord.setInviterId(userId);
+
         this.save(incomeRecord);
         return incomeRecord.getId();
     }