需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -1141,7 +1141,8 @@ public class PayOrderLogic {
 
         return settlementOrderService.lambdaQuery()
                 .in(!CollectionUtils.isEmpty(status),SettlementOrder::getStatus,status)
-                .eq(SettlementOrder::getUserId,currentCompanyWechat.getUser().getUserId())
+                .and(item -> item.eq(SettlementOrder::getUserId,currentCompanyWechat.getUser().getUserId())
+                        .or().eq(SettlementOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber()))
                 .between(!StringUtil.isEmpty(startTime),SettlementOrder::getCreateTime,startTime,endTime)
                 .in(SettlementOrder::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
                 .orderByDesc(SettlementOrder::getCreateTime)

mall-miniapp-service/src/main/resources/mapper/CommonMapper.xml

@@ -96,7 +96,7 @@
             </if>
 
             and a.company_wechat_id = #{companyWechatId}
-        <if test="websitIdsQuchu != null and websitIdsQuchu != '' and lng != '0'.toString() and lat != '0'.toString()">
+        <if test="rice != null and rice != '' and lng != '0'.toString() and lat != '0'.toString()">
             HAVING distance &lt; #{rice}
         </if>
         ORDER BY distance