1
This commit is contained in:
@@ -60,6 +60,8 @@ public interface OrderRowRepository extends JpaRepository<OrderRow, String> {
|
|||||||
@Param("unionIds") List<Long> unionIds
|
@Param("unionIds") List<Long> unionIds
|
||||||
);
|
);
|
||||||
|
|
||||||
|
List<OrderRow> findByUnionId(long l);
|
||||||
|
|
||||||
//// 在OrderRowRepository中添加模糊查询方法
|
//// 在OrderRowRepository中添加模糊查询方法
|
||||||
//// 模糊查询收件人姓名或地址(包含分页)
|
//// 模糊查询收件人姓名或地址(包含分页)
|
||||||
//@Query("SELECT o FROM OrderRow o WHERE " + "o.recipientName LIKE %:keyword% OR " + "o.address LIKE %:keyword% " + "ORDER BY o.orderTime DESC")
|
//@Query("SELECT o FROM OrderRow o WHERE " + "o.recipientName LIKE %:keyword% OR " + "o.address LIKE %:keyword% " + "ORDER BY o.orderTime DESC")
|
||||||
|
|||||||
@@ -720,6 +720,26 @@ public class JDUtil {
|
|||||||
|
|
||||||
contents.add(content);
|
contents.add(content);
|
||||||
}
|
}
|
||||||
|
// 查询一个京粉备注的所有订单
|
||||||
|
if (order.startsWith("JF")) {
|
||||||
|
String jf = order.replace("JF", "");
|
||||||
|
String uuid = getJdidFromRemark(jf);
|
||||||
|
if (uuid != null) {
|
||||||
|
orderRows = orderRowRepository.findByUnionId(Long.parseLong(uuid));
|
||||||
|
OrderStats stats = calculateStats(orderRows);
|
||||||
|
contents.add(buildStatsContentAll("总统计", stats));
|
||||||
|
Map<Long, OrderStats> statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(orderRows);
|
||||||
|
StringBuilder stringBuilder = new StringBuilder().append("详:\n");
|
||||||
|
if (statsByUnionId != null) {
|
||||||
|
for (Map.Entry<Long, OrderStats> entry : statsByUnionId.entrySet()) {
|
||||||
|
OrderStats statsDetail = entry.getValue();
|
||||||
|
String remarkFromJdid = getRemarkFromJdid(String.valueOf(entry.getKey()));
|
||||||
|
stringBuilder.append(buildStatsContentMin("粉:" + remarkFromJdid, statsDetail));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
contents.add(stringBuilder);
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
sendOrderToWxByOrderJD("菜单", fromWxid);
|
sendOrderToWxByOrderJD("菜单", fromWxid);
|
||||||
|
|||||||
@@ -107,6 +107,14 @@ public class WXUtil {
|
|||||||
public static String getRemarkFromJdid(String jdid) {
|
public static String getRemarkFromJdid(String jdid) {
|
||||||
return jdidToRemarkMap.get(jdid);
|
return jdidToRemarkMap.get(jdid);
|
||||||
}
|
}
|
||||||
|
public static String getJdidFromRemark(String remark) {
|
||||||
|
for (Map.Entry<String, String> entry : jdidToRemarkMap.entrySet()) {
|
||||||
|
if (entry.getValue().equals(remark)) {
|
||||||
|
return entry.getKey();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
public static List<SuperAdmin> getSuperAdmins(String wxid) {
|
public static List<SuperAdmin> getSuperAdmins(String wxid) {
|
||||||
List<SuperAdmin> result = new ArrayList<>();
|
List<SuperAdmin> result = new ArrayList<>();
|
||||||
|
|||||||
Reference in New Issue
Block a user