dd

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/order/ShopOrderController.java

@@ -225,6 +225,7 @@ public class ShopOrderController extends BaseController {
                 todayOrderAmountFuture,
                 yesterdayOrderAmountFuture,
                 sevenDayOrderAmountFuture,
+                countByBusinessFuture,
                 waitDisposeRightsOrderNumFuture,
                 waitReceiptRightsOrderNumFuture,
                 waitRefundRightsOrderNumFuture,

ruoyi-shop/src/main/java/com/ruoyi/shop/mq/AutoShopOrderNotifyReceiver.java

@@ -234,7 +234,6 @@ public class AutoShopOrderNotifyReceiver extends BaseRabbiMqHandler<BaseMap> {
                     log.info(String.format("维权订单:%s,维权申请商家过期没处理，完成执行货自动同意", saleRightsOrder.getRightsCode()));
                 } catch (Exception ex) {
                     log.error(String.format("维权订单:%s,维权申请商家过期没处理，完成执行货自动同意,出错%s", saleRightsOrder.getRightsCode(), ex.getMessage()));
-                    throw ex;
                 }
             }
         });
@@ -258,7 +257,6 @@ public class AutoShopOrderNotifyReceiver extends BaseRabbiMqHandler<BaseMap> {
                     log.info(String.format("维权订单:%s,买家过期没有填写物流单，完成执行货自动取消", saleRightsOrder.getRightsCode()));
                 } catch (Exception ex) {
                     log.error(String.format("维权订单:%s,买家过期没有填写物流单，完成执行货自动取消,出错%s", saleRightsOrder.getRightsCode(), ex.getMessage()));
-                    throw ex;
                 }
             }
         });
@@ -308,7 +306,6 @@ public class AutoShopOrderNotifyReceiver extends BaseRabbiMqHandler<BaseMap> {
                     log.info(String.format("维权订单:%s,商家处理维权发送消息完成", saleRightsOrder.getRightsCode()));
                 } catch (Exception ex) {
                     log.error(String.format("维权订单:%s,商家处理维权发送消息出错%s", saleRightsOrder.getRightsCode(), ex.getMessage()));
-                    throw ex;
                 }
             }
         });

ruoyi-shop/src/main/java/com/ruoyi/shop/order/mapper/ShopOrderMapper.java

@@ -36,5 +36,5 @@ public interface ShopOrderMapper extends BaseMapperPlus<ShopOrderMapper, ShopOrd
 
     BigDecimal countOrderSale(@Param("bo") BusinessCountBo bo);
 
-    List<ShopOrderTransactionStatusCountVo> countByBusiness(@Param("bo") Long businessId);
+    List<ShopOrderTransactionStatusCountVo> countByBusiness(@Param("businessId") Long businessId);
 }

ruoyi-shop/src/main/resources/mapper/order/ShopOrderMapper.xml

@@ -362,8 +362,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select count(*) as num, transaction_status
         from tb_shop_order
         <where>
-            <if test="bo.businessId != null">
-                and business_id = #{bo.businessId}
+            <if test="businessId != null">
+                and business_id = #{businessId}
             </if>
         </where>
         GROUP BY transaction_status

ruoyi-shop/src/main/resources/mapper/rights/SaleRightsOrderMapper.xml

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         COUNT(1)
         FROM
-        sale_rights_order
+        tb_sale_rights_order
         <where>
             <if test="businessId!=null and businessId > 0">
                 and `business_id` = #{businessId}