bug修复

ruoyi-api/src/main/java/com/ruoyi/api/controller/shop/ApiAgentController.java

@@ -6,8 +6,10 @@ import com.ruoyi.agent.domain.bo.AgentBalanceRecordBo;
 import com.ruoyi.agent.domain.bo.AgentBo;
 import com.ruoyi.agent.domain.vo.AgentAmountStatisticsVo;
 import com.ruoyi.agent.domain.vo.AgentBalanceRecordVo;
+import com.ruoyi.agent.domain.vo.AgentConfigVo;
 import com.ruoyi.agent.domain.vo.AgentVo;
 import com.ruoyi.agent.service.IAgentBalanceRecordService;
+import com.ruoyi.agent.service.IAgentConfigService;
 import com.ruoyi.agent.service.IAgentService;
 import com.ruoyi.api.controller.common.AbstractApiController;
 import com.ruoyi.business.domain.bo.BusinessBo;
@@ -51,6 +53,7 @@ public class ApiAgentController extends AbstractApiController {
     private final WxMinService wxMinService;
     private final ISysOssService iSysOssService;
     private final IAgentBalanceRecordService agentBalanceRecordService;
+    private final IAgentConfigService iAgentConfigService;
 
     /**
      * 邀请码查省级代理
@@ -145,4 +148,10 @@ public class ApiAgentController extends AbstractApiController {
         return iAgentService.partnerPage(bo, pageQuery);
     }
 
+    @ApiOperation("代理配置")
+    @GetMapping("/config")
+    public R<AgentConfigVo> config() {
+        return R.ok(iAgentConfigService.getInfo());
+    }
+
 }

ruoyi-business/src/main/java/com/ruoyi/agent/exception/AgentAccountCodeApplyExceptionEnum.java

@@ -11,8 +11,7 @@ public enum AgentAccountCodeApplyExceptionEnum implements IIntegerEnum {
 
     // TODO 注意检查错误码，保证系统内唯一
     AgentAccountCodeApply_IS_NOT_EXISTS(380001, "代理账户码申请不存在"),
-
-    ;
+    AGENT_ACCOUNT_CODE_APPLY_QUANTITY_NOT_ENOUGH(380002, "代理账户码申请数量不能少于最小数量");
 
     private Integer code;
 

ruoyi-business/src/main/java/com/ruoyi/agent/service/impl/AgentAccountCodeApplyServiceImpl.java

@@ -4,10 +4,12 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ruoyi.agent.domain.Agent;
+import com.ruoyi.agent.domain.vo.AgentConfigVo;
 import com.ruoyi.agent.enums.AgentAuditType;
 import com.ruoyi.agent.enums.AgentLevel;
 import com.ruoyi.agent.exception.AgentApplyExceptionEnum;
 import com.ruoyi.agent.service.IAgentAccountCodeService;
+import com.ruoyi.agent.service.IAgentConfigService;
 import com.ruoyi.agent.service.IAgentService;
 import com.ruoyi.common.enums.AuditStatus;
 import com.ruoyi.common.exception.ServiceException;
@@ -48,6 +50,7 @@ public class AgentAccountCodeApplyServiceImpl implements IAgentAccountCodeApplyS
 
     private final AgentAccountCodeApplyMapper baseMapper;
     private final IAgentAccountCodeService agentAccountCodeService;
+    private final IAgentConfigService agentConfigService;
     @Lazy
     @Resource
     private IAgentService agentService;
@@ -130,6 +133,19 @@ public class AgentAccountCodeApplyServiceImpl implements IAgentAccountCodeApplyS
         if(AgentLevel.COUNTY_AGENT.equals(agent.getAgentLevel())){
             bo.setParentAgentId(agent.getParentAgentId());
         }
+        //判断码数量
+        AgentConfigVo info = agentConfigService.getInfo();
+        if (ObjectUtil.isNotNull(info)) {
+            if(AgentLevel.COUNTY_AGENT.equals(agent.getAgentLevel())) {
+                if (bo.getApplyQuantity() < info.getRegionMinAccountNum()) {
+                    throw new ServiceException(AgentAccountCodeApplyExceptionEnum.AGENT_ACCOUNT_CODE_APPLY_QUANTITY_NOT_ENOUGH);
+                }
+            } else {
+                if (bo.getApplyQuantity() < info.getProvinceMinAccountNum()) {
+                    throw new ServiceException(AgentAccountCodeApplyExceptionEnum.AGENT_ACCOUNT_CODE_APPLY_QUANTITY_NOT_ENOUGH);
+                }
+            }
+        }
         AgentAccountCodeApply add = BeanUtil.toBean(bo, AgentAccountCodeApply.class);
         validEntityBeforeSave(add);
         add.setAuditStatus(AuditStatus.WAIT_AUDIT);

ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BusinessVo.java

@@ -73,6 +73,8 @@ public class BusinessVo extends BaseVo {
      */
     @ApiModelProperty("上级商家ID")
     private Long parentBusinessId;
+    @ApiModelProperty(value = "上级商家邀请码")
+    private String parentBusinessCode;
     /**
      * 营业执照图片
      */

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BusinessServiceImpl.java

@@ -229,6 +229,9 @@ public class BusinessServiceImpl implements IBusinessService {
         BusinessVo businessVo = baseMapper.selectVoById(businessId);
         if (ObjectUtil.isNotNull(businessVo)) {
             businessVo.setSettlementInfo(businessSettlementService.queryByBusinessId(businessId));
+            if (ObjectUtil.isNotNull(businessVo.getParentBusinessId())) {
+                businessVo.setParentBusinessCode(queryInviteCodeById(businessVo.getParentBusinessId()));
+            }
         }
         return businessVo;
     }

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/service/impl/BusinessDayBillServiceImpl.java

@@ -77,7 +77,7 @@ public class BusinessDayBillServiceImpl implements IBusinessDayBillService {
         LambdaQueryWrapper<BusinessDayBill> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getDayValue()), BusinessDayBill::getDayValue, bo.getDayValue());
         lqw.eq(bo.getBillDay() != null, BusinessDayBill::getBillDay, bo.getBillDay());
-        lqw.eq(bo.getBusinessId() != null, BusinessDayBill::getBusinessId, bo.getBusinessId());
+        lqw.like(bo.getBusinessId() != null, BusinessDayBill::getBusinessId, bo.getBusinessId());
         lqw.like(bo.getBusinessName() != null, BusinessDayBill::getBusinessName, bo.getBusinessName());
         if (ObjectUtil.isNotNull(bo.getStartTime())) {
             lqw.ge(BusinessDayBill::getBillDay, bo.getStartTime());

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

@@ -182,16 +182,16 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
         lqw.eq(bo.getRefundStatus() != null, SubsidyQueue::getRefundStatus, bo.getRefundStatus());
         lqw.eq(bo.getMoved() != null, SubsidyQueue::getMoved, bo.getMoved());
         if (ObjectUtil.isNotNull(bo.getConsumeStartTime())) {
-            lqw.ge(SubsidyQueue::getConsumeTime, bo.getConsumeStartTime());
+            lqw.ge(SubsidyQueue::getConsumeTime, DateUtil.beginOfDay(bo.getConsumeStartTime()));
         }
         if (ObjectUtil.isNotNull(bo.getConsumeEndTime())) {
-            lqw.le(SubsidyQueue::getConsumeTime, bo.getConsumeEndTime());
+            lqw.le(SubsidyQueue::getConsumeTime, DateUtil.endOfDay(bo.getConsumeEndTime()));
         }
         if (ObjectUtil.isNotNull(bo.getQueueStartTime())) {
-            lqw.ge(SubsidyQueue::getQueueTime, bo.getQueueStartTime());
+            lqw.ge(SubsidyQueue::getQueueTime, DateUtil.beginOfDay(bo.getQueueStartTime()));
         }
         if (ObjectUtil.isNotNull(bo.getQueueEndTime())) {
-            lqw.le(SubsidyQueue::getQueueTime, bo.getQueueEndTime());
+            lqw.le(SubsidyQueue::getQueueTime, DateUtil.endOfDay(bo.getQueueEndTime()));
         }
         if (ObjectUtil.isNotNull(bo.getMoveStartTime())) {
             lqw.ge(SubsidyQueue::getMoveTime, DateUtil.beginOfDay(bo.getMoveStartTime()));