dd

ruoyi-api/src/main/java/com/ruoyi/api/controller/line/ApiSubsidyQueueController.java

@@ -64,6 +64,16 @@ public class ApiSubsidyQueueController extends AbstractApiController {
         return iSubsidyQueueService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 获取当前商家的排队数量
+     */
+    @ApiOperation("获取当前商家的排队数量")
+    @GetMapping("/validQueueCount}")
+    public R<Long> validQueueCount() {
+        return R.ok(iSubsidyQueueService.validQueueCount(getBusinessByUserId(getUserId(true), true), false));
+    }
+
+
     /**
      * 用户兑换积分
      */
@@ -97,4 +107,5 @@ public class ApiSubsidyQueueController extends AbstractApiController {
         ExcelUtil.exportExcel(list, "补贴排队", SubsidyQueueVo.class, response);
     }
 
+
 }

ruoyi-line/src/main/java/com/ruoyi/subsidy/domain/bo/SubsidyQueueImportBo.java

@@ -50,6 +50,13 @@ public class SubsidyQueueImportBo implements Serializable {
     @ApiModelProperty(value = "用户手机号", required = true)
     private String userMobile;
 
+    /**
+     * 用户昵称
+     */
+    @ApiModelProperty(value = "用户昵称", required = true)
+    @ExcelProperty(value = "用户昵称")
+    private String nickName;
+
 
     /**
      * 申请时间

ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidyQueueServiceImpl.java

@@ -734,6 +734,7 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
 
     @Override
     public List<SubsidyQueueImportBo> importData(Long businessId,List<SubsidyQueueImportBo> validList) {
+        Business business = businessService.loadById(businessId, true);
         List<SubsidyQueueImportBo> errorList = new ArrayList<>();
         Long l = validQueueCount(businessId, null);
         for(SubsidyQueueImportBo bo:validList) {
@@ -743,7 +744,19 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
                 continue;
             }
             l++;
+            User user = userBusinessRoleService.initUserAndBindBusiness(bo.getUserMobile(), bo.getNickName(), businessId);
             SubsidyQueue subsidyQueue = new SubsidyQueue();
+            subsidyQueue.setUserId(user.getId());
+            subsidyQueue.setUserMobile(bo.getUserMobile());
+            subsidyQueue.setUserName(user.getUserName());
+            subsidyQueue.setOrderNo(bo.getOrderNo());
+            subsidyQueue.setOriginalBusinessId(businessId);
+            subsidyQueue.setOriginalBusinessName(business.getBusinessName());
+            subsidyQueue.setPayAmount(bo.getPayAmount());
+            subsidyQueue.setShouldSubsidyAmount(bo.getExchangePoints().compareTo(BigDecimal.ZERO)>0?MathUtils.subtract(bo.getShouldSubsidyAmount(),bo.getExchangePoints()):bo.getShouldSubsidyAmount());
+            subsidyQueue.setActualSubsidyAmount(bo.getActualSubsidyAmount());
+            subsidyQueue.setSubsidyPoints(bo.getExchangePoints());
+
         }
         return Collections.emptyList();
     }