ruoyi-api/src/main/java/com/ruoyi/api/controller/shop/distribution/ApiDistributionUserOrderGainsController.java

@@ -0,0 +1,90 @@
+package com.ruoyi.api.controller.shop.distribution;
+
+import cn.hutool.core.date.DateUtil;
+import com.ruoyi.api.controller.common.AbstractApiController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.shop.distribution.domain.bo.DistributionUserOrderGainsBo;
+import com.ruoyi.shop.distribution.domain.vo.DistributionUserOrderGainsVo;
+import com.ruoyi.shop.distribution.service.IDistributionUserOrderGainsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * 会员分佣所得Controller
+ *
+ * @author lubo
+ * @date 2026-03-09
+ */
+@Validated
+@Api(value = "会员分佣所得控制器", tags = {"会员分佣所得管理"})
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/distributionUserOrderGains")
+public class ApiDistributionUserOrderGainsController extends AbstractApiController {
+
+    private final IDistributionUserOrderGainsService iDistributionUserOrderGainsService;
+
+    /**
+     * 分页查询会员分佣所得列表
+     */
+    @ApiOperation("查询会员分佣所得列表")
+    @GetMapping("/page")
+    public TableDataInfo<DistributionUserOrderGainsVo> page(@Validated(QueryGroup.class) DistributionUserOrderGainsBo bo, PageQuery pageQuery) {
+        bo.setUserId(getUserId(true));
+        return iDistributionUserOrderGainsService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取会员分佣所得详细信息
+     */
+    @ApiOperation("获取会员分佣所得详细信息")
+    @GetMapping("/info/{userOrderGainsId}")
+    public R<DistributionUserOrderGainsVo> getInfo(@ApiParam("主键")
+                                                  @NotNull(message = "主键不能为空")
+                                                  @PathVariable("userOrderGainsId") Long userOrderGainsId) {
+        return R.ok(iDistributionUserOrderGainsService.queryById(userOrderGainsId));
+    }
+
+
+    /**
+     * 获取会员的时间范围内内的分销订单数
+     */
+    @ApiOperation("获取会员的时间范围内内的分销订单数")
+    @GetMapping("/count/{dateRange}")
+    public R<Long> dateRange(@ApiParam("主键")
+                                                   @NotNull(message = "时间范围不能为空")
+                                                   @PathVariable("dateRange") String dateRange) {
+        Date startTime;
+        Date endTime;
+        Date now = new Date();
+        if("week".equals(dateRange))
+        {
+            startTime = DateUtil.beginOfWeek(now);
+            endTime = DateUtil.endOfWeek(now);
+        }
+        else
+        {
+            startTime = DateUtil.beginOfMonth(now);
+            endTime = DateUtil.endOfMonth(now);
+        }
+
+        Long count = iDistributionUserOrderGainsService.countByDateRange(getUserId(true),startTime,endTime);
+        return R.ok(count);
+    }
+
+
+
+}

ruoyi-shop/src/main/java/com/ruoyi/shop/distribution/domain/bo/DistributionUserOrderGainsBo.java

@@ -12,14 +12,11 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 会员分佣所得业务对象 tb_distribution_user_order_gains
@@ -305,5 +302,4 @@ public class DistributionUserOrderGainsBo extends BaseTimeEntity {
     @NotNull(message = "分润比率不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal ratio;
 
-
 }

ruoyi-shop/src/main/java/com/ruoyi/shop/distribution/service/IDistributionUserOrderGainsService.java

@@ -10,6 +10,7 @@ import com.ruoyi.shop.distribution.domain.vo.UserOrderGainsTo;
 
 import java.math.BigDecimal;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -126,4 +127,6 @@ public interface IDistributionUserOrderGainsService extends IDistributionHandle
      * @return 待结算金额
      */
     BigDecimal loadByWaitAccount(Long userId);
+
+    Long countByDateRange(Long userId, Date startTime, Date endTime);
 }

ruoyi-shop/src/main/java/com/ruoyi/shop/distribution/service/impl/BusinessOrderGainsServiceImpl.java

@@ -353,7 +353,7 @@ public class BusinessOrderGainsServiceImpl implements IBusinessOrderGainsService
             {
                 userOrderGains.setSettlement(false);
                 userOrderGains.setAbleSettlement(true);
-                userOrderGains.setSettlementRemark("系统可以给用户结算");
+                userOrderGains.setSettlementRemark("可以给用户结算");
                 distributionUserOrderGainsMapper.updateById(userOrderGains);
             }
         }

ruoyi-shop/src/main/java/com/ruoyi/shop/distribution/service/impl/DistributionUserOrderGainsServiceImpl.java

@@ -246,6 +246,16 @@ public class DistributionUserOrderGainsServiceImpl implements IDistributionUserO
 
     }
 
+    @Override
+    public Long countByDateRange(Long userId, Date startTime, Date endTime) {
+        return this.baseMapper.selectCount(new LambdaQueryWrapper<DistributionUserOrderGains>()
+                .eq(DistributionUserOrderGains::getUserId,userId)
+                .ge(DistributionUserOrderGains::getCreateTime, startTime)
+                .le(DistributionUserOrderGains::getCreateTime, endTime)
+
+        );
+    }
+
 
     @Lazy
     @Resource(name = "generalGoodsDistribution")