bug修复

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/product/ProductController.java

@@ -82,6 +82,8 @@ public class ProductController extends BaseController {
     @SaCheckPermission("product:product:audit_list")
     @GetMapping("/audit_list")
     public TableDataInfo<ProductVo> auditList(@Validated(QueryGroup.class) ProductBo bo, PageQuery pageQuery) {
+        pageQuery.setOrderByColumn("tp.create_time");
+        pageQuery.setIsAsc("desc");
         return iProductService.queryCustomPageList(bo, pageQuery);
     }
 

ruoyi-business/src/main/java/com/ruoyi/agent/domain/vo/AgentVo.java

@@ -40,14 +40,14 @@ public class AgentVo {
     /**
      * 手机号
      */
-    @ExcelProperty(value = "会员账号", index = 1)
+    @ExcelProperty(value = "会员账号", index = 0)
     @ApiModelProperty(value = "会员账号", required = true)
     private String userMobile;
 
     /**
      * 昵称
      */
-    @ExcelProperty(value = "会员昵称", index = 2)
+    @ExcelProperty(value = "会员昵称", index = 1)
     @ApiModelProperty(value = "会员昵称", required = true)
     private String userNickname;
 
@@ -67,13 +67,13 @@ public class AgentVo {
     /**
      * 代理上级手机号
      */
-    @ExcelProperty(value = "代理上级手机号", index = 6)
+    @ExcelProperty(value = "代理上级手机号", index = 5)
     @ApiModelProperty(value = "代理上级手机号", required = true)
     private String parentAgentPhone;
     /**
      * 代理上级姓名
      */
-    @ExcelProperty(value = "代理上级姓名", index = 7)
+    @ExcelProperty(value = "代理上级姓名", index = 6)
     @ApiModelProperty("代理上级姓名")
     private String parentAgentName;
 
@@ -86,7 +86,7 @@ public class AgentVo {
     /**
      * 代理级别 1:省级代理 2:区县代理
      */
-    @ExcelProperty(value = "代理层级", index = 5, converter = ExcelEnumConvert.class)
+    @ExcelProperty(value = "代理层级", index = 4, converter = ExcelEnumConvert.class)
     @ExcelDictFormat(readConverterExp = "1=省级代理,2=区县代理")
     @ApiModelProperty("代理级别 1:省级代理 2:区县代理")
     private AgentLevel agentLevel;
@@ -94,7 +94,7 @@ public class AgentVo {
     /**
      * 真实姓名
      */
-    @ExcelProperty(value = "真实姓名", index = 3)
+    @ExcelProperty(value = "真实姓名", index = 2)
     @ApiModelProperty("真实姓名")
     private String realName;
 
@@ -107,7 +107,7 @@ public class AgentVo {
     /**
      * 身份证号
      */
-    @ExcelProperty(value = "身份证号", index = 4)
+    @ExcelProperty(value = "身份证号", index = 3)
     @ApiModelProperty("身份证号")
     private String idCard;
 
@@ -120,21 +120,21 @@ public class AgentVo {
     /**
      * 所属省名
      */
-    @ExcelProperty(value = "所属省名", index = 8)
+    @ExcelProperty(value = "所属省名", index = 7)
     @ApiModelProperty("所属省名")
     private String provinceName;
 
     /**
      * 所属市名
      */
-    @ExcelProperty(value = "所属市名", index = 9)
+    @ExcelProperty(value = "所属市名", index = 8)
     @ApiModelProperty("所属市名")
     private String cityName;
 
     /**
      * 所属区名
      */
-    @ExcelProperty(value = "所属区名", index = 10)
+    @ExcelProperty(value = "所属区名", index = 9)
     @ApiModelProperty("所属区名")
     private String areaName;
 
@@ -177,25 +177,25 @@ public class AgentVo {
     /**
      * 累计收益
      */
-    @ExcelProperty(value = "累计收益", index = 11)
+    @ExcelProperty(value = "累计收益", index = 10)
     @ApiModelProperty("累计收益")
     private BigDecimal totalStatisticsAmount;
     /**
      * 累计提现金额
      */
-    @ExcelProperty(value = "累计结算", index = 12)
+    @ExcelProperty(value = "累计结算", index = 11)
     @ApiModelProperty("累计提现金额")
     private BigDecimal totalStatisticsWithdrawalAmount;
     /**
      * 剩余账户码
      */
-    @ExcelProperty(value = "剩余账户码", index = 13)
+    @ExcelProperty(value = "剩余账户码", index = 12)
     @ApiModelProperty("剩余账户码")
     private Long surplusAccountCode;
     /**
      * 推广店铺数
      */
-    @ExcelProperty(value = "推广店铺数", index = 14)
+    @ExcelProperty(value = "推广店铺数", index = 13)
     @ApiModelProperty("推广店铺数")
     private Long promotionBusinessNum;
     /**
@@ -206,7 +206,7 @@ public class AgentVo {
     /**
      * 入驻时间
      */
-    @ExcelProperty(value = "入驻时间", index = 15)
+    @ExcelProperty(value = "入驻时间", index = 14)
     @ApiModelProperty("入驻时间")
     private Date createTime;
 

ruoyi-line/src/main/resources/mapper/subsidy/SubsidyQueueMapper.xml

@@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join tb_online_order as too on tsq.order_id = too.order_id
         <where>
             <if test="query.businessId != null">
-                and tsq.current_business_id = #{businessId}
+                and tsq.current_business_id = #{query.businessId}
             </if>
             <if test="query.businessIds != null and query.businessIds.size>0">
                 and tsq.current_business_id in

ruoyi-shop/src/main/java/com/ruoyi/shop/product/service/impl/ProductServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.shop.product.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -450,6 +451,14 @@ public class ProductServiceImpl implements IProductService {
             productCategoryIds.add(bo.getProductCategoryId());
             bo.setProductCategoryIds(productCategoryIds);
         }
+        if(ObjectUtil.isNotNull(bo.getStartTime()))
+        {
+            bo.setStartTime(DateUtil.beginOfDay(bo.getStartTime()));
+        }
+        if(ObjectUtil.isNotNull(bo.getEndTime()))
+        {
+            bo.setEndTime(DateUtil.endOfDay(bo.getEndTime()));
+        }
         Page<ProductVo> result = baseMapper.queryCustomPageList(pageQuery.buildSafe(ALLOWED_ORDER_COLUMNS), bo);
         return TableDataInfo.build(result);
     }

ruoyi-shop/src/main/java/com/ruoyi/shop/withdrawal/domain/vo/WithdrawalVo.java

@@ -122,7 +122,7 @@ public class WithdrawalVo {
      * 提现状态
      */
     @ExcelProperty(value = "提现状态", converter = ExcelEnumConvert.class)
-    @ExcelDictFormat(readConverterExp = "1=待审核,2=提现失败,3=已到账")
+    @ExcelDictFormat(readConverterExp = "1=待审核,2=驳回,3=已打款")
     @ApiModelProperty("提现状态")
     private WithdrawalStatus status;
 

ruoyi-shop/src/main/java/com/ruoyi/shop/withdrawal/service/impl/WithdrawalServiceImpl.java

@@ -274,20 +274,41 @@ public class WithdrawalServiceImpl implements IWithdrawalService {
 
     @Override
     public TableDataInfo<WithdrawalVo> queryWithdrawaPageList(WithdrawalBo bo, PageQuery pageQuery) {
+        buildTime(bo);
         Page<WithdrawalVo> result = baseMapper.selectWithdrawaPage(pageQuery.build(), bo);
         return TableDataInfo.build(result);
     }
 
     @Override
     public List<WithdrawalVo> queryWithdrawaList(WithdrawalBo bo) {
+        buildTime(bo);
         return baseMapper.selectWithdrawaList(bo);
     }
 
     @Override
     public WithdrawalVo statistics(WithdrawalBo bo) {
+        buildTime(bo);
         return baseMapper.statistics(bo);
     }
 
+    private void buildTime(WithdrawalBo bo) {
+        if(ObjectUtil.isNotNull(bo.getCreateStartTime()))
+        {
+            bo.setCreateStartTime(DateUtil.beginOfDay(bo.getCreateStartTime()));
+        }
+        if(ObjectUtil.isNotNull(bo.getCreateEndTime()))
+        {
+            bo.setCreateEndTime(DateUtil.endOfDay(bo.getCreateEndTime()));
+        }
+        if(ObjectUtil.isNotNull(bo.getPaymentStartTime()))
+        {
+            bo.setPaymentStartTime(DateUtil.beginOfDay(bo.getPaymentStartTime()));
+        }
+        if(ObjectUtil.isNotNull(bo.getPaymentEndTime())) {
+            bo.setPaymentEndTime(DateUtil.endOfDay(bo.getPaymentEndTime()));
+        }
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Boolean audit(WithdrawalBo bo) {

ruoyi-shop/src/main/resources/mapper/product/ProductMapper.xml

@@ -147,6 +147,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.productUseType != null">
                 and tp.product_use_type = #{bo.productUseType.code}
             </if>
+            <if test="bo.startTime != null">
+                and tp.`create_time` >= #{bo.startTime}
+            </if>
+             <if test="bo.endTime != null">
+                and tp.`create_time` &lt;= #{bo.endTime}
+            </if>
         </where>
         <if test="bo.orderType==1">
             ORDER BY tp.recommend_status DESC,tp.show_sales desc,tp.`create_time` ASC

ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserOpinionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.user.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -71,13 +72,21 @@ public class UserOpinionServiceImpl implements IUserOpinionService {
         lqw.eq(StringUtils.isNotBlank(bo.getOpinionContent()), UserOpinion::getOpinionContent, bo.getOpinionContent());
         lqw.eq(bo.getOpinionUserId() != null, UserOpinion::getOpinionUserId, bo.getOpinionUserId());
         lqw.like(StringUtils.isNotBlank(bo.getOpinionUserName()), UserOpinion::getOpinionUserName, bo.getOpinionUserName());
-        lqw.eq(StringUtils.isNotBlank(bo.getOpinionUserPhone()), UserOpinion::getOpinionUserPhone, bo.getOpinionUserPhone());
+        lqw.like(StringUtils.isNotBlank(bo.getOpinionUserPhone()), UserOpinion::getOpinionUserPhone, bo.getOpinionUserPhone());
         lqw.eq(bo.getSubmitTime() != null, UserOpinion::getSubmitTime, bo.getSubmitTime());
         lqw.eq(bo.getOpinionStatus() != null, UserOpinion::getOpinionStatus, bo.getOpinionStatus());
         lqw.eq(bo.getOperateUserId() != null, UserOpinion::getOperateUserId, bo.getOperateUserId());
         lqw.like(StringUtils.isNotBlank(bo.getOperateUserName()), UserOpinion::getOperateUserName, bo.getOperateUserName());
         lqw.eq(bo.getOperateTime() != null, UserOpinion::getOperateTime, bo.getOperateTime());
         lqw.eq(StringUtils.isNotBlank(bo.getOperateContent()), UserOpinion::getOperateContent, bo.getOperateContent());
+        if(ObjectUtil.isNotNull(bo.getSubmitStartTime()))
+        {
+            bo.setSubmitStartTime(DateUtil.beginOfDay(bo.getSubmitStartTime()));
+        }
+        if(ObjectUtil.isNotNull(bo.getSubmitEndTime()))
+        {
+            bo.setSubmitEndTime(DateUtil.endOfDay(bo.getSubmitEndTime()));
+        }
         lqw.ge(bo.getSubmitStartTime() != null, UserOpinion::getSubmitTime, bo.getSubmitStartTime());
         lqw.le(bo.getSubmitEndTime() != null, UserOpinion::getSubmitTime, bo.getSubmitEndTime());
         lqw.orderByDesc(UserOpinion::getSubmitTime);