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

一个微信对多个京粉

Browse Source
This commit is contained in:
雷欧（林平凡）
2025-04-11 15:51:42 +08:00
parent 00dc3d2fc1
commit 2876964c64
5 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,14 +33,22 @@ public interface OrderRowRepository extends JpaRepository<OrderRow, String> {
List<OrderRow> findByValidCode(int validCode); List<OrderRow> findByValidCode(int validCode);
// 查找 validCode != 15 或者 !=-1 的订单行 ,并且按orderTime 降序 // 查找 validCode != 15 或者 !=-1 的订单行 ,并且按orderTime 降序
@Query("select o from OrderRow o where o.validCode not in ?1 and o.unionId =?2 order by o.orderTime DESC") // 修改后支持传入List<Long>
List<OrderRow> findByValidCodeNotInOrderByOrderTimeDescAndUnionId(int[] validCodes, Long unionId); @Query("SELECT o FROM OrderRow o " + "WHERE o.validCode NOT IN ?1 " + "AND o.unionId IN :unionIds " + // 关键修改点
"ORDER BY o.orderTime DESC")
List<OrderRow> findByValidCodeNotInOrderByOrderTimeDescAndUnionId(@Param("validCodes") int[] validCodes, @Param("unionIds") List<Long> unionIds // 参数类型改为List
);
@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(int[] validCodes, @DateTimeFormat(pattern = "yyyy-MM-dd") Date threeMonthsAgo); List<OrderRow> findByValidCodeNotInAndOrderTimeGreaterThanOrderByOrderTimeDesc(int[] validCodes, @DateTimeFormat(pattern = "yyyy-MM-dd") Date threeMonthsAgo);
@Query("select o from OrderRow o where o.validCode not in ?1 and o.skuId = ?2 and o.unionId = ?3 order by o.orderTime DESC") // 修改后支持传入unionId列表
List<OrderRow> findBySkuIdAndUnionId(int[] validCodes,long skuId, long unionId); @Query("SELECT o FROM OrderRow o " + "WHERE o.validCode NOT IN :validCodes " + "AND o.skuId = :skuId " + "AND o.unionId IN :unionIds " + // 关键修改点
"ORDER BY o.orderTime DESC")
List<OrderRow> findBySkuIdAndUnionId(@Param("validCodes") int[] validCodes, @Param("skuId") long skuId, @Param("unionIds") List<Long> unionIds // 参数类型改为List
);
//// 在OrderRowRepository中添加模糊查询方法 //// 在OrderRowRepository中添加模糊查询方法
//// 模糊查询收件人姓名或地址（包含分页） //// 模糊查询收件人姓名或地址（包含分页）

31
src/main/java/cn/van/business/util/JDUtil.java
View File

@@ -235,14 +235,14 @@ public class JDUtil {
public void sendOrderToWxByOrderJD(String order, String fromWxid) { public void sendOrderToWxByOrderJD(String order, String fromWxid) {
int[] param = {-1}; int[] param = {-1};
WXUtil.SuperAdmin superAdmin = getSuperAdmin(fromWxid); List<WXUtil.SuperAdmin> superAdmins = getSuperAdmins(fromWxid);
String unionId; List<Long> unionIds = new ArrayList<>();
if (superAdmin != null) { for (WXUtil.SuperAdmin superAdmin : superAdmins) {
unionId = superAdmin.getUnionId(); String unionId = superAdmin.getUnionId();
}else { unionIds.add(Long.valueOf(unionId));
return;
} }
List<OrderRow> orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDescAndUnionId(param, Long.valueOf(unionId));
List<OrderRow> orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDescAndUnionId(param, unionIds);
/** /**
* 菜单： * 菜单：
* 今日统计 * 今日统计
@@ -426,14 +426,13 @@ public class JDUtil {
*/ */
public void sendOrderToWxByOrderJDAdvanced(String order, String fromWxid) { public void sendOrderToWxByOrderJDAdvanced(String order, String fromWxid) {
int[] param = {-1}; int[] param = {-1};
WXUtil.SuperAdmin superAdmin = getSuperAdmin(fromWxid); List<WXUtil.SuperAdmin> superAdmins = getSuperAdmins(fromWxid);
String unionId; List<Long> unionIds = new ArrayList<>();
if (superAdmin != null) { for (WXUtil.SuperAdmin superAdmin : superAdmins) {
unionId = superAdmin.getUnionId(); String unionId = superAdmin.getUnionId();
}else { unionIds.add(Long.valueOf(unionId));
return;
} }
List<OrderRow> orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDescAndUnionId(param, Long.valueOf(unionId)); List<OrderRow> orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDescAndUnionId(param, unionIds);
List<StringBuilder> contents = new ArrayList<>(); List<StringBuilder> contents = new ArrayList<>();
StringBuilder content = new StringBuilder(); StringBuilder content = new StringBuilder();
@@ -491,7 +490,7 @@ public class JDUtil {
List<OrderRow> orderRowList = orderRowRepository.findByOrderId(Long.parseLong(order)); List<OrderRow> orderRowList = orderRowRepository.findByOrderId(Long.parseLong(order));
if (!orderRowList.isEmpty()) { if (!orderRowList.isEmpty()) {
OrderRow orderRow = orderRowList.get(0); OrderRow orderRow = orderRowList.get(0);
if (orderRow.getUnionId().equals(Long.parseLong(unionId))) { if (unionIds.contains(orderRow.getUnionId())) {
content.append(orderUtil.getFormattedOrderInfo(orderRow, orderRow.getValidCode())); content.append(orderUtil.getFormattedOrderInfo(orderRow, orderRow.getValidCode()));
} else { } else {
content.append("订单不属于你，无法查询\r"); content.append("订单不属于你，无法查询\r");
@@ -506,7 +505,7 @@ public class JDUtil {
content.append("精准查询sku，不统计已取消的订单:\r"); content.append("精准查询sku，不统计已取消的订单:\r");
int[] validCodes = {-1, 3}; int[] validCodes = {-1, 3};
List<OrderRow> bySkuIdAndUnionId = orderRowRepository.findBySkuIdAndUnionId(validCodes, Long.parseLong(order), Long.parseLong(unionId)); List<OrderRow> bySkuIdAndUnionId = orderRowRepository.findBySkuIdAndUnionId(validCodes, Long.parseLong(order), unionIds);
int size = bySkuIdAndUnionId.size(); int size = bySkuIdAndUnionId.size();
content.append("查询到").append(size).append("条订单\r"); content.append("查询到").append(size).append("条订单\r");
// 切割成20条20条返回前100条 // 切割成20条20条返回前100条

8
src/main/java/cn/van/business/util/OrderUtil.java
View File

@@ -156,6 +156,9 @@ public class OrderUtil {
public String getFormattedOrderInfoBatch(OrderRow orderRow) { public String getFormattedOrderInfoBatch(OrderRow orderRow) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
ValidCodeConverter converter = new ValidCodeConverter(); ValidCodeConverter converter = new ValidCodeConverter();
Long unionId = orderRow.getUnionId();
String remarkFromJdid = getRemarkFromJdid(String.valueOf(unionId));
//+ "订单+sku：" + orderRow.getId() + "\r" //+ "订单+sku：" + orderRow.getId() + "\r"
//+ "商品单价：" + orderRow.getPrice() + "\r" //+ "商品单价：" + orderRow.getPrice() + "\r"
//+ "商品数量：" + orderRow.getSkuNum() + "\r" //+ "商品数量：" + orderRow.getSkuNum() + "\r"
@@ -170,9 +173,10 @@ public class OrderUtil {
//} //}
return "订单：" + orderRow.getOrderId() + " (" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r" + return "订单：" + orderRow.getOrderId() + " (" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r"
+"京粉备注："+ remarkFromJdid + "\r"
"状态：" + (converter.getCodeDescription(orderRow.getValidCode())) + "\r" +"状态：" + (converter.getCodeDescription(orderRow.getValidCode())) + "\r"
+ "名称：" + orderRow.getSkuName() + "\r\n" + "名称：" + orderRow.getSkuName() + "\r\n"
//+ "商品单价：" + orderRow.getPrice() + "\r" //+ "商品单价：" + orderRow.getPrice() + "\r"

7
src/main/java/cn/van/business/util/WXUtil.java
View File

@@ -97,13 +97,14 @@ public class WXUtil {
return jdidToRemarkMap.get(jdid); return jdidToRemarkMap.get(jdid);
} }
public static SuperAdmin getSuperAdmin(String wxid) { public static List<SuperAdmin> getSuperAdmins(String wxid) {
List<SuperAdmin> result = new ArrayList<>();
for (SuperAdmin admin : super_admins.values()) { for (SuperAdmin admin : super_admins.values()) {
if (admin.getWxid().equals(wxid)) { if (admin.getWxid().equals(wxid)) {
return admin; result.add(admin);
} }
} }
return null; return result;
} }

2
src/main/java/cn/van/business/util/WxMessageConsumer.java
View File

@@ -231,7 +231,7 @@ public class WxMessageConsumer {
} }
String fromWxid = innerData.getFromWxid(); String fromWxid = innerData.getFromWxid();
WXUtil.SuperAdmin superAdmin = getSuperAdmin(fromWxid); WXUtil.SuperAdmin superAdmin = getSuperAdmins(fromWxid);
if (Util.isEmpty(superAdmin)) { if (Util.isEmpty(superAdmin)) {
logger.info("不是超管消息，不处理"); logger.info("不是超管消息，不处理");
return; return;