CC/Jarvis_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
雷欧（林平凡）
2025-01-09 13:46:20 +08:00
parent 20b555ee46
commit 6b357b0727
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/van/business/repository/OrderRowRepository.java
View File

@@ -31,7 +31,7 @@ public interface OrderRowRepository extends JpaRepository<OrderRow, String> {
// 查找 validCode != 15 或者 !=-1 的订单行 ,并且按orderTime 降序 // 查找 validCode != 15 或者 !=-1 的订单行 ,并且按orderTime 降序
@Query("select o from OrderRow o where o.validCode not in ?1 order by o.orderTime DESC") @Query("select o from OrderRow o where o.validCode not in ?1 order by o.orderTime DESC")
List<OrderRow> findByValidCodeNotInOrderByOrderTimeDesc(int[] validCodes); List<OrderRow> findByValidCodeNotInOrderByOrderTimeDescAndUnionId(int[] validCodes,Long unionId);
@Query("select o from OrderRow o where o.validCode not in ?1 and o.orderTime >= ?2 order by o.orderTime DESC") @Query("select o from OrderRow o where o.validCode not in ?1 and o.orderTime >= ?2 order by o.orderTime DESC")
List<OrderRow> findByValidCodeNotInAndOrderTimeGreaterThanOrderByOrderTimeDesc( List<OrderRow> findByValidCodeNotInAndOrderTimeGreaterThanOrderByOrderTimeDesc(

13
src/main/java/cn/van/business/util/JDUtils.java
View File

@@ -33,6 +33,8 @@ import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static cn.van.business.util.WXUtil.super_admins;
/** /**
* @author Leo * @author Leo
* @version 1.0 * @version 1.0
@@ -494,7 +496,9 @@ public class JDUtils {
*/ */
public void sendOrderToWxByOrderJD(String order,String fromWxid) { public void sendOrderToWxByOrderJD(String order,String fromWxid) {
int[] param = {-1}; int[] param = {-1};
List<OrderRow> orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDesc(param); WXUtil.SuperAdmin superAdmin = super_admins.get(fromWxid);
String unionId = superAdmin.getUnionId();
List<OrderRow> orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDescAndUnionId(param, Long.valueOf(unionId));
/** /**
* 菜单： * 菜单：
* 今日统计 * 今日统计
@@ -794,8 +798,11 @@ public class JDUtils {
* 高级菜单 * 高级菜单
*/ */
public void sendOrderToWxByOrderJDAdvanced(String order,String fromWxid) { public void sendOrderToWxByOrderJDAdvanced(String order,String fromWxid) {
int[] parm = {-1}; int[] param = {-1};
List<OrderRow> orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDesc(parm); WXUtil.SuperAdmin superAdmin = super_admins.get(fromWxid);
String unionId = superAdmin.getUnionId();
List<OrderRow> orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDescAndUnionId(param, Long.valueOf(unionId));
StringBuilder content = new StringBuilder(); StringBuilder content = new StringBuilder();
if (order.startsWith("高级")) { if (order.startsWith("高级")) {