bug修复

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/agent/AgentAccountCodeController.java

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 代理账户码Controller
@@ -41,7 +43,11 @@ public class AgentAccountCodeController extends BaseController {
     @SaCheckPermission("agent:agentAccountCode:list")
     @GetMapping("/agentPage")
     public TableDataInfo<AgentAccountCodeVo> agentPage(@Validated(QueryGroup.class) AgentAccountCodeBo bo, PageQuery pageQuery) {
-        bo.setStatusList(Arrays.asList(AccountCodeStatus.WAIT_USE.getCode(), AccountCodeStatus.USED.getCode(), AccountCodeStatus.UNUSED.getCode()).toString());
+        List<Integer> statusList = Arrays.asList(AccountCodeStatus.WAIT_USE.getCode(), AccountCodeStatus.USED.getCode(), AccountCodeStatus.UNUSED.getCode());
+        String statusStr = statusList.stream()
+            .map(String::valueOf)
+            .collect(Collectors.joining(","));
+        bo.setStatusList(statusStr);
         return iAgentAccountCodeService.agentPageList(bo, pageQuery);
     }
 
@@ -52,7 +58,11 @@ public class AgentAccountCodeController extends BaseController {
     @SaCheckPermission("agent:agentAccountCode:list")
     @GetMapping("/page")
     public TableDataInfo<AgentAccountCodeVo> page(@Validated(QueryGroup.class) AgentAccountCodeBo bo, PageQuery pageQuery) {
-        bo.setStatusList(Arrays.asList(AccountCodeStatus.WAIT_USE.getCode(), AccountCodeStatus.USED.getCode(), AccountCodeStatus.UNUSED.getCode()).toString());
+        List<Integer> statusList = Arrays.asList(AccountCodeStatus.WAIT_USE.getCode(), AccountCodeStatus.USED.getCode(), AccountCodeStatus.UNUSED.getCode());
+        String statusStr = statusList.stream()
+            .map(String::valueOf)
+            .collect(Collectors.joining(","));
+        bo.setStatusList(statusStr);
         return iAgentAccountCodeService.queryPageList(bo, pageQuery);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/business/BusinessController.java

@@ -282,6 +282,9 @@ public class BusinessController extends BaseController {
     @PostMapping("/export")
     public void export(@Validated BusinessBo bo, HttpServletResponse response) {
         List<BusinessVo> list = iBusinessService.queryList(bo);
+        list.stream().forEach(businessVo -> {
+            businessVo.setTotalIntegral(userBusinessRoleService.businessTotalIntegral(businessVo.getBusinessId()));
+        });
         ExcelUtil.exportExcel(list, "商家", BusinessVo.class, response);
     }
 

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

@@ -11,20 +11,18 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.AuditStatus;
 import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.filepathsplicing.FilePathSplicing;
-import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.shop.constants.ShopConstants;
 import com.ruoyi.shop.product.domain.bo.ProductBo;
 import com.ruoyi.shop.product.domain.vo.ProductVo;
+import com.ruoyi.shop.product.exception.ProductExceptionEnum;
 import com.ruoyi.shop.product.service.IProductService;
-import com.ruoyi.user.domain.User;
 import com.ruoyi.user.service.IUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -111,6 +109,9 @@ public class ApiProductController extends AbstractApiController {
     public R<ProductVo> getInfo(@ApiParam("主键") @NotNull(message = "主键不能为空")
                                                   @PathVariable("productId") Long productId) {
         ProductVo productVo = iProductService.queryById(productId);
+        if (ObjectUtil.isNull(productVo)) {
+            throw new ServiceException(ProductExceptionEnum.Product_IS_NOT_EXISTS);
+        }
         productVo.loadSupplier();
         productVo.loadContent();
         productVo.loadProductSkuSetList();

ruoyi-base/src/main/java/com/ruoyi/base/revenue/exception/RevenueSharingConfigExceptionEnum.java

@@ -12,8 +12,7 @@ public enum RevenueSharingConfigExceptionEnum implements IIntegerEnum {
 
     // TODO 注意检查错误码，保证系统内唯一
     RevenueSharingConfig_IS_NOT_EXISTS(470001, "平台分账配置不存在"),
-
-    ;
+    PROVINCE_REGION_RATIO_ADD_REGION_BUSINESS_RATIO_MAX_100(470002, "省级代理和地级代理分账比例加起来不能超过100%");
 
     private Integer code;
 

ruoyi-base/src/main/java/com/ruoyi/base/revenue/service/impl/RevenueSharingConfigServiceImpl.java

@@ -18,6 +18,7 @@ import com.ruoyi.base.revenue.service.IRevenueSharingConfigService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -108,6 +109,10 @@ public class RevenueSharingConfigServiceImpl implements IRevenueSharingConfigSer
      */
     @Override
     public Boolean insertByBo(RevenueSharingConfigBo bo) {
+        //省级代理和地级代理分账比例是否应加起来最大不超过100%
+        if (bo.getProvinceRegionRatio().add(bo.getRegionBusinessRatio()).compareTo(new BigDecimal("100")) > 0) {
+            throw new ServiceException(RevenueSharingConfigExceptionEnum.PROVINCE_REGION_RATIO_ADD_REGION_BUSINESS_RATIO_MAX_100);
+        }
         RevenueSharingConfigVo info = getInfo();
         boolean flag;
         if (ObjectUtil.isNull(info)) {

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

@@ -373,7 +373,6 @@ public class BusinessVo extends BaseVo {
     private BigDecimal agentIncome;
 
     @ApiModelProperty(value = "余额")
-    @ExcelProperty(value = "余额")
     private BigDecimal balance;
 
     @ExcelProperty(value = "店铺积分")

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

@@ -212,7 +212,7 @@ public class BusinessServiceImpl implements IBusinessService {
 
         lqw.exists(ObjectUtil.isNotNull(bo.getBusinessCategoryId()), "SELECT 1 FROM `tb_business_category_relation` WHERE tb_business_category_relation.business_id = tb_business.business_id AND `tb_business_category_relation`.category_id = {0}", bo.getBusinessCategoryId());
 
-        lqw.orderByDesc(Business::getOrderIndex);
+        lqw.orderByAsc(Business::getOrderIndex);
         lqw.orderByDesc(Business::getCreateTime);
 
         return lqw;

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

@@ -86,7 +86,7 @@ public class BusinessDayBillServiceImpl implements IBusinessDayBillService {
         if (ObjectUtil.isNotNull(bo.getEndTime())) {
             lqw.le(BusinessDayBill::getBillDay, bo.getEndTime());
         }
-        lqw.orderByDesc(BusinessDayBill::getBillDay);
+        lqw.orderByDesc(BusinessDayBill::getBillDay).orderByDesc(BusinessDayBill::getBusinessId);
         return lqw;
     }
 

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

@@ -794,23 +794,25 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
 
     @Override
     public BigDecimal getStatistics(List<Long> businessIds, SubsidyCountType countType, SubsidyQueueBo bo) {
-        if (ObjectUtil.isNotNull(bo.getConsumeStartTime())) {
-            bo.setConsumeStartTime(DateUtil.beginOfDay(bo.getConsumeStartTime()));
-        }
-        if (ObjectUtil.isNotNull(bo.getConsumeEndTime())) {
-            bo.setConsumeEndTime(DateUtil.endOfDay(bo.getConsumeEndTime()));
-        }
-        if (ObjectUtil.isNotNull(bo.getQueueStartTime())) {
-            bo.setQueueStartTime(DateUtil.beginOfDay(bo.getQueueStartTime()));
-        }
-        if (ObjectUtil.isNotNull(bo.getQueueEndTime())) {
-            bo.setQueueEndTime(DateUtil.endOfDay(bo.getQueueEndTime()));
-        }
-        if (ObjectUtil.isNotNull(bo.getMoveStartTime())) {
-            bo.setMoveStartTime(DateUtil.beginOfDay(bo.getMoveStartTime()));
-        }
-        if (ObjectUtil.isNotNull(bo.getMoveEndTime())) {
-            bo.setMoveEndTime(DateUtil.endOfDay(bo.getMoveEndTime()));
+        if (ObjectUtil.isNotNull(bo)) {
+            if (ObjectUtil.isNotNull(bo.getConsumeStartTime())) {
+                bo.setConsumeStartTime(DateUtil.beginOfDay(bo.getConsumeStartTime()));
+            }
+            if (ObjectUtil.isNotNull(bo.getConsumeEndTime())) {
+                bo.setConsumeEndTime(DateUtil.endOfDay(bo.getConsumeEndTime()));
+            }
+            if (ObjectUtil.isNotNull(bo.getQueueStartTime())) {
+                bo.setQueueStartTime(DateUtil.beginOfDay(bo.getQueueStartTime()));
+            }
+            if (ObjectUtil.isNotNull(bo.getQueueEndTime())) {
+                bo.setQueueEndTime(DateUtil.endOfDay(bo.getQueueEndTime()));
+            }
+            if (ObjectUtil.isNotNull(bo.getMoveStartTime())) {
+                bo.setMoveStartTime(DateUtil.beginOfDay(bo.getMoveStartTime()));
+            }
+            if (ObjectUtil.isNotNull(bo.getMoveEndTime())) {
+                bo.setMoveEndTime(DateUtil.endOfDay(bo.getMoveEndTime()));
+            }
         }
         if (SubsidyCountType.TODAY_SUBSIDY.equals(countType)) {
             DateTime startTime = DateUtil.beginOfDay(new Date());