余额相关

2023-08-24 09:29:30 +08:00
parent 67626eff09
commit 4e833b7585
13 changed files with 138 additions and 137 deletions
--- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
@@ -2,6 +2,7 @@ package cn.pluss.platform.controller;

 import cn.hutool.json.JSONUtil;
 import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.UserMakerQuota.UserMakerQuotaService;
 import cn.pluss.platform.annotation.OpLog;
 import cn.pluss.platform.api.PageInfo;
 import cn.pluss.platform.api.Result;
@@ -539,6 +540,8 @@ public class MerchantOrderController {

    @Resource
    private MerchantProfitService profitService;
+    @Resource
+    private UserMakerQuotaService userMakerQuotaService;
    @PostMapping("/orderTest")
    public Result<Object> orderTest(@RequestBody MerchantOrder merchantOrder){
        UserApp tokenUa = userAppService.queryUserAppByToken();
@@ -564,6 +567,7 @@ public class MerchantOrderController {

        boolean save = merchantOrderService.save(merchantOrder);
        profitService.createOrderProfitV2(merchantOrder,"1");
+        userMakerQuotaService.quotaInfo(merchantOrder);
        if (save){
            return ResultGenerator.genSuccessResult();
        }else {
--- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java
@@ -26,6 +26,7 @@ import cn.pluss.platform.merchantStore.MerchantStoreService;
 import cn.pluss.platform.systemConfig.SystemConfigService;
 import cn.pluss.platform.systemInfo.SystemInfoService;
 import cn.pluss.platform.user.UserProfitService;
+import cn.pluss.platform.userAccount.UserAccountService;
 import cn.pluss.platform.userApp.UserAppService;
 import cn.pluss.platform.userInfo.UserInfoService;
 import cn.pluss.platform.userPromotion.UserPromotionService;
@@ -121,6 +122,10 @@ public class UserAppController {
  private UserPromotionService userPromotionService;
  @Resource
  private CashMapper cashMapper;
+  @Resource
+  private UserAccountService userAccountService;
+  @Resource
+  private UserAccountFlowMapper userAccountFlowMapper;

  private static String keyStoreUrl =
    "/home/syb/resources/wechatCert/apiclient_cert.p12"; // 验证证书路径
@@ -498,102 +503,51 @@ public class UserAppController {
    if (nextLevel != null) {
      nextRate = nextLevel.getRate();
    }
-    Double totalShareMoneyToday = 0d; // 今日分润总额
-    Double totalAccumulateShareMoney = 0d; // 累计总分润
-    Double merchantShareMoneyToday = 0d; // 推广商户今日分润
-    Double merchantShareMoneyHistory = 0d; // 推广商户历史分润

-    Double allowCashMoney = 0d; // 可提现分润
-    Double noCashMoney = 0d; // 不可提现分润
-    Double cashedMoney = 0d; // 已提现分润
+
+    BigDecimal totalShareMoneyToday = null; // 今日分润总额ok
+    BigDecimal totalAccumulateShareMoney = null; // 累计总分润ok
+    BigDecimal allowCashMoney = null; // 可提现分润ok
+    BigDecimal examineMoney = null;
    // 获取当前商户的所有的下级商户信息
+//    Map<String, Object> queryMap = new HashMap<>();
+//    if ("agent_staff".equals(queryUserApp.getUserType())) {
+//      queryMap.put("agentStaffId", userId);
+//    } else {
+//      queryMap.put("userId", userId);
+//    }
+//
+//    queryMap.put("status", 1);

-    Map<String, Object> queryMap = new HashMap<>();
-    if ("agent_staff".equals(queryUserApp.getUserType())) {
-      queryMap.put("agentStaffId", userId);
-    } else {
-      queryMap.put("userId", userId);
+    // 累计总分润 TODO 改变方式
+    UserAccount userAccountByUserId = userAccountService.getUserAccountByUserId(userId);
+    if (userAccountByUserId == null) {
+      totalShareMoneyToday = BigDecimal.ZERO;
+      totalAccumulateShareMoney = BigDecimal.ZERO;
+      allowCashMoney = BigDecimal.ZERO;
+      examineMoney = BigDecimal.ZERO;
+    }else {
+      // 累计总分润
+      totalAccumulateShareMoney = userAccountByUserId.getBalance();
+
+      //今日分润总额
+      totalShareMoneyToday = userAccountFlowMapper.selectSumByUserId(userId, DateUtils.getDayBegin(), DateUtils.getDayEnd());
+
+      // 可提现分润
+      allowCashMoney = userAccountByUserId.getBalance();
+
+      //审核中的提现金额
+      examineMoney = userAccountByUserId.getFreezeBalance();
    }
-
-    queryMap.put("status", 1);
-
-    // 累计总分润
-    totalAccumulateShareMoney =
-      merchantProfitService.queryMerchantProfitSumPrice(queryMap);
-    if (totalAccumulateShareMoney == null) {
-      totalAccumulateShareMoney = 0d;
-    }
-    queryMap.put("startTime", DateUtils.getDayBegin());
-    totalShareMoneyToday =
-      merchantProfitService.queryMerchantProfitSumPrice(queryMap);
-    if (totalShareMoneyToday == null) {
-      totalShareMoneyToday = 0d;
-    }
-
-    queryMap.put("retype", "1");
-    // 商户今日分润
-    merchantShareMoneyToday =
-      merchantProfitService.queryMerchantProfitSumPrice(queryMap);
-    if (merchantShareMoneyToday == null) {
-      merchantShareMoneyToday = 0d;
-    }
-    // 商户历史分润
-    queryMap.put("startTime", null);
-    queryMap.put("endTime", DateUtils.getDayBegin());
-    merchantShareMoneyHistory =
-      merchantProfitService.queryMerchantProfitSumPrice(queryMap);
-    if (merchantShareMoneyHistory == null) {
-      merchantShareMoneyHistory = 0d;
-    }
-
-    // 今日总分润 = 今日商户分润
-    // 已经提现与正在提现的分润 //+ cashService.sumFansAreadlyCash(map);
-    cashedMoney = cashService.sumMerchantSuccessCash(userId);
-    if (cashedMoney == null) {
-      cashedMoney = 0d;
-    }
-    noCashMoney = totalShareMoneyToday;
-    allowCashMoney = totalAccumulateShareMoney - cashedMoney - noCashMoney;
-
-    //审核中的提现金额
-    BigDecimal bigDecimal = cashMapper.selectCashAmtTotal(String.valueOf(userId), Cash.STATUS_CHECKING);
-
    Map<String, Object> resultMap = new HashMap<>();
-    resultMap.put(
-      "totalShareMoneyToday",
-      StringUtil.bigDecimal(totalShareMoneyToday)
-    ); //今日总分润
-    resultMap.put(
-      "totalAccumulateShareMoney",
-      StringUtil.bigDecimal(totalAccumulateShareMoney)
-    ); //累计总分润
-    resultMap.put(
-      "merchantShareMoneyToday",
-      StringUtil.bigDecimal(merchantShareMoneyToday)
-    ); //今日推广分润
-    resultMap.put(
-      "merchantShareMoneyHistory",
-      StringUtil.bigDecimal(merchantShareMoneyHistory)
-    ); //历史推广分润
-    resultMap.put(
-      "nextMerchantShareMoneyToday",
-      StringUtil.bigDecimal(totalShareMoneyToday - merchantShareMoneyToday)
-    ); //今日升级分润
-    resultMap.put(
-      "nextMerchantShareMoneyHistory",
-      StringUtil.bigDecimal(
-        totalAccumulateShareMoney -
-        merchantShareMoneyHistory -
-        totalShareMoneyToday
-      )
-    ); //历史升级分润
-    resultMap.put(
-      "allowCashMoney",
-      StringUtil.bigDecimal(allowCashMoney, RoundingMode.DOWN)
-    );
-    resultMap.put("noCashMoney", StringUtil.bigDecimal(noCashMoney));
-    resultMap.put("cashedMoney", StringUtil.bigDecimal(cashedMoney));
-    resultMap.put("examineMoney", bigDecimal);
+    //今日总分润
+    resultMap.put("totalShareMoneyToday", totalShareMoneyToday.setScale(2,RoundingMode.DOWN));
+    //累计总分润
+    resultMap.put("totalAccumulateShareMoney", totalAccumulateShareMoney.setScale(2,RoundingMode.DOWN));
+    //可提现分润
+    resultMap.put("allowCashMoney",allowCashMoney.setScale(2,RoundingMode.DOWN));
+    //审核中的提现金额
+    resultMap.put("examineMoney", examineMoney.setScale(2,RoundingMode.DOWN));
    return ResultGenerator.genSuccessResult(resultMap);
  }