Merge branch 'dev/2024/0704/update-admin-Y' of Harper/feifan-backend-zx-admin into master

每日结算的对应orderId不对

feifan-module-distri/feifan-module-distri-biz/src/main/resources/mapper/shopsettlement/ShopSettlementMapper.xml

@@ -25,13 +25,15 @@
 
     <select id="getOrderByMerchantIdWithsShopId"
             resultMap="BaseResultMap">
-        select id,no from trade_order
+        select o.id,o.no from trade_order o
+        join trade_order_item item on o.id = item.order_id
         where pay_status = 1
-        and deleted = 0
-        and status = 30
-        and shop_id = #{shopId}
-        and merchant_id = #{merchantId}
-        and date(receiving_time) <![CDATA[ <= ]]> DATE_SUB(now(),INTERVAL 7 DAY)
+        and o.deleted = 0
+        and o.status = 30
+        and o.shop_id = #{shopId}
+        and o.merchant_id = #{merchantId}
+        and date(o.receiving_time) <![CDATA[ <= ]]> DATE_SUB(now(),INTERVAL 7 DAY)
+        and item.settlement_time is null
     </select>
 
     <select id="getOrderItem" resultType="cn.newfeifan.mall.module.distri.service.dailybill.dto.OrderItemDTO">