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

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

@@ -1,6 +1,8 @@
 package com.ruoyi.agent.domain.vo;
 
 import java.math.BigDecimal;
+import java.util.Date;
+
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.agent.enums.BalanceSourceType;
@@ -101,4 +103,8 @@ public class AgentBalanceRecordVo {
      */
     private Long businessId;
     private String businessName;
+
+    @ExcelProperty(value = "创建时间")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
 }

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

@@ -92,6 +92,7 @@ public class AgentAccountCodeApplyServiceImpl implements IAgentAccountCodeApplyS
         lqw.eq(bo.getAuditUserId() != null, AgentAccountCodeApply::getAuditUserId, bo.getAuditUserId());
         lqw.eq(StringUtils.isNotBlank(bo.getAuditResult()), AgentAccountCodeApply::getAuditResult, bo.getAuditResult());
         lqw.eq(bo.getIssuedQuantity() != null, AgentAccountCodeApply::getIssuedQuantity, bo.getIssuedQuantity());
+        lqw.orderByDesc(AgentAccountCodeApply::getCreateTime);
         return lqw;
     }
 

ruoyi-shop/src/main/java/com/ruoyi/shop/business/service/impl/UserBusinessRoleServiceImpl.java

@@ -433,6 +433,14 @@ public class UserBusinessRoleServiceImpl implements IUserBusinessRoleService {
     public TableDataInfo<UserBusinessVerifierIntegralVo> pageVerifyRecord(UserBusinessVerifierIntegralBo bo, PageQuery pageQuery) {
         bo.setBillType(IntegralBillType.OUTER.getCode());
         bo.setSourceType(IntegralSourceType.INTEGRAL_VERIFY.getCode());
+        if(ObjectUtil.isNotNull(bo.getStartTime()))
+        {
+            bo.setStartTime(DateUtil.beginOfDay(bo.getStartTime()));
+        }
+        if(ObjectUtil.isNotNull(bo.getEndTime()))
+        {
+            bo.setEndTime(DateUtil.endOfDay(bo.getEndTime()));
+        }
         Page<UserBusinessVerifierIntegralVo> result = baseMapper.pageVerifyRecord(bo, pageQuery.build());
         result.setRecords(convertVerifyList(result.getRecords()));
         return TableDataInfo.build(result);