fix

netflix-dao/src/main/java/com/cyksj/model/entity/DistributeMoneyApply.java

@@ -28,9 +28,9 @@ public class DistributeMoneyApply extends BaseEntity {
 
 	@Getter
 	public enum Status {
-		Success("审核成功"),
-		Fail("审核失败"),
-		Verifying("审核中"),
+		success("审核成功"),
+		fail("审核失败"),
+		verifying("审核中"),
 		;
 		String desc;
 

netflix-dao/src/main/java/com/cyksj/model/views/UserDistributeView.java

@@ -0,0 +1,32 @@
+package com.cyksj.model.views;
+
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix
+ *文件名: UserDistributeView
+ *创建者: JavaZou
+ *创建时间:2022/11/15 16:27
+ */
+@Getter
+@Setter
+@SearchBean(tables = "user_plat_distribute_rate up left join goods_don gd on gd.id = up.goods_id")
+public class UserDistributeView {
+	@DbField("up.distribute_id")
+	@JsonIgnore
+	private Long distribute_id;
+
+	@DbField("gd.id")
+	private Long goodsId;
+
+	@DbField("gd.title")
+	private String title;
+
+	@DbField("up.rate")
+	private Integer rate;
+
+}

netflix-service/src/main/java/com/cyksj/service/mange/statistics/impl/StatisticsDataServiceImpl.java

@@ -210,15 +210,15 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 		List<DistributeMoneyApply> distributeMoneyApplies = Optional.ofNullable(beanSearcher.searchAll(DistributeMoneyApply.class, MapUtils.builder().field(DistributeMoneyApply::getCreatedTime, startDate, endDate).op(Operator.Between).build())).orElse(new ArrayList<>());
 		Map<DistributeMoneyApply.Status, List<DistributeMoneyApply>> collect = distributeMoneyApplies.stream().collect(Collectors.groupingBy(DistributeMoneyApply::getVerifyStatus));
 		collect.forEach((k, v) -> {
-			if (DistributeMoneyApply.Status.Fail.name().equals(k)) {
+			if (DistributeMoneyApply.Status.fail.name().equals(k)) {
 				return;
 			}
 			Optional<BigDecimal> reduce = v.stream().map(DistributeMoneyApply::getMoney).reduce(BigDecimal::add);
 			BigDecimal money = reduce.isPresent() ? reduce.get().divide(BigDecimal.valueOf(100)) : BigDecimal.ZERO;
-			if (DistributeMoneyApply.Status.Success.name().equals(k)) {
+			if (DistributeMoneyApply.Status.success.name().equals(k)) {
 				backgroundDataView.setDistributeGotMoney(money);
 			}
-			if (DistributeMoneyApply.Status.Verifying.name().equals(k)) {
+			if (DistributeMoneyApply.Status.verifying.name().equals(k)) {
 				backgroundDataView.setDistributeVerifyingMoney(money);
 			}
 		});

netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -18,10 +18,12 @@ import com.cyksj.model.request.DistributeApplyMoneyReq;
 import com.cyksj.model.request.UserDistributeReq;
 import com.cyksj.model.views.DistributeMoneyApplyView;
 import com.cyksj.model.views.MoneyApplyView;
+import com.cyksj.model.views.UserDistributeView;
 import com.cyksj.model.views.UserDistributeViews;
 import com.cyksj.service.distribute.DistributeService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -87,6 +89,17 @@ public class DistributeController {
 		return GatewayResponse.SUCCESS.newBuilder().toResult("编辑成功");
 	}
 
+	/**
+	 * 固定推广者详情
+	 */
+	@GetMapping("/get/detail/{id}")
+	public Result<List<UserDistributeView>> getDetailById(@PathVariable Long id) {
+		return GatewayResponse.SUCCESS.newBuilder().toResult(beanSearcher.searchAll(UserDistributeView.class, MapUtils.builder()
+				.field(UserDistributeView::getDistribute_id, id).op(Operator.Equal)
+				.orderBy(UserDistributeView::getGoodsId).asc()
+				.build()));
+	}
+
 	/**
 	 * 固定推广者列表
 	 */
@@ -94,10 +107,10 @@ public class DistributeController {
 	public SearchResult<UserDistributeViews> distributeList(HttpServletRequest request) {
 		SearchResult<UserDistributeViews> search = beanSearcher.search(UserDistributeViews.class, MapUtils.flatBuilder(request.getParameterMap()).build());
 		DistributePointsExchangeMoney pointsMoneyRate = distributePointsExchangeMoneyMapper.selectOne(null);
-		Optional.ofNullable(search.getDataList()).ifPresent(list->list.forEach(view->{
+		Optional.ofNullable(search.getDataList()).ifPresent(list -> list.forEach(view -> {
 			Integer num = view.getPoints() / pointsMoneyRate.getPoints();
 			view.setAvailableMoney(pointsMoneyRate.getMoney().multiply(new BigDecimal(num)));
-			List<DistributeMoneyApply> moneyApplies = distributeMoneyApplyMapper.selectList(Wrappers.lambdaQuery(DistributeMoneyApply.class).eq(DistributeMoneyApply::getVerifyStatus, DistributeMoneyApply.Status.Success).eq(DistributeMoneyApply::getUserId, view.getUserId()).select(DistributeMoneyApply::getMoney));
+			List<DistributeMoneyApply> moneyApplies = distributeMoneyApplyMapper.selectList(Wrappers.lambdaQuery(DistributeMoneyApply.class).eq(DistributeMoneyApply::getVerifyStatus, DistributeMoneyApply.Status.success).eq(DistributeMoneyApply::getUserId, view.getUserId()).select(DistributeMoneyApply::getMoney));
 			Optional<BigDecimal> money = moneyApplies.stream().map(apply -> apply.getMoney()).reduce(BigDecimal::add);
 			view.setGotMoney(money.isPresent() ? money.get() : BigDecimal.ZERO);
 			Integer orders = userDistributeMapper.count(view.getUserId());
@@ -111,7 +124,7 @@ public class DistributeController {
 	 */
 	@GetMapping("/get/plat")
 	public Result<List<GoodsDon>> getGoodsDistributeRate() {
-		return GatewayResponse.SUCCESS.newBuilder().toResult(goodsDonMapper.selectList(Wrappers.lambdaQuery(GoodsDon.class).eq(GoodsDon::getType, 1).select(GoodsDon::getId, GoodsDon::getTitle, GoodsDon::getRate)));
+		return GatewayResponse.SUCCESS.newBuilder().toResult(goodsDonMapper.selectList(Wrappers.lambdaQuery(GoodsDon.class).eq(GoodsDon::getType, 1).orderByAsc(GoodsDon::getId).select(GoodsDon::getId, GoodsDon::getTitle, GoodsDon::getRate)));
 	}
 
 	/**
@@ -120,7 +133,7 @@ public class DistributeController {
 	@PutMapping("/put/goods/rate")
 	public Result<String> editGoodsDistributeRate(@RequestBody UserDistributeReq userDistributeReq) {
 		for (UserPlatDistributeRate rate : userDistributeReq.getRates()) {
-			if (rate.getRate() <0 || rate.getRate() > 100) {
+			if (rate.getRate() < 0 || rate.getRate() > 100) {
 				throw new BusinessRuntimeException("比例错误");
 			}
 			GoodsDon goodsDon = goodsDonMapper.selectById(rate.getGoodsId());
@@ -141,7 +154,7 @@ public class DistributeController {
 		MoneyApplyView moneyApplyView = new MoneyApplyView();
 		SearchResult<DistributeMoneyApplyView> search = beanSearcher.search(DistributeMoneyApplyView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
 		moneyApplyView.setDetails(search.getDataList());
-		List<DistributeMoneyApply> distributeMoneyApplies = distributeMoneyApplyMapper.selectList(Wrappers.lambdaQuery(DistributeMoneyApply.class).eq(DistributeMoneyApply::getVerifyStatus, DistributeMoneyApply.Status.Success).select(DistributeMoneyApply::getMoney));
+		List<DistributeMoneyApply> distributeMoneyApplies = distributeMoneyApplyMapper.selectList(Wrappers.lambdaQuery(DistributeMoneyApply.class).eq(DistributeMoneyApply::getVerifyStatus, DistributeMoneyApply.Status.success).select(DistributeMoneyApply::getMoney));
 		Optional<BigDecimal> reduce = distributeMoneyApplies.stream().map(DistributeMoneyApply::getMoney).reduce(BigDecimal::add);
 		moneyApplyView.setGotMoney(reduce.isPresent() ? reduce.get() : BigDecimal.ZERO);
 		return GatewayResponse.SUCCESS.newBuilder().toResult(moneyApplyView);
@@ -153,18 +166,18 @@ public class DistributeController {
 	@PutMapping("/verify/applyMoney")
 	public Result<String> verifyApplyMoney(@RequestBody @NotNull DistributeApplyMoneyReq distributeApplyMoneyReq) {
 		DistributeMoneyApply.Status status = DistributeMoneyApply.Status.checkStatus(distributeApplyMoneyReq.getVerifyStatus());
-		if (status == null) {
+		if (status == null || status == DistributeMoneyApply.Status.verifying) {
 			throw BusinessRuntimeException.getInstance("审核状态错误");
 		}
 		DistributeMoneyApply distributeMoneyApply = distributeMoneyApplyMapper.selectById(distributeApplyMoneyReq.getId());
 		if (distributeMoneyApply == null) {
 			throw BusinessRuntimeException.getInstance("提现记录不存在");
 		}
-		if (distributeMoneyApply.getVerifyStatus() != DistributeMoneyApply.Status.Verifying) {
+		if (distributeMoneyApply.getVerifyStatus() != DistributeMoneyApply.Status.verifying) {
 			throw BusinessRuntimeException.getInstance("该提现记录已处理,无法再进行审核");
 		}
 		distributeMoneyApply.setVerifyStatus(status);
-		if (DistributeMoneyApply.Status.Fail.name().equals(distributeApplyMoneyReq.getVerifyStatus()) && StrUtil.isEmpty(distributeApplyMoneyReq.getReason())) {
+		if (DistributeMoneyApply.Status.fail.name().equals(distributeApplyMoneyReq.getVerifyStatus()) && StrUtil.isEmpty(distributeApplyMoneyReq.getReason())) {
 			throw BusinessRuntimeException.getInstance("拒绝原因为空");
 		}
 		distributeMoneyApplyMapper.updateById(distributeMoneyApply);

netflix-web/src/main/java/com/cyksj/web/controller/user/DistributePopularizeController.java

@@ -83,7 +83,11 @@ public class DistributePopularizeController {
 	 */
 	@GetMapping("/applyMoney/detail")
 	public SearchResult<DistributeMoneyApplyView> getApplyMoneyView() {
-		return beanSearcher.search(DistributeMoneyApplyView.class, null);
+		Long userId = StpUserUtil.getLoginIdAsLong();
+		SearchResult<DistributeMoneyApplyView> search = beanSearcher.search(DistributeMoneyApplyView.class,
+				MapUtils.builder().field(DistributeMoneyApplyView::getUserId, userId).op(Operator.Equal)
+						.build());
+		return search;
 	}
 
 	/**
@@ -128,7 +132,7 @@ public class DistributePopularizeController {
 			distributeMoneyApply.setUserId(userId);
 			distributeMoneyApply.setPoints(points);
 			distributeMoneyApply.setMoney(num.multiply(distributePointsExchangeMoney.getMoney()));
-			distributeMoneyApply.setVerifyStatus(DistributeMoneyApply.Status.Verifying);
+			distributeMoneyApply.setVerifyStatus(DistributeMoneyApply.Status.verifying);
 			distributeMoneyApplyMapper.insert(distributeMoneyApply);
 			return GatewayResponse.SUCCESS.newBuilder().toResult("申请提现成功,待客服审核打款");
 		}