修改小程序的查询用户数据

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dealer/DealerBaseInfoController.java

 package com.ruoyi.web.controller.dealer;
 
-import java.util.Arrays;
-import java.util.List;
-
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.dealer.domain.DealerBaseInfo;
 import com.ruoyi.dealer.domain.dto.WechatDealerRoundInfoReq;
 import com.ruoyi.dealer.service.DealerRoundInfoService;
 import com.ruoyi.dealer.service.IDealerBaseInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 经销商信息Controller
@@ -41,7 +34,6 @@ public class DealerBaseInfoController extends BaseController {
     /**
      * 查询经销商信息列表
      */
-//    @PreAuthorize("@ss.hasPermi('system:dealerBaseInfo:list')")
     @GetMapping("/list")
     public TableDataInfo list(DealerBaseInfo dealerBaseInfo) {
         startPage();
@@ -52,7 +44,6 @@ public class DealerBaseInfoController extends BaseController {
     /**
      * 导出经销商信息列表
      */
-//    @PreAuthorize("@ss.hasPermi('system:dealerBaseInfo:export')")
     @Log(title = "经销商信息", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(DealerBaseInfo dealerBaseInfo) {
@@ -73,7 +64,6 @@ public class DealerBaseInfoController extends BaseController {
     /**
      * 新增经销商信息
      */
-//    @PreAuthorize("@ss.hasPermi('system:dealerBaseInfo:add')")
     @Log(title = "经销商填写预付款信息", businessType = BusinessType.INSERT)
     @PostMapping(value = "/round")
     public AjaxResult addRoundInfo(@Validated @RequestBody WechatDealerRoundInfoReq dealerRoundInfoReq) {
@@ -83,7 +73,6 @@ public class DealerBaseInfoController extends BaseController {
     /**
      * 修改经销商信息
      */
-//    @PreAuthorize("@ss.hasPermi('system:dealerBaseInfo:edit')")
     @Log(title = "经销商信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DealerBaseInfo DealerBaseInfo) {
@@ -93,7 +82,6 @@ public class DealerBaseInfoController extends BaseController {
     /**
      * 删除经销商信息
      */
-//    @PreAuthorize("@ss.hasPermi('system:dealerBaseInfo:remove')")
     @Log(title = "经销商信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dealerBaseInfoIds}")
     public AjaxResult remove(@PathVariable Long[] dealerBaseInfoIds) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dealer/DealerBigScreenController.java

@@ -37,9 +37,7 @@ public class DealerBigScreenController extends BaseController {
      */
     @GetMapping("/dynamic")
     public AjaxResult dynamicList(Integer roundId) {
-
         List<DealerBigScreenDynamicRes> list = dealerRoundInfoService.dynamicList(roundId);
-
         return success(list);
     }
 
@@ -51,9 +49,7 @@ public class DealerBigScreenController extends BaseController {
      */
     @GetMapping("/group/category/{CategoryName}")
     public AjaxResult groupList(@PathVariable("CategoryName") String CategoryName) {
-
         List<DealerBigScreenGroupListRes> list = resultService.groupList(CategoryName);
-
         return success(list);
     }
 
@@ -74,9 +70,7 @@ public class DealerBigScreenController extends BaseController {
      */
     @GetMapping("/result/round/{roundTime}")
     public AjaxResult groupRoundList(@PathVariable("roundTime") Integer roundTime, String phone, String dealerName) {
-
         List<DealerRoundDetailListRes> list = resultService.groupRoundList(roundTime,phone,dealerName);
-
         return success(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

 package com.ruoyi.web.controller.system;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-import cn.hutool.crypto.digest.DigestUtil;
-import cn.hutool.crypto.digest.MD5;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.common.utils.MessageUtils;
-import com.ruoyi.common.utils.sign.Md5Utils;
-import com.ruoyi.dealer.domain.DealerBaseInfo;
-import com.ruoyi.dealer.domain.dto.DealerEnterReq;
-import com.ruoyi.dealer.service.IDealerBaseInfoService;
-import com.ruoyi.framework.manager.AsyncManager;
-import com.ruoyi.framework.manager.factory.AsyncFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
@@ -26,11 +11,20 @@ import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.dealer.domain.DealerBaseInfo;
+import com.ruoyi.dealer.domain.dto.DealerEnterReq;
+import com.ruoyi.dealer.service.IDealerBaseInfoService;
 import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 登录验证
@@ -60,7 +54,7 @@ public class SysLoginController {
     @ResponseBody
     public AjaxResult ajaxLoginEnter(@RequestBody  DealerEnterReq req) {
         String phone = req.getPhone();
-        // 检测是否存在经销商表中 TODO 防止多个手机号绑定一个经销商
+        // 检测是否存在经销商表中  防止多个手机号绑定一个经销商
         DealerBaseInfo dealer = dealerBaseInfoService.getOne(new LambdaQueryWrapper<DealerBaseInfo>()
                 .like(DealerBaseInfo::getPhone, phone));
         if (dealer == null) {

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

@@ -4,8 +4,6 @@ import com.ruoyi.common.annotation.Sensitive;
 import com.ruoyi.common.enums.DesensitizedType;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 @Data
 public class DealerBigScreenDynamicRes {
     private Integer roundTime;
@@ -17,7 +15,7 @@ public class DealerBigScreenDynamicRes {
     private Long dealerId;
     /**
      * 经销商名称（非空）
-     * TODO 脱敏经销商名称
+     * 脱敏经销商名称
      */
     @Sensitive(desensitizedType = DesensitizedType.DEALER_NAME)
     private String dealerName;

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

@@ -2,10 +2,12 @@ package com.ruoyi.dealer.domain.dto;
 
 import lombok.Data;
 
+/**
+ * 小程序页面看到的经销商的数据信息
+ */
 @Data
 public class WechatDealerRoundInfoRes {
     private Integer roundTime;
-    // private String reward;
     /**
      * 销售大区（非空）
      */
@@ -22,7 +24,7 @@ public class WechatDealerRoundInfoRes {
 
     /**
      * 经销商名称（非空）
-     * TODO 脱敏经销商名称
+     * 脱敏经销商名称
      */
     private String dealerName;
 
@@ -31,10 +33,7 @@ public class WechatDealerRoundInfoRes {
      */
     private String dealerType;
 
-    /**
-     * 已完成
-     */
-//    private String dealerDone;
+
 
     /**
      * 活动目标TTL
@@ -58,7 +57,7 @@ public class WechatDealerRoundInfoRes {
      */
     private String paymentPercentage;
     /**
-     * TODO 脱敏手机号
+     * 脱敏手机号
      */
     private String phone;
 
@@ -70,7 +69,5 @@ public class WechatDealerRoundInfoRes {
     /**
      * 销售大区分组名称
      */
-//    private String salesRegionGroupName;
-
-
+    private String salesRegionGroupName;
 }

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

@@ -57,11 +57,7 @@ public class DealerBaseInfoImpl extends ServiceImpl<DealerBaseInfoMapper, Dealer
     @Override
     public WechatDealerRoundInfoRes getDealerRoundInfoByDealerId(Long dealerId) {
 
-        String config = configService.selectConfigByKeyFromDb(Constants.DEALER_ROUND_OVER);
-        Boolean roundOver = Boolean.parseBoolean(config);
-        if (roundOver) {
-            throw new ServiceException("当前轮次活动未开始");
-        }
+//        String config = configService.selectConfigByKeyFromDb(Constants.DEALER_ROUND_OVER);
         String roundConfig = configService.selectConfigByKeyFromDb(Constants.DEALER_ROUND);
         Integer round = Integer.parseInt(roundConfig);
 
@@ -84,20 +80,9 @@ public class DealerBaseInfoImpl extends ServiceImpl<DealerBaseInfoMapper, Dealer
         if (result != null) {
             roundInfoRes.setPaymentTtl(result.getPaymentTtl());
             roundInfoRes.setPaymentPercentage(Math.round(result.getPaymentTtl() * 100.0 / dealerBaseInfo.getGoalTtlAct()) + "%");
-        }else{
-            // 第二轮还没有结果时 ，默认使用第一轮的结果
-            if (round == 2) {
-                roundInfoRes.setGroupName(dealerBaseInfo.getSalesRegionGroupName());
-                // 查询第一轮的结果
-                result = resultService.getOne(new LambdaQueryWrapper<DealerRoundResult>()
-                        .eq(DealerRoundResult::getRoundTime, 1)
-                        .eq(DealerRoundResult::getDealerId, dealerId));
-                if (result != null) {
-                    roundInfoRes.setPaymentTtl(result.getPaymentTtl());
-                    roundInfoRes.setPaymentPercentage(Math.round(result.getPaymentTtl() * 100.0 / dealerBaseInfo.getGoalTtlAct()) + "%");
-                }
-            }
         }
+        // 没有结果数据 数据怎么初始化 ？？
+
         return roundInfoRes;
     }
 }

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

@@ -82,7 +82,7 @@ public class DealerRoundInfoServiceImpl extends ServiceImpl<DealerRoundInfoMappe
         resultInfo.setDealerId(dealerRoundInfoReq.getDealerId());
         resultInfo.setDealerName(dealerRoundInfoReq.getDealerName());
 
-        //TODO  手机号传输？ 是脱敏手机号
+        // 手机号传输 是脱敏手机号
         resultInfo.setPhone(dealerRoundInfoReq.getPhone());
         resultInfo.setRoundTime(dealerRoundInfoReq.getRoundTime());
         resultInfo.setPaymentTtl(dealerRoundInfoReq.getPaymentTtlNew());
@@ -124,7 +124,7 @@ public class DealerRoundInfoServiceImpl extends ServiceImpl<DealerRoundInfoMappe
      */
     @Override
     public List<DealerBigScreenDynamicRes> dynamicList(Integer roundId) {
-        // TODO 当前轮次
+        // 当前轮次
         // 返回经销商信息 名称 手机号 达成进度
         Wrapper<DealerRoundInfo> query = new LambdaQueryWrapper<DealerRoundInfo>()
                 .eq(DealerRoundInfo::getRoundTime, 1)