bug修复

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/domain/vo/SaleRightsOrderExportVo.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.convert.ExcelEnumConvert;
 import com.ruoyi.shop.enums.RightsOperateStatus;
 import com.ruoyi.shop.enums.RightsRefundStatus;
 import com.ruoyi.shop.order.enums.RightsMethod;
@@ -38,8 +38,8 @@ public class SaleRightsOrderExportVo implements Serializable {
     @ExcelProperty(value = "商家名称")
     private String businessName;
 
-    @ExcelProperty(value = "维权方式(0未维权,5退款,10退货退款)", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "0=没有，5=仅退款,10=退款退货")
+    @ExcelProperty(value = "售后类型", converter = ExcelEnumConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=未维权，5=仅退款,10=退款退货")
     private RightsMethod rightsType;
 
     /**
@@ -68,11 +68,14 @@ public class SaleRightsOrderExportVo implements Serializable {
     @ExcelProperty(value = "退款总金额")
     private BigDecimal refundMoney;
 
-    @ExcelProperty(value = "维权订单操作状态", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "退款积分")
+    private BigDecimal refundPoint;
+
+    @ExcelProperty(value = "售后操作", converter = ExcelEnumConvert.class)
     @ExcelDictFormat(readConverterExp = "0=申请，1=商家同意，2=买家已发货，3=商家已收到退货商品,4=商家发起退款支付，5=已支付退款,6=商家拒绝，7=自动关闭,8=主动撤消")
     private RightsOperateStatus rightsOperateStatus;
 
-    @ExcelProperty(value = "维权退款状态", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "售后状态", converter = ExcelEnumConvert.class)
     @ExcelDictFormat(readConverterExp = "0=待退款，1退款成功，2退款失败")
     private RightsRefundStatus rightsRefundStatus;
 

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/service/impl/SaleRightsOrderServiceImpl.java

@@ -153,15 +153,23 @@ public class SaleRightsOrderServiceImpl implements ISaleRightsOrderService {
     private LambdaQueryWrapper<SaleRightsOrder> buildQueryWrapper(SaleRightsOrderBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SaleRightsOrder> lqw = Wrappers.lambdaQuery();
+        if(ObjectUtil.isNotNull(bo.getStartTime()))
+        {
+            bo.setStartTime(DateUtil.beginOfDay(bo.getStartTime()));
+        }
+        if(ObjectUtil.isNotNull(bo.getEndTime()))
+        {
+            bo.setEndTime(DateUtil.endOfDay(bo.getEndTime()));
+        }
         lqw.eq(bo.getBusinessId() != null, SaleRightsOrder::getBusinessId, bo.getBusinessId());
         lqw.like(StringUtils.isNotBlank(bo.getBusinessName()), SaleRightsOrder::getBusinessName, bo.getBusinessName());
         lqw.eq(bo.getOrderId() != null, SaleRightsOrder::getOrderId, bo.getOrderId());
-        lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), SaleRightsOrder::getOrderNo, bo.getOrderNo());
+        lqw.like(StringUtils.isNotBlank(bo.getOrderNo()), SaleRightsOrder::getOrderNo, bo.getOrderNo());
         lqw.eq(bo.getPayMode() != null, SaleRightsOrder::getPayMode, bo.getPayMode());
         lqw.eq(bo.getRefundMoney() != null, SaleRightsOrder::getRefundMoney, bo.getRefundMoney());
         lqw.eq(bo.getRefundNum() != null, SaleRightsOrder::getRefundNum, bo.getRefundNum());
         lqw.eq(bo.getUserId() != null, SaleRightsOrder::getUserId, bo.getUserId());
-        lqw.eq(StringUtils.isNotBlank(bo.getMobile()), SaleRightsOrder::getMobile, bo.getMobile());
+        lqw.like(StringUtils.isNotBlank(bo.getMobile()), SaleRightsOrder::getMobile, bo.getMobile());
         lqw.eq(bo.getRightsCargoStatus() != null, SaleRightsOrder::getRightsCargoStatus, bo.getRightsCargoStatus());
         lqw.eq(bo.getRightsRefundStatus() != null, SaleRightsOrder::getRightsRefundStatus, bo.getRightsRefundStatus());
         lqw.eq(bo.getRightsOperateStatus() != null, SaleRightsOrder::getRightsOperateStatus, bo.getRightsOperateStatus());
@@ -170,13 +178,13 @@ public class SaleRightsOrderServiceImpl implements ISaleRightsOrderService {
         lqw.eq(StringUtils.isNotBlank(bo.getCaption()), SaleRightsOrder::getCaption, bo.getCaption());
         lqw.eq(bo.getValid() != null, SaleRightsOrder::getValid, bo.getValid());
         lqw.eq(bo.getIsAllRights() != null, SaleRightsOrder::getIsAllRights, bo.getIsAllRights());
-        lqw.eq(StringUtils.isNotBlank(bo.getRightsCode()), SaleRightsOrder::getRightsCode, bo.getRightsCode());
+        lqw.like(StringUtils.isNotBlank(bo.getRightsCode()), SaleRightsOrder::getRightsCode, bo.getRightsCode());
         lqw.eq(StringUtils.isNotBlank(bo.getThirdRefundCode()), SaleRightsOrder::getThirdRefundCode, bo.getThirdRefundCode());
         lqw.eq(bo.getLastAgreeTime() != null, SaleRightsOrder::getLastAgreeTime, bo.getLastAgreeTime());
         lqw.eq(bo.getLastShipTime() != null, SaleRightsOrder::getLastShipTime, bo.getLastShipTime());
         lqw.eq(bo.getLastReceiptTime() != null, SaleRightsOrder::getLastReceiptTime, bo.getLastReceiptTime());
         lqw.eq(StringUtils.isNotBlank(bo.getReceiver()), SaleRightsOrder::getReceiver, bo.getReceiver());
-        lqw.eq(StringUtils.isNotBlank(bo.getReceiverMobile()), SaleRightsOrder::getReceiverMobile, bo.getReceiverMobile());
+        lqw.like(StringUtils.isNotBlank(bo.getReceiverMobile()), SaleRightsOrder::getReceiverMobile, bo.getReceiverMobile());
         lqw.eq(bo.getRefundPoint() != null, SaleRightsOrder::getRefundPoint, bo.getRefundPoint());
         lqw.eq(bo.getOrderType() != null, SaleRightsOrder::getOrderType, bo.getOrderType());
         lqw.ge(ObjectUtil.isNotNull(bo.getStartTime()), SaleRightsOrder::getCreateTime, bo.getStartTime());