wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据概览分页问题

This commit is contained in:
Lenovo 2024-07-29 15:47:01 +08:00
parent a1c5a69e25
commit 6d809404df
2 changed files with 40 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
View File

@ -427,9 +427,6 @@ public class MeituanServiceImpl implements IMeituanService {
break;
}
}
String s = String.valueOf(new Random().nextLong());
String nextId = s.substring(1,s.length());
orderInfo.setId(Long.valueOf(nextId));
orderInfo.setStoreCode(wmPoiId);
orderInfo.setDayseq(daySeq);
orderInfo.setOrderNo(wmOrderViewId);
@ -478,11 +475,8 @@ public class MeituanServiceImpl implements IMeituanService {
}
if (list.size() > 0) {
List<BusOrderInfo> newList = list.stream().collect(Collectors.toMap(BusOrderInfo::getOrderNo, p->p,(p1, p2)->p1)).values().stream().collect(Collectors.toList());
busOrderInfoMapper.batchInsertOrder(newList);
List<BusOrderInfo> newList1 = newList.stream().filter(x -> x.getPrivcyPhone() == null && x.getRecipientPhone() == null && x.getRecipientBindedPhone() == null).collect(Collectors.toList());
priPhoneInfo(newList1,cookie);
priPhoneInfo(newList,cookie);
}
pageNum += 1;
@ -563,7 +557,7 @@ public class MeituanServiceImpl implements IMeituanService {
builder.addTextBody("startDate", date);
builder.addTextBody("endDate", date);
builder.addTextBody("pageNum", String.valueOf(pageNum));
builder.addTextBody("pageSize", "20");
builder.addTextBody("pageSize", "50");
builder.addTextBody("pageGray", "1");
HttpPost httpPost = new HttpPost(url);
@ -664,7 +658,13 @@ public class MeituanServiceImpl implements IMeituanService {
@Transactional(rollbackFor = Exception.class)
public void priPhoneInfo(List<BusOrderInfo> ls, String cookie) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
for (BusOrderInfo orderInfo : ls) {
List<BusOrderInfo> lsList = ls.stream().filter(x -> x.getPrivcyPhone() != null && x.getRecipientPhone() != null && x.getRecipientBindedPhone() != null).collect(Collectors.toList());
List<BusOrderInfo> lsList1 = ls.stream().filter(x -> x.getPrivcyPhone() == null && x.getRecipientPhone() == null && x.getRecipientBindedPhone() == null).collect(Collectors.toList());
List<BusReturnVisitInfo> lss = new ArrayList<>();
for (BusOrderInfo orderInfo : lsList1) {
String url = "https://e.waimai.meituan.com/v2/order/history/r/search/ajax";
String regionId = valueFromCookie("region_id", cookie);
String regionVersion = valueFromCookie("region_version", cookie);
@ -704,38 +704,22 @@ public class MeituanServiceImpl implements IMeituanService {
if ("0".equals(code)) {
JSONArray array = jsonObject.getJSONArray("wmOrderList");
List<PriPhoneInfo> list = new ArrayList<>();
for (Object o : array) {
PriPhoneInfo phoneInfo = new PriPhoneInfo();
JSONObject oj = JSONObject.parseObject(JSON.toJSONString(o));
String wmOrderViewId = oj.getString("wm_order_id_view");
JSONObject oj = array.getJSONObject(0);
String privacyPhone = oj.getString("privacy_phone");
String recipientPhone = oj.getString("recipient_phone");
String recipientBindedPhone = oj.getString("recipient_bindedPhone");
phoneInfo.setOrderId(wmOrderViewId);
phoneInfo.setPricyPhone(privacyPhone);
phoneInfo.setRecipientPhone(recipientPhone);
phoneInfo.setRecipientBindedPhone(recipientBindedPhone);
list.add(phoneInfo);
}
if (list.size() > 0) {
List<BusReturnVisitInfo> lss = new ArrayList<>();
List<BusOrderInfo> lcs = new ArrayList<>();
for (PriPhoneInfo phoneInfo : list) {
System.out.println(phoneInfo.getOrderId() + "," + phoneInfo.getPricyPhone() + "," + phoneInfo.getRecipientPhone() + "," + phoneInfo.getRecipientBindedPhone());
BusOrderInfo busOrderInfo = new BusOrderInfo(phoneInfo);
busOrderInfo.setId(orderInfo.getId());
busOrderInfo.setStoreCode(orderInfo.getStoreCode());
busOrderInfo.setStoreName(orderInfo.getStoreName());
lcs.add(busOrderInfo);
// busOrderInfoMapper.updateBusOrderInfo(busOrderInfo);
orderInfo.setPrivcyPhone(privacyPhone);
orderInfo.setRecipientPhone(recipientPhone);
orderInfo.setRecipientBindedPhone(recipientBindedPhone);
lsList.add(orderInfo);
BusReturnVisitInfo returnVisitInfo = new BusReturnVisitInfo();
returnVisitInfo.setStoreCode(busOrderInfo.getStoreCode());
returnVisitInfo.setStoreName(busOrderInfo.getStoreName());
returnVisitInfo.setPhoneEndNumber(busOrderInfo.getRecipientPhone());
returnVisitInfo.setPhoneNumber(busOrderInfo.getPrivcyPhone());
returnVisitInfo.setStoreCode(orderInfo.getStoreCode());
returnVisitInfo.setStoreName(orderInfo.getStoreName());
returnVisitInfo.setPhoneEndNumber(orderInfo.getRecipientPhone());
returnVisitInfo.setPhoneNumber(orderInfo.getPrivcyPhone());
try {
returnVisitInfo.setOrderCompleteTime(sdf.parse(orderInfo.getCompleteTime()));
@ -745,15 +729,13 @@ public class MeituanServiceImpl implements IMeituanService {
}
lss.add(returnVisitInfo);
}
}
if (lsList.size() > 0) {
busOrderInfoMapper.batchInsertOrder(lsList);
}
if (lss.size() > 0) {
busReturnVisitInfoMapper.batchInsertVisit(lss);
}
if (lcs.size() > 0) {
busOrderInfoMapper.batchupdateBusOrderInfo(lcs);
}
}
}
}
}
/**

4
ruoyi-system/src/main/resources/mapper/business/BusOrderInfoMapper.xml
View File

@ -90,9 +90,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<insert id="batchInsertOrder">
insert into bus_order_info (id,store_code,store_name,custom_id,order_no,order_status,complete_time,dayseq,order_count,order_time,is_phf) values
insert into bus_order_info (id,store_code,store_name,custom_id,order_no,order_status,complete_time,dayseq,privcy_phone,recipient_phone,recipient_binded_phone,order_count,order_time,is_phf) values
<foreach collection="list" separator="," item="item">
(#{item.id},#{item.storeCode},#{item.storeName},#{item.customId},#{item.orderNo},#{item.orderStatus},#{item.completeTime},#{item.dayseq},#{item.orderCount},#{item.orderTime},#{item.isPhf})
(#{item.id},#{item.storeCode},#{item.storeName},#{item.customId},#{item.orderNo},#{item.orderStatus},#{item.completeTime},#{item.dayseq},#{item.privcyPhone},#{item.recipientPhone},#{item.recipientBindedPhone},#{item.orderCount},#{item.orderTime},#{item.isPhf})
</foreach>
</insert>