Merge branch 'master' of http://115.29.66.169:10080/yiyao_shop/api

ruoyi-base/src/main/java/com/ruoyi/base/platform/service/impl/PlatformInfoServiceImpl.java

@@ -20,6 +20,7 @@ import com.ruoyi.base.platform.service.IPlatformInfoService;
 import com.ruoyi.tool.service.JzqService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.File;
@@ -136,6 +137,7 @@ public class PlatformInfoServiceImpl implements IPlatformInfoService {
      * @param bo 平台信息管理
      * @return 结果
      */
+    @Transactional
     @Override
     public Boolean insertByBo(PlatformInfoBo bo) {
         PlatformInfoVo info = getInfo();
@@ -154,6 +156,7 @@ public class PlatformInfoServiceImpl implements IPlatformInfoService {
             validEntityBeforeSave(update);
             flag = baseMapper.updateById(update) > 0;
         }
+        organizationCreate();
         return flag;
     }
 

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

@@ -91,7 +91,7 @@ public class AgentAccountCodeServiceImpl implements IAgentAccountCodeService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<AgentAccountCode> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getAgentId() != null, AgentAccountCode::getAgentId, bo.getAgentId());
-        lqw.eq(StringUtils.isNotBlank(bo.getAccountCode()), AgentAccountCode::getAccountCode, bo.getAccountCode());
+        lqw.like(StringUtils.isNotBlank(bo.getAccountCode()), AgentAccountCode::getAccountCode, bo.getAccountCode());
         if (StringUtils.isNotEmpty(bo.getStatusList())) {
             String[] statusArr = bo.getStatusList().split(",");
             lqw.in(AgentAccountCode::getStatus, statusArr);

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

@@ -133,6 +133,7 @@ public class BusinessApplyServiceImpl implements IBusinessApplyService {
         lqw.eq(bo.getAgentAuditStatus() != null, BusinessApply::getAgentAuditStatus, bo.getAgentAuditStatus());
         lqw.in(CollUtil.isNotEmpty(bo.getAgentAuditStatusList()), BusinessApply::getAgentAuditStatus, bo.getAgentAuditStatusList());
         lqw.like(StringUtils.isNotBlank(bo.getLegalName()), BusinessApply::getLegalName, bo.getLegalName());
+        lqw.eq(bo.getBusinessType() != null, BusinessApply::getBusinessType, bo.getBusinessType());
         Date startTime = bo.getStartTime();
         if (ObjectUtil.isNotNull(startTime)) {
             lqw.ge(BusinessApply::getCreateTime, DateUtil.beginOfDay(startTime));

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

@@ -180,6 +180,7 @@ public class BusinessServiceImpl implements IBusinessService {
     private LambdaQueryWrapper<Business> buildQueryWrapper(BusinessBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Business> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getBusinessId() != null, Business::getBusinessId, bo.getBusinessId());
         lqw.eq(bo.getAgentId() != null, Business::getAgentId, bo.getAgentId());
         lqw.like(StringUtils.isNotBlank(bo.getLegalName()), Business::getLegalName, bo.getLegalName());
         lqw.eq(bo.getBusinessType() != null, Business::getBusinessType, bo.getBusinessType());

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

@@ -180,7 +180,7 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
         lqw.eq(bo.getQueueTime() != null, SubsidyQueue::getQueueTime, bo.getQueueTime());
         lqw.eq(bo.getCompleteTime() != null, SubsidyQueue::getCompleteTime, bo.getCompleteTime());
         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());
         }