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

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/domain/bo/BusinessDayBillBo.java

@@ -56,6 +56,10 @@ public class BusinessDayBillBo implements Serializable {
     @NotNull(message = "商家ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long businessId;
 
+
+    @ApiModelProperty(value = "模糊查询商家ID")
+    private Long queryBusinessId;
+
     /**
      * 商家名称
      */

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

@@ -38,6 +38,9 @@ public class BusinessDayBillCountBo implements Serializable {
     @NotNull(message = "商家ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long businessId;
 
+    @ApiModelProperty(value = "模糊查询商家ID")
+    private Long queryBusinessId;
+
     /**
      * 统计类型
      */

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/domain/vo/BusinessDayBillVo.java

@@ -39,20 +39,20 @@ public class BusinessDayBillVo implements Serializable {
     /**
      * 日期
      */
-    @ExcelProperty(value = "日期")
     @ApiModelProperty("日期")
     private Date billDay;
 
     /**
      * 商家ID
      */
+    @ExcelProperty(value = "店铺ID")
     @ApiModelProperty("商家ID")
     private Long businessId;
 
     /**
      * 商家名称
      */
-    @ExcelProperty(value = "商家名称")
+    @ExcelProperty(value = "店铺名称")
     @ApiModelProperty("商家名称")
     private String businessName;
 
@@ -80,24 +80,42 @@ public class BusinessDayBillVo implements Serializable {
     /**
      * 用户消耗积分
      */
-    @ExcelProperty(value = "用户消耗积分")
     @ApiModelProperty("用户消耗积分")
     private BigDecimal userUsePoint;
 
     /**
      * 店铺发放积分
      */
-    @ExcelProperty(value = "店铺发放积分")
     @ApiModelProperty("店铺发放积分")
     private BigDecimal businessGivePoint;
 
+    @ExcelProperty(value = "在线订单额")
+    @ApiModelProperty(value = "在线订单额")
+    private BigDecimal onlineOrderAmount;
+
+    @ExcelProperty(value = "商城订单额")
+    @ApiModelProperty(value = "商城订单额")
+    private BigDecimal shopOrderAmount;
+
+    @ExcelProperty(value = "商家让利")
+    @ApiModelProperty(value = "商家让利")
+    private BigDecimal businessShouldSubsidy;
+
     /**
      * 预估结算
      */
-    @ExcelProperty(value = "预估结算")
+    @ExcelProperty(value = "商家预估结算")
     @ApiModelProperty("预估结算")
     private BigDecimal todaySettlement;
 
+    @ExcelProperty(value = "平台服务费")
+    @ApiModelProperty(value = "平台服务费")
+    private BigDecimal platformServiceFee;
+
+    @ExcelProperty(value = "平台所得")
+    @ApiModelProperty(value = "平台所得")
+    private BigDecimal platformIncome;
+
     /**
      * 结算时间
      */
@@ -105,57 +123,27 @@ public class BusinessDayBillVo implements Serializable {
     private Date todaySettlementTime;
 
 
-    @ExcelProperty(value = "在线订单数")
     @ApiModelProperty(value = "在线订单数")
     private Integer onlineOrderNum;
 
-    @ExcelProperty(value = "商城订单数")
     @ApiModelProperty(value = "商城订单数")
     private Integer shopOrderNum;
 
-    @ExcelProperty(value = "在线订单金额")
-    @ApiModelProperty(value = "在线订单额")
-    private BigDecimal onlineOrderAmount;
-
-    @ExcelProperty(value = "商城订单金额")
-    @ApiModelProperty(value = "商城订单额")
-    private BigDecimal shopOrderAmount;
-
-    @ExcelProperty(value = "在线订单退款单数")
     @ApiModelProperty(value = "在线订单退款单数")
     private Integer onlineRefundOrderNum;
 
-
-    @ExcelProperty(value = "商城订单退款单数")
     @ApiModelProperty(value = "商城订单退款单数")
     private Integer shopRefundOrderNum;
 
-    @ExcelProperty(value = "在线订单退款金额")
     @ApiModelProperty(value = "在线订单退款金额")
     private BigDecimal onlineRefundOrderAmount;
 
-    @ExcelProperty(value = "商城订单退款金额")
     @ApiModelProperty(value = "商城订单退款金额")
     private BigDecimal shopRefundOrderAmount;
 
-
-    @ExcelProperty(value = "商家让利")
-    @ApiModelProperty(value = "商家让利")
-    private BigDecimal businessShouldSubsidy;
-
-    @ExcelProperty(value = "平台服务费")
-    @ApiModelProperty(value = "平台服务费")
-    private BigDecimal platformServiceFee;
-
-    @ExcelProperty(value = "平台所得")
-    @ApiModelProperty(value = "平台所得")
-    private BigDecimal platformIncome;
-
-    @ExcelProperty(value = "积分核销订单数")
     @ApiModelProperty(value = "积分核销订单数")
     private Integer pointVerifiedOrderNum;
 
-    @ExcelProperty(value = "积分核销订单金额")
     @ApiModelProperty(value = "积分核销发发积分额")
     private BigDecimal pointVerifiedOrderAmount;
 

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

@@ -77,7 +77,8 @@ public class BusinessDayBillServiceImpl implements IBusinessDayBillService {
         LambdaQueryWrapper<BusinessDayBill> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getDayValue()), BusinessDayBill::getDayValue, bo.getDayValue());
         lqw.eq(bo.getBillDay() != null, BusinessDayBill::getBillDay, bo.getBillDay());
-        lqw.like(bo.getBusinessId() != null, BusinessDayBill::getBusinessId, bo.getBusinessId());
+        lqw.eq(bo.getBusinessId() != null, BusinessDayBill::getBusinessId, bo.getBusinessId());
+        lqw.like(bo.getQueryBusinessId() != null, BusinessDayBill::getBusinessId, bo.getQueryBusinessId());
         lqw.like(bo.getBusinessName() != null, BusinessDayBill::getBusinessName, bo.getBusinessName());
         if (ObjectUtil.isNotNull(bo.getStartTime())) {
             lqw.ge(BusinessDayBill::getBillDay, bo.getStartTime());

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

@@ -58,6 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.businessId!=null">
                 and tbdb.business_id = #{bo.businessId}
             </if>
+            <if test="bo.queryBusinessId!=null">
+                and tbdb.business_id like concat('%', #{bo.queryBusinessId},'%')
+            </if>
             <if test="bo.businessName!=null and bo.businessName!=''">
                 and tbdb.business_name like concat('%',#{bo.businessName},'%')
             </if>

ruoyi-shop/src/main/resources/mapper/withdrawal/WithdrawalMapper.xml

@@ -68,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join tb_user u on w.withdrawal_source_id = u.id
         left join tb_agent a on w.withdrawal_source_id = a.agent_id
         <include refid="where"/>
+        order by w.create_time desc
     </sql>
 
     <sql id="where">