diff --git a/src/main/java/cn/van/business/repository/OrderRowRepository.java b/src/main/java/cn/van/business/repository/OrderRowRepository.java index c98166c..9ccddc0 100644 --- a/src/main/java/cn/van/business/repository/OrderRowRepository.java +++ b/src/main/java/cn/van/business/repository/OrderRowRepository.java @@ -31,7 +31,7 @@ public interface OrderRowRepository extends JpaRepository { // 查找 validCode != 15 或者 !=-1 的订单行 ,并且按orderTime 降序 @Query("select o from OrderRow o where o.validCode not in ?1 order by o.orderTime DESC") - List findByValidCodeNotInOrderByOrderTimeDesc(int[] validCodes); + List 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") List findByValidCodeNotInAndOrderTimeGreaterThanOrderByOrderTimeDesc( diff --git a/src/main/java/cn/van/business/util/JDUtils.java b/src/main/java/cn/van/business/util/JDUtils.java index 8d5c753..4c39238 100644 --- a/src/main/java/cn/van/business/util/JDUtils.java +++ b/src/main/java/cn/van/business/util/JDUtils.java @@ -33,6 +33,8 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; +import static cn.van.business.util.WXUtil.super_admins; + /** * @author Leo * @version 1.0 @@ -494,7 +496,9 @@ public class JDUtils { */ public void sendOrderToWxByOrderJD(String order,String fromWxid) { int[] param = {-1}; - List orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDesc(param); + WXUtil.SuperAdmin superAdmin = super_admins.get(fromWxid); + String unionId = superAdmin.getUnionId(); + List orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDescAndUnionId(param, Long.valueOf(unionId)); /** * 菜单: * 今日统计 @@ -794,8 +798,11 @@ public class JDUtils { * 高级菜单 */ public void sendOrderToWxByOrderJDAdvanced(String order,String fromWxid) { - int[] parm = {-1}; - List orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDesc(parm); + int[] param = {-1}; + WXUtil.SuperAdmin superAdmin = super_admins.get(fromWxid); + String unionId = superAdmin.getUnionId(); + List orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDescAndUnionId(param, Long.valueOf(unionId)); + StringBuilder content = new StringBuilder(); if (order.startsWith("高级")) {