111

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java

@@ -12,6 +12,7 @@ import com.bsd.pjcloud.hard.api.dto.order.HardOrderSumAndCountDto;
 import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
 import com.bsd.pjcloud.hard.api.vo.order.*;
+import com.bsd.pjcloud.wallet.api.entity.WalletTransactionEntity;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 
 import org.apache.ibatis.annotations.Mapper;
@@ -22,7 +23,7 @@ import java.util.List;
 @Mapper
 public interface HardOrderMapper extends PjcloudBaseMapper<HardOrderEntity> {
 
-    private LambdaQueryWrapper<HardOrderEntity> commonWrapper(HardOrderDto dto) {
+    default LambdaQueryWrapper<HardOrderEntity> commonWrapper(HardOrderDto dto) {
         LambdaQueryWrapper<HardOrderEntity> wrapper = new LambdaQueryWrapper<HardOrderEntity>()
                 .eq(ObjectUtil.isNotEmpty(dto.getOrderType()), HardOrderEntity::getOrderType, dto.getOrderType())
                 .eq(ObjectUtil.isNotEmpty(dto.getPayType()), HardOrderEntity::getPayType, dto.getPayType())
@@ -67,6 +68,12 @@ public interface HardOrderMapper extends PjcloudBaseMapper<HardOrderEntity> {
                 .in(ObjectUtil.isNotEmpty(dto.getUserIds()), HardOrderEntity::getUserId, dto.getUserIds())
                 .in(ObjectUtil.isNotEmpty(dto.getMchIds()), HardOrderEntity::getMerchantId, dto.getMchIds())
                 .in(ObjectUtil.isNotEmpty(dto.getMchTypeCodes()), HardOrderEntity::getMerchantType, dto.getMchTypeCodes())
+                .between(
+                        ObjectUtil.isNotEmpty(dto.getCreateTimeList()),
+                        HardOrderEntity::getCreateTime,
+                        ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[0] : null,
+                        ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[1] : null
+                )
                 .orderByDesc(HardOrderEntity::getCreateTime)
                 .orderByDesc(HardOrderEntity::getUserId);
         return selectJoinPage(page, HardOrderVo.class, wrapper);