修改百分比

ruoyi-admin/src/main/resources/application.yml

@@ -52,7 +52,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid
+    active: druid-dev
   # 文件上传
   servlet:
     multipart:

ruoyi-system/src/main/java/com/ruoyi/dealer/domain/DealerBaseInfo.java

@@ -42,7 +42,7 @@ public class DealerBaseInfo {
     /**
      * 已完成
      */
-    private String dealerDone;
+//    private String dealerDone;
 
     /**
      * 活动目标TTL
@@ -82,7 +82,7 @@ public class DealerBaseInfo {
     /**
      * 预付款百分比（%）
      */
-    private BigDecimal paymentPercentage;
+    private String paymentPercentage;
 
     /**
      * 手机号

ruoyi-system/src/main/java/com/ruoyi/dealer/domain/dto/DealerBaseInfoDto.java

@@ -33,7 +33,7 @@ public class DealerBaseInfoDto {
     /**
      * 已完成
      */
-    private String dealerDone;
+//    private String dealerDone;
 
     /**
      * 活动目标TTL

ruoyi-system/src/main/java/com/ruoyi/dealer/domain/dto/DealerBigScreenDynamicRes.java

@@ -33,7 +33,7 @@ public class DealerBigScreenDynamicRes {
     /**
      * 预付款百分比（%）
      */
-    private BigDecimal paymentPercentage;
+    private String paymentPercentage;
 
     private String phone;
     /**

ruoyi-system/src/main/java/com/ruoyi/dealer/domain/dto/WechatDealerRoudInfoRes.java

@@ -36,22 +36,13 @@ public class WechatDealerRoudInfoRes {
     /**
      * 已完成
      */
-    private String dealerDone;
+//    private String dealerDone;
 
     /**
      * 活动目标TTL
      */
     private Integer goalTtlAct;
 
-    /**
-     * 常规目标
-     */
-//    private Integer goalRegular;
-
-    /**
-     * 活动礼盒目标
-     */
-//    private Integer goalGiftBox;
 
     /**
      * 经销商分类
@@ -63,20 +54,11 @@ public class WechatDealerRoudInfoRes {
      */
     private Integer paymentTtl;
 
-    /**
-     * 预付款成品
-     */
-//    private Integer paymentProduct;
-
-    /**
-     * 预付款分类礼盒
-     */
-//    private Integer paymentGiftBox;
 
     /**
      * 预付款百分比（%）
      */
-    private BigDecimal paymentPercentage;
+    private String paymentPercentage;
     /**
      * TODO 脱敏手机号
      */
@@ -92,5 +74,4 @@ public class WechatDealerRoudInfoRes {
     private String salesRegionGroupName;
 
 
-
 }

ruoyi-system/src/main/java/com/ruoyi/dealer/domain/dto/WechatDealerRoundInfoReq.java

@@ -38,7 +38,7 @@ public class WechatDealerRoundInfoReq {
     /**
      * 已完成
      */
-    private String dealerDone;
+//    private String dealerDone;
 
     /**
      * 活动目标TTL
@@ -77,7 +77,7 @@ public class WechatDealerRoundInfoReq {
     /**
      * 预付款百分比（%）
      */
-    private BigDecimal paymentPercentage;
+    private String  paymentPercentage;
 
     /**
      * 脱敏手机号

ruoyi-system/src/main/java/com/ruoyi/dealer/service/impl/DealerBaseInfoImpl.java

 package com.ruoyi.dealer.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.dealer.domain.DealerBaseInfo;
+import com.ruoyi.dealer.domain.DealerRoundResult;
 import com.ruoyi.dealer.domain.dto.DealerBaseInfoDto;
 import com.ruoyi.dealer.domain.dto.RoundInfoDto;
 import com.ruoyi.dealer.domain.dto.WechatDealerRoudInfoRes;
 import com.ruoyi.dealer.mapper.DealerBaseInfoMapper;
 import com.ruoyi.dealer.service.DealerRoundInfoService;
 import com.ruoyi.dealer.service.IDealerBaseInfoService;
+import com.ruoyi.dealer.service.IDealerRoundResultService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,6 +31,8 @@ public class DealerBaseInfoImpl extends ServiceImpl<DealerBaseInfoMapper, Dealer
     private DealerBaseInfoMapper dealerBaseInfoMapper;
     @Autowired
     private DealerRoundInfoService dealerRoundInfoService;
+    @Autowired
+    private IDealerRoundResultService resultService;
 
     @Override
     public List<DealerBaseInfo> queryList(DealerBaseInfo sysStudent) {
@@ -56,8 +61,16 @@ public class DealerBaseInfoImpl extends ServiceImpl<DealerBaseInfoMapper, Dealer
         // 查询当前的轮次
         WechatDealerRoudInfoRes dealerBaseInfoRes = new WechatDealerRoudInfoRes();
         BeanUtils.copyProperties(dealerBaseInfo, dealerBaseInfoRes);
+        dealerBaseInfoRes.setPaymentPercentage(Math.round(dealerBaseInfo.getPaymentTtl() * 100.0 / dealerBaseInfo.getGoalTtlAct())+"%");
         dealerBaseInfoRes.setRoundTime(1);
         dealerBaseInfoRes.setReward("老铺黄金-葫芦1号吊坠");
+        // 查询结果表，如果有值，更新覆盖
+        DealerRoundResult result = resultService.getOne(new LambdaQueryWrapper<DealerRoundResult>()
+                .eq(DealerRoundResult::getDealerId, dealerBaseInfoId));
+        if (result != null) {
+            dealerBaseInfoRes.setPaymentTtl(result.getPaymentTtl());
+            dealerBaseInfoRes.setPaymentPercentage(Math.round(result.getPaymentTtl() * 100.0 / dealerBaseInfo.getGoalTtlAct())+"%");
+        }
         return dealerBaseInfoRes;
     }
 }

ruoyi-system/src/main/java/com/ruoyi/dealer/service/impl/DealerRoundInfoServiceImpl.java

@@ -115,7 +115,7 @@ public class DealerRoundInfoServiceImpl extends ServiceImpl<DealerRoundInfoMappe
             res.setPaymentTtl(info.getPaymentTtlNew());
             res.setPhone(info.getPhone());
             res.setPaymentChange(info.getPaymentTtlNew()>info.getPaymentTtlPre()?"up":"down");
-            res.setPaymentPercentage(new BigDecimal(info.getPaymentTtlNew()).multiply(new BigDecimal(100)).divide(new BigDecimal(info.getGoalTtlAct()), 0, BigDecimal.ROUND_HALF_UP));
+            res.setPaymentPercentage(new BigDecimal(info.getPaymentTtlNew()).multiply(new BigDecimal(100)).divide(new BigDecimal(info.getGoalTtlAct()), 0, BigDecimal.ROUND_HALF_UP)+"%");
 
             res.setRoundId(info.getRoundId());
             return res;