Bladeren bron

支付联调

guomengjiao 4 maanden geleden
bovenliggende
commit
da61cf27e3

+ 2 - 0
ruoyi-business/src/main/java/com/ruoyi/businessDayBill/domain/bo/BusinessDayBillCountBo.java

@@ -54,4 +54,6 @@ public class BusinessDayBillCountBo implements Serializable {
     @ApiModelProperty(value = "近N日")
     private Integer dayNum;
 
+    private String dayValue;
+
 }

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

@@ -300,15 +300,11 @@ public class BusinessDayBillServiceImpl implements IBusinessDayBillService {
     public BusinessDayBillVo getStatistics(BusinessDayBillCountBo bo) {
         switch (bo.getType()) {
             case "today":
-                return this.baseMapper.selectVoOne(new LambdaQueryWrapper<BusinessDayBill>()
-                    .eq(ObjectUtil.isNotNull(bo.getBusinessId()),BusinessDayBill::getBusinessId, bo.getBusinessId())
-                    .eq(BusinessDayBill::getDayValue, DateUtil.format(new Date(), "yyyy-MM-dd"))
-                );
+                bo.setDayValue(DateUtil.format(new Date(), "yyyy-MM-dd"));
+                return this.baseMapper.getStatistics(bo);
             case "yesterday":
-                return this.baseMapper.selectVoOne(new LambdaQueryWrapper<BusinessDayBill>()
-                    .eq(ObjectUtil.isNotNull(bo.getBusinessId()),BusinessDayBill::getBusinessId, bo.getBusinessId())
-                    .eq(BusinessDayBill::getDayValue, DateUtil.format(DateUtil.offsetDay(new Date(), -1), "yyyy-MM-dd"))
-                );
+                bo.setDayValue(DateUtil.format(DateUtil.offsetDay(new Date(), -1), "yyyy-MM-dd"));
+                return this.baseMapper.getStatistics(bo);
             case "month":
                 bo.setStartTime(DateUtil.beginOfMonth(new Date()));
                 bo.setEndTime(DateUtil.endOfMonth(new Date()));

+ 3 - 0
ruoyi-business/src/main/resources/mapper/businessDayBill/BusinessDayBillMapper.xml

@@ -63,6 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.endTime!=null">
                 and bill_day &lt;= #{bo.endTime}
             </if>
+            <if test="bo.dayValue!=null and bo.dayValue!=''">
+                and day_value = #{bo.dayValue}
+            </if>
         </where>
     </select>